From e85a734abe84a9c92e610bc175510e141603bf7c Mon Sep 17 00:00:00 2001 From: xzl Date: Tue, 17 Dec 2024 14:49:24 +0800 Subject: [PATCH] feat: update libxfce4ui to 4.18.6 widget library for Xfce - Gtk+3 variant Issue: https://github.com/deepin-community/sig-deepin-sysdev-team/issues/557 Log: update repo --- COPYING | 60 +- ChangeLog | 6504 ++++++++- Makefile.am | 3 +- Makefile.in | 45 +- NEWS | 236 +- aclocal.m4 | 4436 ++++--- compile | 6 +- config.guess | 1571 ++- config.h.in | 127 +- config.sub | 2681 ++-- configure | 10977 +++++++++------- configure.ac | 59 +- debian/changelog | 105 +- debian/control | 6 +- debian/gbp.conf | 4 +- debian/libxfce4ui-2-0.lintian-overrides | 2 +- debian/libxfce4ui-2-0.symbols | 10 + debian/libxfce4ui-glade.lintian-overrides | 2 - debian/rules | 15 +- debian/source/lintian-overrides | 4 + debian/upstream/metadata | 2 + debian/watch | 2 +- depcomp | 2 +- docs/Makefile.am | 74 +- docs/Makefile.in | 671 +- docs/html/home.png | Bin 169 -> 0 bytes docs/html/left-insensitive.png | Bin 334 -> 0 bytes docs/html/left.png | Bin 185 -> 0 bytes docs/html/right-insensitive.png | Bin 233 -> 0 bytes docs/html/right.png | Bin 184 -> 0 bytes docs/html/up-insensitive.png | Bin 288 -> 0 bytes docs/html/up.png | Bin 186 -> 0 bytes docs/reference/Makefile.am | 45 + docs/reference/Makefile.in | 899 ++ .../html/XfceFilenameInput.html | 47 +- docs/{ => reference}/html/XfceSMClient.html | 67 +- docs/reference/html/XfceScreensaver.html | 250 + .../html/XfceTitledDialog.html | 102 +- .../html/annotation-glossary.html | 30 +- docs/{ => reference}/html/api-index-4-10.html | 12 +- docs/{ => reference}/html/api-index-4-12.html | 12 +- docs/{ => reference}/html/api-index-4-14.html | 12 +- docs/{ => reference}/html/api-index-4-16.html | 20 +- docs/reference/html/api-index-4-18.html | 56 + docs/reference/html/api-index-deprecated.html | 45 + docs/{ => reference}/html/api-index-full.html | 72 +- docs/reference/html/home.png | Bin 0 -> 256 bytes docs/{ => reference}/html/index.html | 57 +- docs/reference/html/left-insensitive.png | Bin 0 -> 395 bytes docs/reference/html/left.png | Bin 0 -> 262 bytes .../html/libxfce4ui-Gdk-Extensions.html | 96 +- .../html/libxfce4ui-Gtk-Extensions.html | 742 +- .../html/libxfce4ui-Spawn.html | 104 +- .../html/libxfce4ui-XfceDialogs.html | 146 +- .../html/libxfce4ui-extensions.html | 12 +- .../html/libxfce4ui-fundamentals.html | 12 +- .../html/libxfce4ui-introduction.html | 14 +- .../html/libxfce4ui-libxfce4ui-config.html | 30 +- docs/{ => reference}/html/libxfce4ui-sm.html | 21 +- .../html/libxfce4ui-widgets.html | 12 +- docs/{ => reference}/html/libxfce4ui.devhelp2 | 26 +- docs/reference/html/right-insensitive.png | Bin 0 -> 373 bytes docs/reference/html/right.png | Bin 0 -> 261 bytes docs/{ => reference}/html/style.css | 56 +- docs/reference/html/up-insensitive.png | Bin 0 -> 374 bytes docs/reference/html/up.png | Bin 0 -> 260 bytes docs/{ => reference}/libxfce4ui-docs.xml | 64 +- docs/{ => reference}/libxfce4ui-overrides.txt | 0 docs/{ => reference}/libxfce4ui-sections.txt | 20 + docs/{ => reference}/libxfce4ui.types | 6 +- docs/version.xml | 1 - docs/version.xml.in | 1 - glade/Makefile.in | 21 +- glade/icons/16x16/Makefile.in | 19 +- glade/icons/22x22/Makefile.in | 19 +- glade/icons/Makefile.in | 21 +- gtk-doc.make | 15 +- icons/128x128/Makefile.in | 19 +- icons/16x16/Makefile.in | 19 +- icons/48x48/Makefile.in | 19 +- icons/Makefile.in | 21 +- icons/scalable/Makefile.in | 19 +- install-sh | 163 +- libxfce4kbd-private/Makefile.am | 4 + libxfce4kbd-private/Makefile.in | 63 +- libxfce4kbd-private/xfce-shortcut-dialog.c | 15 +- .../xfce-shortcuts-editor-dialog.c | 145 + .../xfce-shortcuts-editor-dialog.h | 50 + libxfce4kbd-private/xfce-shortcuts-editor.c | 581 + libxfce4kbd-private/xfce-shortcuts-editor.h | 57 + libxfce4kbd-private/xfce-shortcuts-grabber.c | 773 +- libxfce4kbd-private/xfce-shortcuts-provider.c | 55 +- libxfce4kbd-private/xfce-shortcuts-xfwm4.c | 9 +- libxfce4kbd-private/xfce-shortcuts.c | 5 +- .../xfce4-keyboard-shortcuts.xml | 17 +- libxfce4ui/Makefile.am | 6 +- libxfce4ui/Makefile.in | 51 +- libxfce4ui/libxfce4ui-alias.h | 39 + libxfce4ui/libxfce4ui-aliasdef.c | 39 + libxfce4ui/libxfce4ui-config.h | 10 +- libxfce4ui/libxfce4ui-config.h.in | 2 +- libxfce4ui/libxfce4ui-private.h | 3 - libxfce4ui/libxfce4ui-resources.c | 318 +- libxfce4ui/libxfce4ui.h | 5 +- libxfce4ui/libxfce4ui.symbols | 16 + libxfce4ui/make-libxfce4ui-alias.pl | 5 + libxfce4ui/xfce-dialogs.c | 64 +- libxfce4ui/xfce-dialogs.h | 2 +- libxfce4ui/xfce-filename-input.c | 90 +- libxfce4ui/xfce-filename-input.h | 2 +- libxfce4ui/xfce-gdk-extensions.c | 79 +- libxfce4ui/xfce-gdk-extensions.h | 7 +- libxfce4ui/xfce-gtk-extensions.c | 324 +- libxfce4ui/xfce-gtk-extensions.h | 78 +- libxfce4ui/xfce-screensaver.c | 678 + libxfce4ui/xfce-screensaver.h | 50 + libxfce4ui/xfce-sm-client.c | 38 +- libxfce4ui/xfce-sm-client.h | 2 +- libxfce4ui/xfce-spawn.c | 85 +- libxfce4ui/xfce-spawn.h | 8 +- libxfce4ui/xfce-titled-dialog.c | 167 +- libxfce4ui/xfce-titled-dialog.h | 5 +- ltmain.sh | 860 +- m4/gtk-doc.m4 | 113 + m4/libtool.m4 | 275 +- m4/ltoptions.m4 | 4 +- m4/ltsugar.m4 | 2 +- m4/ltversion.m4 | 13 +- m4/lt~obsolete.m4 | 4 +- missing | 2 +- po/POTFILES.in | 2 + po/am.po | 393 +- po/ar.po | 483 +- po/ast.po | 675 +- po/az.po | 993 ++ po/be.po | 421 +- po/bg.po | 459 +- po/bn.po | 400 +- po/ca.po | 463 +- po/cs.po | 460 +- po/cy.po | 503 +- po/da.po | 447 +- po/de.po | 483 +- po/el.po | 576 +- po/en_AU.po | 445 +- po/en_GB.po | 495 +- po/es.po | 533 +- po/et.po | 445 +- po/eu.po | 447 +- po/fa_IR.po | 972 ++ po/fi.po | 442 +- po/fr.po | 459 +- po/gl.po | 467 +- po/he.po | 431 +- po/hr.po | 460 +- po/hu.po | 492 +- po/hy.po | 438 +- po/hy_AM.po | 438 +- po/hye.po | 458 +- po/id.po | 455 +- po/ie.po | 394 +- po/is.po | 443 +- po/it.po | 464 +- po/ja.po | 396 +- po/ka.po | 464 +- po/kk.po | 480 +- po/ko.po | 444 +- po/lt.po | 432 +- po/lv.po | 225 +- po/ms.po | 456 +- po/nb.po | 464 +- po/nl.po | 462 +- po/nn.po | 431 +- po/oc.po | 498 +- po/pl.po | 437 +- po/pt.po | 450 +- po/pt_BR.po | 454 +- po/ro.po | 468 +- po/ru.po | 477 +- po/sk.po | 462 +- po/sl.po | 431 +- po/sq.po | 492 +- po/sr.po | 435 +- po/sv.po | 444 +- po/te.po | 403 +- po/th.po | 470 +- po/tr.po | 442 +- po/ug.po | 421 +- po/uk.po | 530 +- po/zh_CN.po | 417 +- po/zh_HK.po | 417 +- po/zh_TW.po | 405 +- test-driver | 19 +- tests/Makefile.in | 21 +- tests/test-ui.c | 4 +- xfce4-about/Makefile.in | 26 +- xfce4-about/about-dialog-ui.h | 457 +- xfce4-about/contributors.h | 28 +- xfce4-about/main.c | 22 +- xfce4-about/system-info.c | 76 +- xfce4-about/system-info.h | 13 +- xfce4-about/xfce4-about-dialog.glade | 132 +- 202 files changed, 43707 insertions(+), 22102 deletions(-) delete mode 100644 debian/libxfce4ui-glade.lintian-overrides create mode 100644 debian/source/lintian-overrides create mode 100644 debian/upstream/metadata delete mode 100644 docs/html/home.png delete mode 100644 docs/html/left-insensitive.png delete mode 100644 docs/html/left.png delete mode 100644 docs/html/right-insensitive.png delete mode 100644 docs/html/right.png delete mode 100644 docs/html/up-insensitive.png delete mode 100644 docs/html/up.png create mode 100644 docs/reference/Makefile.am create mode 100644 docs/reference/Makefile.in rename docs/{ => reference}/html/XfceFilenameInput.html (87%) rename docs/{ => reference}/html/XfceSMClient.html (94%) create mode 100644 docs/reference/html/XfceScreensaver.html rename docs/{ => reference}/html/XfceTitledDialog.html (77%) rename docs/{ => reference}/html/annotation-glossary.html (70%) rename docs/{ => reference}/html/api-index-4-10.html (82%) rename docs/{ => reference}/html/api-index-4-12.html (82%) rename docs/{ => reference}/html/api-index-4-14.html (88%) rename docs/{ => reference}/html/api-index-4-16.html (93%) create mode 100644 docs/reference/html/api-index-4-18.html create mode 100644 docs/reference/html/api-index-deprecated.html rename docs/{ => reference}/html/api-index-full.html (88%) create mode 100644 docs/reference/html/home.png rename docs/{ => reference}/html/index.html (63%) create mode 100644 docs/reference/html/left-insensitive.png create mode 100644 docs/reference/html/left.png rename docs/{ => reference}/html/libxfce4ui-Gdk-Extensions.html (50%) rename docs/{ => reference}/html/libxfce4ui-Gtk-Extensions.html (53%) rename docs/{ => reference}/html/libxfce4ui-Spawn.html (75%) rename docs/{ => reference}/html/libxfce4ui-XfceDialogs.html (74%) rename docs/{ => reference}/html/libxfce4ui-extensions.html (82%) rename docs/{ => reference}/html/libxfce4ui-fundamentals.html (83%) rename docs/{ => reference}/html/libxfce4ui-introduction.html (76%) rename docs/{ => reference}/html/libxfce4ui-libxfce4ui-config.html (86%) rename docs/{ => reference}/html/libxfce4ui-sm.html (72%) rename docs/{ => reference}/html/libxfce4ui-widgets.html (83%) rename docs/{ => reference}/html/libxfce4ui.devhelp2 (85%) create mode 100644 docs/reference/html/right-insensitive.png create mode 100644 docs/reference/html/right.png rename docs/{ => reference}/html/style.css (86%) create mode 100644 docs/reference/html/up-insensitive.png create mode 100644 docs/reference/html/up.png rename docs/{ => reference}/libxfce4ui-docs.xml (57%) rename docs/{ => reference}/libxfce4ui-overrides.txt (100%) rename docs/{ => reference}/libxfce4ui-sections.txt (89%) rename docs/{ => reference}/libxfce4ui.types (72%) delete mode 100644 docs/version.xml delete mode 100644 docs/version.xml.in create mode 100644 libxfce4kbd-private/xfce-shortcuts-editor-dialog.c create mode 100644 libxfce4kbd-private/xfce-shortcuts-editor-dialog.h create mode 100644 libxfce4kbd-private/xfce-shortcuts-editor.c create mode 100644 libxfce4kbd-private/xfce-shortcuts-editor.h create mode 100644 libxfce4ui/xfce-screensaver.c create mode 100644 libxfce4ui/xfce-screensaver.h create mode 100644 m4/gtk-doc.m4 create mode 100644 po/az.po create mode 100644 po/fa_IR.po diff --git a/COPYING b/COPYING index 191a97f..12735e6 100644 --- a/COPYING +++ b/COPYING @@ -1,15 +1,15 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the library GPL. It is numbered 2 because it goes with version 2 of the ordinary GPL.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -99,7 +99,7 @@ works together with the library. Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library which @@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -434,4 +434,48 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/ChangeLog b/ChangeLog index cb50155..11744ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,39 +1,6495 @@ -commit a987b4a2c32a1de8a20d6087befc4fa196799f11 +commit 45b7287dc86f635b8d3730651ea66029cf91b495 +Author: Gaël Bonithon +Date: Thu Feb 8 21:20:04 2024 +0100 + + shortcuts-grabber: Remove filtering by level + + This basically reverts b2e1dac2 and a0203505. The reason is that I don't + know how to tell the difference between legitimate and illegitimate + filtering. In particular, using consumed modifiers doesn't help. In the + end, it's better to grab a few too many keys than not enough, so the + balance tips in favor of deletion. + + Closes: #101 + (cherry picked from commit e8b347d7af642cdfbb3cc56d4030541f99ed9ec7) + +commit 77beab274a2822d72cef4d2ac1a17ca281a9a23b +Author: Gaël Bonithon +Date: Mon Feb 5 19:22:36 2024 +0100 + + Back to development + +commit 1b7db325b9503e6f12fae45c0ad40fca1eb9a5fe +Author: Gaël Bonithon +Date: Mon Feb 5 19:21:45 2024 +0100 + + Updates for release + +commit 402f9dcd172dcbe62002553ab056003e4c847d6b +Author: Gaël Bonithon +Date: Mon Feb 5 18:52:34 2024 +0100 + + Update copyright year + + (cherry picked from commit 7726801a6a0a49bd186a99c8a7c8f764f019fa98) + +commit eb648de83ba308d93fc56684851f22cabbc64762 +Author: Gaël Bonithon +Date: Thu Jan 11 17:56:52 2024 +0100 + + build: Search for bind_textdomain_codeset in libintl too + + In FreeBSD bind_textdomain_codeset is provided by external package + gettext via libintl. + + Related: https://gitlab.xfce.org/xfce/libxfce4util/-/issues/25 + (cherry picked from commit 2b78f44eb51a9d8a751581c65f97bff0027bfd9a) + +commit a23126f27961218f5141f977c5b22153bcda8ac7 +Author: Anonymous +Date: Tue Dec 19 12:45:36 2023 +0100 + + I18n: Update translation hr (91%). + + 194 translated messages, 17 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 9972fbcefa822d85de626c22d647e7f16ae1f0b0 +Author: Gaël Bonithon +Date: Mon Dec 4 17:18:07 2023 +0100 + + sm-client: Reset SmcConnection when IceConnection is closed on error + + Maybe we shouldn't have to do this, but it's better to avoid a crash. + + Fixes: #99 + (cherry picked from commit 1e3c4ec2a4f937a0575eb6d12740177f0699ac4a) + +commit a4b4bad1cd30a8dcb0e1f768480fa7fc83080fab +Author: Anonymous +Date: Fri Nov 24 12:45:42 2023 +0100 + + I18n: Update translation tr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit b8ad4c7d66ef141f3b988d29c00c4ce704b7f5e5 +Author: Gaël Bonithon +Date: Thu Nov 23 18:03:35 2023 +0100 + + docs: Improve xfce_sm_client_get() + + It shouldn't actually work like this (it should be either transfer full + or transfer none), but we can't change it now. + + (cherry picked from commit 0987ba01884f7dfc66dbb338c997cf030a270756) + +commit f350b9f33c9401c207a76b97b4e7eabddc8a9eee +Author: Anonymous +Date: Wed Nov 15 12:45:40 2023 +0100 + + I18n: Update translation ie (90%). + + 192 translated messages, 19 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit bd398235a375d568875619652ca5715f652ac584 +Author: Anonymous +Date: Sun Nov 5 12:45:38 2023 +0100 + + I18n: Update translation el (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 15746b5e4cba6723627e816654ddd9a203986e40 +Author: Anonymous +Date: Wed Sep 13 00:45:32 2023 +0200 + + I18n: Update translation da (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1afd424c43779e983860d3f0a1f084d9dbde589f +Author: Gaël Bonithon +Date: Wed Sep 6 13:01:31 2023 +0200 + + shortcuts-grabber: Fix filtering by level + + a0203505 introduced a regression, see + https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/104#note_79217 + + It seems that a reliable way to filter by level, taking into account the + modifiers from gtk_accelerator_parse(), is to apply the inverse + transformation to gdk_keymap_get_entries_for_keyval(), i.e. + gdk_keymap_translate_keyboard_state(), and see if the keyval matches. + + Fixes: a0203505201af43a8ccc063e536f1353b8c5daa4 + Related: xfce4-settings#442 + (cherry picked from commit b2e1dac24e4393badbf0d9ede344f1096b5d8c82) + +commit bb19a5aa254afbc2c16fa9499bbb6690c0ad23c3 +Author: Gaël Bonithon +Date: Wed Sep 6 12:49:55 2023 +0200 + + shortcuts-grabber: Simplify filtering by group + + If (group0_only && n_matches > 0) then n_matches == n_keys, so we keep + all keys regardless of n_matches value. + + (cherry picked from commit c82e0123090dd822b48956f6cd90db6be1b95cae) + +commit 297adc4aa2cfe29db93de49b309bc1feddb61922 +Author: Gaël Bonithon +Date: Wed Sep 6 12:34:59 2023 +0200 + + shortcuts-grabber: Variable renaming + + (cherry picked from commit daabed0cdd7e766176d4be5a5080865b92bab04c) + +commit 36890aafd3884a9b59c6b047f61a1bcf5765b652 +Author: Theo Linkspfeifer +Date: Mon Mar 13 15:12:01 2023 +0100 + + shortcuts-grabber: Filter grabbing by key level + + The idea is to look at the "level" value from GdkKeymapKey and see if + there is a mismatch with the set modifiers for a shortcut. + + Fixes: xfce4-settings#442 + (cherry picked from commit a0203505201af43a8ccc063e536f1353b8c5daa4) + +commit fac7ef59da99d7634e00832e3681e887e6ec6666 +Author: Elliot +Date: Wed Aug 9 21:06:55 2023 +0000 + + Detect keyboard shortcuts with only single modifier keys on key release + + Fixes: #1 + (cherry picked from commit f35d7bd8a62d903b0d19cf3f7554a8736d6cdad1) + +commit b558e7d75a9c7619c3ed7798aec4e7f5146603ce +Author: Anonymous +Date: Sat Jun 3 12:45:37 2023 +0200 + + I18n: Update translation el (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 3a5b7f853eda005ca3b5bb0a9e40b4ab7b7e9229 +Author: Anonymous +Date: Fri Jun 2 12:45:29 2023 +0200 + + I18n: Update translation el (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit a9e684a8356bffbe64900f6881017a70f9eec1ce +Author: Anonymous +Date: Tue May 30 12:45:50 2023 +0200 + + I18n: Update translation zh_TW (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2d87054f9f485d55a511a5c6ab2959398de0e442 +Author: Anonymous +Date: Tue May 30 12:45:50 2023 +0200 + + I18n: Update translation zh_HK (82%). + + 174 translated messages, 37 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit c096d15c236bf7a8bfdc0524f941f6cb675423d0 +Author: Anonymous +Date: Tue May 30 12:45:50 2023 +0200 + + I18n: Update translation zh_CN (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 61686baf9c303f0f8404c4b69b4411b2dfec81a0 +Author: Anonymous +Date: Tue May 30 12:45:50 2023 +0200 + + I18n: Update translation uk (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 0273af27b745bd0654d6b6155140d0104fee1323 +Author: Anonymous +Date: Tue May 30 12:45:50 2023 +0200 + + I18n: Update translation ug (77%). + + 163 translated messages, 48 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1425042737cabbbf7a252babedc8d12c15b83b7b +Author: Anonymous +Date: Tue May 30 12:45:50 2023 +0200 + + I18n: Update translation tr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit c3507796a52dde54cc501719f19a11e1f5e03d68 +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation th (95%). + + 201 translated messages, 10 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit b9a85a099d0ad912f6fb96538fd28b005b47a62a +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation te (54%). + + 116 translated messages, 95 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 7a9fe43b40917fa269848191f5a1a8faacb77928 +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation sv (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e02286a0722c47bef61fec2aa160da1e774618be +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation sr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 479250abc9dc80e3132f2cddd39df7dc20761ea9 +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation sq (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit ba8be2a9ce067024d7dcb2c592c215eeabb953f5 +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation sl (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 722ac3c6c07b17ea472863c7eef6fefdc9f33f6d +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation sk (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 7b498c45f31167603d3f5a6b08d67b73b0c4857c +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation ru (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit bd62f80ef4cfef273707511e46d63df71108eeeb +Author: Anonymous +Date: Tue May 30 12:45:49 2023 +0200 + + I18n: Update translation ro (86%). + + 183 translated messages, 28 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 42d66362fbd20f58d68cc5f15ace5a33018c12be +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation pt_BR (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 30b576b725e33dbadb0befbf6f0b1e2b20ca850b +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation pt (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit ddc16946795b3dd96e0e8aab1b3588dd37ad6e1c +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation pl (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 36986301ee4f81ab7f95779e0b79faa98630af9d +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation oc (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 373d4cd796fddc6c24d592e62904739a94acd2db +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation nn (75%). + + 159 translated messages, 52 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 021174fdb371f0b34428ca775709c3f80ca63ba1 +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation nl (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 3936f84c625a4065d146295de4f70bef37252e57 +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation nb (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit f12d327c2b7effc589fcef26709b503b680899a9 +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation ms (81%). + + 173 translated messages, 38 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 71cba73bdc72c1608f45cbed176e0f9ce7011c09 +Author: Anonymous +Date: Tue May 30 12:45:48 2023 +0200 + + I18n: Update translation lt (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 947d5f3cb8e47a6047ced132127d302df562f44c +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation ko (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 426a87e70c75299dba11f96a5a58dd07927a3ca1 +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation kk (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit db231584250660984a05e362419fb001ddf44730 +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation ka (63%). + + 133 translated messages, 78 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 76d9649177466ff6ad06a921acbd04a2de733920 +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation ja (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1738fc3e2026b9d68ededac2c913432fd14db5d7 +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation it (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 3d1122026a7b8d7e80a0f15088b2e2d10e9558c0 +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation is (76%). + + 161 translated messages, 50 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 00b5d721e81cbd425f81b5e966ee0c21596b1d0c +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation ie (86%). + + 183 translated messages, 28 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6ed94153d3173ceacf18912f1db6d2a0fb8ec0bf +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation id (98%). + + 207 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1cbb74986afe588d4da1103c654f4d2fcb815992 +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation hye (83%). + + 176 translated messages, 35 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 5f8e49b2b407a3e0fe0aeb437cf08cd44fef5f64 +Author: Anonymous +Date: Tue May 30 12:45:47 2023 +0200 + + I18n: Update translation hy_AM (75%). + + 160 translated messages, 51 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit bb5f46e10092a6b3c644590d161db7f1bf0edc6f +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation hy (74%). + + 158 translated messages, 53 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit da9eca3d0948ab1b296361650792aa0c89adc125 +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation hu (98%). + + 208 translated messages, 3 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e5d3dc5c483aadeac2155c4377567052ca9a74aa +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation hr (90%). + + 191 translated messages, 20 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 85832fb5bbe0a97a0544b2e10862a33b3a9cf7a7 +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation he (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 67ba41b7d7cd58bfbf321e29b45bf80dac5c61d2 +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation gl (95%). + + 201 translated messages, 10 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2a2a6e4e2089a2adc59e467369ecc086d6009a9f +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation fr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1e955980bf63eed9b5cf71f939b4e132d2825902 +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation fi (98%). + + 207 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 9198f8890e87404b25c3033ca95c896e3c1c08d4 +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation fa_IR (61%). + + 130 translated messages, 81 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1f3739fe62e4f84451e2dab0ba7c39b62565dd93 +Author: Anonymous +Date: Tue May 30 12:45:46 2023 +0200 + + I18n: Update translation eu (98%). + + 207 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit bd93af7faf31eb6e06b62ecf73bfbf8e8fa18339 +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation et (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 9d2493a9e34b7a51618fdd6ad8fa86ffd01d4ffb +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation es (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 0427932eeca97f983e2d1bf62708205552383dc9 +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation en_GB (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit ce04f3d6f9b16d9885946c9e5ed540c7eaef1605 +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation en_AU (76%). + + 161 translated messages, 50 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit d8522a6a220d1f03e580dd4e228be63eb7dd9ba6 +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation el (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit d88e3baeae871115f7de507d8238da6bc39e68a2 +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation de (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e49ffe84e8827716b8bd8ad4bb3848808cbdb4c4 +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation da (96%). + + 204 translated messages, 7 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 51383d96e65f24d213f16f7d072c8f9e6e620fdc +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation cy (98%). + + 207 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit a245ff97c4293a9e0bc4542e3853ccf0285179b3 +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation cs (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit a70338578d1126a9f1e2f2f6a076b90bf5598dee +Author: Anonymous +Date: Tue May 30 12:45:45 2023 +0200 + + I18n: Update translation ca (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit f027f1dd30e913ecc356d3b0523c22adf9e73d6c +Author: Anonymous +Date: Tue May 30 12:45:44 2023 +0200 + + I18n: Update translation bn (50%). + + 107 translated messages, 104 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit bfa6829b8a2306c206323be1917406ffe388fef9 +Author: Anonymous +Date: Tue May 30 12:45:44 2023 +0200 + + I18n: Update translation bg (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit b5bb7a4d59df9fc0920b3aa981f3e9434d7e8f72 +Author: Anonymous +Date: Tue May 30 12:45:44 2023 +0200 + + I18n: Update translation be (95%). + + 201 translated messages, 10 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 5b39af00dba635c2b09ed69f372488df15722748 +Author: Anonymous +Date: Tue May 30 12:45:44 2023 +0200 + + I18n: Update translation az (96%). + + 204 translated messages, 7 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 8adad48d1bc480243e8b63528707d95f8b852002 +Author: Anonymous +Date: Tue May 30 12:45:44 2023 +0200 + + I18n: Update translation ast (75%). + + 159 translated messages, 52 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit c0aeac75241cbb8c05ff389d340582fc4c13e83e +Author: Anonymous +Date: Tue May 30 12:45:44 2023 +0200 + + I18n: Update translation ar (96%). + + 204 translated messages, 7 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6b9779d3ffc612acf792f5cea2be0cc240e5b8a9 +Author: Anonymous +Date: Tue May 30 12:45:44 2023 +0200 + + I18n: Update translation am (52%). + + 110 translated messages, 101 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit a0c1162a53bc7da466957c483cabec6f9476dbb7 +Author: Anonymous +Date: Tue May 30 00:46:08 2023 +0200 + + I18n: Add new translation fa_IR (62%). + + 129 translated messages, 79 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6ff3f7fc6a5819da2351cb46c38675126b485079 +Author: Anonymous +Date: Tue May 30 00:46:08 2023 +0200 + + I18n: Update translation zh_TW (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6f617ace08e9aacda66a742610a2737d2f353e15 +Author: Anonymous +Date: Tue May 30 00:46:08 2023 +0200 + + I18n: Update translation zh_HK (82%). + + 171 translated messages, 37 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 9aa7a3e6abbdcc3f763c6a166affe7edf85fcb78 +Author: Anonymous +Date: Tue May 30 00:46:08 2023 +0200 + + I18n: Update translation zh_CN (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e56d8bd6ccc55e3a61d42afa245f50b60e48a09f +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation uk (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 660e508ab45910017b0784ab2a288909a6b9ef37 +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation ug (76%). + + 160 translated messages, 48 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit dbad206e8940f0296c1fa532f94698c70e268c0d +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation tr (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit a8eb9f308c3e1cdec123daeb58e77922a0499887 +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation th (95%). + + 198 translated messages, 10 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit cb064c9fac211fe5c22eb0f966c0f8a49012f137 +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation te (54%). + + 113 translated messages, 95 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 107a380c15316743053b7a4a2e52369dadaa7ba5 +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation sv (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 133e0d5703efa0c67f128556548490ccee9d3b00 +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation sr (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 440aae936d08ad6d578eb9470a885ca595b66bff +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation sq (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 266f6d0cdaaa09c9206819329d0ba79b8f57fd97 +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation sl (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 75110f0d111e79065497db837dee4b974708e0d2 +Author: Anonymous +Date: Tue May 30 00:46:07 2023 +0200 + + I18n: Update translation sk (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6bbad2c838872fbcaa136f7970edf9903c5c17fe +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation ru (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 67409152f7f6799d652f5fbf6e420562ec49c225 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation ro (86%). + + 180 translated messages, 28 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit f146b19d412fa4b6a1aabb7c79f9ea09221bffa2 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation pt_BR (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 04c67408814783f626a30b722cabfbf366e5f3d5 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation pt (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 7e58586ea4d52a62a5564107a4b0114abd71da4b +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation pl (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 0f0620e34a7cde8ccc7a33eefc3666b4476b3854 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation oc (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 313c3df31d84de36169f90e8c090bcbf7dbf8766 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation nn (75%). + + 156 translated messages, 52 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 7576008060a96e3761ae1e9823c87b91ec9e06e1 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation nl (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 36c7db4e78abf27881ec69364d0c19982e632e8d +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation nb (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit f0d9d79fe2af1c48f9e4863b651a535180b9d410 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation ms (81%). + + 170 translated messages, 38 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit ba44639700f1eb8e4fca1119711a9f017abbeb26 +Author: Anonymous +Date: Tue May 30 00:46:06 2023 +0200 + + I18n: Update translation lt (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2dd09f38bae4baf6fcca20e9afd5dc6664ff9e9e +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation ko (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 7f302cfb7eac1ebad6fb1bfccb8ff41e9c7c218d +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation kk (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 3a5398234517a9e0b09483abd90943ec3ea06889 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation ka (62%). + + 131 translated messages, 77 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 45df5941e0f000b3ef14fee0c34050400171bda9 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation ja (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 4229886fc0f09d9a57f6e8d229548c0b0081f828 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation it (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit aa57840259b00b5de4c2ffdbf11c2ad15508ec45 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation is (75%). + + 158 translated messages, 50 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 0683b3d83ef6c1e373d2f26329df6ae81840ccc0 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation ie (86%). + + 180 translated messages, 28 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit df24df50a99796ca2f40dfa2ac1c3d6001cdb550 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation id (98%). + + 204 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 9171ea3e662a8421d12d3d12d9585297b2534d87 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation hye (83%). + + 173 translated messages, 35 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 970d9b6bc636723c18ac528d3245d3fa8407901c +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation hy_AM (75%). + + 157 translated messages, 51 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 60dfba50fdcee7a87aa9e142bdbe13446f25def0 +Author: Anonymous +Date: Tue May 30 00:46:05 2023 +0200 + + I18n: Update translation hy (74%). + + 155 translated messages, 53 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6f0f039cabd54e1330f7967acbda9fbb2a71af6d +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation hu (98%). + + 205 translated messages, 3 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2610ed4d859699e3f01561aad65e618dd2e0e690 +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation hr (90%). + + 188 translated messages, 20 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 80f32934ed542fb77fd529960a2e79936aac2f68 +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation he (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 51f51e0d663e09e56911732d43ef3143fcc9bd31 +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation gl (95%). + + 198 translated messages, 10 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit f3f8a54a613eb0eddee81a287e9333da812dc5f4 +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation fr (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit d7773dde733e2f595313a47e8e51795629da06be +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation fi (98%). + + 204 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit cff21cc436126aefa6601a13bdd541f6b71fa0b5 +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation eu (98%). + + 204 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 95cf3e2650a8592a72ffb6b1de81e68c59ce5530 +Author: Anonymous +Date: Tue May 30 00:46:04 2023 +0200 + + I18n: Update translation et (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e17c4390f8d875f160ac334e9df446a0a6bcba77 +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation es (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 432006c63da4190320b2ff015b0934ca555f8d1e +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation en_GB (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 400a19c09a134f4844a1a17624f6ea0d23da5935 +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation en_AU (75%). + + 158 translated messages, 50 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 3bc1594db5aef431d53545f8755d6020f2a41936 +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation el (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1768a8aa111258390b52c631db782119a22257bf +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation de (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 71e1e97a22caa28c55db437d40750c09ef8387dc +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation da (96%). + + 201 translated messages, 7 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit cb239df12a379ed2a87134158f914755a3470ec3 +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation cy (98%). + + 204 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit a992b72215fc3affdce2a2e8b0b4c1619e885a46 +Author: Anonymous +Date: Tue May 30 00:46:03 2023 +0200 + + I18n: Update translation cs (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit efa2b1ecb683823410fd50c3a46eacbd0b860f9a +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation ca (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 7173acf123eee030ad41854b29b7537c8aebc38b +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation bn (50%). + + 104 translated messages, 104 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2483af28f06f442cb99e64d3016f3de1382f0591 +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation bg (100%). + + 208 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 4e3bff521e62ed99ed325c96183b63d4450c03f6 +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation be (95%). + + 198 translated messages, 10 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 4bd7329be95230b76d09a8eac3fd36b13c111b7c +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation az (96%). + + 201 translated messages, 7 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 4a04982abdc41163a275f6bea9a14b9fff0d66ca +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation ast (75%). + + 156 translated messages, 52 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2adfc704190b6139eaefb2f73b657c2a45a23360 +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation ar (96%). + + 201 translated messages, 7 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 9c1243beaccdddb86211b13b2fd4a1cc3d9dd0da +Author: Anonymous +Date: Tue May 30 00:46:02 2023 +0200 + + I18n: Update translation am (52%). + + 109 translated messages, 99 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 4a12406a83660aa3003764ad703e40d9e42894ca +Author: Gaël Bonithon +Date: Mon May 22 19:03:30 2023 +0200 + + Back to development + +commit f023e5690828549f0a9145d293b9555e687f49db +Author: Gaël Bonithon +Date: Mon May 22 19:02:43 2023 +0200 + + Updates for release + +commit 0f4eb4af1dbdd00ed808c3d0700b324f37d60e4c +Author: Gaël Bonithon +Date: Wed May 17 11:00:59 2023 +0200 + + screensaver: Prevent recursive calling of lock command + + This is not intended to prevent a malicious attack but an accidental + recursive call. When xfce4-session!41 is merged, this will allow in + particular to address xfce4-session#120 in this sense. The original idea + is from Jarno Suni in xfce4-session!20. + + (cherry picked from commit 1678d6082c5032a8bf9da591c7251ee8452e7250) + +commit b00fb0804124119e5b732d919d04971dd663d8b3 +Author: Gaël Bonithon +Date: Sun May 14 15:53:57 2023 +0200 + + screensaver: Add lock-on-sleep property + + This is to keep in sync components having this setting under one name + or another. + + Related: xfce4-power-manager#71 + (cherry picked from commit a234e63495e98598d38139e11f2b653c5f63fb43) + +commit 943e2a927e204b68a56cd49c6011a7d18f9e0b74 +Author: Gaël Bonithon +Date: Fri May 12 12:20:11 2023 +0200 + + screensaver: Update fallback list + + Remove xflock4 since it is redundant and this code could replace it in + the future (or not). + + (cherry picked from commit 3d38ce96b63ac7c7e67d63461c453688d026be2c) + +commit ebd9d03ee238ef3ccf7c87f9c85e9a4633d954d1 +Author: Gaël Bonithon +Date: Fri May 12 11:18:57 2023 +0200 + + screensaver: Prioritize user lock command + + (cherry picked from commit d381731a8e68e72ae84354d08b9cfe1d47581860) + +commit 9331a6f1e9f8916e0282f4165a157cf756f76ffa +Author: Gaël Bonithon +Date: Fri May 12 10:14:53 2023 +0200 + + screensaver: Rewrite D-Bus proxies management + + * Do not autostart proxies at initialization + * Monitor all proxies, properly update running state + * Use only one of them: the highest priority + * Do not start another one if the current one fails to lock + + Fixes: #63, #64 + (cherry picked from commit a25f036b656546f2d5ad840ea2aa1a49d8ece232) + +commit b07efc88bbb682cf8a9a962b5578b143f78761cc +Author: Gaël Bonithon +Date: Fri May 12 21:04:37 2023 +0200 + + screensaver: Use reasonable timeout for methods that may not reply + + Helps: #62, #63 + (cherry picked from commit 877226ca89e4df4192a85b37a8804b819c07121f) + +commit 4bf9d5aae572bad7298bc8bba7ae927e25d03ee8 +Author: Gaël Bonithon +Date: Thu May 11 20:42:58 2023 +0200 + + screensaver: Remove support for gnome-screensaver (Fixes #62) + + (cherry picked from commit 3d15064e500cb683188adb5d613b8ca21241b2a5) + +commit 71b533628c5124f8ddab21e19ee5ee025372ea35 +Author: Gaël Bonithon +Date: Fri May 12 11:59:20 2023 +0200 + + screensaver: Do not take into account empty commands + + (cherry picked from commit 4a1067561eddf35b1df635c33b2935dcfddbc587) + +commit 4ecabf14a8feb4f88f4b233a02d887d071abf74f +Author: Gaël Bonithon +Date: Fri May 12 00:10:12 2023 +0200 + + screensaver: Simplify Xfconf management + + (cherry picked from commit 8b947d87b3d1365fc888791631420728af6644e7) + +commit 8ed6cefc1869d255d969773a542b7a3f7340c125 +Author: Gaël Bonithon +Date: Thu May 11 19:18:11 2023 +0200 + + screensaver: Fix memory leak + + (cherry picked from commit 68d465e72fa8c9461e5febcc1ed015d7ab310e74) + +commit 67ab9538729d79bfbbca391f38c91d3bceb60fb0 +Author: Gaël Bonithon +Date: Thu May 11 19:17:52 2023 +0200 + + screensaver: Fix typos + + (cherry picked from commit 31baf6ac8ca03610cfe0a78333cc332a9d407845) + +commit bc4f3c5ad51a2a10e01c7672c8b5927fadb508df +Author: Gaël Bonithon +Date: Sun May 7 18:14:16 2023 +0200 + + screensaver: Run lock command synchronously (Fixes #70) + + (cherry picked from commit 32f761266658e2f59093af259655e44efecf31a9) + +commit 070a2116815d3c917abcb8a04a80f8d428e29f38 +Author: Gaël Bonithon +Date: Tue May 2 12:34:33 2023 +0200 + + screensaver: Add missing include guard + + Fixes: e53afab3215a1dc58f74919fe7f94d8831d6a59f + Related: !89 + (cherry picked from commit e998988f5ca17fea57c78e5fa3ada65cdc0ea351) + +commit 9d04648894af469a048a8638a216afe397a96fef +Author: Gaël Bonithon +Date: Tue Mar 28 19:20:07 2023 +0200 + + Back to development + +commit 62094afee4500659601e5c7bba31b9d56679dfbd +Author: Gaël Bonithon +Date: Tue Mar 28 19:19:35 2023 +0200 + + Updates for release + +commit 6c89cb5e1be20e2ab7fcef720f1869387a76aca9 +Author: Arthur Demchenkov +Date: Wed Mar 22 16:52:17 2023 +0300 + + Add comment about the need for gtk_widget_destroy() + + (cherry picked from commit d4f23105e738ca17bd02d3da95d7a9c9c37ba752) + +commit 8ec234344aa235022a1430e1f36cc023121fcc8e +Author: Arthur Demchenkov +Date: Sun Mar 19 15:08:59 2023 +0300 + + Fix memory management in Vala generated code + + Incorrect use of the "(transfer full)" annotation causes the generated + vala code to execute g_object_unref() for newly created widgets when the + calling function returns. + + These annotations are exposed mainly for GtkWidget, which is the ancestor + of GInitiallyUnowned: https://docs.gtk.org/gtk3/class.Widget.html + + Each GInitiallyUnowned object is created with a floating reference, + which is converted to a regular reference when we call g_object_ref_sink(), + which is called automatically when the widget is added to a container. + + When we use "(transfer full)", vala generates code that assumes the + function returns a value that has a reference belonging to the calling + function. And this reference is removed by g_object_unref() just before + the function returns, which results in freeing up object memory, which + is not what the programmer expects. + + This leads to the following bunch of errors: + (wrapper-2.0): GLib-GObject-WARNING **: instance with invalid (NULL) class pointer + (wrapper-2.0): GLib-GObject-CRITICAL **: g_signal_emit_valist: assertion 'G_TYPE_CHECK_INSTANCE (instance)' failed + (wrapper-2.0): GLib-GObject-CRITICAL **: g_object_set_qdata: assertion 'G_IS_OBJECT (object)' failed + (wrapper-2.0): GLib-GObject-WARNING **: instance with invalid (NULL) class pointer + (wrapper-2.0): GLib-GObject-CRITICAL **: g_signal_handlers_destroy: assertion 'G_TYPE_CHECK_INSTANCE (instance)' failed + (wrapper-2.0): GLib-GObject-WARNING **: instance with invalid (NULL) class pointer + (wrapper-2.0): GLib-GObject-CRITICAL **: g_signal_handlers_destroy: assertion 'G_TYPE_CHECK_INSTANCE (instance)' failed + (wrapper-2.0): GLib-GObject-CRITICAL **: g_object_unref: assertion 'old_ref > 0' failed + + This example shows the errors which were produced by the code which vala + generated after using xfce_gtk_image_menu_item_new_from_icon_name() to + create a menu item. + + Replacing "(transfer full)" with "(transfer none|floating)" libxfceui4 + generates bindings that allow vala to generate code avoiding such errors. + + Follow these links for better understanding: + 1. https://docs.gtk.org/gobject/method.Object.ref_sink.html + 2. https://developer-old.gnome.org/gtk3/stable/gtk-question-index.html (Q#1.5) + 3. https://discourse.gnome.org/t/about-transfer-in-gobject-introspection/2500 + 4. https://gi.readthedocs.io/en/latest/annotations/giannotations.html + + (cherry picked from commit c6cc39297662915ab133d5c4f212e120e8c2ad89) + +commit b68a9c615149646b1110db43ddf2840159800aa3 +Author: Arthur Demchenkov +Date: Sat Mar 18 16:35:18 2023 +0300 + + Add annotation "(nullable)" where appropriate + + (cherry picked from commit 03fa2eebc5bf191d0951aa8a2b35aaab0cd48751) + +commit 6a442b92184bfdf24f8b72a9631085e32563f426 +Author: Arthur Demchenkov +Date: Sat Mar 18 16:24:35 2023 +0300 + + Replace deprecated annotation: "(allow-none)" + + Since gobject-introspection-1.42 it has been replaced by "(nullable)": + https://gi.readthedocs.io/en/latest/annotations/giannotations.html + + (cherry picked from commit 5703f8d4bb36b9664f4efcc4242272db038922fc) + +commit 65f0472d9732610aaf270582baf805ad4ff08e38 +Author: Alexander Schwinn +Date: Sun Mar 19 10:06:40 2023 +0100 + + Harden xfce_gtk_handle_tab_accels (thunar#1067) + + (cherry picked from commit 1e29c16f3e9b27c3c28e076b2ff0b8b8b957bdc4) + +commit 224c8979a034bf87dd2169ed7f1c78d35e40b00a +Author: Gaël Bonithon +Date: Tue Mar 14 16:39:48 2023 +0100 + + screensaver: Avoid Xfconf warning + + Bindings are already removed in finalize() since XfceScreensaver is the + object bound. + + Fixes: 6b714250d08b182ade4819672b1ab32308120c1a + (cherry picked from commit e3db9484786121a48c88d97c597952354a147860) + +commit 06b72b96890a9b0d6ab9c555977a57383d9b287e +Author: Gaël Bonithon +Date: Sat Mar 11 16:26:36 2023 +0100 + + shortcuts-grabber: Ignore keyboard layout change + + Fixes: xfce4-settings#423 + Related: !27, !91 + (cherry picked from commit 19d86df3f7c263197e45b4538c4a42b058a41f2c) + +commit fbbf1aa3d774d9e9d16471ec220c9d0346020050 +Author: Gaël Bonithon +Date: Wed Mar 8 21:02:32 2023 +0100 + + screensaver: Fix Xfconf memory management + + This was wrong in the original code from xfce4-session and + xfce4-power-manager. + + Fixes: e53afab3215a1dc58f74919fe7f94d8831d6a59f + Related: !89 + (cherry picked from commit 6b714250d08b182ade4819672b1ab32308120c1a) + +commit 6747e367bd906ba1458fdd1e8d3decb774f1a2a1 +Author: Gaël Bonithon +Date: Thu Feb 9 12:00:48 2023 +0100 + + Back to development + +commit 3c0752ec83d4a8109dadc61fe67d57dd9cb9c113 +Author: Gaël Bonithon +Date: Thu Feb 9 12:00:09 2023 +0100 + + Updates for release + +commit 89ad8365f8b2195d3a1397b9a3419127bb32db0d +Author: Gaël Bonithon +Date: Thu Feb 9 11:37:50 2023 +0100 + + Update copyright year + + (cherry picked from commit 4f0ae300770605c55cc215026ab0044e7320c9e5) + +commit f4aaa98685c34e59e6262f84de92c4ff47bb9448 +Author: Gaël Bonithon +Date: Thu Feb 9 10:07:54 2023 +0000 + + Add XfceScreensaver + + To share screensaver code between xfce4-power-manager and xfce4-session. + Except for the formatting, the screensaver code reproduced here is that + of xfce4-power-manager@8b2578c0. The code was the same between the two + components, except for the prioritization of org.xfce.ScreenSaver in + `xfce_screensaver_init()` and the fix in xfce4-power-manager@8b2578c0. + + Related: https://gitlab.xfce.org/xfce/xfce4-session/-/issues/149#note_64581 + (cherry picked from commit e53afab3215a1dc58f74919fe7f94d8831d6a59f) + +commit f12e40a2a92c994c1df32afe499197d3d6f323b6 +Author: Gaël Bonithon +Date: Tue Feb 7 17:15:18 2023 +0100 + + docs: Fix broken links + + (cherry picked from commit 3999a490b620814d127a14e7a7be767fc68e4632) + +commit 95c660307f869ecd383041fdc9164d8914786967 +Author: Gaël Bonithon +Date: Thu Feb 2 23:06:07 2023 +0100 + + shortcut-dialog: Use parent window for the grab if possible (Fixes #52) + + (cherry picked from commit e10f494263ca3d164a965a20e28f2792038d933d) + +commit badd037d8805c487287701a1fe150263ca45e4be +Author: Gaël Bonithon +Date: Thu Jan 12 18:55:46 2023 +0100 + + Fix memory leak + + (cherry picked from commit 792359d82114746f2fa1f6e99a4979ed3502b14c) + +commit f68464ac59eaafba197f1ae141af9811f9edf71f +Author: Gaël Bonithon +Date: Fri Jan 6 16:55:26 2023 +0100 + + Fix memory leaks + + (cherry picked from commit 3c1b961b12f54dcd5059e6edc48f2923b8a04f3b) + +commit 25acc74013eebd1167090fd17ed37da5c372de93 +Author: Alexander Schwinn +Date: Thu Jan 5 02:00:18 2023 +0100 + + Back to development + +commit d582bcff1ba2d9bffc4e29407e52ba929ce5c7f7 +Author: Alexander Schwinn +Date: Thu Jan 5 01:56:04 2023 +0100 + + Updates for release + +commit abc66283f93268534ce7a2fdd14202b639f889e7 +Author: Alexander Schwinn +Date: Thu Jan 5 00:37:42 2023 +0000 + + XfceFileNameInput - wrap error message (Issue #60) + + And remove predefined size + + (cherry picked from commit 48bacbbe43655a9935e51fbbe718a48c94bea50b) + +commit 825d8c975c78611e281424c69efa7f2dae267a9b +Author: Erkki Moorits +Date: Mon Jan 2 15:33:03 2023 +0200 + + xfce4-about: Removed excess square brackets + + (cherry picked from commit 64ed862ebddf168bc7993604cead69b260e6a163) + +commit ffa7ab6ac9bf5f3c9afc3f30ca7b2123cff742ed +Author: Gaël Bonithon +Date: Tue Dec 27 13:10:22 2022 +0100 + + Revert "XfceShortcutsGrabber: Detect auto-repeat key press" + + This reverts commit 145e2bed11ab3a682589b028fed4a637c77c436d. + See xfce4-settings!93 for the rationale. + + Fixes: xfce4-settings#422 + Related: #6, !63, !85 + (cherry picked from commit c36347f6249a99461fd306cde99b11cd3564395e) + +commit a5c290a2b0f8af87cfe50a7f69b0204dbb452d92 +Author: Anonymous +Date: Sun Dec 25 00:45:26 2022 +0100 + + I18n: Update translation he (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + + (cherry picked from commit d9132b3f4073c16008aa8a7db5673d656490ace8) + +commit 44994cae805e3f5a866c9b620b2c1d77379df049 +Author: Anonymous +Date: Sat Dec 24 00:46:13 2022 +0100 + + I18n: Update translation sv (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + + (cherry picked from commit f0e793103c0c646f39d094fd9f15426522a10ebc) + +commit 3684db984148b1b95490346188a02412d0c3cf5f +Author: Anonymous +Date: Sat Dec 17 12:45:21 2022 +0100 + + I18n: Update translation ru (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 3ac1d2ea8e35e091a37cac0ac81ed2dbca144269 +Author: Gaël Bonithon +Date: Thu Dec 15 09:52:25 2022 +0100 + + Back to development + +commit 70cd22c04391d45b8cd0cf649696c85e44917c1d +Author: Gaël Bonithon +Date: Thu Dec 15 09:51:57 2022 +0100 + + Updates for release + +commit a7a1c0b990ff958046a415844ff3f74ef4c39e64 +Author: Anonymous +Date: Wed Dec 14 00:45:11 2022 +0100 + + I18n: Update translation pt_BR (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit cb89e99f9c9a285a2a02654bf3c11a36cfde7ebd +Author: Anonymous +Date: Tue Dec 13 12:45:21 2022 +0100 + + I18n: Update translation lt (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit dd70d918397b64e43922183c51626a75313d6b4b +Author: Romain Bouvier +Date: Thu Nov 24 10:36:41 2022 +0100 + + Update About credits + + - Add some long term actives panel plugins/apps contributors too + +commit 49afdd7cc815f1173599334ca742d123aa759327 +Author: Anonymous +Date: Tue Dec 6 00:45:14 2022 +0100 + + I18n: Update translation nb (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2046d098f1e68ce1a0b615e3c1297d270ca431df +Author: Gaël Bonithon +Date: Mon Dec 5 20:12:25 2022 +0100 + + build: Bump requirements for Xfce 4.18 + +commit 6562224cd9fae174816fec26806240f59c5bb1ec +Author: Anonymous +Date: Mon Dec 5 12:45:31 2022 +0100 + + I18n: Update translation hu (96%). + + 203 translated messages, 8 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1ef6aceb016223d3f21c7d083152b4bc973897d0 +Author: Anonymous +Date: Mon Dec 5 00:45:13 2022 +0100 + + I18n: Update translation oc (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e5335365a0cf563a3177bd7aa95b6d460395397e +Author: Anonymous +Date: Mon Dec 5 00:45:13 2022 +0100 + + I18n: Update translation cs (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 00c99917d227773284575aa6e64d407f38d8cb8a +Author: Anonymous +Date: Sat Dec 3 00:45:13 2022 +0100 + + I18n: Update translation tr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit bccff4c72dafc401357b94ab3f16f5866dfd6eb4 +Author: Anonymous +Date: Fri Dec 2 00:45:18 2022 +0100 + + I18n: Update translation de (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 3e7d123ac321b4208cf6e64b5f2fb1e188a74667 +Author: Anonymous +Date: Thu Dec 1 12:45:31 2022 +0100 + + I18n: Update translation tr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 083e9e7bef8ef35e722f9715cd4703d385476725 +Author: Anonymous +Date: Thu Dec 1 00:45:14 2022 +0100 + + I18n: Update translation zh_CN (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 14c42f7919aea735cb51c1449598d954ab4ec97d +Author: Anonymous +Date: Thu Dec 1 00:45:14 2022 +0100 + + I18n: Update translation sr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit fec4567b252f8752d02f7cc9f8edcffd6100d5db +Author: Gaël Bonithon +Date: Wed Nov 30 16:48:33 2022 +0100 + + Back to development + +commit 1e94f6386a6026c31bdb3d7b1d0e9761878cb1ab +Author: Gaël Bonithon +Date: Wed Nov 30 16:48:09 2022 +0100 + + Updates for release + +commit 051a49dc1b86a32dcad0c3a02e8c2c69c59d9ad7 +Author: Anonymous +Date: Wed Nov 30 00:45:13 2022 +0100 + + I18n: Update translation pt (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 5851c1a54c5d4bf5d9e242b06e5e5263fc85788d +Author: Anonymous +Date: Wed Nov 30 00:45:13 2022 +0100 + + I18n: Update translation kk (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e5067fda764601b3247fb3432b8be4908c5b62d3 +Author: Anonymous +Date: Wed Nov 30 00:45:13 2022 +0100 + + I18n: Update translation fr (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 971f9729299e66448cad04036cb7200ec7abde65 +Author: Anonymous +Date: Wed Nov 30 00:45:13 2022 +0100 + + I18n: Update translation et (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit d1e6947577fdc217d242059d504e90752bee58ec +Author: Anonymous +Date: Wed Nov 30 00:45:13 2022 +0100 + + I18n: Update translation es (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 08a5e8ebdc1c89379b79c504f9b4bf0ae6c0401d +Author: Anonymous +Date: Tue Nov 29 12:45:18 2022 +0100 + + I18n: Update translation zh_TW (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit bdabd0b5b602a180e112b995e59b00451b259082 +Author: Anonymous +Date: Tue Nov 29 12:45:18 2022 +0100 + + I18n: Update translation bg (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit dcf6177dd57598263cb2ced94543e24d1b9e5598 +Author: Anonymous +Date: Tue Nov 29 00:45:11 2022 +0100 + + I18n: Update translation sq (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 726f79ce6ca174106bc511bd4d2c64bbfb9b3781 +Author: Anonymous +Date: Tue Nov 29 00:45:11 2022 +0100 + + I18n: Update translation lt (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e4b41bddc00ed69035b6f047bb25b8d0d87e3b78 +Author: Anonymous +Date: Mon Nov 28 21:10:54 2022 +0100 + + I18n: Update translation pl (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 5b1dcb313ba55afc0f207f6cd8e7e0a883381f3b +Author: Anonymous +Date: Mon Nov 28 21:10:53 2022 +0100 + + I18n: Update translation nl (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit e3404a17c6e2dc44446eeb906ea40a3113765d48 +Author: Anonymous +Date: Mon Nov 28 21:10:53 2022 +0100 + + I18n: Update translation ja (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6d7a4f35ea4ac33c2188791e5c96ecf17c14dd4d +Author: Anonymous +Date: Mon Nov 28 21:10:53 2022 +0100 + + I18n: Update translation it (100%). + + 211 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit fb7a9c2e8914d4024fb62f73d178144d62b90725 +Author: Anonymous +Date: Mon Nov 28 15:02:58 2022 +0100 + + I18n: Update translation it (98%). + + 207 translated messages, 4 untranslated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit ac48fdbdb8d00ce2158a301fde47c04a0cab9fe1 +Author: Nicholas Dahm <(first).(last) at gmail> +Date: Mon Oct 10 23:40:52 2022 -0400 + + Added move-window-to-monitor shortcut options + +commit ad95bc69237c3633a0e8c63f059f049fa8cf1b32 +Author: Gaël Bonithon +Date: Mon Oct 31 17:02:42 2022 +0100 + + Back to development + +commit 802f00e18666629eb580f9f37c045ef38fccadf2 +Author: Gaël Bonithon +Date: Mon Oct 31 17:02:06 2022 +0100 + + Updates for release + +commit 344ed13e4b0a505984bbeae721ca9664f2288aa0 +Author: Anonymous +Date: Thu Oct 27 00:45:15 2022 +0200 + + I18n: Update translation oc (100%). + + 207 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 1bce0d91fdd2529f94ed986e46a1dc42acee81fb +Author: Anonymous +Date: Thu Oct 20 00:45:15 2022 +0200 + + I18n: Update translation kk (100%). + + 207 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 2a8556b818a608f7646ad0314fd96b606d1cef8a +Author: Anonymous +Date: Mon Oct 10 09:41:22 2022 +0200 + + I18n: Update translation sl (100%). + + 207 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit a3bb2bf2230b7fd01caf0a5b79fc52e2cb22037a +Author: Anonymous +Date: Tue Oct 4 14:20:55 2022 +0200 + + I18n: Update translation eu (100%). + + 207 translated messages. + + Transifex (https://explore.transifex.com/xfce/). + +commit 6414240a0ba7536aea3905fa19f503f5f5d719f2 +Author: Alexander Schwinn +Date: Sat Sep 10 22:47:52 2022 +0000 + + Bump GObject Introspection minim version to 1.66 + +commit 3064fa5a39b8b0473b490f8711ca5c83edafdc66 +Author: Gaël Bonithon +Date: Mon Sep 5 18:17:27 2022 +0200 + + Back to development + +commit e7054237516edb6de4c3b169240212fdd2a63d4e +Author: Gaël Bonithon +Date: Mon Sep 5 18:15:09 2022 +0200 + + Updates for release + +commit 3afda0243f1e44d380a52741453139f9d7682d60 +Author: Gaël Bonithon +Date: Mon Sep 5 18:03:33 2022 +0200 + + Update copyright year + +commit 34dcb2c5bf05935c15cc5d9ff1554346315eaab0 +Author: Gaël Bonithon +Date: Sun Sep 4 22:16:52 2022 +0200 + + docs: Add missing index of deprecated symbols + +commit 0da4040dde6caee16222a8214103be38a7f861ae +Author: Gaël Bonithon +Date: Sun Sep 4 12:47:52 2022 +0200 + + libxfce4kbd-private: Reset shortcut recursively + + Fixes: #53 + Co-authored-by: Theo Linkspfeifer + +commit 50b57a2e26d8f88c516099621c4a2fca0530f86b +Author: Gaël Bonithon +Date: Sun Sep 4 12:18:49 2022 +0200 + + tests: Fix deprecation warning + +commit dea3e9a452a4b6109ae46060a23e7817ed6e5aa1 +Author: Gaël Bonithon +Date: Sun Sep 4 11:46:58 2022 +0200 + + docs: Fix some broken links + +commit 939767d13448dcc06f886efcfee0223165b177a9 +Author: Gaël Bonithon +Date: Sun Sep 4 11:45:58 2022 +0200 + + docs: Fix "unused declarations" warning + + * Use private subsection + * LIBXFCE4UI_INSIDE_LIBXFCE4UI_H -> _LIBXFCE4UI_INSIDE_LIBXFCE4UI_H + * Use I_ from Libxfce4util, available since 4.17.2 + +commit 77d1f9f915bdc5282c2913f74df36ca276ca1edb +Author: Gaël Bonithon +Date: Sun Sep 4 11:43:39 2022 +0200 + + docs: Add missing documentation + +commit 0e7f46775679af5ae138764ae153b8b5fb2714c1 +Author: Gaël Bonithon +Date: Sun Sep 4 11:40:27 2022 +0200 + + docs: Add missing deprecation guards + +commit 09f789e09622c3135a27986d7518359552f4c5eb +Author: Gaël Bonithon +Date: Sun Sep 4 11:28:06 2022 +0200 + + docs: Update `.gitignore` + +commit 67c3ef26a3d4d1835c751737d776b162bfe31271 +Author: Andre Miranda +Date: Mon Aug 22 21:20:57 2022 +0200 + + titled-dialog: Add margin to subtitle + +commit 3eebdd1bdc75d471cd1c9248dc26556775188a54 +Author: Andre Miranda +Date: Mon Aug 22 21:15:01 2022 +0200 + + titled-dialog: Add style classes to subtitle and separator + +commit db63977f29488b4f15d565646e2aa9d1fbf9828d +Author: Andre Miranda +Date: Mon Aug 22 21:09:34 2022 +0200 + + titled-dialog: Fix indentation + +commit 9f3e29f129ab7cbccc003fb2b1b6b72553656784 +Author: Andre Miranda +Date: Mon Aug 22 21:08:09 2022 +0200 + + titled-dialog: Support subtitles when headerbars are not used + +commit 2e39a1c71af41e037c5bf50e217d1029559114ca +Author: Anonymous +Date: Sat Aug 20 00:45:29 2022 +0200 + + I18n: Update translation id (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ee1747cf36642352dfccd0fb27a86c39b983ecfd +Author: Anonymous +Date: Sat Aug 6 12:45:38 2022 +0200 + + I18n: Update translation tr (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3c4d55126e210f566960a6c3946c15f079ca4c08 +Author: Anonymous +Date: Sun Jul 31 00:45:27 2022 +0200 + + I18n: Update translation he (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5f4003e1f1ee88fdaa342312331edccca5c4be7a +Author: Anonymous +Date: Wed Jul 27 00:45:30 2022 +0200 + + I18n: Update translation uk (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 17f90d99916b3e97ef368d1b6a24861dec16a0c7 +Author: ზურაბი დავითაშვილი +Date: Tue Jul 26 00:45:32 2022 +0200 + + I18n: Update translation ka (64%). + + 133 translated messages, 74 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fb4c989e192770240d027c6b78f46c4afd9965a7 +Author: Anonymous +Date: Sat Jul 23 12:45:33 2022 +0200 + + I18n: Update translation fr (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2bd2f4f419e38f82404c70c311b7c6bc354656e8 +Author: Anonymous +Date: Fri Jul 22 00:45:28 2022 +0200 + + I18n: Update translation it (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 16faf307dff147799710ec32bb093fb458a4efcf +Author: Anonymous +Date: Thu Jul 21 12:45:37 2022 +0200 + + I18n: Update translation ru (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 14b442e93864ab125b3665511c5446bd45d0be99 +Author: Anonymous +Date: Tue Jul 19 00:45:37 2022 +0200 + + I18n: Update translation sv (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7d4ecf1ac735a2df18e1a997e8ea21f5f3f9386b +Author: Anonymous +Date: Tue Jul 19 00:45:37 2022 +0200 + + I18n: Update translation sr (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 93cb1bbb6c4b095688871e485dcab649cafdc322 +Author: Anonymous +Date: Tue Jul 19 00:45:36 2022 +0200 + + I18n: Update translation es (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 52e914d0d7b1755fcec6d296cb2bca9a5526cf2c +Author: Anonymous +Date: Mon Jul 18 12:45:43 2022 +0200 + + I18n: Update translation zh_TW (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 60531ce6e63c50c0d410532fc34dd56480e59b15 +Author: Anonymous +Date: Mon Jul 18 00:45:27 2022 +0200 + + I18n: Update translation lt (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit aa686df728ef27a718a1313c3cba3c8a818c87f6 +Author: Anonymous +Date: Mon Jul 18 00:45:26 2022 +0200 + + I18n: Update translation cy (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2a696e168523424c611b723e7fb2864ddc55704f +Author: YuHeng Chou +Date: Sun Jul 17 12:45:38 2022 +0200 + + I18n: Update translation zh_CN (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a89131b92ff8dd1eb8452d51ab02f0a655e679f9 +Author: Anonymous +Date: Sun Jul 17 12:45:38 2022 +0200 + + I18n: Update translation bg (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9df0e1822b31bb434035cc5e6e2b604e23e2c967 +Author: Anonymous +Date: Sun Jul 17 00:45:27 2022 +0200 + + I18n: Update translation pt (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9cd933072a2e7fc42b9fefa0670387ea349dcac6 +Author: Anonymous +Date: Sun Jul 17 00:45:27 2022 +0200 + + I18n: Update translation nb (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f07fe894e27141fc0af3bd20a35de43345435919 +Author: Anonymous +Date: Sun Jul 17 00:45:27 2022 +0200 + + I18n: Update translation et (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 753b0da038720b520a3f23e57d61584b5cd2eb2a +Author: Anonymous +Date: Sun Jul 17 00:45:27 2022 +0200 + + I18n: Update translation de (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 80bd85383a94acec08e02a3b5b5d867938495887 +Author: Anonymous +Date: Sat Jul 16 12:45:40 2022 +0200 + + I18n: Update translation sq (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d430d1c0921f0e342d451a16d3ea82c8e06c805e +Author: Anonymous +Date: Sat Jul 16 12:45:39 2022 +0200 + + I18n: Update translation pl (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 56963b5b77fc025fb0ea244be0baacc1993a5587 +Author: Anonymous +Date: Sat Jul 16 12:45:39 2022 +0200 + + I18n: Update translation nl (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c447474d7b3fab6a4726f862a32660d6c11c42c1 +Author: Anonymous +Date: Sat Jul 16 12:45:39 2022 +0200 + + I18n: Update translation ko (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b46fa9de9a4c9bc393ced607fdb49b6051f43740 +Author: Anonymous +Date: Sat Jul 16 12:45:39 2022 +0200 + + I18n: Update translation ja (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7344589044713cbc8c2f2848fc9f4ad9a6714bca +Author: Theo Linkspfeifer +Date: Fri Jul 15 16:59:56 2022 +0200 + + xfce-about: Add kernel and gtk version to system tab + +commit e941515a183902c88f50d299f0f598609f9f8002 +Author: Theo Linkspfeifer +Date: Wed Jul 13 20:55:28 2022 +0000 + + titled-dialog: Exclude normal windows from CSD adjustments + + Enhances: !71 + + MR !72 + +commit a3cb2ffc327f604eea6a515d8af0ebcd66082354 +Author: Theo Linkspfeifer +Date: Mon Jul 11 17:34:36 2022 +0200 + + xfce-about: Slightly tweak padding + +commit 04ccfc4f081eb0c1048878510bf9a9ccd8b47b88 +Author: Anonymous +Date: Tue Jul 12 00:45:27 2022 +0200 + + I18n: Update translation cy (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b2500373a0fd2605de3dcc5636adc598bcaa01fd +Author: Wu Xiaotian +Date: Mon Jul 11 19:58:50 2022 +0000 + + xfce4-about: Add support for 3A5000/loongarch64 + + MR !74 + +commit 8361668494df1513e3441664312ea570bb4356ab +Author: Anonymous +Date: Mon Jul 11 12:45:39 2022 +0200 + + I18n: Update translation cy (76%). + + 157 translated messages, 48 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b2e7075c9dd6c9117e7a90763c60b4c4a9c96a01 +Author: Anonymous +Date: Sat Jun 25 12:45:41 2022 +0200 + + I18n: Update translation el (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit df93fede02dd3d352ef36a79bd97ee78a88de788 +Author: Theo Linkspfeifer +Date: Mon Jun 13 16:17:49 2022 +0200 + + titled-dialog: CSD XfceTitledDialog improvements (Fixes #26) + + We have to work around the limitation of GtkDialogs with CSD not having + the min and max buttons. This is done by changing the type-hint from + "dialog" to "normal". + + As a result of that change, we also have to manually center the window + on the active screen. + +commit 89b6b6cc45287d70059c9b941db08ec9dee471ca +Author: Sabri Ünal +Date: Fri Jun 17 12:45:42 2022 +0200 + + I18n: Update translation tr (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4f51f29cf61399fc03d5e47d013e2a68bcef40d3 +Author: Anonymous +Date: Fri Jun 17 12:45:41 2022 +0200 + + I18n: Update translation sv (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3a70b328ab682db129e2bf43b60f59d5f1a7e163 +Author: Anonymous +Date: Tue Jun 14 12:45:37 2022 +0200 + + I18n: Update translation ru (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bbe5139523c1ba42bd1db9ff4806a579388c1429 +Author: Anonymous +Date: Tue Jun 14 00:45:32 2022 +0200 + + I18n: Update translation sr (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3500149bcc2d821cecad151210e9b82e84d9b5a0 +Author: Anonymous +Date: Tue Jun 14 00:45:32 2022 +0200 + + I18n: Update translation sq (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7324e6945c86f2e4e20f773a68157aedd02cc010 +Author: Anonymous +Date: Mon Jun 13 12:45:38 2022 +0200 + + I18n: Update translation ja (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 88d0b0ea838489cb8aa04bcfba0c59d2c0039c41 +Author: Anonymous +Date: Mon Jun 13 00:45:30 2022 +0200 + + I18n: Update translation es (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a4cf8447035d323f3001734203f7dd4a7fe01617 +Author: Anonymous +Date: Sun Jun 12 12:45:41 2022 +0200 + + I18n: Update translation nb (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 935d2995b1bd6d3c3bc237bda6b08a4b7dabb63b +Author: Anonymous +Date: Sun Jun 12 00:45:32 2022 +0200 + + I18n: Update translation pt (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f105cdda1359bbb29f085722ee7d3fd90268272b +Author: Anonymous +Date: Sun Jun 12 00:45:31 2022 +0200 + + I18n: Update translation nl (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a112fcb7827f0cbb73835398064a29840dd1c297 +Author: Anonymous +Date: Sun Jun 12 00:45:31 2022 +0200 + + I18n: Update translation lt (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1f0b98678dee79bd5e0d1f601b2bcf85faef5846 +Author: roxfr +Date: Sun Jun 12 00:45:31 2022 +0200 + + I18n: Update translation fr (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2026a941ef2e6eb43ed8c751613617b996e63253 +Author: Anonymous +Date: Sat Jun 11 12:45:33 2022 +0200 + + I18n: Update translation et (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 81037ded6d8dea782bf7ca6903c9b4bd5a1f874e +Author: Anonymous +Date: Sat Jun 11 00:45:32 2022 +0200 + + I18n: Update translation it (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4c1ac5814b8eb2cbf48af5848542923d63b8a6a0 +Author: Anonymous +Date: Sat Jun 11 00:45:32 2022 +0200 + + I18n: Update translation de (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 344a99e34d43c4e512dbe4c34622cae3511c9930 +Author: Anonymous +Date: Fri Jun 10 12:45:54 2022 +0200 + + I18n: Update translation zh_TW (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7e1c1a800740d0f82c77dd905a7f2fe7fcf42ac9 +Author: Anonymous +Date: Fri Jun 10 12:45:54 2022 +0200 + + I18n: Update translation zh_CN (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 997c4d831e12d1471db56c93f23e163c8d4f6069 +Author: Anonymous +Date: Fri Jun 10 12:45:54 2022 +0200 + + I18n: Update translation uk (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8de54e11610b9c4e3fbfe1a4b913247bfeeffb0f +Author: Anonymous +Date: Fri Jun 10 12:45:54 2022 +0200 + + I18n: Update translation tr (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d37ad52632dbaf3c9fe1425a70af176bb0ea14f8 +Author: Anonymous +Date: Fri Jun 10 12:45:54 2022 +0200 + + I18n: Update translation sv (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 98ca18bcab25727f082215bcd0b2d444a6610141 +Author: Anonymous +Date: Fri Jun 10 12:45:54 2022 +0200 + + I18n: Update translation sr (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d490eb16e75827f1f5f5ba68250d512911ee8903 +Author: Anonymous +Date: Fri Jun 10 12:45:54 2022 +0200 + + I18n: Update translation sq (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9106ba55eb00ae8522a027441cdc82dd37a6edb3 +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation sl (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0449a99ece874133fe271894ec4eb7011ea55b37 +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation ru (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 95908a2fb9ab53095e1798435054b979b8667fd2 +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation ro (89%). + + 183 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f59905a5fdbcb5ea88dd7c6b39fc5aa20360bf77 +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation pt (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e25126855fdd94d8636cb9dda3e068f81c415f92 +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation pt_BR (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 263800d9f52cd5da8d80fb0312800ad8a03d92c0 +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation pl (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a2adcbfc12e95f2b4628f74b79bc59a1ffd9fa25 +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation oc (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 790fa92353f9e69a6418aa61c950400420e1855f +Author: Anonymous +Date: Fri Jun 10 12:45:53 2022 +0200 + + I18n: Update translation nl (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 20111d534a4c86133eeb924146f970e84e041a39 +Author: heskjestad +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation nb (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4dc00fc68c7d20c57b304f967198375aa6012b73 +Author: Anonymous +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation lt (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 476fabc954b2dfae221de5d4600b78eae1254af7 +Author: Anonymous +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation ja (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 974086e6b5c6f9e096bab0825e0759c8c64bd2c7 +Author: Anonymous +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation it (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 101e91cff4a9d9cfd583d585290d7c303887ef3f +Author: William Thomas +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation id (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 84079783e14f5d1734b93171201f54921c850291 +Author: Anonymous +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation hr (89%). + + 184 translated messages, 21 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 193688a7e5ba2a347c940acb7a96fabeaba5f2d3 +Author: Omer I.S +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation he (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b24ff2810cda8de4ba62b01c99e8c61b9194fca3 +Author: Anonymous +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation fr (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 24575ab84b5e1484fbdd8c69e1bc13a462db20e2 +Author: Anonymous +Date: Fri Jun 10 12:45:52 2022 +0200 + + I18n: Update translation eu (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d56b941628d62a4d89d4f06c7c6fc10e61ae1e1b +Author: Anonymous +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation et (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 60862d78922a9ad16bebf9a5eec23dd04781085a +Author: Anonymous +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation es (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fa4cb13cf9c1a6aa7115d0c249dd9e4c80b536b9 +Author: Anonymous +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation el (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a921765b0882f23acdf3515ab511d8e1eee4edb4 +Author: Anonymous +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation de (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cc100dd0088ebd4190daf698511e31e033795bb4 +Author: Anonymous +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation da (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7a71574ac2e7512e67578f4a3998e5b660ef223d +Author: Anonymous +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation cs (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4f478159b88181d67f46c76f272445c4c04a7d1f +Author: Anonymous +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation bg (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 35ba33da307ccce0830f341ef8163a7a2af22df4 +Author: Əmrə Türkoğlu Tutsaq +Date: Fri Jun 10 12:45:51 2022 +0200 + + I18n: Update translation az (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7147fe77dfe21b1e981e859c6f2b5733a9636318 +Author: Mutaz ismail +Date: Fri Jun 10 12:45:50 2022 +0200 + + I18n: Update translation ar (99%). + + 204 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 04793177639d10c93df890f25cb448e9942eb547 +Author: Sergios - Anestis Kefalidis +Date: Thu Jun 9 12:09:02 2022 +0300 + + Shortcuts Editor: Tooltip improvement + +commit 95ce9e69356c8f8302af0c41d054040f7044ee75 +Author: Mutaz ismail +Date: Tue Jun 7 12:45:39 2022 +0200 + + I18n: Update translation ar (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 00548c1d4dbe9db0ae4508be0039532c6cb97678 +Author: Mutaz ismail +Date: Tue Jun 7 00:45:32 2022 +0200 + + I18n: Update translation ar (98%). + + 202 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 414aa89d824112f59f574c728247e601567df459 +Author: Romain Bouvier +Date: Fri May 13 17:48:47 2022 +0200 + + Fix intltool lock file problem during make distcheck + + - This break make distcheck because a lock file may be left behind in + build dir + - See https://code.launchpad.net/~invidian/intltool/fix-dangling-lock-file/+merge/400825 + for details + +commit e5a8f6e95874bf27c8a36f5bae37170f0f47bf0c +Author: Anonymous +Date: Tue May 3 00:45:32 2022 +0200 + + I18n: Update translation el (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 33697abcc16cb296824e62fae80d4ba10e022feb +Author: Anonymous +Date: Mon May 2 00:45:29 2022 +0200 + + I18n: Update translation el (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 338caea15c029ceec3853333a37e06e02b00b5fe +Author: Anonymous +Date: Sun May 1 12:45:42 2022 +0200 + + I18n: Update translation el (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 185894d22e92a4503a7d83a536b322004c670fe3 +Author: Joan Bruguera +Date: Mon Apr 18 17:34:45 2022 +0200 + + xfce-spawn: Unset exact environment variables only + + The check for unsetting the DISPLAY / DESKTOP_STARTUP_ID environment variables + lacked a "=" at the end, thus it could clear any environment variable *prefixed* + with DISPLAY or DESKTOP_STARTUP_ID, such as one named DISPLAY_STUFF. + +commit 607ccfc21ee090b88a183f1aee8fa011e3d5df1d +Author: Joan Bruguera +Date: Sun Apr 17 22:36:02 2022 +0200 + + xfce-spawn: Do not change DISPLAY on non-X11 displays + + xfce_spawn_process sets the DISPLAY environment variable according to + gdk_screen_make_display_name (screen), but gdk_screen_make_display_name only + returns an X11 display name on X11 environments, so the DISPLAY environment + variable gets set to the wrong value for non-X11 environments. + + In particular, for Wayland, it returns WAYLAND_DISPLAY, so DISPLAY gets + overridden to WAYLAND_DISPLAY, which breaks spawning X11 applications on + XWayland setups (e.g. when launching from Thunar custom actions). + + Only set DISPLAY on X11 displays, and otherwise leave DISPLAY as-is. + + Fixes: #13 + Co-authored-by: Andre Miranda + +commit 2db2cd75b7c1d1443b75c1660ba686021544c919 +Author: Gaël Bonithon +Date: Tue Apr 12 19:47:27 2022 +0200 + + xfce-dialogs: Fix a memory leak + +commit a6626d322072dcb85dfa58524c6b0f988cac3d02 +Author: Anonymous +Date: Wed Apr 6 12:45:37 2022 +0200 + + I18n: Update translation hu (86%). + + 178 translated messages, 27 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1228bd24ea65ea8815d670bff2778b79ce39aacc +Author: Gaël Bonithon +Date: Fri Apr 1 23:56:33 2022 +0200 + + Bump minimal required libxfce4util to 4.17.2 + + `xfce_str_replace()` used in !55 requires libxfce4util 4.17.2. + +commit 3d87d944574b065c326e0f60973f676e07442896 +Author: Anonymous +Date: Fri Apr 1 00:45:30 2022 +0200 + + I18n: Update translation tr (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 86728770685fe59a5772395bb55e53b227f253ce +Author: Əmrə Türkoğlu Tutsaq +Date: Fri Apr 1 00:45:30 2022 +0200 + + I18n: Update translation az (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d878c0e1b72a55175d56df8e94b81f85ed3c6700 +Author: Alexander Schwinn +Date: Thu Mar 31 23:23:41 2022 +0200 + + Back to development + +commit a8a9c0d6ae6387feb0bc335d6cf54cceb3d50ca4 +Author: Alexander Schwinn +Date: Thu Mar 31 23:17:48 2022 +0200 + + Updates for release + +commit 18a17c32972d0cf37196116209366ed779ba4bb7 +Author: Gaël Bonithon +Date: Tue Mar 29 19:51:01 2022 +0200 + + XfceShortcutsEditor: Do not update editor if shortcut change failed + +commit e70623b3a3107ce874b827e1addbb3fe5147e8d4 +Author: Gaël Bonithon +Date: Tue Mar 29 18:17:15 2022 +0200 + + XfceShortcutsEditor: Allow to choose "Space" or "Enter" as shortcut + +commit b3537ba0c5f5499253929e875f0f0de09294387c +Author: Gaël Bonithon +Date: Tue Mar 29 18:01:22 2022 +0200 + + XfceShortcutDialog: Do not propagate key events + + This prevents the predefined keyboard shortcuts of the dialog from + interfering, like "Enter" to activate the default widget, or "Escape" to + trigger "delete-event". These keys can then be entered as shortcuts for + the application calling the dialog. + +commit 86c9d5d74841c6e8c73e833a87d1a217005d5885 +Author: Əmrə Türkoğlu Tutsaq +Date: Thu Mar 31 12:45:35 2022 +0200 + + I18n: Add new translation az (68%). + + 141 translated messages, 64 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 54cbc20c4b1e641b3a6736a2830d45b2e64ec02e +Author: Sergios - Anestis Kefalidis +Date: Mon Mar 28 12:57:00 2022 +0300 + + Function description spelling and format. + +commit b5536a1ef5390798998ff95542dcedb4fb99e623 +Author: Sergios - Anestis Kefalidis +Date: Mon Mar 28 12:56:52 2022 +0300 + + Add new function xfce_gtk_toggle_tool_button_new_from_action_entry + +commit 502779a2537fc984f1abc028bc65f6cdbfb77b8d +Author: Gaël Bonithon +Date: Thu Mar 24 11:08:58 2022 +0100 + + XfceShortcutsGrabber: Fix `-Wanalyzer-null-dereference` warning + + This ensures that `get_entries_for_keyval()` returns `FALSE` if and only + if `keys == NULL && n_keys == 0`, thus avoiding possible null pointer + dereference later. + +commit 4dc280f8258bf95a9acf580d9618ceeb6faecb66 +Author: Gaël Bonithon +Date: Thu Mar 24 10:23:34 2022 +0100 + + Secure memory allocations + + * Use GLib functions to avoid having to check if the call succeeded. In + particular, this removes warnings from the GCC static analyzer + (`-fanalyzer` option). + * Among these functions, prefer `g_new()` to avoid overflow when + calculating the size of the allocated block with some optimizations, + and improve readability. + +commit 797b7a6b681c4ae193cb5d14b44e8150be77f221 +Author: Kevin Bowen +Date: Tue Mar 22 06:42:27 2022 -0700 + + Update COPYING + +commit 145e2bed11ab3a682589b028fed4a637c77c436d +Author: Gaël Bonithon +Date: Fri Mar 18 18:28:52 2022 +0100 + + XfceShortcutsGrabber: Detect auto-repeat key press + + Fixes #6. + +commit 0c1e5a839d8dd267d999a1423a11c9bfc435c625 +Author: Gaël Bonithon +Date: Wed Mar 16 12:10:41 2022 +0100 + + XfceShortcutDialog: Fix a memory leak + +commit 67999b8037d7526a3087279914b900fddb982c96 +Author: Alexander Schwinn +Date: Tue Mar 15 21:30:28 2022 +0100 + + Back to development + +commit 43479767f2aa690758de23daba2b3852a58fd95c +Author: Alexander Schwinn +Date: Tue Mar 15 21:24:48 2022 +0100 + + Updates for release + +commit 91dd545d100ff7d4fcd812b0b1b41f3ab07c5cdd +Author: Gaël Bonithon +Date: Sat Mar 12 18:23:40 2022 +0100 + + XfceShortcutsEditor: Allow NULL for section name and document it + + Related to !46. + +commit 9a1210a1689bb61c5f147ece4b09292df8c76388 +Author: Gaël Bonithon +Date: Mon Mar 14 18:49:18 2022 +0100 + + XfceShortcutsEditor: Add new vectorized constructor + + This is useful when the number of sections is only known at runtime, + thus avoiding the use of `xfce_shortcuts_editor_new()` in a loop. + +commit 60b1b577ee1afe12990c6d5ab751dfdc72ac9adf +Author: Gaël Bonithon +Date: Sat Mar 12 09:52:23 2022 +0100 + + i18n: Do not use textdomain() in libs + + This makes the library the default translation domain and thus breaks + the translation system for applications that use the library. + + See also: + https://developer-old.gnome.org/glib/stable/glib-I18N.html + https://gitlab.xfce.org/xfce/libxfce4util/-/blob/0ef5af7114fd357d7cdb8b20c66f69791858a21c/libxfce4util/libxfce4util-private.c#L41 + +commit 98c3e867d10ba378b0915a4349db7cdf6ab66414 +Author: Gaël Bonithon +Date: Sun Mar 13 22:11:08 2022 +0000 + + XfceShortcutsEditor: Remove label formatting if necessary + + This prevents mnemonics in the text of 'xfce_shortcut_dialog', which is used to record new shortcuts. + +commit 12072b663a51cd804abdf61f0d8d09bfe72efc1e +Author: Anonymous +Date: Sat Mar 12 00:45:35 2022 +0100 + + I18n: Update translation ru (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d1d82ea6553a496e750b6bf81cba90d8f5b80a7b +Author: Anonymous +Date: Sat Mar 12 00:45:35 2022 +0100 + + I18n: Update translation da (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3e6c1a939fdeee8a59b066d072329be9aa13adc0 +Author: Alexander Schwinn +Date: Mon Feb 28 22:32:21 2022 +0000 + + Simplify startup notification timeout + + Related: xfce/thunar#125 (xfce/thunar#125) + + GTimeVal is deprecated due to Y2038 problem. Instead of replacing it, it is just dropped here to simplify the related code. + +commit 8959a150d067dfcb0dbf89d0fec1da14002c01a1 +Author: Sergios - Anestis Kefalidis +Date: Thu Feb 24 18:56:17 2022 +0200 + + XfceShortcutsDialog: New function for centering the dialog on the parent window + +commit bd06688363ced819078d7bb0cb222924900ebcbe +Author: Andre Miranda +Date: Mon Feb 21 18:48:41 2022 -0300 + + Back to development + +commit 957606b36e3568ae69b6045a592e100355ce55f2 +Author: Andre Miranda +Date: Mon Feb 21 18:46:31 2022 -0300 + + Updates for release + +commit 1dbf1ffcc6f9e11a0ec583cb1de2029ae9eb1d24 +Author: MShrimp4 +Date: Fri Feb 18 13:13:41 2022 +0900 + + Replace duplicate logic with xfce_str_replace + + Related: exo#82 (https://gitlab.xfce.org/xfce/exo/-/issues/82#note_42725), + libxfce4util!24 + +commit bbd31aa98399475b0ebb42e7efc784d4b95b1d46 +Author: Andre Miranda +Date: Mon Feb 21 21:12:25 2022 +0000 + + Use headerbars for dialogs if Gtk/DialogsUseHeader is enabled (#14) + +commit a3c4246a7638446e78a39074a64827dddc1328cf +Author: Alexander Schwinn +Date: Mon Feb 21 21:40:57 2022 +0100 + + Add new method "xfce_gtk_menu_append_separator" (Issue #49) + + To get rid of the duplicate of "xfce_gtk_menu_append_seperator" which + has a typo. + +commit 8933a0d7800418c46f74181437149b86332b8528 +Author: Yarema aka Knedlyk +Date: Thu Feb 3 00:45:31 2022 +0100 + + I18n: Update translation uk (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 79f55a1798c06d85369602388ea46191be1a57df +Author: Anonymous +Date: Thu Jan 27 12:45:43 2022 +0100 + + I18n: Update translation cs (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a446c6b348529a4ecbde09bded52c41f3b412708 +Author: Hunter Turcin +Date: Tue Jan 11 07:36:45 2022 +0000 + + xfce4-about - improve /etc/os-release value unquoting (Issue #47) + + - support for single quotes + - fixes partial unquoting in some cases + + MR !54 + +commit b6723f1f158ebfd9d7eb87e124d21a5b8e270766 +Author: Alexander Schwinn +Date: Thu Jan 6 23:41:11 2022 +0100 + + Add comment to return gboolean in XfceGtkActionEntry + + See as well: + + https://gitlab.xfce.org/xfce/thunar/-/issues/469 + https://gitlab.xfce.org/xfce/thunar/-/merge_requests/179 + https://gitlab.xfce.org/apps/xfce4-terminal/-/merge_requests/33 + +commit f0c8415b59d7f13e43ceb4a9dcac677922dfd8c7 +Author: Anonymous +Date: Thu Jan 6 00:45:30 2022 +0100 + + I18n: Update translation ro (89%). + + 184 translated messages, 21 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 62d48ab434df9a0ef8aff0a1a4d56104ea554c8b +Author: Omer I.S +Date: Sat Jan 1 00:45:26 2022 +0100 + + I18n: Update translation he (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 482274d3ffcb3525cb66390721da768453bcd658 +Author: Anonymous +Date: Wed Dec 29 12:45:34 2021 +0100 + + I18n: Update translation oc (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0c2e0b6515af2571ee2c52341967b97408c5c94d +Author: Alexander Schwinn +Date: Sun Dec 26 23:55:51 2021 +0100 + + Back to development + +commit ea2522755366c2707c9afec50a2d9311779ee27b +Author: Alexander Schwinn +Date: Sun Dec 26 23:48:13 2021 +0100 + + Updates for release + +commit 96b922e3935f4a88ae1b0ab30a5ab96beb56f936 +Author: Sergios - Anestis Kefalidis +Date: Sun Dec 26 20:55:39 2021 +0200 + + Add functions for handling accelerators that use the Tab key + + GTK+ does not allow the use of the Tab key as an accelerator. xfce_gtk_handle_tab_accels and xfce_gtk_execute_tab_accel can + be used to manually trigger the callback of an action that uses the Tab key as an accelerator. + +commit 17b0d557d620fd63cedfe0bbc9abb453d5cfcdd0 +Author: Avinash Sonawane +Date: Mon Dec 20 01:20:18 2021 +0530 + + Check time.h and sys/time.h for libgtop + + MR !51 + +commit 3c8c9a658426a904972685668ad44cc473ace69e +Author: Avinash Sonawane +Date: Mon Dec 20 00:46:51 2021 +0530 + + `g_once_init_enter()` parameter shouldn't be volatile anymore. + +commit ba21ed011739887d05c71c0414d4a66900000823 +Author: Ivica Kolić +Date: Wed Dec 15 00:45:25 2021 +0100 + + I18n: Update translation hr (90%). + + 185 translated messages, 20 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f532b6f985b3197554ac30bd60d0a322102a62f6 +Author: Alexander Schwinn +Date: Thu Dec 9 21:52:45 2021 +0100 + + Back to development + +commit e159f6088b93c18d6650c52ee77236fe2325a75f +Author: Alexander Schwinn +Date: Thu Dec 9 21:33:17 2021 +0100 + + Updates for release + +commit 1b732eb91c24eb6457992f2da58ef2339beaa844 +Author: Jan Ziak <0xe2.0x9a.0x9b@xfce.org> +Date: Thu Dec 9 20:59:37 2021 +0100 + + xfce-about: Fix potential NULL pointer access + + This fixes a compiler warning reported by GCC 10.2.0 with -fanalyzer in + CFLAGS saying that the value returned by info_cleanup() can potentially + be NULL. + + MR !35 + +commit 22499db531947ff487b9bc5446a86c18a4415698 +Author: Sergios - Anestis Kefalidis +Date: Mon Dec 6 16:27:18 2021 +0000 + + Minor shortcuts editor improvements + + - removed mnemonics from tooltips + - clearer separation between sections + - ellipsized labels + - min version comment on new method + + MR !48 + +commit e38d7a5c5fc53f1f5cbfc1965ed64271d3e84652 +Author: Ivica Kolić +Date: Sat Dec 4 00:45:27 2021 +0100 + + I18n: Update translation hr (89%). + + 184 translated messages, 21 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d1fd58e4b549e3b2ba8b18e8f0c78e11222546a3 +Author: Anonymous +Date: Sat Dec 4 00:45:27 2021 +0100 + + I18n: Update translation eu (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c210fba41c21b92f21c32a93387ce0f470ea40c0 +Author: Саша Петровић +Date: Sun Nov 28 00:45:30 2021 +0100 + + I18n: Update translation sr (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 759750d0fe3fdf52096233a5b6a6b85f93ff8b4f +Author: Michael Martins +Date: Sat Nov 27 12:45:40 2021 +0100 + + I18n: Update translation pt_BR (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4cc0894a7bafd7ab3f2e7c67d68b68be63625c91 +Author: heskjestad +Date: Wed Nov 24 00:45:30 2021 +0100 + + I18n: Update translation nb (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ade34536f56da937c79d241da30f866c8d130089 +Author: Arnold Marko +Date: Mon Nov 22 00:45:23 2021 +0100 + + I18n: Update translation sl (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d597ad5825d10939a82aa19f85f7ff097ca98704 +Author: Triyan W. Nugroho +Date: Sun Nov 21 12:45:33 2021 +0100 + + I18n: Update translation id (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2f63823e7612c89ab59a4aeb0ab0370f82b71eac +Author: Priit Jõerüüt +Date: Fri Nov 19 00:45:23 2021 +0100 + + I18n: Update translation et (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 24e64920641fc325727e0d7e6246634a0c2c96ca +Author: Luna Jernberg +Date: Thu Nov 18 12:45:34 2021 +0100 + + I18n: Update translation sv (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e2fe18c35400d60d57f1153e948df3c45b4d29a9 +Author: Andre Miranda +Date: Thu Nov 18 00:45:24 2021 +0100 + + I18n: Update translation pt_BR (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9b86d530188b60185cda125631e35582cdbdeaab +Author: Emanuele Petriglia +Date: Thu Nov 18 00:45:24 2021 +0100 + + I18n: Update translation it (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4e8699ca3fe43afdaf9b26b9f391df2564ca1b13 +Author: Hugo Carvalho +Date: Wed Nov 17 00:45:25 2021 +0100 + + I18n: Update translation pt (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9168acc2e619121059692ad74be097f914b06b0c +Author: Toni Estévez +Date: Wed Nov 17 00:45:24 2021 +0100 + + I18n: Update translation es (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6d68bb31eb41a0220b07b0ab949d360f792fe0fd +Author: Andreas Eitel +Date: Wed Nov 17 00:45:24 2021 +0100 + + I18n: Update translation de (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7c363cc076b82d771cf245b746437b8450daa39e +Author: 玉堂白鹤 +Date: Tue Nov 16 12:45:43 2021 +0100 + + I18n: Update translation zh_CN (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 19276c73a318942b2ce7e45f7f8e2311bc208d98 +Author: jc1 +Date: Tue Nov 16 12:45:43 2021 +0100 + + I18n: Update translation fr (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cf1eede0f756c5641b1e634a064a6bd9b3335d32 +Author: Kiril Kirilov +Date: Tue Nov 16 12:45:42 2021 +0100 + + I18n: Update translation bg (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bbb28850fff333be7f14f4c2d1706486647429dc +Author: 黃柏諺 +Date: Mon Nov 15 12:46:09 2021 +0100 + + I18n: Update translation zh_TW (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 41ee7d231dce10a7c5a10ca9adc9e3d2efc1fad1 +Author: Xfce Bot +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation zh_HK (84%). + + 174 translated messages, 31 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7b9946fb3546c35e7d79be3d327d77685ff6f163 +Author: Xfce Bot +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation zh_CN (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3ddc34fdd9db597d9fab182aa47a373d5456f688 +Author: Xfce Bot +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation uk (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 13bb75377f58a12330ebf24888e22d5331e58ea1 +Author: Xfce Bot +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation ug (79%). + + 163 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ca535c7362364a1868d4b7f7f39fb5b3c79b67cf +Author: Demiray Muhterem +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation tr (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1370029e59129bdb4265f205d7dfdd24eb191585 +Author: Xfce Bot +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation th (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b220393e6fc4efdfb757cf9613e6bb3e2735152c +Author: Xfce Bot +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation te (56%). + + 116 translated messages, 89 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 75a4d810b7d83a1fd56e4effe82b50048c07e406 +Author: Xfce Bot +Date: Mon Nov 15 12:46:08 2021 +0100 + + I18n: Update translation sv (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 201b537323f728fac7c5273877b691de09d00d61 +Author: Xfce Bot +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation sr (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a179319c63efd34e781c875892edc0eff3d5fd32 +Author: Besnik Bleta +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation sq (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 07b61a1005e512cbe45e11c83f194deda0931788 +Author: Arnold Marko +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation sl (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7499eacd81962956f632699b71933f412ea3428c +Author: Xfce Bot +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation sk (90%). + + 186 translated messages, 19 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 547cfb03750c4678e51340ca53c719f3c35290bd +Author: Xfce Bot +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation ru (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e805b3604af5ff1b36097577fdc1e89b0da35ad0 +Author: Xfce Bot +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation ro (74%). + + 153 translated messages, 52 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b93e6783d417ac478321c317083135808369aedc +Author: Xfce Bot +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation pt (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 51cc11bd2bffdb73985180526f4831f73919010e +Author: Wellington Almeida +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation pt_BR (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ca36360df213c59a824f4f51f3b79d287d34ba30 +Author: Anonymous +Date: Mon Nov 15 12:46:07 2021 +0100 + + I18n: Update translation pl (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4caf855566afb30aa72f3f157c44adae4bb73fbe +Author: Anonymous +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation oc (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2b0a627698d8ff9a6bf66b09b769579d33a185e2 +Author: Xfce Bot +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation nn (77%). + + 159 translated messages, 46 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d2b41324c1508f0cf45413acd7d6008dab77dcc4 +Author: Pjotr +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation nl (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fe767b6d34cfa171fc42e0a6c12cb78451eb0ea0 +Author: Xfce Bot +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation nb (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 66ff2a2c1fc32b1779cad9f9622cecf3017c9b17 +Author: Xfce Bot +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation ms (84%). + + 173 translated messages, 32 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 03e3c0a20204274d1ab860aec6210fc443aa2aa7 +Author: Xfce Bot +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation lv (50%). + + 104 translated messages, 101 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d54b2193f1a65c1f4c11c1a004a9063f514242ec +Author: Anonymous +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation lt (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0381105534b4175ceae95c73711dbb35bb725a3f +Author: Xfce Bot +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation ko (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 184020a73f647127661c1abc83c1a17226898a84 +Author: Xfce Bot +Date: Mon Nov 15 12:46:06 2021 +0100 + + I18n: Update translation kk (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 73dd3cb4b50fc81f06755da7dfa8c109991d54de +Author: UTUMI Hirosi +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation ja (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ce477d1a99b846ec7a4a7901d62dbd268a89727b +Author: Xfce Bot +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation it (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0403614449256672ceba9404341740aa13a3e1ec +Author: Xfce Bot +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation is (78%). + + 161 translated messages, 44 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 64b633f40744f95fc049692f0a729ebeaf2c5412 +Author: Xfce Bot +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation ie (89%). + + 183 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 50e06131de601151418c4d65b69cd3e217819580 +Author: Xfce Bot +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation id (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit edb95ff30c0010b5e720149c0f6b4dd3d1c2954c +Author: Xfce Bot +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation hy (77%). + + 158 translated messages, 47 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4e9b676ccc4c84b6ae111c2ce882701aab13f4e3 +Author: Xfce Bot +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation hye (85%). + + 176 translated messages, 29 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3f2f5d2e3121b25a182bc832e85987843db7e01e +Author: Xfce Bot +Date: Mon Nov 15 12:46:05 2021 +0100 + + I18n: Update translation hy_AM (78%). + + 160 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a274dacc96ea3b89763d778fbd0a56b2b082e4d0 +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation hu (84%). + + 173 translated messages, 32 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f0c766db4aef3dfa8ad5dd89078d349d108cc429 +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation hr (87%). + + 179 translated messages, 26 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 49e303649f243c04fd175cab0f3f4589e70a1435 +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation he (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 55d584136426216f176f38ccea29ebe995959510 +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation gl (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6582ee92263edba5eed55e037b3a2a3421b38d91 +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation fr (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 41349acce5df9936eaa75f15960e3946842716bc +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation fi (88%). + + 181 translated messages, 24 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1090bc05ee41e050326fe7fadd6080f08a957ea2 +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation eu (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4c64c76ce8eccf986d0cc0505ce3966a3c0685b8 +Author: Xfce Bot +Date: Mon Nov 15 12:46:04 2021 +0100 + + I18n: Update translation et (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 10beeaa432d67ea4d0e30a9b9475f85e0ca1800b +Author: Toni Estévez +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation es (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5ed25cf7faa09816439ee6a24021f0ae754b3260 +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation en_GB (78%). + + 161 translated messages, 44 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9fbd9f293370147a280fbbe4c8210f5bda2c6dae +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation en_AU (78%). + + 161 translated messages, 44 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f80cce70e689e1e14ea98d8f7fdd9219dd098cfe +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation el (77%). + + 159 translated messages, 46 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e15df48f8bebd3ebe7ac4e1e3aea497797278378 +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation de (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dc78a9094dc31516052c1c717d53de5588f026ff +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation da (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 884f12d024f2e544ee3374c90fce1ee7d787c4bf +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation cy (72%). + + 149 translated messages, 56 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0e4b615f057044c327ca6e8e5738be43d7e63e4e +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation cs (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3b92cdac69c38f35129f78de55e34efc14443c13 +Author: Xfce Bot +Date: Mon Nov 15 12:46:03 2021 +0100 + + I18n: Update translation ca (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 738afbbd3d164943b4e66d2e52c6d33d5aa7a258 +Author: Xfce Bot +Date: Mon Nov 15 12:46:02 2021 +0100 + + I18n: Update translation bn (52%). + + 107 translated messages, 98 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e7eb775d8116acb031bb2b0c4033a3176c84b7b1 +Author: Xfce Bot +Date: Mon Nov 15 12:46:02 2021 +0100 + + I18n: Update translation bg (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6bafb7ba3c62e30ee2d832ea3ed5601bde655fc3 +Author: Xfce Bot +Date: Mon Nov 15 12:46:02 2021 +0100 + + I18n: Update translation be (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c02454308d52265737eb87d5cf7096341391aef8 +Author: Xfce Bot +Date: Mon Nov 15 12:46:02 2021 +0100 + + I18n: Update translation ar (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 84649c79d5875b6440b7c32095e4aac6047d6976 +Author: Xfce Bot +Date: Mon Nov 15 12:46:02 2021 +0100 + + I18n: Update translation am (53%). + + 110 translated messages, 95 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4eb37f09719b4484550c46ad305e86e4cf11bca7 +Author: Sergios - Anestis Kefalidis +Date: Sun Nov 14 20:46:52 2021 +0000 + + Introduce a shortcuts editor widget + + - Requires 1..N lists of XfceActionEntries for which all shortcuts will be shown + - Possibility to modify the shortcut of each action-entry + - Possibility to clear the shortcut or reset it to the default + - Separate section for each passed XfceActionEntriy list + + MR: !46 + Related Issue: https://gitlab.xfce.org/xfce/thunar/-/issues/279 + Related Thunar MR: https://gitlab.xfce.org/xfce/thunar/-/merge_requests/171 + Related Xfce4-terminal MR: https://gitlab.xfce.org/apps/xfce4-terminal/-/merge_requests/32 + +commit e01a350c413268219d07d7b66f167e56ab0a87d5 +Author: Anonymous +Date: Sat Nov 13 00:45:23 2021 +0100 + + I18n: Update translation oc (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5f065f2c4cc200ec7b176c6cc8045a243e154bf8 +Author: Anonymous +Date: Fri Nov 12 00:45:28 2021 +0100 + + I18n: Update translation oc (91%). + + 182 translated messages, 17 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4a13b842e846bf6658f2eee68defdf0e7128888c +Author: Ivica Kolić +Date: Thu Nov 4 00:45:24 2021 +0100 + + I18n: Update translation hr (88%). + + 177 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3b833e30913a4672e741b8e04542a22465a46a0d +Author: Hugo Carvalho +Date: Tue Oct 19 12:45:33 2021 +0200 + + I18n: Update translation pt (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7ae9111e3439dd8a44e09a27744f6d3d75b91c82 +Author: Omeritzics Games +Date: Fri Sep 24 12:45:43 2021 +0200 + + I18n: Update translation he (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 09720fbcfdacacef70be81cd53e529d03c61322b +Author: Simon Steinbeiss +Date: Mon Sep 6 11:44:50 2021 +0200 + + Back to development + +commit a36d0df6abf57bd1d6a5a0073292b35eb3249d06 +Author: Simon Steinbeiss +Date: Mon Sep 6 11:44:11 2021 +0200 + + Updates for release + +commit fec339514c979bcd8851dcf606a7c733c6105c52 +Author: Michael Martins +Date: Mon Sep 6 00:45:24 2021 +0200 + + I18n: Update translation pt_BR (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1304e75411ed60462522ffb28948cbc40e075e67 +Author: Andre Miranda +Date: Fri Sep 3 20:44:19 2021 -0300 + + Add 4.18 section to docs + +commit d3829be39aad53de48c82e341fae4c9bc78e0855 +Author: Andre Miranda +Date: Fri Sep 3 20:43:38 2021 -0300 + + Add xfce_gdk_device_grab + +commit c55439b8a4f628d66b8ec21889a8de5ad469ddb6 +Author: Andre Miranda +Date: Sun Sep 5 18:30:05 2021 -0300 + + Add 4.16 section to docs + +commit af15e2c5e3320e047e9fa14025fd1543dc8c8d50 +Author: Baurzhan Muftakhidinov +Date: Thu Sep 2 00:45:27 2021 +0200 + + I18n: Update translation kk (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0d718ff0e378f87780c492faf217cfa89f41d436 +Author: Alexander Schwinn +Date: Tue Aug 17 14:47:48 2021 +0200 + + Switch keybord shortcut 'tile-up' with 'tile-down' (were mixed up) + + Related Issue #2 + +commit 8dedb3f8584a44dd0b9160dcf37c4b19454d57fb +Author: Alexander Schwinn +Date: Tue Aug 17 14:30:16 2021 +0200 + + Usage of '<' and '>' instead of '<' and '>' in XML (Issue #44) + +commit 75bd991190ba02645ddd43195aaad31cddb18149 +Author: Emanuele Petriglia +Date: Mon Aug 2 00:45:24 2021 +0200 + + I18n: Update translation it (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 34c903110b40ce87cc88344439daa40cab8bedd6 +Author: Xfce Bot +Date: Sun Aug 1 12:46:04 2021 +0200 + + I18n: Update translation zh_TW (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit aa8fa25141d706ca10882655ce9ab4562d5e03d3 +Author: Xfce Bot +Date: Sun Aug 1 12:46:04 2021 +0200 + + I18n: Update translation zh_HK (87%). + + 174 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d5c86056a9b271b201f9661552f1e9472e672b50 +Author: Xfce Bot +Date: Sun Aug 1 12:46:04 2021 +0200 + + I18n: Update translation zh_CN (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7d46b6150b001bfeff3dadfdbbe3d8093d37a632 +Author: Xfce Bot +Date: Sun Aug 1 12:46:04 2021 +0200 + + I18n: Update translation uk (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 158c0b130c8e292ab1ef3fb261db6da7459a43ed +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation ug (81%). + + 163 translated messages, 36 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8ae81c6c1f9452c40d639349c3c3f81f9288392e +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation tr (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d48bbd2f14852fadbc6ed1feb3ee35be92dc302c +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation th (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a311817b1129bf88ee43c2888c5d7d26283be10d +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation te (58%). + + 116 translated messages, 83 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f26d2d20fd8902d33d06731e1277d7e2043ddf9f +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation sv (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 73053bcf80cd9b9525a0868d2912e8ae005efa58 +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation sr (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7349366408f5f6b81a506515ccb89747542dee99 +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation sq (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3d9f664d9acd8a41fbc10efc1f03a57342bbf151 +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation sl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ee38309f4e889a28c66155f5b140f5e586cbc2be +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation sk (92%). + + 184 translated messages, 15 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b63368384b72a63ac4bd7324b4cdd9e36fec99e8 +Author: Xfce Bot +Date: Sun Aug 1 12:46:03 2021 +0200 + + I18n: Update translation ru (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 346e0dad31890fde58ca997f2f5bc3cff12373dd +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation ro (76%). + + 153 translated messages, 46 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4f056b598ac9f23b0747956559c932eadc5bda4d +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation pt (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f6229d5c01746ab41382e300e42601a1a78cdca0 +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation pt_BR (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 297f20e4f0cf453edc5d5d35f726ef45288d23e7 +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation pl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ba862a6fe467076dbbe49e1c5122dd11de3a9364 +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation oc (78%). + + 157 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 50386f3354cd456a96244aff91abbd76d6533ddf +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation nn (78%). + + 157 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 89a5ab1fa83b3be8c4ae70b1b823f949a17cd021 +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation nl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 187b747a4a39ff689c7c8bc8c6f9c556ae8b7652 +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation nb (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a3d8e166ab8c79685d1606f6a180dd31320d2541 +Author: Xfce Bot +Date: Sun Aug 1 12:46:02 2021 +0200 + + I18n: Update translation ms (85%). + + 171 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 013afd900ec161557f7e9e721c5e78c5f1263ca8 +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation lv (52%). + + 104 translated messages, 95 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 624e9040b3d1c9e6470cc9f0d5aed85d6f74833d +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation lt (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 342c395c34db1450ece82a7a422d2b1188c165bf +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation ko (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 11dd9aa29379af1dc8f568a3cdb8b86527aee10e +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation kk (94%). + + 189 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fca394bd358de2b90f1b66cf041f94fa9d2070a9 +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation ja (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 12b9069ee8a6821ccf29be077348467d3a547056 +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation it (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 180d8fc8cecab58d4baa6a89b3f8b35a7a2d31d3 +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation is (79%). + + 159 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f864d7449d5677c267f4cf8cf9319a374fd81c80 +Author: Xfce Bot +Date: Sun Aug 1 12:46:01 2021 +0200 + + I18n: Update translation ie (90%). + + 181 translated messages, 18 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b46f4a35ca9d91ca768b577115501259c4439a77 +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation id (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d4ddfdee042792dd0db7a419a631172e084008f2 +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation hy (78%). + + 156 translated messages, 43 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0a727d87cd5c8cbc5419fa59fdde6cde369cb3db +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation hye (87%). + + 174 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 09571ae61fcf4a9dbfc897e0a67b89004f05a0e4 +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation hy_AM (79%). + + 158 translated messages, 41 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1be7ef9b9a6b809e9d460767c89704f4c65c7ccd +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation hu (85%). + + 171 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b6b85b6d8e39de2b813ba089cf3d4e1d6443f7d9 +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation hr (87%). + + 174 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d0da99fe270a5e05164cdc337ef1d2c730a0da08 +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation he (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c971b44588d370215fcc157efe1f7487094b4e74 +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation gl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 17097bb3b3cad018493b0eb4002a0c2385cc904f +Author: Xfce Bot +Date: Sun Aug 1 12:46:00 2021 +0200 + + I18n: Update translation fr (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bea0944e076fdfdf93be72ddfa355ae25220c91c +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation fi (89%). + + 179 translated messages, 20 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 194b8846f0d444ff96e7ee967b432f576d2a36b6 +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation eu (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 96f99ecf9d1bbd603ea5a6f10b50337816e596b7 +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation et (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 924ee308f528993ac555e7ef6cef77d2dc715d59 +Author: Toni Estévez +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fba66b0d25b73ee83db9d23dd64806657e429447 +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation en_GB (79%). + + 159 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9e012e4fecd338f64ec29baebe00ad7f6d586b23 +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation en_AU (79%). + + 159 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3b14a3c12a679b6fa2723cbed820b714a683038d +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation el (78%). + + 157 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 77e997ec04d9fa77d13ee7a26e79f419055d248f +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation de (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6676113a40b0ef7cb4400a36ed9d780fc6254df5 +Author: Xfce Bot +Date: Sun Aug 1 12:45:59 2021 +0200 + + I18n: Update translation da (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 23bb3990f8317faad0fed3cbbd5b572724c81a01 +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation cy (74%). + + 149 translated messages, 50 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 798cdde0efb42360f89b5fda6abb33d5485bad74 +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation cs (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8617707ddd33abce00e7ef6b0906a2860363a05a +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation ca (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a390e772e8951708591b20e25c578f679655f20c +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation bn (53%). + + 107 translated messages, 92 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9c75c7b71ee70a886ca21761622bfd36c2e45e21 +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation bg (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d57b9481a81ed0d484e745ebdf25ce74c637b2e6 +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation be (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a9b3051ba814192db8ba2f1c9da8781f9e32e9e4 +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation ar (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dffdcdc201ce0ad514b623bf7cf0524eb9d22540 +Author: Xfce Bot +Date: Sun Aug 1 12:45:58 2021 +0200 + + I18n: Update translation am (55%). + + 110 translated messages, 89 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 40f4155d31dcc98081dbddd1f7e27174f9fe802f +Author: scootergrisen +Date: Sat Jul 31 17:23:44 2021 +0000 + + Change "Setting System" to "Settings Manager" + +commit db24ae3ac3b3a7600b56282876c24a601bcd5707 +Author: Anonymous +Date: Tue Jul 27 00:45:09 2021 +0200 + + I18n: Update translation pl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f7e2d78bd16b287ebf1a86f082860dd9061d371e +Author: Xfce Bot +Date: Fri Jul 23 15:47:24 2021 +0200 + + I18n: Update translation gl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1090d1a0b1c18b99aa5096f17973b963e9340389 +Author: Toni Estévez +Date: Fri Jul 23 15:47:23 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 47eeddbc7c7c394131ab81fa8e53981fbe869ab9 +Author: Xfce Bot +Date: Fri Jul 23 15:47:22 2021 +0200 + + I18n: Update translation ca (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 39f9c98fd2e3235bad369c3db1f9a80429a6da4e +Author: Maciej Szeptuch +Date: Mon Jul 19 12:08:12 2021 +0000 + + Fix xfce_gdk_screen_get_active to return correct monitor number + +commit 11ac0bbc845a4ef4b78945611c4031a003f6ad58 +Author: Theppitak Karoonboonyanan +Date: Mon Jun 28 12:45:20 2021 +0200 + + I18n: Update translation th (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 83bfa1541d5e6ee83a7cafab3843e5d4ef17fff1 +Author: Alexander Schwinn +Date: Sat Jun 26 22:40:27 2021 +0200 + + Back to development + +commit 31677d19c2793f14dcad149be7cf280bd7c1cfb3 +Author: Alexander Schwinn +Date: Sat Jun 26 22:38:27 2021 +0200 + + Updates for release + +commit e22b7306c448ce1903950eca6398144c78a4e6c6 +Author: Yongha Hwang +Date: Mon Jun 21 12:59:21 2021 +0900 + + xfce_gtk_label_set_a11y_relation + +commit 6269d5c55d148c52ce2f67487311e9cf4e33adb2 +Author: Seong-ho Cho +Date: Thu Jun 3 12:45:16 2021 +0200 + + I18n: Update translation ko (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d293dd0996a5d3fa68003ffd96c5677ba035f4b7 +Author: Arnold Marko +Date: Wed May 26 12:45:24 2021 +0200 + + I18n: Update translation sl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit abc08e6238b960b8969bf09f7e51b23e55459847 +Author: Toni Estévez +Date: Mon May 24 00:45:14 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 59e9736e33b0cd63c273afdaedbfbe479b422890 +Author: Toni Estévez +Date: Sun May 23 00:45:14 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a63ed4906f133ded539059ead3e3293ee103da99 +Author: Toni Estévez +Date: Fri May 14 00:45:13 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fd42463fbb9ed37aa9243d7550acf32e9411576e +Author: Michael Martins +Date: Mon May 3 00:45:10 2021 +0200 + + I18n: Update translation pt_BR (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 89742d9ffd2b99b000988b8395a9a67735b32a3d +Author: Olaf Hering +Date: Wed Jan 6 17:00:23 2021 +0100 + + initialize base_property prior xfce_shortcuts_provider_register + + xfce_shortcuts_provider_property_changed expects initialized strings. + + Fixes #36 + + Signed-off-by: Olaf Hering + +commit effc2fa6101f64357f0937a5a0a96d7f96e967b5 +Author: Toni Estévez +Date: Sun Apr 25 00:46:29 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 20b2349dacb224986fe9d658590f924b1108d15f +Author: Toni Estévez +Date: Sat Apr 24 12:46:49 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f6258ba3098aa8ec7d6ae72b13a14be882cc6513 +Author: Emanuele Petriglia +Date: Sat Apr 24 00:46:45 2021 +0200 + + I18n: Update translation it (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 744267525d2d56bf5b815ced8e1bb956dd070da6 +Author: Xfce Bot +Date: Fri Apr 23 12:47:30 2021 +0200 + + I18n: Update translation zh_TW (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 94e08fa894abdb1e02106481cf0fa9821bcd4a23 +Author: Xfce Bot +Date: Fri Apr 23 12:47:30 2021 +0200 + + I18n: Update translation zh_HK (87%). + + 174 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cd183bb7eacde3ed137b9f85ee52583f914851ce +Author: Xfce Bot +Date: Fri Apr 23 12:47:30 2021 +0200 + + I18n: Update translation zh_CN (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cfc94f685cb2391f5516d319ead5bf114e210cbf +Author: Xfce Bot +Date: Fri Apr 23 12:47:30 2021 +0200 + + I18n: Update translation uk (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 41e491310177611bc14a6e8757a8f6cdce5b9fe7 +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation ug (81%). + + 163 translated messages, 36 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0d7ccc45ebcfb453b1cc2239dd3e065c9701706b +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation tr (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9389956b5851b5a7af3ffee23e7140279078cadf +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation th (80%). + + 161 translated messages, 38 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b3be0f58a51fbd8c9fbb68fce125f924aa96faa2 +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation te (58%). + + 116 translated messages, 83 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2e149662a85cc7309ec5d0cd6e066aec628cd68d +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation sv (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c33a0bc7e3de7bca2f90c3e0c065dc37ad02ad1a +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation sr (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e5510ecf70ab65aa8bf1d24582072d1749225cf1 +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation sq (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d61d232ee731af5872b950bc6fbc68ccd0df7b21 +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation sl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6de3704d9dfc18afbcb36df75e9c98ca1f566212 +Author: Xfce Bot +Date: Fri Apr 23 12:47:29 2021 +0200 + + I18n: Update translation sk (92%). + + 184 translated messages, 15 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bdc0622b7dde14d2faf140d9f0baf51166dbb1ce +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation ru (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 93994f0bcb7a0ae7fa8b158b3e549170cfb85ca9 +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation ro (76%). + + 153 translated messages, 46 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f18623e5bdf957b53edf6c848de272f785bc98c3 +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation pt (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 01c6471e29e8e3df635b81c5ba9ba56f89fd059f +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation pt_BR (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1f5e3b9f2a075e1fa4b3f59615a898adae16d443 +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation pl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 50c576bd001b7471546aeaee8182a5a40f315339 +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation oc (78%). + + 157 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1d90dfa2e5202040fcc40142d8a17bdf2dd768a3 +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation nn (78%). + + 157 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b720ccd6cf1d204bbd7eaf2d4d4080a9258a92a3 +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation nl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2145b127ea8f204fdd4d817bf8b1d35295d1a826 +Author: Xfce Bot +Date: Fri Apr 23 12:47:28 2021 +0200 + + I18n: Update translation nb (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1fe4a62b48c9ab36aa45353b0f7738c8a79acb3a +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation ms (85%). + + 171 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7ea28dad24a1761045d6f19b4604a4e09df9552a +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation lv (51%). + + 103 translated messages, 96 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b1cd6c3a352c59b342dbd89d9478bddb10ace14a +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation lt (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit af39a2ea4b59359e237fa466a16ed7ed5dba8f16 +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation ko (94%). + + 189 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6eff90adf84e7ed7023ab5e0b2494dd9628da981 +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation kk (94%). + + 189 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a27885f2a65fd537e183d7a8e0ca3481de126232 +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation ja (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9aa70989309f7878776b1bf6686c0646be62751a +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation it (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 45a31d5bae49024ef69c66da292fdf8e6493b1b4 +Author: Xfce Bot +Date: Fri Apr 23 12:47:27 2021 +0200 + + I18n: Update translation is (79%). + + 159 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8a0258f674f02692a0814f1dfb73b01363a4c92f +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation ie (90%). + + 181 translated messages, 18 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5539909e0e542155b28ca96ea3972e60ac33e431 +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation id (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c9d36e34810ea76703f3505cefb54ad2263c978b +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation hy (78%). + + 157 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3280798ede763410973a278e75b5da1146741d6d +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation hye (87%). + + 174 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1fa881998913a40a35938a2504a487a6e1d5b7e4 +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation hy_AM (79%). + + 158 translated messages, 41 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 27760428fd020e04c3ec5641b1bd01cf813d8619 +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation hu (85%). + + 171 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 28a58a1c3bf5f42c7df4eb7a4068d3128cebafa7 +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation hr (87%). + + 174 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 862a3fabcdf652339266f0b8be3c4029b209ef80 +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation he (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 73c30682448a80f0bdb9f3c7c6e1a1ed1d1c9dce +Author: Xfce Bot +Date: Fri Apr 23 12:47:26 2021 +0200 + + I18n: Update translation gl (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b40916cc357de83b0debfedb86d3daf0130dd64e +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation fr (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e6dccd01c9d0bb4fda738953972b0a234b456d41 +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation fi (89%). + + 179 translated messages, 20 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 39b2f774db085e21ea7e60ed1efe179029e706e0 +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation eu (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1cb3465055c25c1cbb4ad02cbc99eae7ac69c7d5 +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation et (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 24461e82a39094f07a40790e209396edc913743e +Author: Toni Estévez +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation es (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bf8d96e0a06ba09114ee618fcac6b16e264ca90f +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation en_GB (79%). + + 159 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 069621e2eafbabbea2e9228d9ec62130b4a3f93e +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation en_AU (79%). + + 159 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 62ada622cb63f913d4ecdc367a1b7fdb0b5e1ca0 +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation el (78%). + + 157 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 13ad6fece619f4fd76df5f7338622a9193fcf819 +Author: Xfce Bot +Date: Fri Apr 23 12:47:25 2021 +0200 + + I18n: Update translation de (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8283a1e8c22c3d0db0cf759f9a7bbe779af30111 +Author: Xfce Bot +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation da (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 64f9035a6a69a87fa17f1931758501b7bfcd26c4 +Author: Geraint Rowlands +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation cy (75%). + + 150 translated messages, 49 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c844697530914e887ac6b7062aca45e1629f106a +Author: Xfce Bot +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation cs (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c077d558750abdbb6a64dbd12be9063c34a4af86 +Author: Xfce Bot +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation ca (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7d1daf6d23990f153b81fe816d27a3eb44846e1e +Author: Xfce Bot +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation bn (53%). + + 106 translated messages, 93 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 40e4cbece4dc41341ac3b02c0e2fc36b57cea84a +Author: Xfce Bot +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation bg (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 82bb63d0e09584df67dd387b267b02a4b191d0c9 +Author: Xfce Bot +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation be (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5f013d4d1c1cafb1bc644fa097a487baf0d85f2b +Author: Xfce Bot +Date: Fri Apr 23 12:47:24 2021 +0200 + + I18n: Update translation ar (100%). + + 199 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8b3fde6c1a8faef6c35981b14c798566273f6ab4 +Author: Xfce Bot +Date: Fri Apr 23 12:47:23 2021 +0200 + + I18n: Update translation am (55%). + + 110 translated messages, 89 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 534f7c60661b282ed985e84031c2c11aa3d80b1a +Author: Toni Estévez +Date: Fri Apr 23 00:46:28 2021 +0200 + + I18n: Update translation es (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5225df0ea21d4b1e6237478a9d222bf1a9b6be48 +Author: Simon Steinbeiss +Date: Thu Apr 22 22:59:27 2021 +0200 + + about: Replace stock with regular button + +commit 83952008976c55715e596130487a7bfa6a3d2eb6 +Author: Simon Steinbeiss +Date: Thu Apr 22 23:01:09 2021 +0200 + + Fix typo + +commit 99a66f23c90fa57575049eba4ceb1f11d2929bce +Author: Simon Steinbeiss +Date: Thu Apr 22 22:58:07 2021 +0200 + + about: Make Close button translateable (Fixes #41) + +commit a500e145161714314f8dedf4307ecfedcd9c8f0d +Author: Arnold Marko +Date: Thu Apr 22 10:02:09 2021 +0200 + + I18n: Update translation sl (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2d0260c8b8024da6e42800a64fbe9ec5d862680b +Author: heskjestad +Date: Thu Apr 22 10:02:07 2021 +0200 + + I18n: Update translation nb (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit eefce195b37a4df1bac8599052463d53a70fc397 +Author: Anonymous +Date: Thu Apr 22 10:02:04 2021 +0200 + + I18n: Update translation ar (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0cc18832999a5891abf8030dc3dddcea62bdad80 +Author: Gaël Bonithon +Date: Fri Jan 22 11:35:49 2021 +0100 + + Fix compilation warnings + +commit ad345639716e8ff788b5df9cffe8a97448e85bb5 +Author: Gaël Bonithon +Date: Fri Jan 22 11:34:57 2021 +0100 + + Fix (some) GObject introspection warnings + +commit ca5429fac120af2e41fee95edadc4e8482315994 +Author: Anonymous +Date: Wed Apr 21 12:45:25 2021 +0200 + + I18n: Update translation bg (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e3a0fc090f2c5ca4d2ff0a422901ef7b140771b4 +Author: Osama Chibani +Date: Mon Apr 12 12:45:19 2021 +0200 + + I18n: Update translation ar (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5faa2b9c316ad4da810fc4009d5201428d55cf7e Author: Andre Miranda -Date: Sun Sep 5 18:30:05 2021 -0300 +Date: Thu Apr 8 10:44:14 2021 -0300 + + Check if pixbuf is valid before unref + +commit db622456d59bc5a71192db786607da79a12da857 +Author: Salem Yaslem +Date: Thu Apr 8 00:45:18 2021 +0200 + + I18n: Update translation ar (98%). + + 195 translated messages, 2 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a06682d0b6f9c656a6f8b5ded3faab648e9611fc +Author: Gaël Bonithon +Date: Sun Mar 21 23:00:30 2021 +0100 + + Fix a small memory leak + +commit dc9e170804911af95c8e9aeb30582e4b256aba5c +Author: Kjell Cato Heskjestad +Date: Sun Mar 21 12:45:18 2021 +0100 + + I18n: Update translation nb (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2a55e86aeee2b70359c0621613061382ede3f428 +Author: Yousuf Philips +Date: Fri Mar 12 00:52:34 2021 +0100 + + shortcuts: Add Alt+Super+s for orca (Fixes #39) + + This is a widespread default keyboard shortcut also present in other DEs + (like Gnome or Mate) and therefor helpful for a11y. + +commit 0d4e6ad6cee9d332ea81fbb801789a819ed8d3d2 +Author: Jan Ziak <0xe2.0x9a.0x9b@gmail.com> +Date: Sat Feb 27 17:34:41 2021 +0100 + + shortcuts-grabber: Filter grabbing by key group + + Closes: https://gitlab.xfce.org/xfce/libxfce4ui/-/issues/33 + +commit d444532329bbfc46363ca07e0e57fe35be999855 +Author: Jan Ziak <0xe2.0x9a.0x9b@gmail.com> +Date: Fri Feb 26 06:52:04 2021 +0100 + + shortcuts-grabber: Redesign shortcut regrabbing (Bug #33) + + This patch hopes to fix shortcut grabbing issues related to keyboard + layouts while maintaining high performance. + + The implementation uses a new hash-table for tracking the keycodes grabbed + from the X server. The grabbed X11/Xorg keys are reference counted: + X11 XGrabKey() is called once per a keycode+modifiers combination and + X11 XUngrabKey() is called when the reference count of the combination + drops to zero. It is common for the reference counts to, for example, + reach the value of 4 if the user is using 4 keyboard layouts, in which + case the new implementation will use a single XGrabKey() call compared + to 4 such calls in previous implementations. + + The grab_all() function has been removed and has been replaced by an + optimized regrab_all() function which is more efficient than the sequence + ungrab_all()+grab_all(). + + Tested keyboard layouts: + - English + - English (Colemak) + - French (BÉPO) + - Slovak (QWERTY) + + Test environments: + - Arch Linux (FR-BÉPO) + - FreeBSD (basic testing) + - Gentoo Linux (EN, EN-Colemak, SK-QWERTY) + - Xubuntu (basic testing) + + Closes: https://gitlab.xfce.org/xfce/libxfce4ui/-/issues/33 + +commit f63a1074084219a65670dc3320934b41adb8dfd1 +Author: Jan Ziak <0xe2.0x9a.0x9b@gmail.com> +Date: Fri Feb 26 05:57:42 2021 +0100 + + shortcuts-grabber: Stop search when the first match is found + +commit edd8d6e20a3477d35e05d32010449a6f4bbf9c45 +Author: Jan Ziak <0xe2.0x9a.0x9b@gmail.com> +Date: Fri Feb 26 05:27:16 2021 +0100 + + shortcuts: Fix a memory leak + +commit b50af3427ae2ac03e500ad3e85a36f8b6c36111f +Author: Jan Ziak <0xe2.0x9a.0x9b@gmail.com> +Date: Mon Jan 4 17:01:04 2021 +0100 + + shortcuts-grabber: Record xkb state group (Bug #33) + + XkbGroupForCoreState(xevent->xkey.state) returns 0 even after a keyboard + layout switch. Instead of using the XkbGroupForCoreState() function, this + patch watches for XkbStateNotify events from which it obtains the xkb state + group. + + Closes: https://gitlab.xfce.org/xfce/libxfce4ui/-/issues/33 + See also: https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/33 + +commit e79d5a7ff37df12b080e3304708a37de94198f53 +Author: Gheyret Kenji +Date: Wed Mar 10 12:45:46 2021 +0100 + + I18n: Update translation ug (81%). + + 161 translated messages, 36 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2575aee2a60c290d2b9419c0d368703c08bbb3ee +Author: Jan Ziak <0xe2.0x9a.0x9b@xfce.org> +Date: Sun Mar 7 19:59:59 2021 +0100 + + about: Fix invalid length and Zink renderer string + + This patch fixes the about dialog in case the renderer string reported by + OpenGL is "zink (AMD RADV NAVI14 (ACO))". + +commit 6e215352658038024667f06f10396cf20d708c40 +Author: Toni Estévez +Date: Mon Mar 8 00:45:18 2021 +0100 + + I18n: Update translation es (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 078a227511638527a65d4e0c0ce13be9f0428768 +Author: Omer I.S +Date: Fri Mar 5 12:45:38 2021 +0100 + + I18n: Update translation he (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0405af2a762b015e58c406275e2dcb9e363ad45c +Author: Alexander Schwinn +Date: Thu Mar 4 21:22:58 2021 +0100 + + Revert "Show image of menu items as well in wayland sessions (Issue + #38)" + + This reverts commit fc96ece5c8a7ebc289df573c15c7a8ae988c93e1. + + Prevent forcing it. There is already a setting for it in xfce4-settings, + channel "xsettings". So when xfsettingsd will run in wayland, menu items + will be back. + +commit fc96ece5c8a7ebc289df573c15c7a8ae988c93e1 +Author: Alexander Schwinn +Date: Mon Mar 1 22:09:52 2021 +0100 + + Show image of menu items as well in wayland sessions (Issue #38) + +commit 3798518f29d8d87173bf7066b0f8d747f3938a1d +Author: Sergey Alyoshin +Date: Fri Feb 26 12:45:51 2021 +0100 + + I18n: Update translation ru (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2117d8f3f6ff59e0e2e5a82e02ee86228a4b6f1d +Author: Andrij Mizyk +Date: Thu Feb 18 00:45:08 2021 +0100 + + I18n: Update translation uk (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3933124de456ca15221fc6a8ffbeb1ebd7c6ee84 +Author: Simon Steinbeiss +Date: Sun Feb 7 16:21:29 2021 +0100 + + Don't leak pixbuf + +commit 9fc6c9669f6e1167a80a201afbf1baacfc129215 +Author: Simon Steinbeiss +Date: Sun Feb 7 15:28:01 2021 +0100 + + XfceTitledDialog: Add pixbuf support as fallback + + Previously only icons set via gtk_window_set_icon_name were handled, now + we also handle GdkPixbufs set by gtk_window_set_icon if no icon_name was + set. + +commit 5aacc774ea923d0173e83c166b945c7eed8bfd80 +Author: Romain Bouvier +Date: Sat Jan 30 21:43:17 2021 +0100 + + Revamp the documentation to modernize and uniformize accross components + + - And fix some autohells warnings + +commit d56aa102d4d1e63bd027851e40b7972cb77e6d77 +Author: Michal Várady +Date: Fri Jan 29 00:45:15 2021 +0100 + + I18n: Update translation cs (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a84cb6f985b2aa515a42461d1b3bbb367a4fcdd9 +Author: Jan Ziak <0xe2.0x9a.0x9b@gmail.com> +Date: Wed Jan 27 00:45:15 2021 +0100 + + I18n: Update translation sk (92%). + + 182 translated messages, 15 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 20f08331831e4aa8703fe4334650bdd4673c43a1 +Author: AlexanderFilev +Date: Tue Jan 26 00:45:08 2021 +0100 + + I18n: Update translation ru (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). - Add 4.16 section to docs +commit 4d308d3e825d6a8d77926052e656625a2cbd8618 +Author: ivmazurenko +Date: Fri Jan 22 12:45:17 2021 +0100 -commit 37b8733ef6359c7e189b2b6330e99e1ccf67c60c -Author: Simon Steinbeiss -Date: Thu Apr 22 22:59:27 2021 +0200 + I18n: Update translation ru (98%). + + 194 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). - about: Replace stock with regular button +commit 544be0514c190e2a3dabfb8e7e7d8e320ed48721 +Author: Reuben Green +Date: Fri Nov 13 12:22:53 2020 +0000 -commit 5a1c17b196bfce3388459cb013ee6e68717bfc7a -Author: Simon Steinbeiss -Date: Thu Apr 22 22:58:07 2021 +0200 + Prevent resizing on message display with XfceFilenameInput + + Modified XfceFilenameInput to prevent resizing of the widget when + an error or warning message is displayed by making the widget big + enough to contain any error message. - about: Make Close button translatable (Fixes #41) +commit d5e779b7b73296725d81557aa4f7a5c4a0e2f656 +Author: Reuben Green +Date: Sun Aug 30 12:39:03 2020 +0100 -commit a06939b9bdb8215de535ac127cb1c82a93e8905b -Author: Alexander Schwinn -Date: Thu Mar 4 21:22:58 2021 +0100 + Delay whitespace warning in XfceFilenameInput + + Add a delay to the warning about the text ending in whitespace to + XfceFilenameInput, so that the warning does not keep appearing and + disappearing as the user types a filename containing spaces. - Revert "Show image of menu items as well in wayland sessions (Issue - #38)" +commit c4645b28b8c4de273f424a6b47bda53984963eb4 +Author: 黃柏諺 +Date: Tue Jan 19 09:55:46 2021 +0100 + + I18n: Update translation zh_TW (100%). - This reverts commit fc96ece5c8a7ebc289df573c15c7a8ae988c93e1. + 197 translated messages. - Prevent forcing it. There is already a setting for it in xfce4-settings, - channel "xsettings". So when xfsettingsd will run in wayland, menu items - will be back. + Transifex (https://www.transifex.com/xfce/public/). -commit c3672e2b21328aa998fdcb30e48b48d92297e15e -Author: Alexander Schwinn -Date: Mon Mar 1 22:09:52 2021 +0100 +commit 57d8424bc2996cdaf8aecdf712f8ca08a7fa21be +Author: Xfce Bot +Date: Tue Jan 19 09:55:46 2021 +0100 - Show image of menu items as well in wayland sessions (Issue #38) + I18n: Update translation zh_HK (87%). + + 172 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 59d4a348f9029850ed6304896c11a3e3e34136de +Author: 玉堂白鹤 +Date: Tue Jan 19 09:55:46 2021 +0100 + + I18n: Update translation zh_CN (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 683481ecd8fe0454374445e284d191d7670ad264 +Author: Xfce Bot +Date: Tue Jan 19 09:55:46 2021 +0100 + + I18n: Update translation uk (87%). + + 172 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9a1d1eba655e818ee1b06715635a182a4925398a +Author: Xfce Bot +Date: Tue Jan 19 09:55:45 2021 +0100 + + I18n: Update translation ug (76%). + + 151 translated messages, 46 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4cd4a183ccc9e94a697c6ab5784c829bc7633ef9 +Author: Xfce Bot +Date: Tue Jan 19 09:55:45 2021 +0100 + + I18n: Update translation th (80%). + + 159 translated messages, 38 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ebb6bd8d356d4f06a71665cf796ee8cc63731f04 +Author: Xfce Bot +Date: Tue Jan 19 09:55:45 2021 +0100 + + I18n: Update translation te (57%). + + 114 translated messages, 83 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dc236ec3bbe81921c0186ef7dab16aabea647d54 +Author: Besnik Bleta +Date: Tue Jan 19 09:55:45 2021 +0100 + + I18n: Update translation sq (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 48690e27217765091e509ef39d3332545f9410e1 +Author: Xfce Bot +Date: Tue Jan 19 09:55:45 2021 +0100 + + I18n: Update translation sk (88%). + + 175 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8711aecef57c34e795a012529cf45e9343704f33 +Author: Xfce Bot +Date: Tue Jan 19 09:55:44 2021 +0100 + + I18n: Update translation ro (76%). + + 151 translated messages, 46 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3d0ae68c4c3aaff09ee388396413e4a0c0613ec0 +Author: Xfce Bot +Date: Tue Jan 19 09:55:44 2021 +0100 + + I18n: Update translation oc (78%). + + 155 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d991cb9880bfdd4e71a8e0a79afbefcf85b074d0 +Author: Xfce Bot +Date: Tue Jan 19 09:55:44 2021 +0100 + + I18n: Update translation nn (78%). + + 155 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 902f19b4aa13ce2269db9f3931d80404c3b12505 +Author: Pjotr +Date: Tue Jan 19 09:55:44 2021 +0100 + + I18n: Update translation nl (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 41783943e92a6e398958434f4c51270c2cc7e1cd +Author: Xfce Bot +Date: Tue Jan 19 09:55:43 2021 +0100 + + I18n: Update translation ms (85%). + + 169 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bce2c8c3c96d359ce6b3247a270bafa4f4d2319f +Author: Xfce Bot +Date: Tue Jan 19 09:55:43 2021 +0100 + + I18n: Update translation lv (51%). + + 101 translated messages, 96 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 27160ce663106c689138d5d5e4e5ea5939a03446 +Author: Xfce Bot +Date: Tue Jan 19 09:55:43 2021 +0100 + + I18n: Update translation ko (94%). + + 187 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1d4c1776e40006db4b685fa5296a9e9e78a9b1b7 +Author: Xfce Bot +Date: Tue Jan 19 09:55:43 2021 +0100 + + I18n: Update translation kk (94%). + + 187 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 097aa694482db4eef2793888e18d13328f9045b2 +Author: Emanuele Petriglia +Date: Tue Jan 19 09:55:43 2021 +0100 + + I18n: Update translation it (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit eebe086636d124cc69426ecdbdab2c439eed4d7b +Author: Xfce Bot +Date: Tue Jan 19 09:55:43 2021 +0100 + + I18n: Update translation is (79%). + + 157 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 762690e72e12cda81ff317ed08e6dd150d8c88f6 +Author: Xfce Bot +Date: Tue Jan 19 09:55:42 2021 +0100 + + I18n: Update translation hy (78%). + + 155 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3ca6520e5ed8338dc1b7364994e90b50581b5ed6 +Author: Xfce Bot +Date: Tue Jan 19 09:55:42 2021 +0100 + + I18n: Update translation hye (87%). + + 172 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 82bf8058ad19fa47f83494cf39ecf43d8d2635ac +Author: Xfce Bot +Date: Tue Jan 19 09:55:42 2021 +0100 + + I18n: Update translation hy_AM (79%). + + 156 translated messages, 41 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7d9ed4206d77382d8aee63578d7028e9cdcb22a9 +Author: Xfce Bot +Date: Tue Jan 19 09:55:42 2021 +0100 + + I18n: Update translation hu (85%). + + 169 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 65fd3c4afbb4f65db09b808079fc7fb577f57c03 +Author: Xfce Bot +Date: Tue Jan 19 09:55:42 2021 +0100 + + I18n: Update translation hr (87%). + + 172 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 46e5b6c707e90c7f1881c386877a6135ec1461d6 +Author: Daniel Muñiz Fontoira +Date: Tue Jan 19 09:55:42 2021 +0100 + + I18n: Update translation gl (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 34c4e204bf400b91fe1c90ae62baa0b915e39f13 +Author: Xfce Bot +Date: Tue Jan 19 09:55:41 2021 +0100 + + I18n: Update translation en_GB (79%). + + 157 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4ebc68aa3b3c61c4acb7e9a6a4edbde3580003dc +Author: Xfce Bot +Date: Tue Jan 19 09:55:41 2021 +0100 + + I18n: Update translation en_AU (79%). + + 157 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c16ea161d2c7b5a0fc58fc02ce734a2c6c8d5dad +Author: Xfce Bot +Date: Tue Jan 19 09:55:41 2021 +0100 + + I18n: Update translation el (78%). + + 155 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 49e060276adce5bd6295ad63bce4c5454ab896ac +Author: Andreas Eitel +Date: Tue Jan 19 09:55:41 2021 +0100 + + I18n: Update translation de (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 17e54db453e11fbfd8a67b24d2095bd17010e639 +Author: Xfce Bot +Date: Tue Jan 19 09:55:41 2021 +0100 + + I18n: Update translation cy (75%). + + 149 translated messages, 48 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 91126da89aff087779513a2be00f7d852d151768 +Author: Michal Várady +Date: Tue Jan 19 09:55:40 2021 +0100 + + I18n: Update translation cs (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 97a5edaeb69f75411797439b30e5a9f60f08f5ca +Author: Robert Antoni Buj Gelonch +Date: Tue Jan 19 09:55:40 2021 +0100 + + I18n: Update translation ca (100%). + + 197 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 79e939d009a5d0dcdb068fcfaea5036be3d4d82e +Author: Xfce Bot +Date: Tue Jan 19 09:55:40 2021 +0100 + + I18n: Update translation bn (52%). + + 104 translated messages, 93 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 39ccaefbb307cff4e16b4cdad59bd9e45528ed9c +Author: Xfce Bot +Date: Tue Jan 19 09:55:40 2021 +0100 + + I18n: Update translation ar (77%). + + 152 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c5c103ed78e9566c6b9875751bdb811a09a2575e +Author: Xfce Bot +Date: Tue Jan 19 09:55:40 2021 +0100 + + I18n: Update translation am (54%). + + 108 translated messages, 89 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). commit 2ad668de58be12d00f3485731e816d1f2613fb58 Author: Avinash Sonawane diff --git a/Makefile.am b/Makefile.am index a777b99..9dfe4f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,8 @@ EXTRA_DIST = \ DISTCLEANFILES = \ intltool-extract \ intltool-merge \ - intltool-update + intltool-update \ + po/.intltool-merge-cache.lock DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ diff --git a/Makefile.in b/Makefile.in index da60a9c..9968f0b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -90,11 +90,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -140,8 +140,8 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -158,13 +158,10 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ - COPYING ChangeLog NEWS THANKS TODO compile config.guess \ - config.sub install-sh ltmain.sh missing + COPYING ChangeLog NEWS README.md THANKS TODO compile \ + config.guess config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -203,6 +200,8 @@ am__relativize = \ GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.bz2 DIST_TARGETS = dist-bzip2 +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print @@ -220,6 +219,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -234,8 +235,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -456,7 +459,8 @@ EXTRA_DIST = \ DISTCLEANFILES = \ intltool-extract \ intltool-merge \ - intltool-update + intltool-update \ + po/.intltool-merge-cache.lock DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ @@ -631,7 +635,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -717,6 +720,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -759,6 +766,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -774,7 +783,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -937,7 +946,7 @@ uninstall-am: am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ + dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-local distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ diff --git a/NEWS b/NEWS index f08f3fe..7325ffe 100644 --- a/NEWS +++ b/NEWS @@ -1,16 +1,240 @@ -4.16.1 +4.18.6 (2024-03-08) ====== +- shortcuts-grabber: Remove filtering by level + +4.18.5 (2024-02-05) +====== +- Update copyright year +- build: Search for bind_textdomain_codeset in libintl too +- sm-client: Reset SmcConnection when IceConnection is closed on error +- docs: Improve xfce_sm_client_get() +- shortcuts-grabber: Fix filtering by level +- shortcuts-grabber: Simplify filtering by group +- shortcuts-grabber: Variable renaming +- shortcuts-grabber: Filter grabbing by key level +- Detect keyboard shortcuts with only single modifier keys on key +release +- Translation Updates: + Albanian, Amharic, Arabic, Armenian, Armenian (Armenia), Asturian, + Azerbaijani, Basque, Belarusian, Bengali, Bulgarian, Catalan, Chinese + (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, + Danish, Dutch, Eastern Armenian, English (Australia), English (United + Kingdom), Estonian, Finnish, French, Galician, Georgian, German, + Greek, Hebrew, Hungarian, Icelandic, Indonesian, Interlingue, + Italian, Japanese, Kazakh, Korean, Lithuanian, Malay, Norwegian + Bokmål, Norwegian Nynorsk, Occitan (post 1500), Persian (Iran), + Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian, + Slovak, Slovenian, Spanish, Swedish, Telugu, Thai, Turkish, + Ukrainian, Uyghur, Welsh + +4.18.4 (2023-05-22) +====== +- screensaver: Prevent recursive calling of lock command +- screensaver: Add lock-on-sleep property +- screensaver: Update fallback list +- screensaver: Prioritize user lock command +- screensaver: Rewrite D-Bus proxies management +- screensaver: Use reasonable timeout for methods that may not reply +- screensaver: Remove support for gnome-screensaver (Fixes #62) +- screensaver: Do not take into account empty commands +- screensaver: Simplify Xfconf management +- screensaver: Fix memory leak +- screensaver: Fix typos +- screensaver: Run lock command synchronously (Fixes #70) +- screensaver: Add missing include guard + +4.18.3 (2023-03-28) +====== +- Add comment about the need for gtk_widget_destroy() +- Fix memory management in Vala generated code +- Add annotation "(nullable)" where appropriate +- Replace deprecated annotation: "(allow-none)" +- Harden xfce_gtk_handle_tab_accels (thunar#1067) +- screensaver: Avoid Xfconf warning +- shortcuts-grabber: Ignore keyboard layout change +- screensaver: Fix Xfconf memory management + +4.18.2 (2023-02-09) +====== +- Update copyright year +- Add XfceScreensaver (!89) +- docs: Fix broken links +- shortcut-dialog: Use parent window for the grab if possible (Fixes #52) +- Fix memory leak +- Fix memory leaks + +4.18.1 (2023-01-05) +====== +- XfceFileNameInput - wrap error message (Issue #60) +- xfce4-about: Removed excess square brackets +- Revert "XfceShortcutsGrabber: Detect auto-repeat key press" +- Translation Updates: + Hebrew, Russian, Swedish + +4.18.0 (2022-12-15) +====== +- Update About credits +- build: Bump requirements for Xfce 4.18 +- Translation Updates: + Chinese (China), Czech, German, Hungarian, Lithuanian, Norwegian + Bokmål, Occitan (post 1500), Portuguese (Brazil), Serbian, Turkish + +4.17.9 (2022-11-30) +====== +- Added move-window-to-monitor shortcut options (!80) +- Translation Updates: + Albanian, Bulgarian, Chinese (Taiwan), Dutch, Estonian, French, + Italian, Japanese, Kazakh, Lithuanian, Polish, Portuguese, Spanish + +4.17.8 (2022-10-31) +====== +- Bump GObject Introspection minim version to 1.66 (xfconf#8, !79) +- Translation Updates: + Basque, Kazakh, Occitan (post 1500), Slovenian + +4.17.7 (2022-09-05) +====== +- Update copyright year +- docs: Add missing index of deprecated symbols +- libxfce4kbd-private: Reset shortcut recursively (#53) +- tests: Fix deprecation warning +- docs: Fix some broken links +- docs: Fix "unused declarations" warning +- docs: Add missing documentation +- docs: Add missing deprecation guards +- docs: Update `.gitignore` +- Fix titled dialog subtitle when headerbar is not used (!78) +- xfce-about: Add kernel and gtk version to system tab (!76) +- titled-dialog: Exclude normal windows from CSD adjustments (!72) +- xfce-about: Slightly tweak padding (!75) +- xfce4-about: Add support for 3A5000/loongarch64 (!74) +- titled-dialog: CSD XfceTitledDialog improvements (#26, !71) +- Shortcuts Editor: Tooltip improvement (!70) +- Fix intltool lock file problem during make distcheck (!69) +- xfce-spawn: Do not change DISPLAY on non-X11 displays (#13, !68) +- xfce-dialogs: Fix a memory leak +- Bump minimal required libxfce4util to 4.17.2 +- Translation Updates: + Albanian, Arabic, Azerbaijani, Basque, Bulgarian, Chinese (China), + Chinese (Taiwan), Croatian, Czech, Danish, Dutch, Estonian, French, + Georgian, German, Greek, Hebrew, Hungarian, Indonesian, Italian, + Japanese, Korean, Lithuanian, Norwegian Bokmål, Occitan (post 1500), + Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian, + Slovenian, Spanish, Swedish, Turkish, Ukrainian, Welsh + +4.17.6 +====== +- XfceShortcutsEditor: Do not update editor if shortcut change failed +- XfceShortcutsEditor: Allow to choose "Space" or "Enter" as shortcut +- XfceShortcutDialog: Do not propagate key events +- Function description spelling and format. +- Add new function xfce_gtk_toggle_tool_button_new_from_action_entry +- XfceShortcutsGrabber: Fix `-Wanalyzer-null-dereference` warning +- Secure memory allocations +- Update COPYING +- XfceShortcutsGrabber: Detect auto-repeat key press +- XfceShortcutDialog: Fix a memory leak +- Translation Updates: + Azerbaijani + +4.17.5 +====== +- XfceShortcutsEditor: Allow NULL for section name and document it +- XfceShortcutsEditor: Add new vectorized constructor +- i18n: Do not use textdomain() in libs +- XfceShortcutsEditor: Remove label formatting if necessary +- Simplify startup notification timeout +- XfceShortcutsDialog: center the dialog on the parent window +- Translation Updates: + Danish, Russian + +4.17.4 (2022-02-21) +====== +- Replace duplicate logic with xfce_str_replace +- Use headerbars for dialogs if Gtk/DialogsUseHeader is enabled (#14) +- Add new method "xfce_gtk_menu_append_separator" (Issue #49) +- xfce4-about - improve /etc/os-release value unquoting (Issue #47) +- Add comment to return gboolean in XfceGtkActionEntry +- Translation Updates: + Czech, Hebrew, Occitan (post 1500), Romanian, Ukrainian + +4.17.3 +====== +- Add functions for handling accelerators that use the Tab key +- Check time.h and sys/time.h for libgtop +- `g_once_init_enter()` parameter shouldn't be volatile anymore. +- Translation Updates: Croatian + +4.17.2 +====== +- xfce-about: Fix potential NULL pointer access +- Introduce a shortcuts editor widget +- Translation Updates: + Albanian, Amharic, Arabic, Armenian, Armenian (Armenia), Basque, + Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese + (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, + Eastern Armenian, English (Australia), English (United Kingdom), + Estonian, Finnish, French, Galician, German, Greek, Hebrew, + Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, + Kazakh, Korean, Latvian, Lithuanian, Malay, Norwegian Bokmål, + Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese, + Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, + Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Uyghur, Welsh + +4.17.1 +====== +- Add xfce_gdk_device_grab +- Fix xfce_gdk_screen_get_active to return correct monitor number +- Switch keyboard shortcut 'tile-up' with 'tile-down' (were mixed up) +- Usage of '<' and '>' instead of '<' and '>' in XML (Issue #44) +- Change "Setting System" to "Settings Manager" +- Add 4.18 section to docs - Add 4.16 section to docs +- Translation Updates: + Albanian, Amharic, Arabic, Armenian, Armenian (Armenia), Basque, + Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese + (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, + Eastern Armenian, English (Australia), English (United Kingdom), + Estonian, Finnish, French, Galician, German, Greek, Hebrew, + Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, + Kazakh, Korean, Latvian, Lithuanian, Malay, Norwegian Bokmål, + Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese, + Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, + Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Uyghur, Welsh + +4.17.0 +====== +- added xfce_gtk_label_set_a11y_relation to be used by various components +- initialize base_property prior xfce_shortcuts_provider_register - about: Replace stock with regular button -- about: Make Close button translatable (Fixes #41) +- about: Make Close button translateable (Fixes #41) +- Check if pixbuf is valid before unref +- shortcuts: Add Alt+Super+s for orca (Fixes #39) +- shortcuts-grabber: Filter grabbing by key group +- shortcuts-grabber: Redesign shortcut regrabbing (Bug #33) +- shortcuts-grabber: Stop search when the first match is found +- shortcuts: Fix a memory leak +- shortcuts-grabber: Record xkb state group (Bug #33) +- about: Fix invalid length and Zink renderer string +- Don't leak pixbuf +- XfceTitledDialog: Add pixbuf support as fallback +- Revamp the documentation to uniformize accross components +- Prevent resizing on message display with XfceFilenameInput +- Delay whitespace warning in XfceFilenameInput - Fix cast alignment warning - Remove Gtk2 leftovers - Don't reserve vertical space for subtitles in headerbars - Translation Updates: - Basque, Belarusian, Bulgarian, Czech, Danish, Estonian, Finnish, - French, Hebrew, Indonesian, Interlingue, Japanese, Lithuanian, - Norwegian Bokmål, Polish, Portuguese, Portuguese (Brazil), Russian, - Serbian, Slovenian, Spanish, Swedish, Turkish + Albanian, Amharic, Arabic, Armenian, Armenian (Armenia), Basque, + Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese + (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, + Eastern Armenian, English (Australia), English (United Kingdom), + Estonian, Finnish, French, Galician, German, Greek, Hebrew, + Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, + Kazakh, Korean, Latvian, Lithuanian, Malay, Norwegian Bokmål, + Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese, + Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, + Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Uyghur, Welsh 4.16.0 ====== diff --git a/aclocal.m4 b/aclocal.m4 index fccf539..60b8845 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,2397 +14,2543 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],, +[m4_warning([this file was generated for autoconf 2.72. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# -*- mode: autoconf -*- +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # -# gtk-doc.m4 - configure macro to check for gtk-doc -# Copyright (C) 2003 James Henstridge -# 2007-2017 Stefan Sauer -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# As a special exception, the above copyright owner gives unlimited -# permission to copy, distribute and modify the configure scripts that -# are the output of Autoconf when processing the Macro. You need not -# follow the terms of the GNU General Public License when using or -# distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. - -# serial 2 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) - AC_MSG_CHECKING([for gtk-doc]) - PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) - AC_MSG_RESULT($have_gtk_doc) - - if test "$have_gtk_doc" = "no"; then - AC_MSG_WARN([ - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found.]) - fi - - dnl check for tools we added during development - dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that - dnl may not be writable by the user. Currently, automake requires that the - dnl test name must end in '.test'. - dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 - AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) - AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then - AC_MSG_ERROR([ - You must have $gtk_doc_requires installed to build documentation for - $PACKAGE_NAME. Please install gtk-doc or disable building the - documentation by adding '--disable-gtk-doc' to '[$]0'.]) - fi - - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - AC_SUBST([AM_DEFAULT_VERBOSITY]) - - AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.16' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.16.5], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.16.5])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) +# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) +# AM_CONDITIONAL -*- Autoconf -*- -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi +# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi + $1_TRUE='#' + $1_FALSE= fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) +# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -IT_PO_SUBDIR([po]) -]) +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. # -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software -dnl Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -AC_PREREQ([2.50]) + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl -dnl Copyright © 2004 Scott James Remnant . -dnl Copyright © 2012-2015 Dan Nicholson -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception to the GNU General Public License, if you -dnl distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it under -dnl the same distribution terms that you use for the rest of that -dnl program. -dnl PKG_PREREQ(MIN-VERSION) -dnl ----------------------- -dnl Since: 0.29 -dnl -dnl Verify that the version of the pkg-config macros are at least -dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -dnl installed version of pkg-config, this checks the developer's version -dnl of pkg.m4 when generating configure. -dnl -dnl To ensure that this macro is defined, also add: -dnl m4_ifndef([PKG_PREREQ], -dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -dnl -dnl See the "Since" comment for each macro you use to see what version -dnl of the macros you require. -m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) -m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, - [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -])dnl PKG_PREREQ +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 -dnl -dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])dnl PKG_PROG_PKG_CONFIG - -dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------------------------------- -dnl Since: 0.18 -dnl -dnl Check to see whether a particular set of modules exists. Similar to -dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -dnl -dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place -dnl it's called might be skipped (such as if it is within an "if", you -dnl have to call PKG_CHECK_EXISTS manually -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -dnl --------------------------------------------- -dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -dnl pkg_failed based on the result. -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])dnl _PKG_CONFIG - -dnl _PKG_SHORT_ERRORS_SUPPORTED -dnl --------------------------- -dnl Internal check to see if pkg-config supports short errors. -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])dnl _PKG_SHORT_ERRORS_SUPPORTED - - -dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl -------------------------------------------------------------- -dnl Since: 0.4.0 -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# Generate code to set up dependency tracking. -*- Autoconf -*- -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) + shift + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf + do + # Strip MF so we end up with the name of the file. + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? + done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -$$1_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +# Do all the work for Automake. -*- Autoconf -*- -_PKG_TEXT +# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])dnl PKG_CHECK_MODULES +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) -dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl --------------------------------------------------------------------- -dnl Since: 0.29 -dnl -dnl Checks for existence of MODULES and gathers its build flags with -dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -dnl and VARIABLE-PREFIX_LIBS from --libs. -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -dnl configure.ac. -AC_DEFUN([PKG_CHECK_MODULES_STATIC], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -_save_PKG_CONFIG=$PKG_CONFIG -PKG_CONFIG="$PKG_CONFIG --static" -PKG_CHECK_MODULES($@) -PKG_CONFIG=$_save_PKG_CONFIG[]dnl -])dnl PKG_CHECK_MODULES_STATIC +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) -dnl PKG_INSTALLDIR([DIRECTORY]) -dnl ------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable pkgconfigdir as the location where a module -dnl should install pkg-config .pc files. By default the directory is -dnl $libdir/pkgconfig, but the default can be changed by passing -dnl DIRECTORY. The user can override through the --with-pkgconfigdir -dnl parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_INSTALLDIR +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable noarch_pkgconfigdir as the location where a -dnl module should install arch-independent pkg-config .pc files. By -dnl default the directory is $datadir/pkgconfig, but the default can be -dnl changed by passing DIRECTORY. The user can override through the -dnl --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_NOARCH_INSTALLDIR +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------- -dnl Since: 0.28 -dnl -dnl Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])dnl PKG_CHECK_VAR +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. -dnl Copyright (c) 2002-2015 -dnl The Xfce development team. All rights reserved. -dnl -dnl Written for Xfce by Benedikt Meurer . -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License along -dnl with this program; if not, write to the Free Software Foundation, Inc., -dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl -dnl xdt-depends -dnl ----------- -dnl Contains M4 macros to check for software dependencies. -dnl Partly based on prior work of the XDG contributors. -dnl +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. -dnl We need recent a autoconf version -AC_PREREQ([2.69]) +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -dnl XDT_PROG_PKG_CONFIG() -dnl -dnl Checks for the freedesktop.org pkg-config -dnl utility and sets the PKG_CONFIG environment -dnl variable to the full path if found. -dnl -AC_DEFUN([XDT_PROG_PKG_CONFIG], -[ - # minimum supported version of pkg-config - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - m4_ifdef([PKG_PROG_PKG_CONFIG], - [ - PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION]) +# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test x"$PKG_CONFIG" = x""; then - echo - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/" - echo "***" - exit 1; - fi - ], - [ - echo - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/" - echo "***" - exit 1 - ]) -]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) +# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -dnl XDT_CHECK_PACKAGE(varname, package, version, [action-if], [action-if-not]) -dnl -dnl Checks if "package" >= "version" is installed on the -dnl target system, using the pkg-config utility. If the -dnl dependency is met, "varname"_CFLAGS, "varname"_LIBS, -dnl "varname"_VERSION and "varname"_REQUIRED_VERSION -dnl will be set and marked for substition. -dnl -dnl "varname"_REQUIRED_VERSION will be set to the value of -dnl "version". This is mostly useful to automatically -dnl place the correct version information into the RPM -dnl .spec file. -dnl -dnl In addition, if the dependency is met, "action-if" will -dnl be executed if given. -dnl -dnl If the package check fails, "action-if-not" will be -dnl executed. If this parameter isn't specified, a diagnostic -dnl message will be printed and the configure script will -dnl be terminated with exit code 1. -dnl -AC_DEFUN([XDT_CHECK_PACKAGE], -[ - XDT_PROG_PKG_CONFIG() +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering - AC_MSG_CHECKING([for $2 >= $3]) - if $PKG_CONFIG "--atleast-version=$3" "$2" >/dev/null 2>&1; then - $1_VERSION=`$PKG_CONFIG --modversion "$2"` - AC_MSG_RESULT([$$1_VERSION]) +# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING([$1_CFLAGS]) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT([$$1_CFLAGS]) +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) - AC_MSG_CHECKING([$1_LIBS]) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT([$$1_LIBS]) +# Check to see how 'make' treats includes. -*- Autoconf -*- - $1_REQUIRED_VERSION=$3 +# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_SUBST([$1_VERSION]) - AC_SUBST([$1_CFLAGS]) - AC_SUBST([$1_LIBS]) - AC_SUBST([$1_REQUIRED_VERSION]) +# AM_MAKE_INCLUDE() +# ----------------- +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. +AC_DEFUN([AM_MAKE_INCLUDE], +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) - ifelse([$4], , , [$4]) - elif $PKG_CONFIG --exists "$2" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "$2"` - AC_MSG_RESULT([found, but $xdt_cv_version]) +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + MISSING="\${SHELL} '$am_aux_dir/missing'" +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) - ifelse([$5], , - [ - echo "*** The required package $2 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade $2 to atleast version $3, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." - exit 1 - ], [$5]) - else - AC_MSG_RESULT([not found]) +# Helper functions for option handling. -*- Autoconf -*- - ifelse([$5], , - [ - echo "*** The required package $2 was not found on your system." - echo "*** Please install $2 (atleast version $3) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." - exit 1 - ], [$5]) - fi -]) +# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -dnl XDT_CHECK_OPTIONAL_PACKAGE(varname, package, version, optionname, helpstring, [default]) -dnl -dnl Checks for an optional dependency on "package" >= "version". "default" -dnl can be "yes" or "no" (defaults to "yes" if not specified) and controls -dnl whether configure should check this dependency by default, or only if -dnl the user explicitly enables it using a command line switch. -dnl -dnl This macro automatically adds a commandline switch based on the "optionname" -dnl parameter (--enable-optionname/--disable-optionname), which allows the -dnl user to explicitly control whether this optional dependency should be -dnl enabled or not. The "helpstring" parameter gives a brief(!) description -dnl about this dependency. -dnl -dnl If the user chose to enable this dependency and the required package -dnl was found, this macro defines the variable "varname"_FOUND and sets it -dnl to the string "yes", in addition to the 4 variables set by XDT_CHECK_PACKAGE. -dnl But "varname"_FOUND will not be marked for substition. Furthermore, -dnl a CPP define HAVE_"varname" will be placed in config.h (or added to -dnl the cc command line, depending on your configure.ac) and set to -dnl 1. -dnl -AC_DEFUN([XDT_CHECK_OPTIONAL_PACKAGE], -[ - AC_REQUIRE([XDT_PROG_PKG_CONFIG]) +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - AC_ARG_ENABLE([$4], -AS_HELP_STRING([--enable-$4],[Enable checking for $5 (default=m4_default([$6], [yes]))]) -AS_HELP_STRING([--disable-$4],[Disable checking for $5]), - [xdt_cv_$1_check=$enableval], [xdt_cv_$1_check=m4_default([$6], [yes])]) +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - if test x"$xdt_cv_$1_check" = x"yes"; then - if $PKG_CONFIG --exists "$2 >= $3" >/dev/null 2>&1; then - XDT_CHECK_PACKAGE([$1], [$2], [$3], - [ - AC_DEFINE([HAVE_$1], [1], [Define if $2 >= $3 present]) - $1_FOUND="yes" - ]) +# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK else - AC_MSG_CHECKING([for optional package $2 >= $3]) - AC_MSG_RESULT([not found]) + am_cv_prog_cc_c_o=no + break fi - else - AC_MSG_CHECKING([for optional package $2]) - AC_MSG_RESULT([disabled]) - fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) - AM_CONDITIONAL([HAVE_$1], [test x"$$1_FOUND" = x"yes"]) -]) +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) +# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) -dnl XDT_CHECK_LIBX11() -dnl -dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS -dnl and LIBX11_LIBS (and marks them for substitution). In addition -dnl HAVE_LIBX11 is set to 1 in config.h, if the X window system and -dnl the development files are detected on the target system. -dnl -AC_DEFUN([XDT_CHECK_LIBX11], -[ - AC_REQUIRE([AC_PATH_XTRA]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- - LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS= - if test x"$no_x" != x"yes"; then - AC_CHECK_LIB([X11], [main], - [ - AC_DEFINE([HAVE_LIBX11], [1], [Define if libX11 is available]) - LIBX11_CFLAGS="$X_CFLAGS" - for option in $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS; do - case "$option" in - -L*) - path=`echo $option | sed 's/^-L//'` - if test x"$path" != x""; then - LIBX11_LDFLAGS="$LIBX11_LDFLAGS -L$path" - fi - ;; - *) - LIBX11_LIBS="$LIBX11_LIBS $option" - ;; - esac - done - if ! echo $LIBX11_LIBS | grep -- '-lX11' >/dev/null; then - LIBX11_LIBS="$LIBX11_LIBS -lX11" - fi - ], [], [$X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS]) - fi - AC_SUBST([LIBX11_CFLAGS]) - AC_SUBST([LIBX11_LDFLAGS]) - AC_SUBST([LIBX11_LIBS]) +# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file ]) +# Copyright (C) 2009-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - -dnl XDT_CHECK_LIBX11_REQUIRE() -dnl -dnl Similar to XDT_CHECK_LIBX11(), but terminates with an error if -dnl the X window system and development files aren't detected on the -dnl target system. -dnl -AC_DEFUN([XDT_CHECK_LIBX11_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBX11]) - - if test x"$no_x" = x"yes"; then - AC_MSG_ERROR([X Window system libraries and header files are required]) - fi +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl ]) - - - -dnl XDT_CHECK_LIBSM() -dnl -dnl Checks whether the session management library is present on the -dnl target system, and sets LIBSM_CFLAGS, LIBSM_LDFLAGS and LIBSM_LIBS -dnl properly. In addition, HAVE_LIBSM will be set to 1 in config.h -dnl if libSM is detected. +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac dnl -AC_DEFUN([XDT_CHECK_LIBSM], -[ - AC_REQUIRE([XDT_CHECK_LIBX11]) - - LIBSM_CFLAGS= LIBSM_LDFLAGS= LIBSM_LIBS= - if test x"$no_x" != x"yes"; then - AC_CHECK_LIB([SM], [SmcSaveYourselfDone], - [ - AC_DEFINE([HAVE_LIBSM], [1], [Define if libSM is available]) - LIBSM_CFLAGS="$LIBX11_CFLAGS" - LIBSM_LDFLAGS="$LIBX11_LDFLAGS" - LIBSM_LIBS="$LIBX11_LIBS" - if ! echo $LIBSM_LIBS | grep -- '-lSM' >/dev/null; then - LIBSM_LIBS="$LIBSM_LIBS -lSM -lICE" - fi - ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lICE]) - fi - AC_SUBST([LIBSM_CFLAGS]) - AC_SUBST([LIBSM_LDFLAGS]) - AC_SUBST([LIBSM_LIBS]) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) +# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl XDT_CHECK_LIBXPM() -dnl -dnl Checks if the Xpm library is present on the target system, and -dnl sets LIBXPM_CFLAGS, LIBXPM_LDFLAGS and LIBXPM_LIBS. In addition, -dnl HAVE_LIBXPM will be set to 1 in config.h if libXpm is detected. -dnl -AC_DEFUN([XDT_CHECK_LIBXPM], -[ - AC_REQUIRE([XDT_CHECK_LIBX11]) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) - LIBXPM_CFLAGS= LIBXPM_LDFLAGS= LIBXPM_LIBS= - if test "$no_x" != "yes"; then - AC_CHECK_LIB([Xpm], [main], - [ - AC_DEFINE([HAVE_LIBXPM], [1], [Define if libXpm is available]) - LIBXPM_CFLAGS="$LIBX11_CFLAGS" - LIBXPM_LDFLAGS="$LIBX11_LDFLAGS" - LIBXPM_LIBS="$LIBX11_LIBS" - if ! echo $LIBXPM_LIBS | grep -- '-lXpm' >/dev/null; then - LIBXPM_LIBS="$LIBXPM_LIBS -lXpm" - fi - ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lXpm]) - fi - AC_SUBST([LIBXPM_CFLAGS]) - AC_SUBST([LIBXPM_LDFLAGS]) - AC_SUBST([LIBXPM_LIBS]) -]) +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# Check how to create a tarball. -*- Autoconf -*- +# Copyright (C) 2004-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl XDT_CHECK_LIBXPM_REQUIRE() -dnl -dnl Similar to XDT_CHECK_LIBXPM(), but fails if the Xpm library isn't -dnl present on the target system. -dnl -AC_DEFUN([XDT_CHECK_LIBXPM_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE]) - AC_REQUIRE([XDT_CHECK_LIBXPM]) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) - if test x"$LIBXPM_LIBS" = x""; then - AC_MSG_ERROR([The Xpm library was not found on your system]) - fi -]) +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -dnl Copyright (c) 2002-2015 -dnl The Xfce development team. All rights reserved. -dnl -dnl Written for Xfce by Benedikt Meurer . -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License along -dnl with this program; if not, write to the Free Software Foundation, Inc., -dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl -dnl xdt-depends -dnl ----------- -dnl Contains M4 macros to check for software dependencies. -dnl Partly based on prior work of the XDG contributors. -dnl + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + [pax], + [], + [m4_fatal([Unknown tar format])]) -dnl We need recent a autoconf version -AC_PREREQ([2.69]) + AC_MSG_CHECKING([how to create a $1 tar archive]) + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} -dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS) -dnl -dnl For each token in FLAGS, checks to be sure the compiler supports -dnl the flag, and if so, adds each one to VAR. -dnl -AC_DEFUN([XDT_SUPPORTED_FLAGS], -[ - for flag in $2; do - AC_MSG_CHECKING([if $CC supports $flag]) - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $flag" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) - CFLAGS="$saved_CFLAGS" - AC_MSG_RESULT([$flag_supported]) + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - if test "x$flag_supported" = "xyes"; then - $1="$$1 $flag" + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi done -]) - - - -dnl XDT_FEATURE_DEBUG(default_level=minimum) -dnl -AC_DEFUN([XDT_FEATURE_DEBUG], -[ - dnl weird indentation to keep output indentation correct - AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],[Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@]) -AS_HELP_STRING([--disable-debug],[Include no debugging support]), - [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])]) + rm -rf conftest.dir - dnl enable most warnings regardless of debug level - xdt_cv_additional_CFLAGS="-Wall -Wextra \ - -Wno-missing-field-initializers \ - -Wno-unused-parameter -Wold-style-definition \ - -Wdeclaration-after-statement \ - -Wmissing-declarations \ - -Wmissing-noreturn -Wpointer-arith \ - -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ - -Winit-self -Wmissing-include-dirs -Wundef \ - -Wnested-externs -Wredundant-decls" + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) - AC_MSG_CHECKING([whether to build with debugging support]) - if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then - AC_DEFINE([DEBUG], [1], [Define for debugging support]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR - CPPFLAGS="$CPPFLAGS" - if test x`uname` = x"Linux"; then - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" - fi +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl - if test x"$enable_debug" = x"full"; then - AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g" - CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" - AC_MSG_RESULT([full]) - else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow" - AC_MSG_RESULT([yes]) - fi - else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wshadow" - CPPFLAGS="$CPPFLAGS -DNDEBUG" +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac - if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([minimum]) - fi - fi +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi - XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS]) +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi - ifelse([$CXX], , , [ - dnl FIXME: should test on c++ compiler, but the following line causes - dnl autoconf errors for projects that don't check for a - dnl c++ compiler at all. - dnl AC_LANG_PUSH([C++]) - dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS]) - dnl AC_LANG_POP() - dnl instead, just use supported_CFLAGS... - supported_CXXFLAGS="$supported_CFLAGS" - ]) +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) - CFLAGS="$CFLAGS $supported_CFLAGS" - CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS" -]) +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) -dnl XDT_FEATURE_VISIBILITY() -dnl -dnl Checks to see if the compiler supports the 'visibility' attribute -dnl If so, adds -DHAVE_GNUC_VISIBILTY to CPPFLAGS. Also sets the -dnl automake conditional HAVE_GNUC_VISIBILITY. -dnl -AC_DEFUN([XDT_FEATURE_VISIBILITY], -[ - AC_ARG_ENABLE([visibility], - AS_HELP_STRING([--disable-visibility],[Don't use ELF visibility attributes]), - [enable_visibility=$enableval], [enable_visibility=yes]) - have_gnuc_visibility=no - if test "x$enable_visibility" != "xno"; then - XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter]) - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $xdt_vis_test_cflags" - AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE( - [ - void test_default (void); - void test_hidden (void); + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - void __attribute__ ((visibility("default"))) test_default (void) {} - void __attribute__ ((visibility("hidden"))) test_hidden (void) {} +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) - int main (int argc, char **argv) { - test_default (); - test_hidden (); - return 0; - } - ])], - [ - have_gnuc_visibility=yes - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - ]) - CFLAGS="$saved_CFLAGS" - fi +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi - if test "x$have_gnuc_visibility" = "xyes"; then - CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" - xdt_vis_hidden_cflags="" - XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden]) - if test "x$xdt_vis_hidden_cflags" = "x"; then - XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) - fi - CFLAGS="$CFLAGS $xdt_vis_hidden_cflags" - fi +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi - AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"]) -]) +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) -dnl XDT_FEATURE_LINKER_OPTS -dnl -dnl Checks for and enables any special linker optimizations. -dnl -AC_DEFUN([XDT_FEATURE_LINKER_OPTS], -[ - AC_ARG_ENABLE([linker-opts], - AS_HELP_STRING([--disable-linker-opts],[Disable linker optimizations]), - [enable_linker_opts=$enableval], [enable_linker_opts=yes]) +IT_PO_SUBDIR([po]) - if test "x$enable_linker_opts" != "xno"; then - if test x`uname` != x"OpenBSD"; then - AC_MSG_CHECKING([whether $LD accepts --as-needed]) - case `$LD --as-needed -v 2>&1 &1 . -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License along -dnl with this program; if not, write to the Free Software Foundation, Inc., -dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl -dnl xdt-i18n -dnl -------- -dnl Internalization M4 macros. -dnl - -dnl XDT_I18N([LINGUAS][, PACKAGE]) -dnl -dnl This macro takes care of setting up everything for i18n support. -dnl -dnl If LINGUAS isn't specified, it will automatically extract the linguas -dnl from po/*.po. -dnl -dnl If PACKAGE isn't specified, it defaults to the package tarname; see -dnl the description of AC_INIT() for an explanation of what makes up -dnl the package tarname. Normally, you don't need to specify PACKAGE, -dnl but you can stick with the default. +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -AC_DEFUN([XDT_I18N], -[ - dnl Substitute GETTEXT_PACKAGE variable - GETTEXT_PACKAGE=m4_default([$2], [AC_PACKAGE_TARNAME()]) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Name of default gettext domain]) - AC_SUBST([GETTEXT_PACKAGE]) - - dnl gettext and stuff - ALL_LINGUAS="m4_ifblank( - [$1], - [esyscmd([echo $(for i in po/*.po; do test -e "$i" && basename -- "$i" .po; done) | tr -d '\n'])], - [$1])" - - dnl This is required on some Linux systems - AC_CHECK_FUNC([bind_textdomain_codeset]) - - dnl Determine where to install locale files - AC_MSG_CHECKING([for locales directory]) - AC_ARG_WITH([locales-dir], - [ - AS_HELP_STRING([--with-locales-dir=DIR],[Install locales into DIR]) - ], [localedir=$withval], - [ - if test x"$CATOBJEXT" = x".mo"; then - localedir=$libdir/locale - else - localedir=$datarootdir/locale +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" ]) - AC_MSG_RESULT([$localedir]) - AC_SUBST([localedir]) +])dnl ]) - -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.16' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +# nls.m4 serial 6 (gettext-0.20.2) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2023 Free +dnl Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Lesser General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Lesser General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -AC_DEFUN([AM_AUX_DIR_EXPAND], -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) -# AM_CONDITIONAL -*- Autoconf -*- +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# Copyright (C) 1997-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG -# Copyright (C) 1999-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurrence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +pkg_failed=no +AC_MSG_CHECKING([for $2]) -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done +$$1_PKG_ERRORS - cd .. - rm -rf conftest.dir +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR -# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - AS_CASE([$CONFIG_FILES], - [*\'*], [eval set x "$CONFIG_FILES"], - [*], [set x $CONFIG_FILES]) - shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf - do - # Strip MF so we end up with the name of the file. - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`AS_DIRNAME(["$am_mf"])` - am_filepart=`AS_BASENAME(["$am_mf"])` - AM_RUN_LOG([cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles]) || am_rc=$? - done - if test $am_rc -ne 0; then - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking).]) - fi - AS_UNSET([am_dirpart]) - AS_UNSET([am_filepart]) - AS_UNSET([am_mf]) - AS_UNSET([am_rc]) - rm -f conftest-deps.mk -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking is enabled. -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in -# order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) -# Do all the work for Automake. -*- Autoconf -*- +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) -# Copyright (C) 1996-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +])dnl PKG_WITH_MODULES -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target (and possibly the TAP driver). The -# system "awk" is bad on some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + +dnl Copyright (c) 2002-2015 +dnl The Xfce development team. All rights reserved. +dnl +dnl Written for Xfce by Benedikt Meurer . +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +dnl +dnl xdt-depends +dnl ----------- +dnl Contains M4 macros to check for software dependencies. +dnl Partly based on prior work of the XDG contributors. +dnl + + + +dnl We need recent a autoconf version +AC_PREREQ([2.69]) + + + +dnl XDT_PROG_PKG_CONFIG() +dnl +dnl Checks for the freedesktop.org pkg-config +dnl utility and sets the PKG_CONFIG environment +dnl variable to the full path if found. +dnl +AC_DEFUN([XDT_PROG_PKG_CONFIG], +[ + # minimum supported version of pkg-config + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 + + m4_ifdef([PKG_PROG_PKG_CONFIG], + [ + PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION]) + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/" + echo "***" + exit 1; + fi + ], + [ + echo + echo "*** The pkg-config utility could not be found on your system." + echo "*** Make sure it is in your path, or set the PKG_CONFIG" + echo "*** environment variable to the full path to pkg-config." + echo "*** You can download pkg-config from the freedesktop.org" + echo "*** software repository at" + echo "***" + echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/" + echo "***" + exit 1 + ]) ]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. +dnl XDT_CHECK_PACKAGE(varname, package, version, [action-if], [action-if-not]) +dnl +dnl Checks if "package" >= "version" is installed on the +dnl target system, using the pkg-config utility. If the +dnl dependency is met, "varname"_CFLAGS, "varname"_LIBS, +dnl "varname"_VERSION and "varname"_REQUIRED_VERSION +dnl will be set and marked for substition. +dnl +dnl "varname"_REQUIRED_VERSION will be set to the value of +dnl "version". This is mostly useful to automatically +dnl place the correct version information into the RPM +dnl .spec file. +dnl +dnl In addition, if the dependency is met, "action-if" will +dnl be executed if given. +dnl +dnl If the package check fails, "action-if-not" will be +dnl executed. If this parameter isn't specified, a diagnostic +dnl message will be printed and the configure script will +dnl be terminated with exit code 1. +dnl +AC_DEFUN([XDT_CHECK_PACKAGE], +[ + XDT_PROG_PKG_CONFIG() + + AC_MSG_CHECKING([for $2 >= $3]) + if $PKG_CONFIG "--atleast-version=$3" "$2" >/dev/null 2>&1; then + $1_VERSION=`$PKG_CONFIG --modversion "$2"` + AC_MSG_RESULT([$$1_VERSION]) + + AC_MSG_CHECKING([$1_CFLAGS]) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT([$$1_CFLAGS]) + + AC_MSG_CHECKING([$1_LIBS]) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT([$$1_LIBS]) + + $1_REQUIRED_VERSION=$3 + + AC_SUBST([$1_VERSION]) + AC_SUBST([$1_CFLAGS]) + AC_SUBST([$1_LIBS]) + AC_SUBST([$1_REQUIRED_VERSION]) + + if test x"$1" = x"GLIB"; then + dnl Use GLib structured logging, see https://docs.gtk.org/glib/logging.html + dnl XFCE apps&libraries can override this setting after XDT_CHECK_PACKAGE(GLIB) + dnl using AC_DEFINE. + dnl Note that it requires GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56 to work + dnl properly in GLib logging macros (not documented, see glib/gmessages.h). + AC_DEFINE(G_LOG_USE_STRUCTURED, 1, [Use GLib structured logging]) + fi -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. + ifelse([$1], GLIB, [ + dnl Report uses of GLib functions newer than $3 as C compiler warnings. + dnl XFCE apps&libraries can override this setting after XDT_CHECK_PACKAGE(GLIB) + dnl using AC_DEFINE, in which case it is recommended to override both MAX and MIN. + AC_MSG_NOTICE([setting GLIB_VERSION_MAX_ALLOWED and GLIB_VERSION_MIN_REQUIRED according to $3]) + m4_pushdef([SUFFIX], translit($3, `.', `_')) + m4_define([SUFFIX], ifelse(regexp(SUFFIX, [[0-9]+_[0-9]+_[0-9]+]), -1, SUFFIX, patsubst(SUFFIX, [_[0-9]+$]))) + AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, m4_format(GLIB_VERSION_%s, SUFFIX), m4_format(Prevent post %s APIs, SUFFIX)) + AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, m4_format(GLIB_VERSION_%s, SUFFIX), m4_format(Ignore post %s APIs, SUFFIX)) + m4_popdef([SUFFIX]) + ]) -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . + ifelse([$4], , , [$4]) + elif $PKG_CONFIG --exists "$2" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "$2"` + AC_MSG_RESULT([found, but $xdt_cv_version]) -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. + ifelse([$5], , + [ + echo "*** The required package $2 was found on your system," + echo "*** but the installed version ($xdt_cv_version) is too old." + echo "*** Please upgrade $2 to atleast version $3, or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you installed" + echo "*** the new version of the package in a nonstandard prefix so" + echo "*** pkg-config is able to find it." + exit 1 + ], [$5]) + else + AC_MSG_RESULT([not found]) -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + ifelse([$5], , + [ + echo "*** The required package $2 was not found on your system." + echo "*** Please install $2 (atleast version $3) or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you" + echo "*** installed the package in a nonstandard prefix so that" + echo "*** pkg-config is able to find it." + exit 1 + ], [$5]) fi -fi -dnl The trailing newline in this macro's definition is deliberate, for -dnl backward compatibility and to allow trailing 'dnl'-style comments -dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +dnl XDT_CHECK_OPTIONAL_PACKAGE(varname, package, version, optionname, helpstring, [default]) +dnl +dnl Checks for an optional dependency on "package" >= "version". "default" +dnl can be "yes" or "no" (defaults to "yes" if not specified) and controls +dnl whether configure should check this dependency by default, or only if +dnl the user explicitly enables it using a command line switch. +dnl +dnl This macro automatically adds a commandline switch based on the "optionname" +dnl parameter (--enable-optionname/--disable-optionname), which allows the +dnl user to explicitly control whether this optional dependency should be +dnl enabled or not. The "helpstring" parameter gives a brief(!) description +dnl about this dependency. +dnl +dnl If the user chose to enable this dependency and the required package +dnl was found, this macro defines the variable "varname"_FOUND and sets it +dnl to the string "yes", in addition to the 4 variables set by XDT_CHECK_PACKAGE. +dnl But "varname"_FOUND will not be marked for substition. Furthermore, +dnl a CPP define HAVE_"varname" will be placed in config.h (or added to +dnl the cc command line, depending on your configure.ac) and set to +dnl 1. +dnl +AC_DEFUN([XDT_CHECK_OPTIONAL_PACKAGE], +[ + AC_REQUIRE([XDT_PROG_PKG_CONFIG]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_ARG_ENABLE([$4], +AS_HELP_STRING([--enable-$4],[Enable checking for $5 (default=m4_default([$6], [yes]))]) +AS_HELP_STRING([--disable-$4],[Disable checking for $5]), + [xdt_cv_$1_check=$enableval], [xdt_cv_$1_check=m4_default([$6], [yes])]) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) + if test x"$xdt_cv_$1_check" = x"yes"; then + if $PKG_CONFIG --exists "$2 >= $3" >/dev/null 2>&1; then + XDT_CHECK_PACKAGE([$1], [$2], [$3], + [ + AC_DEFINE([HAVE_$1], [1], [Define if $2 >= $3 present]) + $1_FOUND="yes" + ]) + else + AC_MSG_CHECKING([for optional package $2 >= $3]) + AC_MSG_RESULT([not found]) + fi + else + AC_MSG_CHECKING([for optional package $2]) + AC_MSG_RESULT([disabled]) + fi -# Copyright (C) 2003-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AM_CONDITIONAL([HAVE_$1], [test x"$$1_FOUND" = x"yes"]) +]) -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl XDT_FEATURE_DEPENDENCY(varname, package, version) +dnl +dnl Used only as an argument to XDT_CHECK_OPTIONAL_FEATURE(), this macro +dnl declares a dependency required for the feature to be enabled. +dnl +dnl If the dependency is checked and found, variables and substitutions will be +dnl created and set as in XDT_CHECK_PACKAGE(), plus varname_FOUND will be set +dnl to "yes", and HAVE_varname will be set in config.h. +dnl +dnl Note that, unlike with XDT_CHECK_OPTIONAL_PACKAGE(), no automake +dnl conditional is set for this dependency. +dnl +dnl See XDT_CHECK_OPTIONAL_FEATURE() for more information. +dnl +AC_DEFUN([XDT_FEATURE_DEPENDENCY], +[ + AC_REQUIRE([XDT_PROG_PKG_CONFIG]) -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless 'enable' is passed literally. -# For symmetry, 'disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], - am_maintainer_other[ make rules and dependencies not useful - (and sometimes confusing) to the casual installer])], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) + if test x"$xdt_feature_deps_check_only" = x"yes"; then + if ! $PKG_CONFIG --exists "$2 >= $3" >/dev/null 2>&1; then + if test x"$xdt_feature_deps_missing" = x""; then + xdt_feature_deps_missing="$2 >= $3" + else + xdt_feature_deps_missing="$xdt_feature_deps_missing, $2 >= $3" + fi + fi + else + XDT_CHECK_PACKAGE([$1], [$2], [$3], + [ + AC_DEFINE([HAVE_$1], [1], [Define if $2 >= $3 present]) + $1_FOUND="yes" + ]) + fi +]) -# Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_MAKE_INCLUDE() -# ----------------- -# Check whether make has an 'include' directive that can support all -# the idioms we need for our automatic dependency tracking code. -AC_DEFUN([AM_MAKE_INCLUDE], -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) -cat > confinc.mk << 'END' -am__doit: - @echo this is the am__doit target >confinc.out -.PHONY: am__doit -END -am__include="#" -am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) - AS_CASE([$?:`cat confinc.out 2>/dev/null`], - ['0:this is the am__doit target'], - [AS_CASE([$s], - [BSD], [am__include='.include' am__quote='"'], - [am__include='include' am__quote=''])]) - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break +dnl XDT_CHECK_OPTIONAL_FEATURE(varname, optionname, dependency-checks, [helpstring], [default]) +dnl +dnl Introduces an --enable-optionname/--disable-optionname flag pair for a +dnl named feature. If neither flag is provided, the feature will be enabled or +dnl disabled depending on whether or not dependency-checks succeed or fail. +dnl If --enable-optionname is provided, the configure script will error out if +dnl the dependencies are not met. If --disable-optionname is provided, the +dnl feature will be disabled, and dependencies will not be checked. +dnl +dnl The dependency-checks argument should be a series of +dnl XDT_FEATURE_DEPENDENCY() macro calls, passed as a single quoted argument to +dnl XDT_CHECK_OPTIONAL_FEATURE(). +dnl +dnl If helpstring is not provided, optionname is used instead. +dnl +dnl The default is "auto", and semantics are as described above. If default is +dnl set to "yes", then the feature will be required unless --disable-optionname +dnl is passed to configure. If default is set to "no", the feature will not be +dnl built unless --enable-optionname is passed. +dnl +dnl If the feature is enabled and dependencies are met, ENABLE_varname will be +dnl defined in config.h. Additionally, an automake conditional called +dnl ENABLE_varname will be created, and a shell variable called ENABLE_varname +dnl will set to "yes" or "no". +dnl +dnl Example usage: +dnl +dnl XDT_CHECK_OPTIONAL_FEATURE([WAYLAND], +dnl [wayland], +dnl [ +dnl XDT_FEATURE_DEPENDENCY([GDK_WAYLAND], [gdk-wayland-3.0], [3.24.0]) +dnl XDT_FEATURE_DEPENDENCY([GTK_LAYER_SHELL], [gtk-layer-shell-0], [0.7.0]) +dnl ], +dnl [the Wayland windowing system]) +dnl +dnl Note that there are no commas between the XDT_FEATURE_DEPENDENCY() +dnl invocations; they should all form a single "argument" to +dnl XDT_CHECK_OPTIONAL_FEATURE(). +dnl +dnl Also note that you must quote the dependency-checks argument with square +dnl brackets, or you will get syntax errors in the generated configure script. +dnl +AC_DEFUN([XDT_CHECK_OPTIONAL_FEATURE], +[ + AC_ARG_ENABLE([$2], +AS_HELP_STRING([--enable-$2], [Enable support for m4_default($4, $2) (default=m4_default([$5], [auto]))]) +AS_HELP_STRING([--disable-$2], [Disable support for m4_default($4, $2)]), + [xdt_cv_$1_enabled=$enableval], [xdt_cv_$1_enabled=m4_default([$5], [auto])]) + + if test x"$xdt_cv_$1_enabled" != x"no"; then + xdt_feature_deps_check_only=yes + xdt_feature_deps_missing= + $3 + if test x"$xdt_feature_deps_missing" = x""; then + xdt_feature_deps_check_only= + $3 + ENABLE_$1="yes" + AC_DEFINE([ENABLE_$1], [1], [Define if m4_default($4, $2) is enabled]) + AC_MSG_CHECKING([if m4_default($4, $2) is enabled]) + AC_MSG_RESULT([yes]) + else + AC_MSG_CHECKING([if m4_default($4, $2) is enabled]) + AC_MSG_RESULT([dependencies missing: $xdt_feature_deps_missing]) + if test x"$xdt_cv_$1_enabled" = x"yes"; then + AC_MSG_ERROR([support for m4_default($4, $2) was required, but dependencies were not met]) + else + ENABLE_$1="no" + fi + fi + xdt_feature_deps_check_only= + xdt_feature_deps_missing= + else + ENABLE_$1="no" + AC_MSG_CHECKING([if m4_default($4, $2) is enabled]) + AC_MSG_RESULT([disabled]) + fi + + AM_CONDITIONAL([ENABLE_$1], [test x"$ENABLE_$1" = x"yes"]) +]) + + + +dnl XDT_CHECK_PACKAGE_BINARY(varname, package, pkgvarname, [binname]) +dnl +dnl Finds a program by looking for a variable named pkgvarname in the +dnl pkg-config file for package. If found, varname (both a shell variable and +dnl automake substitution) is set to the name of the binary (and possibly full +dnl path, if that is how it is specified in the pkg-config file). If not found, +dnl or not present and executable, configure will exit with an error. +dnl +dnl Users can also override this detection by specfying a varname on the +dnl configure command line. In that case, the provided value is still checked +dnl to ensure it exists and is executable. +dnl +dnl If binname is not provided (for documentation purposes), pkgvarname will be +dnl used instead. +dnl +dnl Example usage: +dnl +dnl XDT_CHECK_PACKAGE_BINARY([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal], [glib-genmarshal]) +dnl +AC_DEFUN([XDT_CHECK_PACKAGE_BINARY], +[ + AC_REQUIRE([XDT_PROG_PKG_CONFIG]) + + AC_ARG_VAR([$1], [Location of program ]m4_default($4, $3)) + AC_MSG_CHECKING([for m4_default($4, $3)]) + + if test x"$$1" = x""; then + $1=`$PKG_CONFIG --variable=$3 $2` fi -done -rm -f confinc.* confmf.* -AC_MSG_RESULT([${_am_result}]) -AC_SUBST([am__include])]) -AC_SUBST([am__quote])]) + if test x"$$1" != x"" -a -x "$$1"; then + AC_MSG_RESULT([$$1]) + else + AC_MSG_ERROR([could not find m4_default($4, $3). You can run: +./configure $1=/path/to/m4_default($4, $3) +to provide a custom location for it.]) + fi +]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +dnl XDT_CHECK_LIBX11() +dnl +dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS +dnl and LIBX11_LIBS (and marks them for substitution). In addition +dnl HAVE_LIBX11 is set to 1 in config.h, if the X window system and +dnl the development files are detected on the target system. +dnl +AC_DEFUN([XDT_CHECK_LIBX11], +[ + AC_REQUIRE([AC_PATH_XTRA]) -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi + LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS= + if test x"$no_x" != x"yes"; then + AC_CHECK_LIB([X11], [main], + [ + AC_DEFINE([HAVE_LIBX11], [1], [Define if libX11 is available]) + LIBX11_CFLAGS="$X_CFLAGS" + for option in $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS; do + case "$option" in + -L*) + path=`echo $option | sed 's/^-L//'` + if test x"$path" != x""; then + LIBX11_LDFLAGS="$LIBX11_LDFLAGS -L$path" + fi + ;; + *) + LIBX11_LIBS="$LIBX11_LIBS $option" + ;; + esac + done + if ! echo $LIBX11_LIBS | grep -- '-lX11' >/dev/null; then + LIBX11_LIBS="$LIBX11_LIBS -lX11" + fi + ], [], [$X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS]) + fi + AC_SUBST([LIBX11_CFLAGS]) + AC_SUBST([LIBX11_LDFLAGS]) + AC_SUBST([LIBX11_LIBS]) ]) -# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +dnl XDT_CHECK_LIBX11_REQUIRE() +dnl +dnl Similar to XDT_CHECK_LIBX11(), but terminates with an error if +dnl the X window system and development files aren't detected on the +dnl target system. +dnl +AC_DEFUN([XDT_CHECK_LIBX11_REQUIRE], +[ + AC_REQUIRE([XDT_CHECK_LIBX11]) + + if test x"$no_x" = x"yes"; then + AC_MSG_ERROR([X Window system libraries and header files are required]) + fi +]) -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +dnl XDT_CHECK_LIBSM() +dnl +dnl Checks whether the session management library is present on the +dnl target system, and sets LIBSM_CFLAGS, LIBSM_LDFLAGS and LIBSM_LIBS +dnl properly. In addition, HAVE_LIBSM will be set to 1 in config.h +dnl if libSM is detected. +dnl +AC_DEFUN([XDT_CHECK_LIBSM], +[ + AC_REQUIRE([XDT_CHECK_LIBX11]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + LIBSM_CFLAGS= LIBSM_LDFLAGS= LIBSM_LIBS= + if test x"$no_x" != x"yes"; then + AC_CHECK_LIB([SM], [SmcSaveYourselfDone], + [ + AC_DEFINE([HAVE_LIBSM], [1], [Define if libSM is available]) + LIBSM_CFLAGS="$LIBX11_CFLAGS" + LIBSM_LDFLAGS="$LIBX11_LDFLAGS" + LIBSM_LIBS="$LIBX11_LIBS" + if ! echo $LIBSM_LIBS | grep -- '-lSM' >/dev/null; then + LIBSM_LIBS="$LIBSM_LIBS -lSM -lICE" + fi + ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lICE]) + fi + AC_SUBST([LIBSM_CFLAGS]) + AC_SUBST([LIBSM_LDFLAGS]) + AC_SUBST([LIBSM_LIBS]) +]) -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl XDT_CHECK_LIBXPM() +dnl +dnl Checks if the Xpm library is present on the target system, and +dnl sets LIBXPM_CFLAGS, LIBXPM_LDFLAGS and LIBXPM_LIBS. In addition, +dnl HAVE_LIBXPM will be set to 1 in config.h if libXpm is detected. +dnl +AC_DEFUN([XDT_CHECK_LIBXPM], +[ + AC_REQUIRE([XDT_CHECK_LIBX11]) -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) + LIBXPM_CFLAGS= LIBXPM_LDFLAGS= LIBXPM_LIBS= + if test "$no_x" != "yes"; then + AC_CHECK_LIB([Xpm], [main], + [ + AC_DEFINE([HAVE_LIBXPM], [1], [Define if libXpm is available]) + LIBXPM_CFLAGS="$LIBX11_CFLAGS" + LIBXPM_LDFLAGS="$LIBX11_LDFLAGS" + LIBXPM_LIBS="$LIBX11_LIBS" + if ! echo $LIBXPM_LIBS | grep -- '-lXpm' >/dev/null; then + LIBXPM_LIBS="$LIBXPM_LIBS -lXpm" + fi + ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lXpm]) + fi + AC_SUBST([LIBXPM_CFLAGS]) + AC_SUBST([LIBXPM_LDFLAGS]) + AC_SUBST([LIBXPM_LIBS]) +]) + + + +dnl XDT_CHECK_LIBXPM_REQUIRE() +dnl +dnl Similar to XDT_CHECK_LIBXPM(), but fails if the Xpm library isn't +dnl present on the target system. +dnl +AC_DEFUN([XDT_CHECK_LIBXPM_REQUIRE], +[ + AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE]) + AC_REQUIRE([XDT_CHECK_LIBXPM]) + + if test x"$LIBXPM_LIBS" = x""; then + AC_MSG_ERROR([The Xpm library was not found on your system]) + fi +]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl Copyright (c) 2002-2015 +dnl The Xfce development team. All rights reserved. +dnl +dnl Written for Xfce by Benedikt Meurer . +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +dnl +dnl xdt-depends +dnl ----------- +dnl Contains M4 macros to check for software dependencies. +dnl Partly based on prior work of the XDG contributors. +dnl -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) +dnl We need recent a autoconf version +AC_PREREQ([2.69]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac +dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS) dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +dnl For each token in FLAGS, checks to be sure the compiler supports +dnl the flag, and if so, adds each one to VAR. +dnl +AC_DEFUN([XDT_SUPPORTED_FLAGS], +[ + for flag in $2; do + AC_MSG_CHECKING([if $CC supports $flag]) + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) + CFLAGS="$saved_CFLAGS" + AC_MSG_RESULT([$flag_supported]) + + if test "x$flag_supported" = "xyes"; then + $1="$$1 $flag" + fi + done ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor 'install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl XDT_FEATURE_DEBUG(default_level=minimum) +dnl +AC_DEFUN([XDT_FEATURE_DEBUG], +[ + dnl weird indentation to keep output indentation correct + AC_ARG_ENABLE([debug], + AS_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],[Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@]) +AS_HELP_STRING([--disable-debug],[Include no debugging support]), + [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])]) -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + dnl Enable most warnings regardless of debug level. Common flags for both C and C++. + xdt_cv_additional_COMMON_FLAGS="-Wall -Wextra \ + -Wno-missing-field-initializers \ + -Wno-unused-parameter \ + -Wmissing-declarations \ + -Wmissing-noreturn -Wpointer-arith \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ + -Winit-self -Wmissing-include-dirs -Wundef \ + -Wredundant-decls" -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + AC_MSG_CHECKING([whether to build with debugging support]) + if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then + AC_DEFINE([DEBUG], [1], [Define for debugging support]) -# Check how to create a tarball. -*- Autoconf -*- + CPPFLAGS="$CPPFLAGS" -# Copyright (C) 2004-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + if test x`uname` = x"Linux"; then + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -fstack-protector" + fi -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -# -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) + if test x"$enable_debug" = x"full"; then + AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -O0 -g" + CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" + AC_MSG_RESULT([full]) + else + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -g -Wshadow" + AC_MSG_RESULT([yes]) + fi + else + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -Wshadow" + CPPFLAGS="$CPPFLAGS -DNDEBUG" -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + if test x"$enable_debug" = x"no"; then + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([minimum]) + fi + fi -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + xdt_cv_additional_CFLAGS="$xdt_cv_additional_COMMON_FLAGS \ + -Wnested-externs \ + -Wold-style-definition" + xdt_cv_additional_CXXFLAGS="$xdt_cv_additional_COMMON_FLAGS" - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], + XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS]) + XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CXXFLAGS]) - [pax], - [], + CFLAGS="$CFLAGS $supported_CFLAGS" + CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS" +]) - [m4_fatal([Unknown tar format])]) - AC_MSG_CHECKING([how to create a $1 tar archive]) +dnl XDT_FEATURE_VISIBILITY() +dnl +dnl Checks to see if the compiler supports the 'visibility' attribute +dnl If so, adds -DHAVE_GNUC_VISIBILTY to CPPFLAGS. Also sets the +dnl automake conditional HAVE_GNUC_VISIBILITY. +dnl +AC_DEFUN([XDT_FEATURE_VISIBILITY], +[ + AC_ARG_ENABLE([visibility], + AS_HELP_STRING([--disable-visibility],[Don't use ELF visibility attributes]), + [enable_visibility=$enableval], [enable_visibility=yes]) + have_gnuc_visibility=no + if test "x$enable_visibility" != "xno"; then + XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter]) + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $xdt_vis_test_cflags" + AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [ + void test_default (void); + void test_hidden (void); - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} + void __attribute__ ((visibility("default"))) test_default (void) {} + void __attribute__ ((visibility("hidden"))) test_hidden (void) {} - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' + int main (int argc, char **argv) { + test_default (); + test_hidden (); + return 0; + } + ])], + [ + have_gnuc_visibility=yes + AC_MSG_RESULT([yes]) + ], + [ + AC_MSG_RESULT([no]) + ]) + CFLAGS="$saved_CFLAGS" + fi + + if test "x$have_gnuc_visibility" = "xyes"; then + CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" + xdt_vis_hidden_cflags="" + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden]) + if test "x$xdt_vis_hidden_cflags" = "x"; then + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) + fi + CFLAGS="$CFLAGS $xdt_vis_hidden_cflags" + fi + + AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"]) +]) + +dnl XDT_FEATURE_LINKER_OPTS +dnl +dnl Checks for and enables any special linker optimizations. +dnl +AC_DEFUN([XDT_FEATURE_LINKER_OPTS], +[ + AC_ARG_ENABLE([linker-opts], + AS_HELP_STRING([--disable-linker-opts],[Disable linker optimizations]), + [enable_linker_opts=$enableval], [enable_linker_opts=yes]) + + if test "x$enable_linker_opts" != "xno"; then + if test x`uname` != x"OpenBSD"; then + AC_MSG_CHECKING([whether $LD accepts --as-needed]) + case `$LD --as-needed -v 2>&1 &1 . +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +dnl +dnl xdt-i18n +dnl -------- +dnl Internalization M4 macros. +dnl - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi - done - rm -rf conftest.dir - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +dnl XDT_I18N([LINGUAS][, PACKAGE]) +dnl +dnl This macro takes care of setting up everything for i18n support. +dnl +dnl If LINGUAS isn't specified, it will automatically extract the linguas +dnl from po/*.po. +dnl +dnl If PACKAGE isn't specified, it defaults to the package tarname; see +dnl the description of AC_INIT() for an explanation of what makes up +dnl the package tarname. Normally, you don't need to specify PACKAGE, +dnl but you can stick with the default. +dnl +AC_DEFUN([XDT_I18N], +[ + dnl Substitute GETTEXT_PACKAGE variable + GETTEXT_PACKAGE=m4_default([$2], [AC_PACKAGE_TARNAME()]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Name of default gettext domain]) + AC_SUBST([GETTEXT_PACKAGE]) + + dnl gettext and stuff + ALL_LINGUAS="m4_ifblank( + [$1], + [esyscmd([echo $(for i in po/*.po; do test -e "$i" && basename -- "$i" .po; done) | tr -d '\n'])], + [$1])" + + dnl This is required on some Linux systems + AC_SEARCH_LIBS([bind_textdomain_codeset], [intl], + [AC_DEFINE([HAVE_BIND_TEXTDOMAIN_CODESET], [1], [Define to 1 if you have the 'bind_textdomain_codeset' function.])], + []) + + dnl Determine where to install locale files + AC_MSG_CHECKING([for locales directory]) + AC_ARG_WITH([locales-dir], + [ + AS_HELP_STRING([--with-locales-dir=DIR],[Install locales into DIR]) + ], [localedir=$withval], + [ + if test x"$CATOBJEXT" = x".mo"; then + localedir=$libdir/locale + else + localedir=$datarootdir/locale + fi + ]) + AC_MSG_RESULT([$localedir]) + AC_SUBST([localedir]) +]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +m4_include([m4/gtk-doc.m4]) m4_include([m4/introspection.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/compile b/compile index 99e5052..df363c8 100755 --- a/compile +++ b/compile @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff --git a/config.guess b/config.guess index f50dcdb..cdfc439 100755 --- a/config.guess +++ b/config.guess @@ -1,12 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2018 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. -timestamp='2018-02-24' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2023-08-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -27,17 +29,25 @@ timestamp='2018-02-24' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -50,13 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2018 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -84,85 +94,107 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 +# Just in case it came from the environment. +GUESS= # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown - eval "$set_cc_for_build" + set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -174,12 +206,12 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -188,18 +220,18 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown + machine=${arch}${endian}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -215,7 +247,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -226,7 +258,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -237,45 +269,57 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; + GUESS=$UNAME_MACHINE-unknown-redox + ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -289,7 +333,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -326,117 +370,121 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" + set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; + # Japanese Language versions have a version number like '4.1.3-JL'. + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -446,43 +494,43 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -508,78 +556,79 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux"$UNAME_RELEASE" + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux"$UNAME_RELEASE" + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include @@ -593,16 +642,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -610,57 +659,57 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; + GUESS=rs6000-ibm-aix + ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" + if test "$HP_ARCH" = ""; then + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -698,9 +747,9 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then - eval "$set_cc_for_build" + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -719,14 +768,14 @@ EOF HP_ARCH=hppa64 fi fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include int @@ -754,36 +803,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -791,17 +840,18 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -809,103 +859,155 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __ARM_EABI__ + #ifdef __ARM_PCS_VFP + ABI=eabihf + #else + ABI=eabi + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; + esac + fi + GUESS=$CPU-unknown-linux-$LIBCABI + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -916,187 +1018,245 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:cos:*:*) + GUESS=$UNAME_MACHINE-unknown-cos + ;; + kvx:mbr:*:*) + GUESS=$UNAME_MACHINE-unknown-mbr + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - if objdump -f /bin/sh | grep -q elf32-x86-64; then - echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 - else - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - exit ;; + GUESS=$CPU-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1104,12 +1264,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1119,11 +1279,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1131,31 +1291,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1180,249 +1340,407 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + ;; + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv"$UNAME_RELEASE" + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; esac +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 < header file. */ #undef HAVE_CRT_EXTERNS_H -/* Define to 1 if you have the declaration of `environ', and to 0 if you +/* Define to 1 if you have the declaration of 'environ', and to 0 if you don't. */ #undef HAVE_DECL_ENVIRON @@ -73,6 +79,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the header file. */ #undef HAVE_SIGNAL_H @@ -82,6 +91,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -94,13 +106,22 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_TIME_H + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `_NSGetEnviron' function. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + +/* Define to 1 if you have the '_NSGetEnviron' function. */ #undef HAVE__NSGETENVIRON /* Define to the sub-directory where libtool stores uninstalled libraries. */ @@ -130,28 +151,100 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif @@ -163,13 +256,3 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING - -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE diff --git a/config.sub b/config.sub index 1d8e98b..defe52c 100755 --- a/config.sub +++ b/config.sub @@ -1,12 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2018 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. -timestamp='2018-02-22' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2023-09-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -33,7 +35,7 @@ timestamp='2018-02-22' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,6 +52,13 @@ timestamp='2018-02-22' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -67,13 +76,13 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2018 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -89,7 +98,7 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) @@ -110,1223 +119,1165 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo "$1" | sed 's/-[^-]*$//'` - if [ "$basic_machine" != "$1" ] - then os=`echo "$1" | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 ;; - -lynx*) - os=-lynxos + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - -ptx*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \ + | windows-* ) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-pc - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx + cpu=m68k + vendor=motorola ;; dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 ;; - vsta) - basic_machine=i386-unknown - os=-vsta + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent + cpu=m68000 + vendor=convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + basic_os=newsos ;; next | m*-next) - basic_machine=m68k-next - case $os in - -nextstep* ) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsv-tandem) - basic_machine=nsv-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc + cpu=m68k + vendor=tti ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm + cpu=pn + vendor=gould ;; - ppc | ppcbe) basic_machine=powerpc-unknown + power) + cpu=power + vendor=ibm ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown + ps2) + cpu=i386 + vendor=ibm ;; - ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + rm[46]00) + cpu=mips + vendor=siemens ;; - ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` + sde) + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} ;; - ps2) - basic_machine=i386-ibm + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; - pw32) - basic_machine=i586-unknown - os=-pw32 + tower | tower-32) + cpu=m68k + vendor=ncr ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - rdos32) - basic_machine=i386-pc - os=-rdos + w65) + cpu=w65 + vendor=wdc ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + w89k-*) + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; - rm[46]00) - basic_machine=mips-siemens + none) + cpu=none + vendor=none ;; - rtpc | rtpc-*) - basic_machine=romp-ibm + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - s390 | s390-*) - basic_machine=s390-ibm + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - s390x | s390x-*) - basic_machine=s390x-ibm + + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be | aarch64c | arm64ec \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb | arc32 | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | javascript \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | kvx \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips* \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1334,203 +1285,226 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x"$basic_os" != x then + +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# set os. +obj= +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1543,258 +1517,443 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +obj= +case $cpu-$vendor in score-*) - os=-elf + os= + obj=elf ;; spu-*) - os=-elf + os= + obj=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os= + obj=aout ;; c4x-* | tic4x-*) - os=-coff + os= + obj=coff ;; c8051-*) - os=-elf + os= + obj=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os= + obj=elf ;; tic54x-*) - os=-coff + os= + obj=coff ;; tic55x-*) - os=-coff + os= + obj=coff ;; tic6x-*) - os=-coff + os= + obj=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os= + obj=aout ;; mep-*) - os=-elf + os= + obj=elf ;; mips*-cisco) - os=-elf + os= + obj=elf ;; mips*-*) - os=-elf + os= + obj=elf ;; or32-*) - os=-coff + os= + obj=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os= + obj=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os= + obj=coff ;; *-*bug) - os=-coff + os= + obj=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ). + +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # See `case $cpu-$os` validation below + ghcjs) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* | tvos* | watchos* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | oabi* \ + | ptx* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* | mlibc* | cos* | mbr* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + kernel* | msvc* ) + # Restricted further below + ;; + '') + if test x"$obj" = x + then + echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2 + fi + ;; + *) + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 + exit 1 + ;; +esac + +case $obj in + aout* | coff* | elf* | pe*) + ;; + '') + # empty is fine + ;; + *) + echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2 + exit 1 + ;; +esac + +# Here we handle the constraint that a (synthetic) cpu and os are +# valid only in combination with each other and nowhere else. +case $cpu-$os in + # The "javascript-unknown-ghcjs" triple is used by GHC; we + # accept it here in order to tolerate that, but reject any + # variations. + javascript-ghcjs) + ;; + javascript-* | *-ghcjs) + echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os-$obj in + linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \ + | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- ) + ;; + uclinux-uclibc*- ) + ;; + managarm-mlibc*- | managarm-kernel*- ) + ;; + windows*-msvc*-) + ;; + -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel*- ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel*- ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 + exit 1 + ;; + *-msvc*- ) + echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 + exit 1 + ;; + kfreebsd*-gnu*- | kopensolaris*-gnu*-) + ;; + vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) + ;; + nto-qnx*-) + ;; + os2-emx-) + ;; + *-eabi*- | *-gnueabi*-) + ;; + none--*) + # None (no kernel, i.e. freestanding / bare metal), + # can be paired with an machine code file format + ;; + -*-) + # Blank kernel with real OS is always fine. + ;; + --*) + # Blank kernel and OS with real machine code file format is always fine. + ;; + *-*-*) + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - -os400*) + s390-* | s390x-*) vendor=ibm ;; - -ptx*) + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$basic_machine$os" +echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/configure b/configure index b69e937..da2fc04 100755 --- a/configure +++ b/configure @@ -1,14 +1,15 @@ #! /bin/sh -# From configure.ac a987b4a. +# From configure.ac 45b7287. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libxfce4ui 4.16.1. +# Generated by GNU Autoconf 2.72 for libxfce4ui 4.18.6. # # Report bugs to . # -# Copyright (c) 2007-2019 The Xfce development team +# Copyright (c) 2007-2024 The Xfce development team # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -19,63 +20,65 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -84,13 +87,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -99,43 +95,27 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -156,26 +136,28 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +# out after a failed 'exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -190,12 +172,16 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO @@ -210,30 +196,39 @@ test \$(( 1 + 1 )) = 2 || exit 1 PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -241,14 +236,22 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi ;; +esac +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -265,26 +268,28 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +# out after a failed 'exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://gitlab.xfce.org/xfce/libxfce4ui/-/issues about $0: your system, including any error possibly output before $0: this message. Then install a modern shell, or manually $0: run the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -305,6 +310,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -336,7 +342,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -384,16 +390,18 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -401,16 +409,18 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -424,9 +434,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -453,7 +463,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -486,6 +496,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -497,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -511,6 +523,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -524,6 +540,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -535,9 +557,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -562,10 +584,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated SHELL=${CONFIG_SHELL-/bin/sh} @@ -593,47 +617,43 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libxfce4ui' PACKAGE_TARNAME='libxfce4ui' -PACKAGE_VERSION='4.16.1' -PACKAGE_STRING='libxfce4ui 4.16.1' +PACKAGE_VERSION='4.18.6' +PACKAGE_STRING='libxfce4ui 4.18.6' PACKAGE_BUGREPORT='https://gitlab.xfce.org/xfce/libxfce4ui/-/issues' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -676,10 +696,6 @@ GLADEUI2_CFLAGS GLADEUI2_VERSION ENABLE_KEYBOARD_LIBRARY_FALSE ENABLE_KEYBOARD_LIBRARY_TRUE -XFCONF_REQUIRED_VERSION -XFCONF_LIBS -XFCONF_CFLAGS -XFCONF_VERSION HAVE_LIBSTARTUP_NOTIFICATION_FALSE HAVE_LIBSTARTUP_NOTIFICATION_TRUE LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION @@ -723,6 +739,10 @@ GLIBTOP_REQUIRED_VERSION GLIBTOP_LIBS GLIBTOP_CFLAGS GLIBTOP_VERSION +XFCONF_REQUIRED_VERSION +XFCONF_LIBS +XFCONF_CFLAGS +XFCONF_VERSION LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_CFLAGS @@ -748,6 +768,7 @@ X_EXTRA_LIBS X_LIBS X_PRE_LIBS X_CFLAGS +CPP XMKMF GETTEXT_PACKAGE LIBXFCE4KBD_PRIVATE_VERSION_API @@ -769,6 +790,7 @@ ac_ct_AR AR DLLTOOL OBJDUMP +FILECMD LN_S NM ac_ct_DUMPBIN @@ -813,15 +835,14 @@ INTLTOOL_UPDATE USE_NLS LD FGREP +EGREP +GREP SED NO_UNDEFINED PLATFORM_OSX_FALSE PLATFORM_OSX_TRUE PLATFORM_WIN32_FALSE PLATFORM_WIN32_TRUE -EGREP -GREP -CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -845,6 +866,9 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__untar am__tar AMTAR @@ -967,9 +991,9 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP LT_SYS_LIBRARY_PATH XMKMF +CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -1043,8 +1067,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1085,9 +1107,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1111,9 +1133,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1324,9 +1346,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1340,9 +1362,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1370,8 +1392,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1379,16 +1401,16 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1404,7 +1426,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1429,7 +1451,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1468,7 +1490,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1497,7 +1519,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1525,7 +1547,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libxfce4ui 4.16.1 to adapt to many kinds of systems. +'configure' configures libxfce4ui 4.18.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1539,11 +1561,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1551,10 +1573,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1601,7 +1623,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxfce4ui 4.16.1:";; + short | recursive ) echo "Configuration of libxfce4ui 4.18.6:";; esac cat <<\_ACEOF @@ -1701,10 +1723,10 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor LT_SYS_LIBRARY_PATH User-defined run-time library search path. XMKMF Path to xmkmf, Makefile generator for X Window System + CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1715,7 +1737,7 @@ Some influential environment variables: GTKDOC_DEPS_LIBS linker flags for GTKDOC_DEPS, overriding pkg-config -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . @@ -1734,9 +1756,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1764,7 +1786,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1772,7 +1795,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1781,14 +1804,14 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxfce4ui configure 4.16.1 -generated by GNU Autoconf 2.69 +libxfce4ui configure 4.18.6 +generated by GNU Autoconf 2.72 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright (c) 2007-2019 The Xfce development team +Copyright (c) 2007-2024 The Xfce development team _ACEOF exit fi @@ -1803,14 +1826,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1818,192 +1841,24 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## --------------------------------------------------------------- ## -## Report this to https://gitlab.xfce.org/xfce/libxfce4ui/-/issues ## -## --------------------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ac_retval=1 ;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval -} # ac_fn_c_try_run +} # ac_fn_c_try_compile # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- @@ -2012,26 +1867,30 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2042,14 +1901,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2057,20 +1916,22 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -2088,28 +1949,22 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. For example, HP-UX 11i declares gettimeofday. */ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (void); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -2118,7 +1973,7 @@ else #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -2127,47 +1982,53 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- +# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +# ------------------------------------------------------------------ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { #ifndef $as_decl_name #ifdef __cplusplus @@ -2181,27 +2042,91 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + ;; +esac fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_check_decl + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 ;; +esac +fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac -} # ac_fn_c_check_decl cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libxfce4ui $as_me 4.16.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by libxfce4ui $as_me 4.18.6, which was +generated by GNU Autoconf 2.72. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2234,8 +2159,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2270,7 +2199,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2305,11 +2234,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2320,8 +2251,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2345,7 +2276,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2353,14 +2284,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2368,15 +2299,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2384,8 +2315,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2399,65 +2330,50 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2465,19 +2381,454 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (char **p, int i) +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +/* Does the compiler advertise C99 conformance? */ +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +// See if C++-style comments work. + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); +extern void free (void *); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +/* Does the compiler advertise C11 conformance? */ +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" + +# Auxiliary files required by this configure script. +ac_aux_files="ltmain.sh compile missing install-sh config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else case e in #( + e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; +esac +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2488,12 +2839,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2502,24 +2853,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2529,11 +2880,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2549,55 +2901,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2616,21 +2944,23 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -2649,21 +2979,23 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +printf %s "checking target system type... " >&6; } +if test ${ac_cv_target+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5 fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +printf "%s\n" "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; @@ -2691,7 +3023,8 @@ test -n "$target_alias" && am__api_version='1.16' -# Find a good install program. We prefer a C program (faster), + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -2705,20 +3038,25 @@ am__api_version='1.16' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -2728,13 +3066,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -2742,12 +3080,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -2761,9 +3099,10 @@ esac IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir - + ;; +esac fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -2773,8 +3112,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2784,8 +3123,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2839,8 +3178,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -2857,28 +3196,25 @@ test "$program_prefix" != NONE && test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. -# By default was `s,x,x', remove it if useless. +# By default was 's,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` + # Expand $ac_aux_dir to an absolute path. am_aux_dir=`cd "$ac_aux_dir" && pwd` -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + + if test x"${MISSING+set}" != xset; then + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -2898,38 +3234,44 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2938,38 +3280,44 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2977,8 +3325,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2990,98 +3338,110 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + *'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done done done IFS=$as_save_IFS - + ;; +esac fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" + # As a last resort, use plain mkdir -p, + # in the hope it doesn't have the bugs of ancient mkdir. + MKDIR_P='mkdir -p' fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' @@ -3093,15 +3453,16 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in *) eval ac_cv_prog_make_${ac_make}_set=no;; esac -rm -f conftest.make +rm -f conftest.make ;; +esac fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -3115,7 +3476,8 @@ fi rmdir .tst 2>/dev/null # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -3125,12 +3487,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -3140,10 +3503,11 @@ am__doit: am_cv_make_support_nested_variables=yes else am_cv_make_support_nested_variables=no +fi ;; +esac fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -3175,17 +3539,13 @@ fi # Define the identity of the package. PACKAGE='libxfce4ui' - VERSION='4.16.1' + VERSION='4.18.6' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -3231,29 +3591,29 @@ _am_tools='gnutar plaintar pax cpio none' # (that is, avoid stderr redirection). am_uid=`id -u || echo unknown` am_gid=`id -g || echo unknown` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 -$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; } if test $am_uid -le $am_max_uid; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } _am_tools=none fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 -$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; } if test $am_gid -le $am_max_gid; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } _am_tools=none fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +printf %s "checking how to create a ustar tar archive... " >&6; } # Go ahead even if we have the value already cached. We do so because we # need to set the values for the 'am__tar' and 'am__untar' variables. @@ -3328,19 +3688,35 @@ $as_echo_n "checking how to create a ustar tar archive... " >&6; } done rm -rf conftest.dir - if ${am_cv_prog_tar_ustar+:} false; then : - $as_echo_n "(cached) " >&6 -else - am_cv_prog_tar_ustar=$_am_tool + if test ${am_cv_prog_tar_ustar+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) am_cv_prog_tar_ustar=$_am_tool ;; +esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 -$as_echo "$am_cv_prog_tar_ustar" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +printf "%s\n" "$am_cv_prog_tar_ustar" >&6; } +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -3387,17 +3763,19 @@ fi ac_config_headers="$ac_config_headers config.h" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : +if test ${enable_maintainer_mode+y} +then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no +else case e in #( + e) USE_MAINTAINER_MODE=no ;; +esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -3410,7 +3788,8 @@ fi # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -3420,12 +3799,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -3435,10 +3815,11 @@ am__doit: am_cv_make_support_nested_variables=yes else am_cv_make_support_nested_variables=no +fi ;; +esac fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -3449,12 +3830,21 @@ fi AM_BACKSLASH='\' + + + + + + + + + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } cat > confinc.mk << 'END' am__doit: @echo this is the am__doit target >confinc.out @@ -3490,11 +3880,12 @@ esac fi done rm -f confinc.* confmf.* -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -$as_echo "${_am_result}" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +printf "%s\n" "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -3520,38 +3911,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3560,38 +3957,44 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -3599,8 +4002,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3613,38 +4016,44 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3653,12 +4062,13 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -3666,15 +4076,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3690,18 +4104,19 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3712,38 +4127,44 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3756,38 +4177,44 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3799,8 +4226,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3808,25 +4235,131 @@ esac fi fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3836,7 +4369,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3844,7 +4377,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3856,9 +4389,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3879,13 +4412,14 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -3900,12 +4434,12 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -3916,48 +4450,52 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3967,15 +4505,16 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3984,9 +4523,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3996,8 +4537,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -4005,10 +4546,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -4016,39 +4557,41 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4062,11 +4605,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -4075,31 +4619,34 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4109,30 +4656,36 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -4140,57 +4693,63 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -4205,94 +4764,153 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC ;; +esac +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" ;; +esac +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 ;; +esac +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC ;; +esac +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" ;; +esac +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 ;; +esac +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac +fi +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 ;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - +fi fi ac_ext=c @@ -4301,21 +4919,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4341,10 +4961,11 @@ _ACEOF fi done rm -f core conftest* - unset am_i + unset am_i ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -4362,12 +4983,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up @@ -4471,10 +5093,11 @@ else else am_cv_CC_dependencies_compiler_type=none fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4489,467 +5112,186 @@ fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + fi - done - ac_cv_prog_CPP=$CPP + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include + #include + mbstate_t x; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* +if ac_fn_c_try_compile "$LINENO" +then : -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; int -main () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } -$as_echo "#define STDC_HEADERS 1" >>confdefs.h + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h -fi + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h -fi + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h -done + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = xyes; then : - MINIX=yes -else - MINIX= -fi + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h - if test "$MINIX" = yes; then + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h -$as_echo "#define _MINIX 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h - fi + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if ${ac_cv_safe_to_define___extensions__+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else case e in #( + e) MINIX= ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking platform" >&5 -$as_echo_n "checking platform... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking platform" >&5 +printf %s "checking platform... " >&6; } case "$host" in *-*-mingw*|*-*-cygwin*) platform="win32" @@ -4988,38 +5330,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5028,38 +5376,44 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -5067,8 +5421,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5081,38 +5435,44 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5121,12 +5481,13 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -5134,15 +5495,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5158,18 +5523,19 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5180,38 +5546,44 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5224,38 +5596,44 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5267,34 +5645,140 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -5304,20 +5788,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -5327,30 +5812,36 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -5358,57 +5849,63 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -5423,94 +5920,153 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC ;; +esac +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" ;; +esac +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 ;; +esac +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC ;; +esac +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" ;; +esac +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 ;; +esac +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac +fi +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 ;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - +fi fi ac_ext=c @@ -5519,21 +6075,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -5559,10 +6117,11 @@ _ACEOF fi done rm -f core conftest* - unset am_i + unset am_i ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -5580,12 +6139,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up @@ -5689,10 +6249,11 @@ else else am_cv_CC_dependencies_compiler_type=none fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -5706,12 +6267,13 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done @@ -5724,25 +6286,31 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in +case `"$ac_path_SED" --version 2>&1` in #( *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +#( *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -5768,10 +6336,11 @@ IFS=$as_save_IFS else ac_cv_path_SED=$SED fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -5788,12 +6357,161 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in #( +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in #( +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + ac_cv_path_EGREP=$EGREP +fi + + fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + EGREP_TRADITIONAL=$EGREP + ac_cv_path_EGREP_TRADITIONAL=$EGREP + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else if test -z "$FGREP"; then @@ -5803,25 +6521,31 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in +case `"$ac_path_FGREP" --version 2>&1` in #( *GNU*) ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +#( *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -5848,10 +6572,11 @@ else ac_cv_path_FGREP=$FGREP fi - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -5877,8 +6602,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +printf %s "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -5904,12 +6629,12 @@ func_echo_all () } case $ECHO in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; + printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +printf "%s\n" "printf" >&6; } ;; + print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +printf "%s\n" "print -r" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +printf "%s\n" "cat" >&6; } ;; esac @@ -5928,17 +6653,19 @@ esac # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else - with_gnu_ld=no +else case e in #( + e) with_gnu_ld=no ;; +esac fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -5967,16 +6694,17 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test yes = "$with_gnu_ld"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do IFS=$lt_save_ifs @@ -5999,24 +6727,26 @@ else IFS=$lt_save_ifs else lt_cv_path_LD=$LD # Let the user override the test with a path. -fi +fi ;; +esac fi LD=$lt_cv_path_LD if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -6041,17 +6772,19 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +printf %s "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : +if test ${enable_nls+y} +then : enableval=$enable_nls; USE_NLS=$enableval -else - USE_NLS=yes +else case e in #( + e) USE_NLS=yes ;; +esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +printf "%s\n" "$USE_NLS" >&6; } @@ -6068,22 +6801,23 @@ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.35.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 -$as_echo_n "checking for intltool >= 0.35.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +printf %s "checking for intltool >= 0.35.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +printf "%s\n" "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_UPDATE in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_UPDATE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. ;; @@ -6092,11 +6826,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_UPDATE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6104,26 +6842,28 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +printf "%s\n" "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_MERGE in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_MERGE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. ;; @@ -6132,11 +6872,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_MERGE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6144,26 +6888,28 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +printf "%s\n" "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_EXTRACT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_EXTRACT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. ;; @@ -6172,11 +6918,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_EXTRACT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6184,15 +6934,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +printf "%s\n" "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6342,12 +7093,13 @@ fi # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XGETTEXT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XGETTEXT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $XGETTEXT in [\\/]* | ?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; @@ -6356,11 +7108,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XGETTEXT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6368,26 +7124,28 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +printf "%s\n" "$XGETTEXT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGMERGE in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGMERGE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $MSGMERGE in [\\/]* | ?:[\\/]*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ;; @@ -6396,11 +7154,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_MSGMERGE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6408,26 +7170,28 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +printf "%s\n" "$MSGMERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGFMT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGFMT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $MSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; @@ -6436,11 +7200,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_MSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6448,26 +7216,28 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GMSGFMT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; @@ -6476,11 +7246,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6489,15 +7263,16 @@ IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; +esac ;; esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +printf "%s\n" "$GMSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6513,12 +7288,13 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_PERL in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_PERL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. ;; @@ -6527,11 +7303,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_PERL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6539,37 +7319,38 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 +printf "%s\n" "$INTLTOOL_PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then as_fn_error $? "perl not found" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 -$as_echo_n "checking for perl >= 5.8.1... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +printf %s "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 -$as_echo "$IT_PERL_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 +printf "%s\n" "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 -$as_echo_n "checking for XML::Parser... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 +printf %s "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } else as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi @@ -6585,38 +7366,44 @@ for ac_prog in perl5 perl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PERL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PERL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$PERL"; then ac_cv_prog_PERL="$PERL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_PERL="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi PERL=$ac_cv_prog_PERL if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +printf "%s\n" "$PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6625,12 +7412,13 @@ done # Extract the first word of "glib-compile-resources", so it can be a program name with args. set dummy glib-compile-resources; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_COMPILE_RESOURCES in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GLIB_COMPILE_RESOURCES+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $GLIB_COMPILE_RESOURCES in [\\/]* | ?:[\\/]*) ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path. ;; @@ -6639,11 +7427,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6651,15 +7443,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES if test -n "$GLIB_COMPILE_RESOURCES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 -$as_echo "$GLIB_COMPILE_RESOURCES" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 +printf "%s\n" "$GLIB_COMPILE_RESOURCES" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6667,14 +7460,15 @@ fi case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7.4-1ec8f-dirty' +macro_revision='2.4.7.4' + @@ -6707,12 +7501,13 @@ delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' # Sed substitution to avoid accidental globbing in evaled expressions no_glob_subst='s/\*/\\\*/g' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test ${lt_cv_path_NM+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM=$NM else @@ -6736,13 +7531,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -6759,10 +7554,11 @@ else IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} +fi ;; +esac fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } if test no != "$lt_cv_path_NM"; then NM=$lt_cv_path_NM else @@ -6775,38 +7571,44 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +printf "%s\n" "$DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6819,38 +7621,44 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +printf "%s\n" "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6862,15 +7670,15 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -6891,12 +7699,13 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +printf %s "checking the name lister ($NM) interface... " >&6; } +if test ${lt_cv_nm_interface+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) @@ -6909,29 +7718,31 @@ else if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi - rm -f conftest* + rm -f conftest* ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +printf "%s\n" "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - i=0 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +printf %s "checking the maximum length of command line arguments... " >&6; } +if test ${lt_cv_sys_max_cmd_len+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) i=0 teststring=ABCD case $build_os in @@ -6972,7 +7783,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -7015,7 +7826,7 @@ else sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -7053,15 +7864,16 @@ else fi ;; esac - + ;; +esac fi if test -n "$lt_cv_sys_max_cmd_len"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -7105,12 +7917,13 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +printf %s "checking how to convert $build file names to $host format... " >&6; } +if test ${lt_cv_to_host_file_cmd+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $host in *-*-mingw* ) case $build in *-*-mingw* ) # actually msys @@ -7141,23 +7954,25 @@ else lt_cv_to_host_file_cmd=func_convert_file_noop ;; esac - + ;; +esac fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - #assume ordinary cross tools, or native build. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +printf %s "checking how to convert $build file names to toolchain format... " >&6; } +if test ${lt_cv_to_tool_file_cmd+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in *-*-mingw* ) @@ -7168,26 +7983,29 @@ case $host in esac ;; esac - + ;; +esac fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +printf %s "checking for $LD option to reload object files... " >&6; } +if test ${lt_cv_ld_reload_flag+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_ld_reload_flag='-r' ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -7217,41 +8035,157 @@ esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7260,38 +8194,44 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -7299,8 +8239,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -7319,12 +8259,13 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +printf %s "checking how to recognize dependent libraries... " >&6; } +if test ${lt_cv_deplibs_check_method+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support @@ -7349,7 +8290,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -7383,14 +8324,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -7404,7 +8345,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -7441,7 +8382,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -7451,7 +8392,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -7517,10 +8458,11 @@ os2*) lt_cv_deplibs_check_method=pass_all ;; esac - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -7564,38 +8506,44 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7604,38 +8552,44 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -7643,8 +8597,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -7664,12 +8618,13 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +printf %s "checking how to associate runtime and link libraries... " >&6; } +if test ${lt_cv_sharedlib_from_linklib_cmd+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in cygwin* | mingw* | pw32* | cegcc*) @@ -7689,10 +8644,11 @@ cygwin* | mingw* | pw32* | cegcc*) lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -7707,38 +8663,44 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7751,38 +8713,44 @@ if test -z "$AR"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7794,8 +8762,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -7803,42 +8771,60 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cr} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + + + + + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +printf %s "checking for archiver @FILE support... " >&6; } +if test ${lt_cv_ar_at_file+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. @@ -7846,7 +8832,7 @@ if ac_fn_c_try_compile "$LINENO"; then : { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ @@ -7855,11 +8841,12 @@ if ac_fn_c_try_compile "$LINENO"; then : rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +printf "%s\n" "$lt_cv_ar_at_file" >&6; } if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= @@ -7876,38 +8863,44 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7916,38 +8909,44 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -7955,8 +8954,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -7975,38 +8974,44 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8015,38 +9020,44 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -8054,8 +9065,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -8144,12 +9155,13 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +printf %s "checking command to parse $NM output from $compiler object... " >&6; } +if test ${lt_cv_sys_global_symbol_pipe+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -8203,7 +9215,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -8221,20 +9233,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -8258,7 +9270,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -8276,9 +9288,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -8300,12 +9312,15 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -8373,7 +9388,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi @@ -8401,18 +9416,19 @@ _LT_EOF lt_cv_sys_global_symbol_pipe= fi done - + ;; +esac fi if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi # Response file support. @@ -8458,14 +9474,16 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +printf %s "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : +if test ${with_sysroot+y} +then : withval=$with_sysroot; -else - with_sysroot=no +else case e in #( + e) with_sysroot=no ;; +esac fi @@ -8477,30 +9495,31 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -$as_echo "$with_sysroot" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +printf "%s\n" "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +printf "%s\n" "${lt_sysroot:-no}" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 -$as_echo_n "checking for a working dd... " >&6; } -if ${ac_cv_path_lt_DD+:} false; then : - $as_echo_n "(cached) " >&6 -else - printf 0123456789abcdef0123456789abcdef >conftest.i +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +printf %s "checking for a working dd... " >&6; } +if test ${ac_cv_path_lt_DD+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i : ${lt_DD:=$DD} if test -z "$lt_DD"; then @@ -8510,10 +9529,15 @@ if test -z "$lt_DD"; then for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in dd; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in dd + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_lt_DD" || continue if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then cmp -s conftest.i conftest.out \ @@ -8531,18 +9555,20 @@ else ac_cv_path_lt_DD=$lt_DD fi -rm -f conftest.i conftest2.i conftest.out +rm -f conftest.i conftest2.i conftest.out ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -$as_echo "$ac_cv_path_lt_DD" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +printf "%s\n" "$ac_cv_path_lt_DD" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 -$as_echo_n "checking how to truncate binary pipes... " >&6; } -if ${lt_cv_truncate_bin+:} false; then : - $as_echo_n "(cached) " >&6 -else - printf 0123456789abcdef0123456789abcdef >conftest.i +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +printf %s "checking how to truncate binary pipes... " >&6; } +if test ${lt_cv_truncate_bin+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i lt_cv_truncate_bin= if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then @@ -8550,10 +9576,11 @@ if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; the && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" fi rm -f conftest.i conftest2.i conftest.out -test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -$as_echo "$lt_cv_truncate_bin" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +printf "%s\n" "$lt_cv_truncate_bin" >&6; } @@ -8576,7 +9603,8 @@ func_cc_basename () } # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test ${enable_libtool_lock+y} +then : enableval=$enable_libtool_lock; fi @@ -8592,9 +9620,9 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -8612,10 +9640,10 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -8627,7 +9655,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -8650,10 +9678,10 @@ mips64*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -8661,7 +9689,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -8669,7 +9697,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -8691,16 +9719,16 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -8754,12 +9782,13 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +printf %s "checking whether the C compiler needs -belf... " >&6; } +if test ${lt_cv_cc_needs_belf+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -8769,29 +9798,32 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no +else case e in #( + e) lt_cv_cc_needs_belf=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS=$SAVE_CFLAGS @@ -8804,9 +9836,9 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -8841,38 +9873,44 @@ need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +printf "%s\n" "$MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8881,38 +9919,44 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -8920,8 +9964,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -8931,22 +9975,24 @@ else fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if test ${lt_cv_path_mainfest_tool+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out cat conftest.err >&5 if $GREP 'Manifest Tool' conftest.out > /dev/null; then lt_cv_path_mainfest_tool=yes fi - rm -f conftest* + rm -f conftest* ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -8961,38 +10007,44 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9001,38 +10053,44 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -9040,8 +10098,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -9053,38 +10111,44 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9093,38 +10157,44 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -9132,8 +10202,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -9145,38 +10215,44 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LIPO+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +printf "%s\n" "$LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9185,38 +10261,44 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_LIPO"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_LIPO+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +printf "%s\n" "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -9224,8 +10306,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -9237,38 +10319,44 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +printf "%s\n" "$OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9277,38 +10365,44 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +printf "%s\n" "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -9316,8 +10410,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -9329,38 +10423,44 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +printf "%s\n" "$OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9369,38 +10469,44 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +printf "%s\n" "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -9408,8 +10514,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -9444,12 +10550,13 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +printf %s "checking for -single_module linker flag... " >&6; } +if test ${lt_cv_apple_cc_single_mod+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_apple_cc_single_mod=no if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE @@ -9475,17 +10582,19 @@ else fi rm -rf libconftest.dylib* rm -f conftest.* - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +printf %s "checking for -exported_symbols_list linker flag... " >&6; } +if test ${lt_cv_ld_exported_symbols_list+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" @@ -9493,39 +10602,43 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no +else case e in #( + e) lt_cv_ld_exported_symbols_list=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +printf %s "checking for -force_load linker flag... " >&6; } +if test ${lt_cv_ld_force_load+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cr libconftest.a conftest.o" >&5 - $AR cr libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -9543,26 +10656,22 @@ _LT_EOF fi rm -f conftest.err libconftest.a conftest conftest.c rm -rf conftest.dSYM - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +printf "%s\n" "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -9617,26 +10726,22 @@ func_munge_path_list () esac } -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi -done - # Set options # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -9654,8 +10759,9 @@ if test "${enable_static+set}" = set; then : IFS=$lt_save_ifs ;; esac -else - enable_static=no +else case e in #( + e) enable_static=no ;; +esac fi @@ -9674,7 +10780,8 @@ fi # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test ${enable_shared+y} +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -9692,8 +10799,9 @@ if test "${enable_shared+set}" = set; then : IFS=$lt_save_ifs ;; esac -else - enable_shared=yes +else case e in #( + e) enable_shared=yes ;; +esac fi @@ -9707,7 +10815,8 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test ${with_pic+y} +then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -9724,8 +10833,9 @@ if test "${with_pic+set}" = set; then : IFS=$lt_save_ifs ;; esac -else - pic_mode=default +else case e in #( + e) pic_mode=default ;; +esac fi @@ -9736,7 +10846,8 @@ fi # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test ${enable_fast_install+y} +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -9754,8 +10865,9 @@ if test "${enable_fast_install+set}" = set; then : IFS=$lt_save_ifs ;; esac -else - enable_fast_install=yes +else case e in #( + e) enable_fast_install=yes ;; +esac fi @@ -9768,11 +10880,12 @@ fi shared_archive_member_spec= case $host,$enable_shared in power*-*-aix[5-9]*,yes) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 -$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +printf %s "checking which variant of shared library versioning to provide... " >&6; } # Check whether --with-aix-soname was given. -if test "${with_aix_soname+set}" = set; then : +if test ${with_aix_soname+y} +then : withval=$with_aix_soname; case $withval in aix|svr4|both) ;; @@ -9781,18 +10894,21 @@ if test "${with_aix_soname+set}" = set; then : ;; esac lt_cv_with_aix_soname=$with_aix_soname -else - if ${lt_cv_with_aix_soname+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_with_aix_soname=aix +else case e in #( + e) if test ${lt_cv_with_aix_soname+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_with_aix_soname=aix ;; +esac fi - with_aix_soname=$lt_cv_with_aix_soname + with_aix_soname=$lt_cv_with_aix_soname ;; +esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -$as_echo "$with_aix_soname" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +printf "%s\n" "$with_aix_soname" >&6; } if test aix != "$with_aix_soname"; then # For the AIX way of multilib, we name the shared archive member # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', @@ -9874,12 +10990,13 @@ if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +printf %s "checking for objdir... " >&6; } +if test ${lt_cv_objdir+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then lt_cv_objdir=.libs @@ -9887,19 +11004,18 @@ else # MS-DOS does not allow filenames that begin with a dot. lt_cv_objdir=_libs fi -rmdir .libs 2>/dev/null +rmdir .libs 2>/dev/null ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h @@ -9920,8 +11036,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -9945,12 +11061,13 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +printf %s "checking for ${ac_tool_prefix}file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; @@ -9993,16 +11110,17 @@ _LT_EOF IFS=$lt_save_ifs MAGIC_CMD=$lt_save_MAGIC_CMD ;; +esac ;; esac fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10011,12 +11129,13 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +printf %s "checking for file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; @@ -10059,16 +11178,17 @@ _LT_EOF IFS=$lt_save_ifs MAGIC_CMD=$lt_save_MAGIC_CMD ;; +esac ;; esac fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10153,12 +11273,13 @@ if test yes = "$GCC"; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test ${lt_cv_prog_compiler_rtti_exceptions+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment @@ -10186,10 +11307,11 @@ else fi fi $RM conftest* - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -10386,12 +11508,6 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - # flang / f18. f95 an alias for gfortran or flang on Debian - flang* | f18* | f95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -10436,7 +11552,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -10552,27 +11668,30 @@ case $host_os in ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment @@ -10600,10 +11719,11 @@ else fi fi $RM conftest* - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in @@ -10631,12 +11751,13 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_prog_compiler_static_works=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -10657,10 +11778,11 @@ else fi $RM -r conftest* LDFLAGS=$save_LDFLAGS - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test yes = "$lt_cv_prog_compiler_static_works"; then : @@ -10674,12 +11796,13 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest cd conftest @@ -10719,22 +11842,24 @@ else cd .. $RM -r conftest $RM conftest* - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest cd conftest @@ -10774,10 +11899,11 @@ else cd .. $RM -r conftest $RM conftest* - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -10785,19 +11911,19 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test no = "$hard_links"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -10809,8 +11935,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -10854,23 +11980,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -10917,7 +12040,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -11029,6 +12152,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -11043,7 +12167,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -11086,7 +12210,7 @@ _LT_EOF compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -11098,7 +12222,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -11114,7 +12238,7 @@ _LT_EOF archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -11125,7 +12249,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11246,7 +12370,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -11368,21 +12492,23 @@ _LT_EOF if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -11397,12 +12523,13 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib fi - + ;; +esac fi aix_libpath=$lt_cv_aix_libpath_ @@ -11421,21 +12548,23 @@ fi if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -11450,12 +12579,13 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib fi - + ;; +esac fi aix_libpath=$lt_cv_aix_libpath_ @@ -11513,12 +12643,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -11559,7 +12689,7 @@ fi fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -11600,8 +12730,8 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -11635,7 +12765,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -11701,12 +12831,13 @@ fi # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +printf %s "checking if $CC understands -b... " >&6; } +if test ${lt_cv_prog_compiler__b+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_prog_compiler__b=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -11727,10 +12858,11 @@ else fi $RM -r conftest* LDFLAGS=$save_LDFLAGS - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } if test yes = "$lt_cv_prog_compiler__b"; then archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -11770,32 +12902,35 @@ fi # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS=$LDFLAGS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if test ${lt_cv_irix_exported_symbol+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no +else case e in #( + e) lt_cv_irix_exported_symbol=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS + LDFLAGS=$save_LDFLAGS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi - link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -11817,7 +12952,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11884,6 +13019,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -12072,8 +13208,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -12109,18 +13245,19 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -12138,7 +13275,7 @@ else if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -12150,10 +13287,11 @@ else cat conftest.err 1>&5 fi $RM conftest* - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -12312,8 +13450,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } if test yes = "$GCC"; then case $host_os in @@ -12575,7 +13713,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -12585,14 +13723,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -12611,7 +13749,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -12648,7 +13786,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -12681,7 +13819,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -12874,10 +14012,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ @@ -12886,23 +14025,26 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_c_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir - + ;; +esac fi shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath @@ -12932,18 +14074,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -13142,8 +14272,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -13264,8 +14394,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -13289,8 +14419,8 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test relink = "$hardcode_action" || test yes = "$inherit_rpath"; then @@ -13334,50 +14464,59 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dlopen (); +char dlopen (void); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no +else case e in #( + e) ac_cv_lib_dl_dlopen=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else - +else case e in #( + e) lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes - + ;; +esac fi ;; @@ -13392,183 +14531,222 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen=shl_load -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +printf %s "checking for shl_load in -ldld... " >&6; } +if test ${ac_cv_lib_dld_shl_load+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char shl_load (); +char shl_load (void); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes -else - ac_cv_lib_dld_shl_load=no +else case e in #( + e) ac_cv_lib_dld_shl_load=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld -else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +else case e in #( + e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen=dlopen -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dlopen (); +char dlopen (void); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no +else case e in #( + e) ac_cv_lib_dl_dlopen=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +printf %s "checking for dlopen in -lsvld... " >&6; } +if test ${ac_cv_lib_svld_dlopen+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dlopen (); +char dlopen (void); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes -else - ac_cv_lib_svld_dlopen=no +else case e in #( + e) ac_cv_lib_svld_dlopen=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +printf %s "checking for dld_link in -ldld... " >&6; } +if test ${ac_cv_lib_dld_dld_link+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dld_link (); +char dld_link (void); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes -else - ac_cv_lib_dld_dld_link=no +else case e in #( + e) ac_cv_lib_dld_dld_link=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi ;; @@ -13591,12 +14769,13 @@ fi save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test yes = "$cross_compiling"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +printf %s "checking whether a program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -13674,7 +14853,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -13690,19 +14869,21 @@ _LT_EOF fi rm -fr conftest* - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test yes = "$cross_compiling"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self_static+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -13780,7 +14961,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -13796,10 +14977,11 @@ _LT_EOF fi rm -fr conftest* - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS=$save_CPPFLAGS @@ -13837,32 +15019,43 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +printf %s "checking whether stripping libraries is possible... " >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; + esac + fi fi @@ -13877,13 +15070,13 @@ fi # Report what library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +printf %s "checking if libtool supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +printf %s "checking whether to build shared libraries... " >&6; } test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -13907,15 +15100,15 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } @@ -13955,8 +15148,8 @@ CC=$lt_save_CC LIBXFCE4UI_VERINFO=0:0:0 LIBXFCE4UI_VERSION_API=2 LIBXFCE4UI_VERSION_MAJOR=4 -LIBXFCE4UI_VERSION_MINOR=16 -LIBXFCE4UI_VERSION_MICRO=1 +LIBXFCE4UI_VERSION_MINOR=18 +LIBXFCE4UI_VERSION_MICRO=6 LIBXFCE4KBD_PRIVATE_VERINFO=0:0:0 LIBXFCE4KBD_PRIVATE_VERSION_API=3 @@ -13967,215 +15160,542 @@ LIBXFCE4KBD_PRIVATE_VERSION_API=3 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include +ac_fn_c_check_header_compile "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default" +if test "x$ac_cv_header_crt_externs_h" = xyes +then : + printf "%s\n" "#define HAVE_CRT_EXTERNS_H 1" >>confdefs.h -int -main () -{ +fi +ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" +if test "x$ac_cv_header_errno_h" = xyes +then : + printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +fi +ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" +if test "x$ac_cv_header_limits_h" = xyes +then : + printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : +fi +ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = xyes +then : + printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h -else - ac_cv_header_stdc=no fi -rm -f conftest* +ac_fn_c_check_header_compile "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default" +if test "x$ac_cv_header_math_h" = xyes +then : + printf "%s\n" "#define HAVE_MATH_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default" +if test "x$ac_cv_header_memory_h" = xyes +then : + printf "%s\n" "#define HAVE_MEMORY_H 1" >>confdefs.h -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +fi +ac_fn_c_check_header_compile "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default" +if test "x$ac_cv_header_signal_h" = xyes +then : + printf "%s\n" "#define HAVE_SIGNAL_H 1" >>confdefs.h -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : +fi +ac_fn_c_check_header_compile "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" +if test "x$ac_cv_header_stdarg_h" = xyes +then : + printf "%s\n" "#define HAVE_STDARG_H 1" >>confdefs.h -else - ac_cv_header_stdc=no fi -rm -f conftest* +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int -main () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; +(void) strchr; + ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +extern void ac_decl (int, char *); -else - ac_cv_header_stdc=no +int +main (void) +{ +(void) ac_decl (0, (char *) 0); + (void) ac_decl; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else case e in #( + e) ac_cv_c_undeclared_builtin_options=$ac_arg ;; +esac fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + break fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS + ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See 'config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; +esac + +ac_fn_check_decl "$LINENO" "environ" "ac_cv_have_decl_environ" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_environ" = xyes +then : + ac_have_decl=1 +else case e in #( + e) ac_have_decl=0 ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +printf "%s\n" "#define HAVE_DECL_ENVIRON $ac_have_decl" >>confdefs.h -$as_echo "#define STDC_HEADERS 1" >>confdefs.h +ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron" +if test "x$ac_cv_func__NSGetEnviron" = xyes +then : + printf "%s\n" "#define HAVE__NSGETENVIRON 1" >>confdefs.h fi -for ac_header in crt_externs.h errno.h fcntl.h limits.h locale.h math.h \ - memory.h signal.h stdarg.h stdlib.h string.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + + + GETTEXT_PACKAGE=libxfce4ui + +printf "%s\n" "#define GETTEXT_PACKAGE \"$GETTEXT_PACKAGE\"" >>confdefs.h + + + + ALL_LINGUAS="am ar ast az be bg bn ca cs cy da de el en_AU en_GB es et eu fa_IR fi fr gl he hr hu hy_AM hye hy id ie is it ja ka kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing bind_textdomain_codeset" >&5 +printf %s "checking for library containing bind_textdomain_codeset... " >&6; } +if test ${ac_cv_search_bind_textdomain_codeset+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char bind_textdomain_codeset (void); +int +main (void) +{ +return bind_textdomain_codeset (); + ; + return 0; +} _ACEOF +for ac_lib in '' intl +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_bind_textdomain_codeset=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_bind_textdomain_codeset+y} +then : + break +fi +done +if test ${ac_cv_search_bind_textdomain_codeset+y} +then : +else case e in #( + e) ac_cv_search_bind_textdomain_codeset=no ;; +esac fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_bind_textdomain_codeset" >&5 +printf "%s\n" "$ac_cv_search_bind_textdomain_codeset" >&6; } +ac_res=$ac_cv_search_bind_textdomain_codeset +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -done +printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h -ac_fn_c_check_decl "$LINENO" "environ" "ac_cv_have_decl_environ" "$ac_includes_default" -if test "x$ac_cv_have_decl_environ" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ENVIRON $ac_have_decl -_ACEOF -for ac_func in _NSGetEnviron -do : - ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron" -if test "x$ac_cv_func__NSGetEnviron" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE__NSGETENVIRON 1 -_ACEOF + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for locales directory" >&5 +printf %s "checking for locales directory... " >&6; } +# Check whether --with-locales-dir was given. +if test ${with_locales_dir+y} +then : + withval=$with_locales_dir; localedir=$withval +else case e in #( + e) + if test x"$CATOBJEXT" = x".mo"; then + localedir=$libdir/locale + else + localedir=$datarootdir/locale + fi + ;; +esac fi -done + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $localedir" >&5 +printf "%s\n" "$localedir" >&6; } - GETTEXT_PACKAGE=libxfce4ui +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing bind_textdomain_codeset" >&5 +printf %s "checking for library containing bind_textdomain_codeset... " >&6; } +if test ${ac_cv_search_bind_textdomain_codeset+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char bind_textdomain_codeset (void); +int +main (void) +{ +return bind_textdomain_codeset (); + ; + return 0; +} _ACEOF +for ac_lib in '' intl +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_bind_textdomain_codeset=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_bind_textdomain_codeset+y} +then : + break +fi +done +if test ${ac_cv_search_bind_textdomain_codeset+y} +then : +else case e in #( + e) ac_cv_search_bind_textdomain_codeset=no ;; +esac +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_bind_textdomain_codeset" >&5 +printf "%s\n" "$ac_cv_search_bind_textdomain_codeset" >&6; } +ac_res=$ac_cv_search_bind_textdomain_codeset +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h + +fi - ALL_LINGUAS="am ar ast be bg bn ca cs cy da de el en_AU en_GB es et eu fi fr gl he hr hu hy hy_AM hye id ie is it ja ka kk ko lt lv ms nb nl nn oc pa pl pt pt_BR ro ru si sk sl sq sr sv te th tr ug uk ur ur_PK vi zh_CN zh_HK zh_TW" - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi +rm -f conftest.err conftest.i conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else case e in #( + e) # Passes both tests. +ac_preproc_ok=: +break ;; +esac +fi +rm -f conftest.err conftest.i conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for locales directory" >&5 -$as_echo_n "checking for locales directory... " >&6; } +done +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi -# Check whether --with-locales-dir was given. -if test "${with_locales_dir+set}" = set; then : - withval=$with_locales_dir; localedir=$withval + done + ac_cv_prog_CPP=$CPP + ;; +esac +fi + CPP=$ac_cv_prog_CPP else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : - if test x"$CATOBJEXT" = x".mo"; then - localedir=$libdir/locale - else - localedir=$datarootdir/locale - fi +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac +fi +rm -f conftest.err conftest.i conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else case e in #( + e) # Passes both tests. +ac_preproc_ok=: +break ;; +esac fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $localedir" >&5 -$as_echo "$localedir" >&6; } +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See 'config.log' for more details" "$LINENO" 5; } ;; +esac +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +printf %s "checking for X... " >&6; } # Check whether --with-x was given. -if test "${with_x+set}" = set; then : +if test ${with_x+y} +then : withval=$with_x; fi -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +# $have_x is 'yes', 'no', 'disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else case $x_includes,$x_libraries in #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : - $as_echo_n "(cached) " >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir + *,NONE | NONE,*) if test ${ac_cv_have_x+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no +ac_x_libraries=no +# Do we need to do anything special at all? +ac_save_LIBS=$LIBS +LIBS="-lX11 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + # We can compile and link X programs with no special options. + ac_x_includes= + ac_x_libraries= +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +# If that didn't work, only try xmkmf and file system searches +# for native compilation. +if test x"$ac_x_includes" = xno && test "$cross_compiling" = no +then : + rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -14214,7 +15734,7 @@ _ACEOF rm -f -r conftest.dir fi -# Standard set of common directories for X headers. + # Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -14241,6 +15761,8 @@ ac_x_header_dirs=' /usr/local/include/X11R5 /usr/local/include/X11R4 +/opt/X11/include + /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -14262,16 +15784,18 @@ if test "$ac_x_includes" = no; then /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # We can compile using X headers with no special include directory. ac_x_includes= -else - for ac_dir in $ac_x_header_dirs; do +else case e in #( + e) for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi -done +done ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext fi # $ac_x_includes = no @@ -14286,20 +15810,21 @@ if test "$ac_x_libraries" = no; then /* end confdefs.h. */ #include int -main () +main (void) { XrmInitialize () ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -else - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +else case e in #( + e) LIBS=$ac_save_LIBS +for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib la dll; do @@ -14308,21 +15833,25 @@ do break 2 fi done -done +done ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no +fi +# Record the results. case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) + no,* | *,no | *\'*) : # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) + ac_cv_have_x="have_x=no" ;; #( + *) : # Record where we found X for the cache. ac_cv_have_x="have_x=yes\ ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" + ac_x_libraries='$ac_x_libraries'" ;; +esac ;; esac fi ;; #( @@ -14332,8 +15861,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -$as_echo "$have_x" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +printf "%s\n" "$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -14343,14 +15872,14 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h +printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -14363,8 +15892,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +printf %s "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -14372,42 +15901,46 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" -else - LIBS="$ac_xsave_LIBS -R $x_libraries" +else case e in #( + e) LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -$as_echo "neither works" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +printf "%s\n" "neither works" >&6; } ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS @@ -14429,106 +15962,127 @@ rm -f core conftest.err conftest.$ac_objext \ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XOpenDisplay (); +char XOpenDisplay (void); int -main () +main (void) { return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +if ac_fn_c_try_link "$LINENO" +then : + +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +printf %s "checking for dnet_ntoa in -ldnet... " >&6; } +if test ${ac_cv_lib_dnet_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dnet_ntoa (); +char dnet_ntoa (void); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_dnet_ntoa=yes -else - ac_cv_lib_dnet_dnet_ntoa=no +else case e in #( + e) ac_cv_lib_dnet_dnet_ntoa=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dnet_ntoa (); +char dnet_ntoa (void); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - ac_cv_lib_dnet_stub_dnet_ntoa=no +else case e in #( + e) ac_cv_lib_dnet_stub_dnet_ntoa=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi - fi + fi ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -14541,89 +16095,106 @@ rm -f core conftest.err conftest.$ac_objext \ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes; then : +if test "x$ac_cv_func_gethostbyname" = xyes +then : fi if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +printf %s "checking for gethostbyname in -lnsl... " >&6; } +if test ${ac_cv_lib_nsl_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gethostbyname (); +char gethostbyname (void); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_nsl_gethostbyname=yes -else - ac_cv_lib_nsl_gethostbyname=no +else case e in #( + e) ac_cv_lib_nsl_gethostbyname=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +printf %s "checking for gethostbyname in -lbsd... " >&6; } +if test ${ac_cv_lib_bsd_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gethostbyname (); +char gethostbyname (void); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_bsd_gethostbyname=yes -else - ac_cv_lib_bsd_gethostbyname=no +else case e in #( + e) ac_cv_lib_bsd_gethostbyname=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -14638,48 +16209,57 @@ fi # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = xyes; then : +if test "x$ac_cv_func_connect" = xyes +then : fi if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if ${ac_cv_lib_socket_connect+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +printf %s "checking for connect in -lsocket... " >&6; } +if test ${ac_cv_lib_socket_connect+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char connect (); +char connect (void); int -main () +main (void) { return connect (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_socket_connect=yes -else - ac_cv_lib_socket_connect=no +else case e in #( + e) ac_cv_lib_socket_connect=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes +then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -14687,48 +16267,57 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = xyes; then : +if test "x$ac_cv_func_remove" = xyes +then : fi if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if ${ac_cv_lib_posix_remove+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +printf %s "checking for remove in -lposix... " >&6; } +if test ${ac_cv_lib_posix_remove+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char remove (); +char remove (void); int -main () +main (void) { return remove (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_posix_remove=yes -else - ac_cv_lib_posix_remove=no +else case e in #( + e) ac_cv_lib_posix_remove=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -14736,48 +16325,57 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes; then : +if test "x$ac_cv_func_shmat" = xyes +then : fi if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if ${ac_cv_lib_ipc_shmat+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +printf %s "checking for shmat in -lipc... " >&6; } +if test ${ac_cv_lib_ipc_shmat+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char shmat (); +char shmat (void); int -main () +main (void) { return shmat (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ipc_shmat=yes -else - ac_cv_lib_ipc_shmat=no +else case e in #( + e) ac_cv_lib_ipc_shmat=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -14793,43 +16391,51 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +printf %s "checking for IceConnectionNumber in -lICE... " >&6; } +if test ${ac_cv_lib_ICE_IceConnectionNumber+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char IceConnectionNumber (); +char IceConnectionNumber (void); int -main () +main (void) { return IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ICE_IceConnectionNumber=yes -else - ac_cv_lib_ICE_IceConnectionNumber=no +else case e in #( + e) ac_cv_lib_ICE_IceConnectionNumber=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes +then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -14842,40 +16448,45 @@ fi LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS= if test x"$no_x" != x"yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lX11" >&5 -$as_echo_n "checking for main in -lX11... " >&6; } -if ${ac_cv_lib_X11_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lX11" >&5 +printf %s "checking for main in -lX11... " >&6; } +if test ${ac_cv_lib_X11_main+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_X11_main=yes -else - ac_cv_lib_X11_main=no +else case e in #( + e) ac_cv_lib_X11_main=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_main" >&5 -$as_echo "$ac_cv_lib_X11_main" >&6; } -if test "x$ac_cv_lib_X11_main" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_main" >&5 +printf "%s\n" "$ac_cv_lib_X11_main" >&6; } +if test "x$ac_cv_lib_X11_main" = xyes +then : -$as_echo "#define HAVE_LIBX11 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBX11 1" >>confdefs.h LIBX11_CFLAGS="$X_CFLAGS" for option in $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS; do @@ -14914,46 +16525,54 @@ fi LIBSM_CFLAGS= LIBSM_LDFLAGS= LIBSM_LIBS= if test x"$no_x" != x"yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcSaveYourselfDone in -lSM" >&5 -$as_echo_n "checking for SmcSaveYourselfDone in -lSM... " >&6; } -if ${ac_cv_lib_SM_SmcSaveYourselfDone+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SmcSaveYourselfDone in -lSM" >&5 +printf %s "checking for SmcSaveYourselfDone in -lSM... " >&6; } +if test ${ac_cv_lib_SM_SmcSaveYourselfDone+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lSM $LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lICE $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char SmcSaveYourselfDone (); +char SmcSaveYourselfDone (void); int -main () +main (void) { return SmcSaveYourselfDone (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_SM_SmcSaveYourselfDone=yes -else - ac_cv_lib_SM_SmcSaveYourselfDone=no +else case e in #( + e) ac_cv_lib_SM_SmcSaveYourselfDone=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcSaveYourselfDone" >&5 -$as_echo "$ac_cv_lib_SM_SmcSaveYourselfDone" >&6; } -if test "x$ac_cv_lib_SM_SmcSaveYourselfDone" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcSaveYourselfDone" >&5 +printf "%s\n" "$ac_cv_lib_SM_SmcSaveYourselfDone" >&6; } +if test "x$ac_cv_lib_SM_SmcSaveYourselfDone" = xyes +then : -$as_echo "#define HAVE_LIBSM 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSM 1" >>confdefs.h LIBSM_CFLAGS="$LIBX11_CFLAGS" LIBSM_LDFLAGS="$LIBX11_LDFLAGS" @@ -14987,12 +16606,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15001,11 +16621,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15013,15 +16637,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15030,12 +16655,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15044,11 +16670,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15056,15 +16686,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -15072,8 +16703,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -15085,14 +16716,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -15110,54 +16741,74 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.50.0" >&5 -$as_echo_n "checking for glib-2.0 >= 2.50.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.50.0" "glib-2.0" >/dev/null 2>&1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.66.0" >&5 +printf %s "checking for glib-2.0 >= 2.66.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.66.0" "glib-2.0" >/dev/null 2>&1; then GLIB_VERSION=`$PKG_CONFIG --modversion "glib-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_VERSION" >&5 -$as_echo "$GLIB_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIB_VERSION" >&5 +printf "%s\n" "$GLIB_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIB_CFLAGS" >&5 -$as_echo_n "checking GLIB_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GLIB_CFLAGS" >&5 +printf %s "checking GLIB_CFLAGS... " >&6; } GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_CFLAGS" >&5 -$as_echo "$GLIB_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIB_CFLAGS" >&5 +printf "%s\n" "$GLIB_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIB_LIBS" >&5 -$as_echo_n "checking GLIB_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GLIB_LIBS" >&5 +printf %s "checking GLIB_LIBS... " >&6; } GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_LIBS" >&5 -$as_echo "$GLIB_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIB_LIBS" >&5 +printf "%s\n" "$GLIB_LIBS" >&6; } + + GLIB_REQUIRED_VERSION=2.66.0 + + + + + + + if test x"GLIB" = x"GLIB"; then - GLIB_REQUIRED_VERSION=2.50.0 +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting GLIB_VERSION_MAX_ALLOWED and GLIB_VERSION_MIN_REQUIRED according to 2.66.0" >&5 +printf "%s\n" "$as_me: setting GLIB_VERSION_MAX_ALLOWED and GLIB_VERSION_MIN_REQUIRED according to 2.66.0" >&6;} +printf "%s\n" "#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_66" >>confdefs.h + + +printf "%s\n" "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_66" >>confdefs.h + elif $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "glib-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } echo "*** The required package glib-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade glib-2.0 to atleast version 2.50.0, or adjust" + echo "*** Please upgrade glib-2.0 to atleast version 2.66.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } echo "*** The required package glib-2.0 was not found on your system." - echo "*** Please install glib-2.0 (atleast version 2.50.0) or adjust" + echo "*** Please install glib-2.0 (atleast version 2.66.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15182,12 +16833,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15196,11 +16848,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15208,15 +16864,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15225,12 +16882,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15239,11 +16897,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15251,15 +16913,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -15267,8 +16930,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -15280,14 +16943,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -15305,54 +16968,62 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.22.0" >&5 -$as_echo_n "checking for gtk+-3.0 >= 3.22.0... " >&6; } - if $PKG_CONFIG "--atleast-version=3.22.0" "gtk+-3.0" >/dev/null 2>&1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.24.0" >&5 +printf %s "checking for gtk+-3.0 >= 3.24.0... " >&6; } + if $PKG_CONFIG "--atleast-version=3.24.0" "gtk+-3.0" >/dev/null 2>&1; then GTK3_VERSION=`$PKG_CONFIG --modversion "gtk+-3.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_VERSION" >&5 -$as_echo "$GTK3_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK3_VERSION" >&5 +printf "%s\n" "$GTK3_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK3_CFLAGS" >&5 -$as_echo_n "checking GTK3_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GTK3_CFLAGS" >&5 +printf %s "checking GTK3_CFLAGS... " >&6; } GTK3_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_CFLAGS" >&5 -$as_echo "$GTK3_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK3_CFLAGS" >&5 +printf "%s\n" "$GTK3_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK3_LIBS" >&5 -$as_echo_n "checking GTK3_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GTK3_LIBS" >&5 +printf %s "checking GTK3_LIBS... " >&6; } GTK3_LIBS=`$PKG_CONFIG --libs "gtk+-3.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_LIBS" >&5 -$as_echo "$GTK3_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK3_LIBS" >&5 +printf "%s\n" "$GTK3_LIBS" >&6; } + + GTK3_REQUIRED_VERSION=3.24.0 + + + + - GTK3_REQUIRED_VERSION=3.22.0 + if test x"GTK3" = x"GLIB"; then +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + fi elif $PKG_CONFIG --exists "gtk+-3.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-3.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } echo "*** The required package gtk+-3.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gtk+-3.0 to atleast version 3.22.0, or adjust" + echo "*** Please upgrade gtk+-3.0 to atleast version 3.24.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } echo "*** The required package gtk+-3.0 was not found on your system." - echo "*** Please install gtk+-3.0 (atleast version 3.22.0) or adjust" + echo "*** Please install gtk+-3.0 (atleast version 3.24.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15377,12 +17048,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15391,11 +17063,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15403,15 +17079,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15420,12 +17097,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15434,11 +17112,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15446,15 +17128,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -15462,8 +17145,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -15475,14 +17158,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -15500,54 +17183,277 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.15.6" >&5 -$as_echo_n "checking for libxfce4util-1.0 >= 4.15.6... " >&6; } - if $PKG_CONFIG "--atleast-version=4.15.6" "libxfce4util-1.0" >/dev/null 2>&1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.17.2" >&5 +printf %s "checking for libxfce4util-1.0 >= 4.17.2... " >&6; } + if $PKG_CONFIG "--atleast-version=4.17.2" "libxfce4util-1.0" >/dev/null 2>&1; then LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 -$as_echo "$LIBXFCE4UTIL_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 +printf "%s\n" "$LIBXFCE4UTIL_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 -$as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 +printf %s "checking LIBXFCE4UTIL_CFLAGS... " >&6; } LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 -$as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 +printf "%s\n" "$LIBXFCE4UTIL_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 -$as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 +printf %s "checking LIBXFCE4UTIL_LIBS... " >&6; } LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 -$as_echo "$LIBXFCE4UTIL_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 +printf "%s\n" "$LIBXFCE4UTIL_LIBS" >&6; } + + LIBXFCE4UTIL_REQUIRED_VERSION=4.17.2 + + + + + + + if test x"LIBXFCE4UTIL" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + + + elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } + + + echo "*** The required package libxfce4util-1.0 was found on your system," + echo "*** but the installed version ($xdt_cv_version) is too old." + echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.17.2, or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you installed" + echo "*** the new version of the package in a nonstandard prefix so" + echo "*** pkg-config is able to find it." + exit 1 + + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + + + echo "*** The required package libxfce4util-1.0 was not found on your system." + echo "*** Please install libxfce4util-1.0 (atleast version 4.17.2) or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you" + echo "*** installed the package in a nonstandard prefix so that" + echo "*** pkg-config is able to find it." + exit 1 + + fi + + + + # minimum supported version of pkg-config + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/" + echo "***" + exit 1; + fi - LIBXFCE4UTIL_REQUIRED_VERSION=4.15.6 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.12.0" >&5 +printf %s "checking for libxfconf-0 >= 4.12.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.12.0" "libxfconf-0" >/dev/null 2>&1; then + XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 +printf "%s\n" "$XFCONF_VERSION" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking XFCONF_CFLAGS" >&5 +printf %s "checking XFCONF_CFLAGS... " >&6; } + XFCONF_CFLAGS=`$PKG_CONFIG --cflags "libxfconf-0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XFCONF_CFLAGS" >&5 +printf "%s\n" "$XFCONF_CFLAGS" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking XFCONF_LIBS" >&5 +printf %s "checking XFCONF_LIBS... " >&6; } + XFCONF_LIBS=`$PKG_CONFIG --libs "libxfconf-0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 +printf "%s\n" "$XFCONF_LIBS" >&6; } + + XFCONF_REQUIRED_VERSION=4.12.0 - elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + + if test x"XFCONF" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + + + elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } - echo "*** The required package libxfce4util-1.0 was found on your system," + echo "*** The required package libxfconf-0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.15.6, or adjust" + echo "*** Please upgrade libxfconf-0 to atleast version 4.12.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } - echo "*** The required package libxfce4util-1.0 was not found on your system." - echo "*** Please install libxfce4util-1.0 (atleast version 4.15.6) or adjust" + echo "*** The required package libxfconf-0 was not found on your system." + echo "*** Please install libxfconf-0 (atleast version 4.12.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15560,10 +17466,12 @@ $as_echo "not found" >&6; } # Check whether --enable-glibtop was given. -if test "${enable_glibtop+set}" = set; then : +if test ${enable_glibtop+y} +then : enableval=$enable_glibtop; xdt_cv_GLIBTOP_check=$enableval -else - xdt_cv_GLIBTOP_check=yes +else case e in #( + e) xdt_cv_GLIBTOP_check=yes ;; +esac fi @@ -15586,12 +17494,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15600,11 +17509,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15612,15 +17525,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15629,12 +17543,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15643,11 +17558,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15655,15 +17574,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -15671,8 +17591,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -15684,14 +17604,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -15709,24 +17629,24 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtop-2.0 >= 2.24.0" >&5 -$as_echo_n "checking for libgtop-2.0 >= 2.24.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgtop-2.0 >= 2.24.0" >&5 +printf %s "checking for libgtop-2.0 >= 2.24.0... " >&6; } if $PKG_CONFIG "--atleast-version=2.24.0" "libgtop-2.0" >/dev/null 2>&1; then GLIBTOP_VERSION=`$PKG_CONFIG --modversion "libgtop-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBTOP_VERSION" >&5 -$as_echo "$GLIBTOP_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIBTOP_VERSION" >&5 +printf "%s\n" "$GLIBTOP_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIBTOP_CFLAGS" >&5 -$as_echo_n "checking GLIBTOP_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GLIBTOP_CFLAGS" >&5 +printf %s "checking GLIBTOP_CFLAGS... " >&6; } GLIBTOP_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBTOP_CFLAGS" >&5 -$as_echo "$GLIBTOP_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIBTOP_CFLAGS" >&5 +printf "%s\n" "$GLIBTOP_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLIBTOP_LIBS" >&5 -$as_echo_n "checking GLIBTOP_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GLIBTOP_LIBS" >&5 +printf %s "checking GLIBTOP_LIBS... " >&6; } GLIBTOP_LIBS=`$PKG_CONFIG --libs "libgtop-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBTOP_LIBS" >&5 -$as_echo "$GLIBTOP_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIBTOP_LIBS" >&5 +printf "%s\n" "$GLIBTOP_LIBS" >&6; } GLIBTOP_REQUIRED_VERSION=2.24.0 @@ -15735,16 +17655,24 @@ $as_echo "$GLIBTOP_LIBS" >&6; } + if test x"GLIBTOP" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + -$as_echo "#define HAVE_GLIBTOP 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_GLIBTOP 1" >>confdefs.h GLIBTOP_FOUND="yes" elif $PKG_CONFIG --exists "libgtop-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "libgtop-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } echo "*** The required package libgtop-2.0 was found on your system," @@ -15756,8 +17684,8 @@ $as_echo "found, but $xdt_cv_version" >&6; } exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } echo "*** The required package libgtop-2.0 was not found on your system." @@ -15770,16 +17698,16 @@ $as_echo "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libgtop-2.0 >= 2.24.0" >&5 -$as_echo_n "checking for optional package libgtop-2.0 >= 2.24.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package libgtop-2.0 >= 2.24.0" >&5 +printf %s "checking for optional package libgtop-2.0 >= 2.24.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libgtop-2.0" >&5 -$as_echo_n "checking for optional package libgtop-2.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package libgtop-2.0" >&5 +printf %s "checking for optional package libgtop-2.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +printf "%s\n" "disabled" >&6; } fi if test x"$GLIBTOP_FOUND" = x"yes"; then @@ -15801,18 +17729,34 @@ fi -$as_echo "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_50" >>confdefs.h +printf "%s\n" "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_66" >>confdefs.h + + +printf "%s\n" "#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_66" >>confdefs.h -$as_echo "#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_50" >>confdefs.h +printf "%s\n" "#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_24" >>confdefs.h -$as_echo "#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_22" >>confdefs.h +printf "%s\n" "#define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_24" >>confdefs.h -$as_echo "#define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_22" >>confdefs.h +if test x"$GLIBTOP_FOUND" = x"yes"; then + ac_fn_c_check_header_compile "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default" +if test "x$ac_cv_header_time_h" = xyes +then : + printf "%s\n" "#define HAVE_TIME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_time_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h + +fi +fi EPOXY_FOUND="no" if test x"$GLIBTOP_FOUND" = x"yes"; then @@ -15820,10 +17764,12 @@ if test x"$GLIBTOP_FOUND" = x"yes"; then # Check whether --enable-epoxy was given. -if test "${enable_epoxy+set}" = set; then : +if test ${enable_epoxy+y} +then : enableval=$enable_epoxy; xdt_cv_EPOXY_check=$enableval -else - xdt_cv_EPOXY_check=yes +else case e in #( + e) xdt_cv_EPOXY_check=yes ;; +esac fi @@ -15846,12 +17792,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15860,11 +17807,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15872,15 +17823,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15889,12 +17841,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -15903,11 +17856,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15915,15 +17872,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -15931,8 +17889,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -15944,14 +17902,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -15969,24 +17927,24 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoxy >= 1.2" >&5 -$as_echo_n "checking for epoxy >= 1.2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoxy >= 1.2" >&5 +printf %s "checking for epoxy >= 1.2... " >&6; } if $PKG_CONFIG "--atleast-version=1.2" "epoxy" >/dev/null 2>&1; then EPOXY_VERSION=`$PKG_CONFIG --modversion "epoxy"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPOXY_VERSION" >&5 -$as_echo "$EPOXY_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EPOXY_VERSION" >&5 +printf "%s\n" "$EPOXY_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking EPOXY_CFLAGS" >&5 -$as_echo_n "checking EPOXY_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking EPOXY_CFLAGS" >&5 +printf %s "checking EPOXY_CFLAGS... " >&6; } EPOXY_CFLAGS=`$PKG_CONFIG --cflags "epoxy"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPOXY_CFLAGS" >&5 -$as_echo "$EPOXY_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EPOXY_CFLAGS" >&5 +printf "%s\n" "$EPOXY_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking EPOXY_LIBS" >&5 -$as_echo_n "checking EPOXY_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking EPOXY_LIBS" >&5 +printf %s "checking EPOXY_LIBS... " >&6; } EPOXY_LIBS=`$PKG_CONFIG --libs "epoxy"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPOXY_LIBS" >&5 -$as_echo "$EPOXY_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EPOXY_LIBS" >&5 +printf "%s\n" "$EPOXY_LIBS" >&6; } EPOXY_REQUIRED_VERSION=1.2 @@ -15995,16 +17953,24 @@ $as_echo "$EPOXY_LIBS" >&6; } + if test x"EPOXY" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + + -$as_echo "#define HAVE_EPOXY 1" >>confdefs.h +printf "%s\n" "#define HAVE_EPOXY 1" >>confdefs.h EPOXY_FOUND="yes" elif $PKG_CONFIG --exists "epoxy" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "epoxy"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } echo "*** The required package epoxy was found on your system," @@ -16016,8 +17982,8 @@ $as_echo "found, but $xdt_cv_version" >&6; } exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } echo "*** The required package epoxy was not found on your system." @@ -16030,16 +17996,16 @@ $as_echo "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package epoxy >= 1.2" >&5 -$as_echo_n "checking for optional package epoxy >= 1.2... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package epoxy >= 1.2" >&5 +printf %s "checking for optional package epoxy >= 1.2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package epoxy" >&5 -$as_echo_n "checking for optional package epoxy... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package epoxy" >&5 +printf %s "checking for optional package epoxy... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +printf "%s\n" "disabled" >&6; } fi if test x"$EPOXY_FOUND" = x"yes"; then @@ -16068,10 +18034,12 @@ if test x"$GLIBTOP_FOUND" = x"yes"; then # Check whether --enable-gudev was given. -if test "${enable_gudev+set}" = set; then : +if test ${enable_gudev+y} +then : enableval=$enable_gudev; xdt_cv_GUDEV_check=$enableval -else - xdt_cv_GUDEV_check=yes +else case e in #( + e) xdt_cv_GUDEV_check=yes ;; +esac fi @@ -16094,12 +18062,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -16108,11 +18077,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16120,15 +18093,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16137,12 +18111,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -16151,11 +18126,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16163,15 +18142,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -16179,8 +18159,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -16192,14 +18172,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -16217,24 +18197,24 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gudev-1.0 >= 232" >&5 -$as_echo_n "checking for gudev-1.0 >= 232... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gudev-1.0 >= 232" >&5 +printf %s "checking for gudev-1.0 >= 232... " >&6; } if $PKG_CONFIG "--atleast-version=232" "gudev-1.0" >/dev/null 2>&1; then GUDEV_VERSION=`$PKG_CONFIG --modversion "gudev-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUDEV_VERSION" >&5 -$as_echo "$GUDEV_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GUDEV_VERSION" >&5 +printf "%s\n" "$GUDEV_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GUDEV_CFLAGS" >&5 -$as_echo_n "checking GUDEV_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GUDEV_CFLAGS" >&5 +printf %s "checking GUDEV_CFLAGS... " >&6; } GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUDEV_CFLAGS" >&5 -$as_echo "$GUDEV_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GUDEV_CFLAGS" >&5 +printf "%s\n" "$GUDEV_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GUDEV_LIBS" >&5 -$as_echo_n "checking GUDEV_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GUDEV_LIBS" >&5 +printf %s "checking GUDEV_LIBS... " >&6; } GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUDEV_LIBS" >&5 -$as_echo "$GUDEV_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GUDEV_LIBS" >&5 +printf "%s\n" "$GUDEV_LIBS" >&6; } GUDEV_REQUIRED_VERSION=232 @@ -16243,16 +18223,24 @@ $as_echo "$GUDEV_LIBS" >&6; } + if test x"GUDEV" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + -$as_echo "#define HAVE_GUDEV 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_GUDEV 1" >>confdefs.h GUDEV_FOUND="yes" elif $PKG_CONFIG --exists "gudev-1.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gudev-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } echo "*** The required package gudev-1.0 was found on your system," @@ -16264,8 +18252,8 @@ $as_echo "found, but $xdt_cv_version" >&6; } exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } echo "*** The required package gudev-1.0 was not found on your system." @@ -16278,16 +18266,16 @@ $as_echo "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gudev-1.0 >= 232" >&5 -$as_echo_n "checking for optional package gudev-1.0 >= 232... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package gudev-1.0 >= 232" >&5 +printf %s "checking for optional package gudev-1.0 >= 232... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gudev-1.0" >&5 -$as_echo_n "checking for optional package gudev-1.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package gudev-1.0" >&5 +printf %s "checking for optional package gudev-1.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +printf "%s\n" "disabled" >&6; } fi if test x"$GUDEV_FOUND" = x"yes"; then @@ -16314,15 +18302,17 @@ fi # Check whether --enable-introspection was given. -if test "${enable_introspection+set}" = set; then : +if test ${enable_introspection+y} +then : enableval=$enable_introspection; -else - enable_introspection=auto +else case e in #( + e) enable_introspection=auto ;; +esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 -$as_echo_n "checking for gobject-introspection... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 +printf %s "checking for gobject-introspection... " >&6; } case $enable_introspection in #( no) : @@ -16330,32 +18320,32 @@ $as_echo_n "checking for gobject-introspection... " >&6; } ;; #( yes) : if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then : else as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 fi if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.30.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.30.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.66.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.66.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then found_introspection=yes else - as_fn_error $? "You need to have gobject-introspection >= 1.30.0 installed to build libxfce4ui" "$LINENO" 5 + as_fn_error $? "You need to have gobject-introspection >= 1.66.0 installed to build libxfce4ui" "$LINENO" 5 fi ;; #( auto) : if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.30.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.30.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.66.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.66.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then found_introspection=yes else @@ -16367,8 +18357,8 @@ fi as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 -$as_echo "$found_introspection" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 +printf "%s\n" "$found_introspection" >&6; } EXP_VAR=_GI_EXP_DATADIR @@ -16463,27 +18453,32 @@ fi - if test "x" != "xyes"; then : + if test "x" != "xyes" +then : fi # Check whether --enable-vala was given. -if test "${enable_vala+set}" = set; then : +if test ${enable_vala+y} +then : enableval=$enable_vala; -else - - if test "x" = "x"; then : +else case e in #( + e) + if test "x" = "x" +then : enable_vala=auto -else - +else case e in #( + e) enable_vala= - + ;; +esac fi - + ;; +esac fi @@ -16492,7 +18487,8 @@ fi enable_vala=no ;; #( yes) : - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + if test "x" != "xyes" -a "x$found_introspection" != "xyes" +then : as_fn_error $? "Vala bindings require GObject Introspection" "$LINENO" 5 @@ -16500,7 +18496,8 @@ fi ;; #( auto) : - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + if test "x" != "xyes" -a "x$found_introspection" != "xyes" +then : enable_vala=no @@ -16512,235 +18509,30 @@ fi ;; esac - if test "x" = "x"; then : + if test "x" = "x" +then : vapigen_pkg_name=vapigen -else - +else case e in #( + e) vapigen_pkg_name=vapigen- - -fi - if test "x" = "x"; then : - - vapigen_pkg="$vapigen_pkg_name" - -else - - vapigen_pkg="$vapigen_pkg_name >= " - -fi - - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$vapigen_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - - if test "$enable_vala" = "auto"; then : - - enable_vala=yes - -fi - -else - - case $enable_vala in #( - yes) : - - as_fn_error $? "$vapigen_pkg not found" "$LINENO" 5 - ;; #( - auto) : - - enable_vala=no - ;; #( - *) : ;; esac - fi + if test "x" = "x" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vapigen" >&5 -$as_echo_n "checking for vapigen... " >&6; } - - case $enable_vala in #( - yes) : - - VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen - if test "x" = "x"; then : - - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` - -else - - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` + vapigen_pkg="$vapigen_pkg_name" -fi - ;; #( - *) : +else case e in #( + e) + vapigen_pkg="$vapigen_pkg_name >= " ;; esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vala" >&5 -$as_echo "$enable_vala" >&6; } - - - - - - if test "x$enable_vala" = "xyes"; then - ENABLE_VAPIGEN_TRUE= - ENABLE_VAPIGEN_FALSE='#' -else - ENABLE_VAPIGEN_TRUE='#' - ENABLE_VAPIGEN_FALSE= -fi - - - - - - - # Check whether --enable-startup-notification was given. -if test "${enable_startup_notification+set}" = set; then : - enableval=$enable_startup_notification; xdt_cv_LIBSTARTUP_NOTIFICATION_check=$enableval -else - xdt_cv_LIBSTARTUP_NOTIFICATION_check=yes fi - if test x"$xdt_cv_LIBSTARTUP_NOTIFICATION_check" = x"yes"; then - if $PKG_CONFIG --exists "libstartup-notification-1.0 >= 0.4" >/dev/null 2>&1; then - - - # minimum supported version of pkg-config - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - - - @@ -16751,12 +18543,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -16765,11 +18558,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16777,15 +18574,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16794,12 +18592,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -16808,11 +18607,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16820,15 +18623,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -16836,8 +18640,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -16848,123 +18652,106 @@ fi fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + _pkg_min_version=0.9.0 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" - fi -fi - - if test x"$PKG_CONFIG" = x""; then - echo - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/" - echo "***" - exit 1; - fi - + fi +fi + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$vapigen_pkg") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification-1.0 >= 0.4" >&5 -$as_echo_n "checking for libstartup-notification-1.0 >= 0.4... " >&6; } - if $PKG_CONFIG "--atleast-version=0.4" "libstartup-notification-1.0" >/dev/null 2>&1; then - LIBSTARTUP_NOTIFICATION_VERSION=`$PKG_CONFIG --modversion "libstartup-notification-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBSTARTUP_NOTIFICATION_VERSION" >&5 -$as_echo "$LIBSTARTUP_NOTIFICATION_VERSION" >&6; } + if test "$enable_vala" = "auto" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBSTARTUP_NOTIFICATION_CFLAGS" >&5 -$as_echo_n "checking LIBSTARTUP_NOTIFICATION_CFLAGS... " >&6; } - LIBSTARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBSTARTUP_NOTIFICATION_CFLAGS" >&5 -$as_echo "$LIBSTARTUP_NOTIFICATION_CFLAGS" >&6; } + enable_vala=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBSTARTUP_NOTIFICATION_LIBS" >&5 -$as_echo_n "checking LIBSTARTUP_NOTIFICATION_LIBS... " >&6; } - LIBSTARTUP_NOTIFICATION_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBSTARTUP_NOTIFICATION_LIBS" >&5 -$as_echo "$LIBSTARTUP_NOTIFICATION_LIBS" >&6; } +fi - LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION=0.4 +else + case $enable_vala in #( + yes) : + as_fn_error $? "$vapigen_pkg not found" "$LINENO" 5 + ;; #( + auto) : + enable_vala=no + ;; #( + *) : + ;; +esac +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vapigen" >&5 +printf %s "checking for vapigen... " >&6; } + case $enable_vala in #( + yes) : + VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` + VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen + if test "x" = "x" +then : -$as_echo "#define HAVE_LIBSTARTUP_NOTIFICATION 1" >>confdefs.h + VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` - LIBSTARTUP_NOTIFICATION_FOUND="yes" +else case e in #( + e) + VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` + ;; +esac +fi + ;; #( + *) : + ;; +esac - elif $PKG_CONFIG --exists "libstartup-notification-1.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libstartup-notification-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_vala" >&5 +printf "%s\n" "$enable_vala" >&6; } - echo "*** The required package libstartup-notification-1.0 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libstartup-notification-1.0 to atleast version 0.4, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." - exit 1 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - echo "*** The required package libstartup-notification-1.0 was not found on your system." - echo "*** Please install libstartup-notification-1.0 (atleast version 0.4) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." - exit 1 + if test "x$enable_vala" = "xyes"; then + ENABLE_VAPIGEN_TRUE= + ENABLE_VAPIGEN_FALSE='#' +else + ENABLE_VAPIGEN_TRUE='#' + ENABLE_VAPIGEN_FALSE= +fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libstartup-notification-1.0 >= 0.4" >&5 -$as_echo_n "checking for optional package libstartup-notification-1.0 >= 0.4... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libstartup-notification-1.0" >&5 -$as_echo_n "checking for optional package libstartup-notification-1.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } - fi - if test x"$LIBSTARTUP_NOTIFICATION_FOUND" = x"yes"; then - HAVE_LIBSTARTUP_NOTIFICATION_TRUE= - HAVE_LIBSTARTUP_NOTIFICATION_FALSE='#' -else - HAVE_LIBSTARTUP_NOTIFICATION_TRUE='#' - HAVE_LIBSTARTUP_NOTIFICATION_FALSE= -fi -# Check whether --enable-keyboard-library was given. -if test "${enable_keyboard_library+set}" = set; then : - enableval=$enable_keyboard_library; enable_keyboard_library=$enableval -else - enable_keyboard_library=yes + # Check whether --enable-startup-notification was given. +if test ${enable_startup_notification+y} +then : + enableval=$enable_startup_notification; xdt_cv_LIBSTARTUP_NOTIFICATION_check=$enableval +else case e in #( + e) xdt_cv_LIBSTARTUP_NOTIFICATION_check=yes ;; +esac fi -if test "x$enable_keyboard_library" = "xyes"; then + + if test x"$xdt_cv_LIBSTARTUP_NOTIFICATION_check" = x"yes"; then + if $PKG_CONFIG --exists "libstartup-notification-1.0 >= 0.4" >/dev/null 2>&1; then # minimum supported version of pkg-config @@ -16982,12 +18769,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -16996,11 +18784,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17008,15 +18800,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -17025,12 +18818,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -17039,11 +18833,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17051,15 +18849,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -17067,8 +18866,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -17080,14 +18879,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -17105,54 +18904,67 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.12.0" >&5 -$as_echo_n "checking for libxfconf-0 >= 4.12.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.12.0" "libxfconf-0" >/dev/null 2>&1; then - XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 -$as_echo "$XFCONF_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification-1.0 >= 0.4" >&5 +printf %s "checking for libstartup-notification-1.0 >= 0.4... " >&6; } + if $PKG_CONFIG "--atleast-version=0.4" "libstartup-notification-1.0" >/dev/null 2>&1; then + LIBSTARTUP_NOTIFICATION_VERSION=`$PKG_CONFIG --modversion "libstartup-notification-1.0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSTARTUP_NOTIFICATION_VERSION" >&5 +printf "%s\n" "$LIBSTARTUP_NOTIFICATION_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_CFLAGS" >&5 -$as_echo_n "checking XFCONF_CFLAGS... " >&6; } - XFCONF_CFLAGS=`$PKG_CONFIG --cflags "libxfconf-0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_CFLAGS" >&5 -$as_echo "$XFCONF_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBSTARTUP_NOTIFICATION_CFLAGS" >&5 +printf %s "checking LIBSTARTUP_NOTIFICATION_CFLAGS... " >&6; } + LIBSTARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSTARTUP_NOTIFICATION_CFLAGS" >&5 +printf "%s\n" "$LIBSTARTUP_NOTIFICATION_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_LIBS" >&5 -$as_echo_n "checking XFCONF_LIBS... " >&6; } - XFCONF_LIBS=`$PKG_CONFIG --libs "libxfconf-0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 -$as_echo "$XFCONF_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBSTARTUP_NOTIFICATION_LIBS" >&5 +printf %s "checking LIBSTARTUP_NOTIFICATION_LIBS... " >&6; } + LIBSTARTUP_NOTIFICATION_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSTARTUP_NOTIFICATION_LIBS" >&5 +printf "%s\n" "$LIBSTARTUP_NOTIFICATION_LIBS" >&6; } - XFCONF_REQUIRED_VERSION=4.12.0 + LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION=0.4 + if test x"LIBSTARTUP_NOTIFICATION" = x"GLIB"; then - elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + fi - echo "*** The required package libxfconf-0 was found on your system," + + + + +printf "%s\n" "#define HAVE_LIBSTARTUP_NOTIFICATION 1" >>confdefs.h + + LIBSTARTUP_NOTIFICATION_FOUND="yes" + + elif $PKG_CONFIG --exists "libstartup-notification-1.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libstartup-notification-1.0"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } + + + echo "*** The required package libstartup-notification-1.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfconf-0 to atleast version 4.12.0, or adjust" + echo "*** Please upgrade libstartup-notification-1.0 to atleast version 0.4, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } - echo "*** The required package libxfconf-0 was not found on your system." - echo "*** Please install libxfconf-0 (atleast version 4.12.0) or adjust" + echo "*** The required package libstartup-notification-1.0 was not found on your system." + echo "*** Please install libstartup-notification-1.0 (atleast version 0.4) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -17160,7 +18972,38 @@ $as_echo "not found" >&6; } fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package libstartup-notification-1.0 >= 0.4" >&5 +printf %s "checking for optional package libstartup-notification-1.0 >= 0.4... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package libstartup-notification-1.0" >&5 +printf %s "checking for optional package libstartup-notification-1.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +printf "%s\n" "disabled" >&6; } + fi + + if test x"$LIBSTARTUP_NOTIFICATION_FOUND" = x"yes"; then + HAVE_LIBSTARTUP_NOTIFICATION_TRUE= + HAVE_LIBSTARTUP_NOTIFICATION_FALSE='#' +else + HAVE_LIBSTARTUP_NOTIFICATION_TRUE='#' + HAVE_LIBSTARTUP_NOTIFICATION_FALSE= +fi + + + +# Check whether --enable-keyboard-library was given. +if test ${enable_keyboard_library+y} +then : + enableval=$enable_keyboard_library; enable_keyboard_library=$enableval +else case e in #( + e) enable_keyboard_library=yes ;; +esac fi + if test "x$enable_keyboard_library" = "xyes"; then ENABLE_KEYBOARD_LIBRARY_TRUE= ENABLE_KEYBOARD_LIBRARY_FALSE='#' @@ -17170,56 +19013,58 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional vendor name and/or info" >&5 -$as_echo_n "checking for additional vendor name and/or info... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for additional vendor name and/or info" >&5 +printf %s "checking for additional vendor name and/or info... " >&6; } # Check whether --with-vendor-info was given. -if test "${with_vendor_info+set}" = set; then : +if test ${with_vendor_info+y} +then : withval=$with_vendor_info; with_vendor_info="$withval" -else - with_vendor_info="" +else case e in #( + e) with_vendor_info="" ;; +esac fi if test x"$with_vendor_info" != x""; then -cat >>confdefs.h <<_ACEOF -#define VENDOR_INFO "$with_vendor_info" -_ACEOF +printf "%s\n" "#define VENDOR_INFO \"$with_vendor_info\"" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vendorinfo" >&5 -$as_echo "$vendorinfo" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vendorinfo" >&5 +printf "%s\n" "$vendorinfo" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +printf "%s\n" "not set" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom manual website location" >&5 -$as_echo_n "checking for a custom manual website location... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a custom manual website location" >&5 +printf %s "checking for a custom manual website location... " >&6; } # Check whether --with-manual-website was given. -if test "${with_manual_website+set}" = set; then : +if test ${with_manual_website+y} +then : withval=$with_manual_website; with_manual_website="$withval" -else - with_manual_website="https://docs.xfce.org/help.php" +else case e in #( + e) with_manual_website="https://docs.xfce.org/help.php" ;; +esac fi -cat >>confdefs.h <<_ACEOF -#define MANUAL_WEBSITE "$with_manual_website" -_ACEOF +printf "%s\n" "#define MANUAL_WEBSITE \"$with_manual_website\"" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_manual_website" >&5 -$as_echo "$with_manual_website" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_manual_website" >&5 +printf "%s\n" "$with_manual_website" >&6; } # Check whether --enable-gladeui2 was given. -if test "${enable_gladeui2+set}" = set; then : +if test ${enable_gladeui2+y} +then : enableval=$enable_gladeui2; xdt_cv_GLADEUI2_check=$enableval -else - xdt_cv_GLADEUI2_check=yes +else case e in #( + e) xdt_cv_GLADEUI2_check=yes ;; +esac fi @@ -17242,12 +19087,13 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -17256,11 +19102,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17268,15 +19118,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -17285,12 +19136,13 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -17299,11 +19151,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17311,15 +19167,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -17327,8 +19184,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -17340,14 +19197,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -17365,24 +19222,24 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gladeui-2.0 >= 3.5.0" >&5 -$as_echo_n "checking for gladeui-2.0 >= 3.5.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gladeui-2.0 >= 3.5.0" >&5 +printf %s "checking for gladeui-2.0 >= 3.5.0... " >&6; } if $PKG_CONFIG "--atleast-version=3.5.0" "gladeui-2.0" >/dev/null 2>&1; then GLADEUI2_VERSION=`$PKG_CONFIG --modversion "gladeui-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLADEUI2_VERSION" >&5 -$as_echo "$GLADEUI2_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLADEUI2_VERSION" >&5 +printf "%s\n" "$GLADEUI2_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLADEUI2_CFLAGS" >&5 -$as_echo_n "checking GLADEUI2_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GLADEUI2_CFLAGS" >&5 +printf %s "checking GLADEUI2_CFLAGS... " >&6; } GLADEUI2_CFLAGS=`$PKG_CONFIG --cflags "gladeui-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLADEUI2_CFLAGS" >&5 -$as_echo "$GLADEUI2_CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLADEUI2_CFLAGS" >&5 +printf "%s\n" "$GLADEUI2_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GLADEUI2_LIBS" >&5 -$as_echo_n "checking GLADEUI2_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking GLADEUI2_LIBS" >&5 +printf %s "checking GLADEUI2_LIBS... " >&6; } GLADEUI2_LIBS=`$PKG_CONFIG --libs "gladeui-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLADEUI2_LIBS" >&5 -$as_echo "$GLADEUI2_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLADEUI2_LIBS" >&5 +printf "%s\n" "$GLADEUI2_LIBS" >&6; } GLADEUI2_REQUIRED_VERSION=3.5.0 @@ -17391,16 +19248,24 @@ $as_echo "$GLADEUI2_LIBS" >&6; } + if test x"GLADEUI2" = x"GLIB"; then + +printf "%s\n" "#define G_LOG_USE_STRUCTURED 1" >>confdefs.h + + fi + + -$as_echo "#define HAVE_GLADEUI2 1" >>confdefs.h + +printf "%s\n" "#define HAVE_GLADEUI2 1" >>confdefs.h GLADEUI2_FOUND="yes" elif $PKG_CONFIG --exists "gladeui-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "gladeui-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 -$as_echo "found, but $xdt_cv_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +printf "%s\n" "found, but $xdt_cv_version" >&6; } echo "*** The required package gladeui-2.0 was found on your system," @@ -17412,8 +19277,8 @@ $as_echo "found, but $xdt_cv_version" >&6; } exit 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } echo "*** The required package gladeui-2.0 was not found on your system." @@ -17426,16 +19291,16 @@ $as_echo "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gladeui-2.0 >= 3.5.0" >&5 -$as_echo_n "checking for optional package gladeui-2.0 >= 3.5.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package gladeui-2.0 >= 3.5.0" >&5 +printf %s "checking for optional package gladeui-2.0 >= 3.5.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gladeui-2.0" >&5 -$as_echo_n "checking for optional package gladeui-2.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for optional package gladeui-2.0" >&5 +printf %s "checking for optional package gladeui-2.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +printf "%s\n" "disabled" >&6; } fi if test x"$GLADEUI2_FOUND" = x"yes"; then @@ -17450,19 +19315,22 @@ fi # Check whether --with-gladeui2-catalogdir was given. -if test "${with_gladeui2_catalogdir+set}" = set; then : +if test ${with_gladeui2_catalogdir+y} +then : withval=$with_gladeui2_catalogdir; gladeui2_catalogdir="$withval" fi # Check whether --with-gladeui2-moduledir was given. -if test "${with_gladeui2_moduledir+set}" = set; then : +if test ${with_gladeui2_moduledir+y} +then : withval=$with_gladeui2_moduledir; gladeui2_moduledir="$withval" fi # Check whether --with-gladeui2-pixmapdir was given. -if test "${with_gladeui2_pixmapdir+set}" = set; then : +if test ${with_gladeui2_pixmapdir+y} +then : withval=$with_gladeui2_pixmapdir; gladeui2_pixmapdir="$withval" fi @@ -17491,75 +19359,82 @@ fi gtk_doc_requires="gtk-doc >= 1.0" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 -$as_echo_n "checking for gtk-doc... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +printf %s "checking for gtk-doc... " >&6; } if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then have_gtk_doc=yes else have_gtk_doc=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 -$as_echo "$have_gtk_doc" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +printf "%s\n" "$have_gtk_doc" >&6; } if test "$have_gtk_doc" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You will not be able to create source packages with 'make dist' because $gtk_doc_requires is not found." >&5 -$as_echo "$as_me: WARNING: +printf "%s\n" "$as_me: WARNING: You will not be able to create source packages with 'make dist' because $gtk_doc_requires is not found." >&2;} fi # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GTKDOC_CHECK"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_GTKDOC_CHECK+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$GTKDOC_CHECK"; then ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +printf "%s\n" "$GTKDOC_CHECK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GTKDOC_CHECK_PATH in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTKDOC_CHECK_PATH+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; @@ -17568,11 +19443,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17580,15 +19459,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH if test -n "$GTKDOC_CHECK_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 -$as_echo "$GTKDOC_CHECK_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +printf "%s\n" "$GTKDOC_CHECK_PATH" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -17596,12 +19476,13 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_REBASE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GTKDOC_REBASE in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTKDOC_REBASE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $GTKDOC_REBASE in [\\/]* | ?:[\\/]*) ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. ;; @@ -17610,11 +19491,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_REBASE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17622,15 +19507,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE if test -n "$GTKDOC_REBASE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 -$as_echo "$GTKDOC_REBASE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +printf "%s\n" "$GTKDOC_REBASE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -17640,12 +19526,13 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. set dummy gtkdoc-mkpdf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GTKDOC_MKPDF in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTKDOC_MKPDF+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $GTKDOC_MKPDF in [\\/]* | ?:[\\/]*) ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. ;; @@ -17654,11 +19541,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_MKPDF="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17666,42 +19557,47 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF if test -n "$GTKDOC_MKPDF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 -$as_echo "$GTKDOC_MKPDF" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +printf "%s\n" "$GTKDOC_MKPDF" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then : +if test ${with_html_dir+y} +then : withval=$with_html_dir; -else - with_html_dir='${datadir}/gtk-doc/html' +else case e in #( + e) with_html_dir='${datadir}/gtk-doc/html' ;; +esac fi HTML_DIR="$with_html_dir" # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then : +if test ${enable_gtk_doc+y} +then : enableval=$enable_gtk_doc; -else - enable_gtk_doc=no +else case e in #( + e) enable_gtk_doc=no ;; +esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +printf %s "checking whether to build gtk-doc documentation... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +printf "%s\n" "$enable_gtk_doc" >&6; } if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then as_fn_error $? " @@ -17713,17 +19609,17 @@ $as_echo "$enable_gtk_doc" >&6; } if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 -$as_echo_n "checking for GTKDOC_DEPS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" >&5 +printf %s "checking for glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0... " >&6; } if test -n "$GTKDOC_DEPS_CFLAGS"; then pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -17737,10 +19633,10 @@ if test -n "$GTKDOC_DEPS_LIBS"; then pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -17754,8 +19650,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17763,39 +19659,43 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` else - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + : else - GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS - GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi # Check whether --enable-gtk-doc-html was given. -if test "${enable_gtk_doc_html+set}" = set; then : +if test ${enable_gtk_doc_html+y} +then : enableval=$enable_gtk_doc_html; -else - enable_gtk_doc_html=yes +else case e in #( + e) enable_gtk_doc_html=yes ;; +esac fi # Check whether --enable-gtk-doc-pdf was given. -if test "${enable_gtk_doc_pdf+set}" = set; then : +if test ${enable_gtk_doc_pdf+y} +then : enableval=$enable_gtk_doc_pdf; -else - enable_gtk_doc_pdf=no +else case e in #( + e) enable_gtk_doc_pdf=no ;; +esac fi @@ -17860,82 +19760,90 @@ fi # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : +if test ${enable_debug+y} +then : enableval=$enable_debug; enable_debug=$enableval -else - enable_debug=minimum +else case e in #( + e) enable_debug=minimum ;; +esac fi - xdt_cv_additional_CFLAGS="-Wall -Wextra \ - -Wno-missing-field-initializers \ - -Wno-unused-parameter -Wold-style-definition \ - -Wdeclaration-after-statement \ - -Wmissing-declarations \ - -Wmissing-noreturn -Wpointer-arith \ - -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ - -Winit-self -Wmissing-include-dirs -Wundef \ - -Wnested-externs -Wredundant-decls" + xdt_cv_additional_COMMON_FLAGS="-Wall -Wextra \ + -Wno-missing-field-initializers \ + -Wno-unused-parameter \ + -Wmissing-declarations \ + -Wmissing-noreturn -Wpointer-arith \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ + -Winit-self -Wmissing-include-dirs -Wundef \ + -Wredundant-decls" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with debugging support" >&5 -$as_echo_n "checking whether to build with debugging support... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with debugging support" >&5 +printf %s "checking whether to build with debugging support... " >&6; } if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then -$as_echo "#define DEBUG 1" >>confdefs.h +printf "%s\n" "#define DEBUG 1" >>confdefs.h CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -fstack-protector" fi if test x"$enable_debug" = x"full"; then -$as_echo "#define DEBUG_TRACE 1" >>confdefs.h +printf "%s\n" "#define DEBUG_TRACE 1" >>confdefs.h - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -O0 -g" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: full" >&5 -$as_echo "full" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: full" >&5 +printf "%s\n" "full" >&6; } else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -g -Wshadow" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wshadow" + xdt_cv_additional_COMMON_FLAGS="$xdt_cv_additional_COMMON_FLAGS -Wshadow" CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: minimum" >&5 -$as_echo "minimum" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: minimum" >&5 +printf "%s\n" "minimum" >&6; } fi fi + xdt_cv_additional_CFLAGS="$xdt_cv_additional_COMMON_FLAGS \ + -Wnested-externs \ + -Wold-style-definition" + xdt_cv_additional_CXXFLAGS="$xdt_cv_additional_COMMON_FLAGS" + for flag in $xdt_cv_additional_CFLAGS; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 -$as_echo_n "checking if $CC supports $flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 +printf %s "checking if $CC supports $flag... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : flag_supported=yes -else - flag_supported=no +else case e in #( + e) flag_supported=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$saved_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 -$as_echo "$flag_supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 +printf "%s\n" "$flag_supported" >&6; } if test "x$flag_supported" = "xyes"; then supported_CFLAGS="$supported_CFLAGS $flag" @@ -17943,8 +19851,31 @@ $as_echo "$flag_supported" >&6; } done + for flag in $xdt_cv_additional_CXXFLAGS; do + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 +printf %s "checking if $CC supports $flag... " >&6; } + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + flag_supported=yes +else case e in #( + e) flag_supported=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS="$saved_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 +printf "%s\n" "$flag_supported" >&6; } - supported_CXXFLAGS="$supported_CFLAGS" + if test "x$flag_supported" = "xyes"; then + supported_CXXFLAGS="$supported_CXXFLAGS $flag" + fi + done CFLAGS="$CFLAGS $supported_CFLAGS" @@ -17953,73 +19884,79 @@ $as_echo "$flag_supported" >&6; } # Check whether --enable-linker-opts was given. -if test "${enable_linker_opts+set}" = set; then : +if test ${enable_linker_opts+y} +then : enableval=$enable_linker_opts; enable_linker_opts=$enableval -else - enable_linker_opts=yes +else case e in #( + e) enable_linker_opts=yes ;; +esac fi if test "x$enable_linker_opts" != "xno"; then if test x`uname` != x"OpenBSD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5 -$as_echo_n "checking whether $LD accepts --as-needed... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5 +printf %s "checking whether $LD accepts --as-needed... " >&6; } case `$LD --as-needed -v 2>&1 &5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts -O1" >&5 -$as_echo_n "checking whether $LD accepts -O1... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts -O1" >&5 +printf %s "checking whether $LD accepts -O1... " >&6; } case `$LD -O1 -v 2>&1 &5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi # Check whether --enable-visibility was given. -if test "${enable_visibility+set}" = set; then : +if test ${enable_visibility+y} +then : enableval=$enable_visibility; enable_visibility=$enableval -else - enable_visibility=yes +else case e in #( + e) enable_visibility=yes ;; +esac fi have_gnuc_visibility=no if test "x$enable_visibility" != "xno"; then for flag in -Wall -Werror -Wno-unused-parameter; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 -$as_echo_n "checking if $CC supports $flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 +printf %s "checking if $CC supports $flag... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : flag_supported=yes -else - flag_supported=no +else case e in #( + e) flag_supported=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$saved_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 -$as_echo "$flag_supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 +printf "%s\n" "$flag_supported" >&6; } if test "x$flag_supported" = "xyes"; then xdt_vis_test_cflags="$xdt_vis_test_cflags $flag" @@ -18028,8 +19965,8 @@ $as_echo "$flag_supported" >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $xdt_vis_test_cflags" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports the GNUC visibility attribute" >&5 -$as_echo_n "checking whether $CC supports the GNUC visibility attribute... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports the GNUC visibility attribute" >&5 +printf %s "checking whether $CC supports the GNUC visibility attribute... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18044,19 +19981,21 @@ $as_echo_n "checking whether $CC supports the GNUC visibility attribute... " >&6 } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : have_gnuc_visibility=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$saved_CFLAGS" fi if test "x$have_gnuc_visibility" = "xyes"; then @@ -18073,23 +20012,25 @@ fi for flag in -Wno-sign-compare; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 -$as_echo_n "checking if $CC supports $flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5 +printf %s "checking if $CC supports $flag... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : flag_supported=yes -else - flag_supported=no +else case e in #( + e) flag_supported=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$saved_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 -$as_echo "$flag_supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5 +printf "%s\n" "$flag_supported" >&6; } if test "x$flag_supported" = "xyes"; then GTK_DOC_EXTRA_CFLAGS="$GTK_DOC_EXTRA_CFLAGS $flag" @@ -18102,14 +20043,16 @@ $as_echo "$flag_supported" >&6; } # Enable Tests # # Check whether --enable-tests was given. -if test "${enable_tests+set}" = set; then : +if test ${enable_tests+y} +then : enableval=$enable_tests; enable_tests=$enableval -else - enable_tests=no +else case e in #( + e) enable_tests=no ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the validation test framework" >&5 -$as_echo_n "checking whether to build the validation test framework... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the validation test framework" >&5 +printf %s "checking whether to build the validation test framework... " >&6; } if test "x$enable_tests" = "xyes"; then BUILD_TESTS_TRUE= BUILD_TESTS_FALSE='#' @@ -18118,26 +20061,26 @@ else BUILD_TESTS_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tests" >&5 -$as_echo "$enable_tests" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_tests" >&5 +printf "%s\n" "$enable_tests" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking PLATFORM_CPPFLAGS" >&5 -$as_echo_n "checking PLATFORM_CPPFLAGS... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_CPPFLAGS" >&5 -$as_echo "$PLATFORM_CPPFLAGS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PLATFORM_CPPFLAGS" >&5 +printf %s "checking PLATFORM_CPPFLAGS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_CPPFLAGS" >&5 +printf "%s\n" "$PLATFORM_CPPFLAGS" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking PLATFORM_CFLAGS" >&5 -$as_echo_n "checking PLATFORM_CFLAGS... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_CFLAGS" >&5 -$as_echo "$PLATFORM_CFLAGS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PLATFORM_CFLAGS" >&5 +printf %s "checking PLATFORM_CFLAGS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_CFLAGS" >&5 +printf "%s\n" "$PLATFORM_CFLAGS" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking PLATFORM_LDFLAGS" >&5 -$as_echo_n "checking PLATFORM_LDFLAGS... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_LDFLAGS" >&5 -$as_echo "$PLATFORM_LDFLAGS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PLATFORM_LDFLAGS" >&5 +printf %s "checking PLATFORM_LDFLAGS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_LDFLAGS" >&5 +printf "%s\n" "$PLATFORM_LDFLAGS" >&6; } -ac_config_files="$ac_config_files Makefile docs/Makefile docs/version.xml glade/Makefile glade/icons/Makefile glade/icons/16x16/Makefile glade/icons/22x22/Makefile icons/Makefile icons/16x16/Makefile icons/48x48/Makefile icons/128x128/Makefile icons/scalable/Makefile libxfce4kbd-private/libxfce4kbd-private-3.pc libxfce4kbd-private/Makefile libxfce4ui/libxfce4ui-2.pc libxfce4ui/libxfce4ui-config.h libxfce4ui/Makefile xfce4-about/Makefile po/Makefile.in tests/Makefile" +ac_config_files="$ac_config_files Makefile docs/Makefile docs/reference/Makefile glade/Makefile glade/icons/Makefile glade/icons/16x16/Makefile glade/icons/22x22/Makefile icons/Makefile icons/16x16/Makefile icons/48x48/Makefile icons/128x128/Makefile icons/scalable/Makefile libxfce4kbd-private/libxfce4kbd-private-3.pc libxfce4kbd-private/Makefile libxfce4ui/libxfce4ui-2.pc libxfce4ui/libxfce4ui-config.h libxfce4ui/Makefile xfce4-about/Makefile po/Makefile.in tests/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18149,8 +20092,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -18166,8 +20109,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -18180,14 +20123,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -18197,15 +20140,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -18219,8 +20162,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -18237,7 +20180,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -18248,14 +20191,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -18373,8 +20316,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -18397,63 +20340,65 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -18462,13 +20407,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -18477,43 +20415,27 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -18526,9 +20448,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -18559,22 +20481,25 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -18582,16 +20507,18 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -18618,7 +20545,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -18640,6 +20567,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -18653,6 +20584,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -18664,9 +20601,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -18694,7 +20631,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -18703,7 +20640,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18747,10 +20684,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -18765,8 +20704,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libxfce4ui $as_me 4.16.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by libxfce4ui $as_me 4.18.6, which was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18798,7 +20737,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -18828,14 +20767,16 @@ $config_commands Report bugs to ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libxfce4ui config.status 4.16.1 -configured by $0, generated by GNU Autoconf 2.69, +libxfce4ui config.status 4.18.6 +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -18875,15 +20816,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -18891,23 +20832,23 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + as_fn_error $? "ambiguous option: '$1' +Try '$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -18928,7 +20869,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -18942,7 +20883,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -18994,6 +20935,7 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' @@ -19002,6 +20944,7 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -19122,6 +21065,7 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -19130,7 +21074,6 @@ want_nocaseglob \ DLLTOOL \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -19248,7 +21191,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "docs/version.xml") CONFIG_FILES="$CONFIG_FILES docs/version.xml" ;; + "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;; "glade/icons/Makefile") CONFIG_FILES="$CONFIG_FILES glade/icons/Makefile" ;; "glade/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES glade/icons/16x16/Makefile" ;; @@ -19268,7 +21211,7 @@ do "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -19278,9 +21221,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -19288,7 +21231,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -19312,7 +21255,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -19470,13 +21413,13 @@ fi # test -n "$CONFIG_FILES" # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. +# This happens for instance with './config.status Makefile'. if test -n "$CONFIG_HEADERS"; then cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF -# Transform confdefs.h into an awk script `defines.awk', embedded as +# Transform confdefs.h into an awk script 'defines.awk', embedded as # here-document in config.status, that substitutes the proper values into # config.h.in to produce config.h. @@ -19586,7 +21529,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -19608,33 +21551,33 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -19651,7 +21594,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -19675,9 +21618,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -19739,8 +21682,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -19753,7 +21696,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -19784,9 +21727,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -19802,20 +21745,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -19835,7 +21778,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -19855,8 +21798,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -19882,7 +21825,7 @@ esac for am_mf do # Strip MF so we end up with the name of the file. - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile which includes # dependency-tracking related rules and includes. # Grep'ing the whole file directly is not great: AIX grep has a line @@ -19894,7 +21837,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$am_mf" : 'X\(//\)[^/]' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$am_mf" | +printf "%s\n" X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -19916,7 +21859,7 @@ $as_echo X"$am_mf" | $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$am_mf" | +printf "%s\n" X/"$am_mf" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -19941,13 +21884,15 @@ $as_echo X/"$am_mf" | (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi { am_dirpart=; unset am_dirpart;} { am_filepart=; unset am_filepart;} @@ -20090,6 +22035,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -20114,8 +22062,11 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -20483,6 +22434,7 @@ _LT_EOF esac + ltmain=$ac_aux_dir/ltmain.sh @@ -20490,7 +22442,7 @@ ltmain=$ac_aux_dir/ltmain.sh # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -20552,8 +22504,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -20605,3 +22557,4 @@ echo "* System Info (gudev): no (assumes libgtop)" fi echo "* Manual website: $with_manual_website" echo + diff --git a/configure.ac b/configure.ac index c53cf97..ddde7e1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Edit that file instead! dnl dnl -dnl Copyright (c) 2007-2020 The Xfce development team +dnl Copyright (c) 2007-2024 The Xfce development team dnl dnl *************************** @@ -13,10 +13,10 @@ dnl *************************** m4_define([libxfce4ui_verinfo], [0:0:0]) m4_define([libxfce4ui_version_api], [2]) m4_define([libxfce4ui_version_major], [4]) -m4_define([libxfce4ui_version_minor], [16]) -m4_define([libxfce4ui_version_micro], [1]) +m4_define([libxfce4ui_version_minor], [18]) +m4_define([libxfce4ui_version_micro], [6]) m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version -m4_define([libxfce4ui_version_build], [a987b4a]) +m4_define([libxfce4ui_version_build], [45b7287]) m4_define([libxfce4ui_version_tag], []) m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])]) @@ -35,7 +35,7 @@ m4_define([libxfce4ui_debug_default], [ifelse(libxfce4ui_version_tag(), [git], [ dnl *************************** dnl *** Initialize autoconf *** dnl *************************** -AC_COPYRIGHT([Copyright (c) 2007-2019 The Xfce development team]) +AC_COPYRIGHT([Copyright (c) 2007-2024 The Xfce development team]) AC_INIT([libxfce4ui], [libxfce4ui_version], [https://gitlab.xfce.org/xfce/libxfce4ui/-/issues], [libxfce4ui]) AC_PREREQ([2.69]) AC_CONFIG_MACRO_DIRS([m4]) @@ -110,7 +110,6 @@ AC_SUBST([LIBXFCE4KBD_PRIVATE_VERSION_API]) dnl *************************************** dnl *** Check for standard header files *** dnl *************************************** -AC_HEADER_STDC() AC_CHECK_HEADERS([crt_externs.h errno.h fcntl.h limits.h locale.h math.h \ memory.h signal.h stdarg.h stdlib.h string.h unistd.h]) AC_CHECK_DECLS([environ]) @@ -119,7 +118,10 @@ AC_CHECK_FUNCS([_NSGetEnviron]) dnl ****************************** dnl *** Check for i18n support *** dnl ****************************** -XDT_I18N([]) +XDT_I18N() +AC_SEARCH_LIBS([bind_textdomain_codeset], [intl], + [AC_DEFINE([HAVE_BIND_TEXTDOMAIN_CODESET], [1], [Define to 1 if you have the 'bind_textdomain_codeset' function.])], + []) dnl ******************************************* dnl *** Check for X Window System installed *** @@ -130,9 +132,10 @@ XDT_CHECK_LIBSM() dnl *********************************** dnl *** Check for required packages *** dnl *********************************** -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.50.0]) -XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.15.6]) +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.66.0]) +XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.24.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.17.2]) +XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0]) dnl **************************************************************** dnl *** Optional support for system information based on glibtop *** @@ -142,11 +145,18 @@ XDT_CHECK_OPTIONAL_PACKAGE([GLIBTOP], [GLIBTOP support]) AM_CONDITIONAL([ENABLE_GLIBTOP], [test "x$GLIBTOP_FOUND" = "xyes"]) -AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_50, [Ignore post 2.50 deprecations]) -AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_50, [Prevent post 2.50 APIs]) +AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_66, [Ignore post 2.66 deprecations]) +AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_66, [Prevent post 2.66 APIs]) -AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_22, [Ignore post 3.22 deprecations]) -AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_22, [Prevent post 3.22 APIs]) +AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_24, [Ignore post 3.24 deprecations]) +AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_24, [Prevent post 3.24 APIs]) + +dnl ************************************************************** +dnl *** Check time.h and sys/time.h for libgtop *** +dnl ************************************************************** +if test x"$GLIBTOP_FOUND" = x"yes"; then + AC_CHECK_HEADERS([time.h sys/time.h]) +fi dnl ************************************************************** dnl *** Optional support for system information based on epoxy *** @@ -175,7 +185,7 @@ fi dnl *************************************** dnl *** Check for gobject-introspection *** dnl *************************************** -GOBJECT_INTROSPECTION_CHECK([1.30.0]) +GOBJECT_INTROSPECTION_CHECK([1.66.0]) dnl ************************* dnl *** Check for vapigen *** @@ -194,12 +204,9 @@ dnl ************************************************** dnl *** Check whether to build the keyboard libary *** dnl ************************************************** AC_ARG_ENABLE([keyboard-library], - [AC_HELP_STRING([--disable-keyboard-library], + [AS_HELP_STRING([--disable-keyboard-library], [Do not compile the keyboard library needed by xfwm4 and xfce4-settings (default=enabled)])], [enable_keyboard_library=$enableval], [enable_keyboard_library=yes]) -if test "x$enable_keyboard_library" = "xyes"; then - XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0]) -fi AM_CONDITIONAL([ENABLE_KEYBOARD_LIBRARY], [test "x$enable_keyboard_library" = "xyes"]) dnl ********************************************* @@ -207,7 +214,7 @@ dnl *** Check for vendor specific information *** dnl ********************************************* AC_MSG_CHECKING([for additional vendor name and/or info]) AC_ARG_WITH([vendor-info], -AC_HELP_STRING([--with-vendor-info=NAME], [Specify an additional vendor name, optionally with a file in $prefix/share/xfce4/venderinfo]), +AS_HELP_STRING([--with-vendor-info=NAME], [Specify an additional vendor name, optionally with a file in $prefix/share/xfce4/venderinfo]), [with_vendor_info="$withval"], [with_vendor_info=""]) if test x"$with_vendor_info" != x""; then AC_DEFINE_UNQUOTED([VENDOR_INFO], ["$with_vendor_info"], [Additional vendor name and/or info]) @@ -221,7 +228,7 @@ dnl *** Check for vendor specific information *** dnl ********************************************* AC_MSG_CHECKING([for a custom manual website location]) AC_ARG_WITH([manual-website], -AC_HELP_STRING([--with-manual-website=URI], [Specify an optional manual website, defaults to https://docs.xfce.org.]), +AS_HELP_STRING([--with-manual-website=URI], [Specify an optional manual website, defaults to https://docs.xfce.org.]), [with_manual_website="$withval"], [with_manual_website="https://docs.xfce.org/help.php"]) AC_DEFINE_UNQUOTED([MANUAL_WEBSITE], ["$with_manual_website"], [Documentation website]) @@ -235,15 +242,15 @@ XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI2], [gladeui-2.0], [3.5.0], [gladeui2], [glade interface designer]) AC_ARG_WITH([gladeui2-catalogdir], - [AC_HELP_STRING([--with-gladeui2-catalogdir=PATH], + [AS_HELP_STRING([--with-gladeui2-catalogdir=PATH], [Specify where to install glade 3.0 designer catalog files (default=autodetect)])], [gladeui2_catalogdir="$withval"]) AC_ARG_WITH([gladeui2-moduledir], - [AC_HELP_STRING([--with-gladeui2-moduledir=PATH], + [AS_HELP_STRING([--with-gladeui2-moduledir=PATH], [Specify where to install glade 3.0 designer modules (default=autodetect)])], [gladeui2_moduledir="$withval"]) AC_ARG_WITH([gladeui2-pixmapdir], - [AC_HELP_STRING([--with-gladeui2-pixmapdir=PATH], + [AS_HELP_STRING([--with-gladeui2-pixmapdir=PATH], [Specify where to install glade 3.0 designer pixmaps (default=autodetect)])], [gladeui2_pixmapdir="$withval"]) if test x"$GLADEUI2_FOUND" = x"yes"; then @@ -286,7 +293,7 @@ dnl **************************************** dnl *** Check for ELF visibility support *** dnl **************************************** AC_ARG_ENABLE([visibility], - AC_HELP_STRING([--disable-visibility], + AS_HELP_STRING([--disable-visibility], [Do not use ELF visibility attributes]), [enable_visibility=$enableval], [enable_visibility=yes]) have_gnuc_visibility=no @@ -356,7 +363,7 @@ dnl ***************************** AC_CONFIG_FILES([ Makefile docs/Makefile -docs/version.xml +docs/reference/Makefile glade/Makefile glade/icons/Makefile glade/icons/16x16/Makefile diff --git a/debian/changelog b/debian/changelog index dd33b82..c1c4287 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,107 @@ -libxfce4ui (4.16.1-deepin1) unstable; urgency=medium +libxfce4ui (4.18.6-1) unstable; urgency=medium - * Rebuild + [ Yves-Alexis Perez ] + * d/watch: track 4.18 releases + * d/gbp.conf: track 4.18 branches + * New upstream version 4.18.6 + * d/control: replace pkg-config by pkgconf in b-deps + * update override syntax to silence warning + * add/update lintian override for false positive + + -- Yves-Alexis Perez Fri, 26 Jul 2024 15:14:10 +0200 + +libxfce4ui (4.18.4-1) unstable; urgency=medium + + * Team upload. + * New upstream version 4.18.4. + + -- Unit 193 Tue, 13 Jun 2023 01:58:25 -0400 + +libxfce4ui (4.18.2-2) unstable; urgency=medium + + * Team upload. + * d/rules: Explicitly disable vala. + + -- Unit 193 Mon, 27 Feb 2023 01:01:48 -0500 + +libxfce4ui (4.18.2-1) unstable; urgency=medium + + * Team upload. + * New upstream version 4.18.2. + * d/libxfce4ui-2-0.symbols: Add new symbols. + * Update Standards-Version to 4.6.2. + + -- Unit 193 Thu, 09 Feb 2023 19:09:49 -0500 + +libxfce4ui (4.18.1-1) unstable; urgency=medium + + * Team upload. + * New upstream version 4.18.1. + + -- Unit 193 Fri, 06 Jan 2023 00:43:08 -0500 + +libxfce4ui (4.18.0-1) unstable; urgency=medium + + * Team upload. + * New upstream version 4.18.0. + * d/rules: Opt-out of trimmed changelogs, install NEWS as changelog. + + -- Unit 193 Thu, 15 Dec 2022 05:16:49 -0500 + +libxfce4ui (4.17.9-1) experimental; urgency=medium + + * Team upload. + * New upstream version 4.17.9. + + -- Unit 193 Mon, 05 Dec 2022 01:54:50 -0500 + +libxfce4ui (4.17.8-1) experimental; urgency=medium + + * Team upload. + * New upstream version 4.17.8. + * d/rules: Remove .la files before running the dh_install target. + + -- Unit 193 Tue, 01 Nov 2022 05:02:09 -0400 + +libxfce4ui (4.17.7-1) experimental; urgency=medium + + * Team upload. + * New upstream version 4.17.7. + * Update Standards-Version to 4.6.1. + + -- Unit 193 Fri, 30 Sep 2022 23:38:19 -0400 + +libxfce4ui (4.17.6-1) experimental; urgency=medium + + * Team upload. + + [ Debian Janitor ] + * Set upstream metadata fields: Bug-Submit (from ./configure). + + [ Unit 193 ] + * New upstream version 4.17.6. + * d/control: Bump libxfce4util-dev B-D to 4.17.2. + * d/libxfce4ui-2-0.symbols: Add new symbols. + + -- Unit 193 Fri, 22 Apr 2022 22:49:01 -0400 + +libxfce4ui (4.17.3-1) experimental; urgency=medium + + * Team upload. + * Add missing entries to previous changelog. + * New upstream version 4.17.3. + * d/libxfce4ui-2-0.symbols: Add new symbols. + * d/rules: Drop '--as-needed', as this is now default in stable. + + -- Unit 193 Sun, 02 Jan 2022 23:29:08 -0500 + +libxfce4ui (4.17.2-1) experimental; urgency=medium + + * New upstream version 4.17.2 + * d/libxfce4ui-2-0.symbols: updated for new release + * d/libxfce4ui-glade.lintian-overrides: dropped, unused - -- Deepin Packages Builder Fri, 11 Nov 2022 18:00:32 +0800 + -- Yves-Alexis Perez Sat, 18 Dec 2021 10:20:04 +0100 libxfce4ui (4.16.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 9be2b7b..1ae9202 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ Build-Depends: debhelper-compat (= 13), libgtk-3-dev, libgtop2-dev, libstartup-notification0-dev, - libxfce4util-dev (>= 4.15.6), + libxfce4util-dev (>= 4.17.2), libxfconf-0-dev, - pkg-config, + pkgconf, xfce4-dev-tools Rules-Requires-Root: no -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Homepage: https://docs.xfce.org/xfce/libxfce4ui/start Vcs-Git: https://salsa.debian.org/xfce-team/desktop/libxfce4ui.git Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/libxfce4ui diff --git a/debian/gbp.conf b/debian/gbp.conf index 48731a6..1f36e28 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,4 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master -upstream-branch = upstream/latest +debian-branch = debian/4.18 +upstream-branch = upstream/4.18 diff --git a/debian/libxfce4ui-2-0.lintian-overrides b/debian/libxfce4ui-2-0.lintian-overrides index 37ec8fd..96841c8 100644 --- a/debian/libxfce4ui-2-0.lintian-overrides +++ b/debian/libxfce4ui-2-0.lintian-overrides @@ -1,2 +1,2 @@ # libxfce4kbd-private-3 is “private” to Xfce core -shared-library-symbols-not-tracked libxfce4kbd-private-3 0 for usr/lib/*/libxfce4kbd-private-3.so.0.0.0 +shared-library-symbols-not-tracked diff --git a/debian/libxfce4ui-2-0.symbols b/debian/libxfce4ui-2-0.symbols index 0742479..cbebcde 100644 --- a/debian/libxfce4ui-2-0.symbols +++ b/debian/libxfce4ui-2-0.symbols @@ -17,6 +17,7 @@ libxfce4ui-2.so.0 libxfce4ui-2-0 #MINVER# xfce_filename_input_get_text@Base 4.15.2 xfce_filename_input_get_type@Base 4.15.2 xfce_filename_input_sensitise_widget@Base 4.15.2 + xfce_gdk_device_grab@Base 4.17.2 xfce_gdk_screen_get_active@Base 4.11.0 xfce_gdk_screen_get_geometry@Base 4.13.5 xfce_gicon_from_name@Base 4.15.1 @@ -25,11 +26,15 @@ libxfce4ui-2.so.0 libxfce4ui-2-0 #MINVER# xfce_gtk_accel_map_add_entries@Base 4.15.3 xfce_gtk_button_new_mixed@Base 4.11.0 xfce_gtk_check_menu_item_new@Base 4.15.2 + xfce_gtk_execute_tab_accel@Base 4.17.3 xfce_gtk_frame_box_new@Base 4.11.0 xfce_gtk_frame_box_new_with_content@Base 4.11.0 xfce_gtk_get_action_entry_by_id@Base 4.15.2 + xfce_gtk_handle_tab_accels@Base 4.17.3 xfce_gtk_image_menu_item_new@Base 4.15.2 xfce_gtk_image_menu_item_new_from_icon_name@Base 4.15.2 + xfce_gtk_label_set_a11y_relation@Base 4.17.2 + xfce_gtk_menu_append_separator@Base 4.17.6 xfce_gtk_menu_append_seperator@Base 4.15.2 xfce_gtk_menu_item_new@Base 4.15.2 xfce_gtk_menu_item_new_from_action_entry@Base 4.15.2 @@ -37,6 +42,7 @@ libxfce4ui-2.so.0 libxfce4ui-2-0 #MINVER# xfce_gtk_menu_popup_until_mapped@Base 4.13.0 xfce_gtk_radio_menu_item_new@Base 4.15.2 xfce_gtk_toggle_menu_item_new_from_action_entry@Base 4.15.2 + xfce_gtk_toggle_tool_button_new_from_action_entry@Base 4.17.6 xfce_gtk_tool_button_new_from_action_entry@Base 4.15.2 xfce_gtk_translate_action_entries@Base 4.15.2 xfce_gtk_window_center_on_active_screen@Base 4.11.0 @@ -45,6 +51,10 @@ libxfce4ui-2.so.0 libxfce4ui-2-0 #MINVER# xfce_message_dialog@Base 4.11.0 xfce_message_dialog_new@Base 4.11.0 xfce_message_dialog_new_valist@Base 4.11.0 + xfce_screensaver_get_type@Base 4.18.2 + xfce_screensaver_inhibit@Base 4.18.2 + xfce_screensaver_lock@Base 4.18.2 + xfce_screensaver_new@Base 4.18.2 xfce_sm_client_connect@Base 4.11.0 xfce_sm_client_disconnect@Base 4.11.0 xfce_sm_client_error_enum_get_type@Base 4.11.0 diff --git a/debian/libxfce4ui-glade.lintian-overrides b/debian/libxfce4ui-glade.lintian-overrides deleted file mode 100644 index 5fb4ba3..0000000 --- a/debian/libxfce4ui-glade.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# libxfce4uiglade2.so is a glade plugin and doesn't use any libc symbol -libxfce4ui-glade: library-not-linked-against-libc usr/lib/*/glade/modules/libxfce4uiglade2.so diff --git a/debian/rules b/debian/rules index e34094b..fb6f361 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs +export DEB_LDFLAGS_MAINT_APPEND=-Wl,-O1 -Wl,-z,defs export DEB_BUILD_MAINT_OPTIONS=hardening=+all XFVENDOR=Debian @@ -12,16 +12,21 @@ endif dh $@ --with gir override_dh_auto_configure: - dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --enable-gtk-doc --enable-introspection=yes + dh_auto_configure -- \ + --with-vendor-info=$(XFVENDOR) \ + --enable-gtk-doc \ + --enable-introspection=yes \ + --enable-vala=no override_dh_install: + find debian/tmp -name '*.la' -delete ifneq ($(XFVENDOR),Xubuntu) dh_install --sourcedir=$(CURDIR) -plibxfce4ui-utils debian/vendorinfo usr/share/xfce4 endif - dh_install -X .la + dh_install -override_dh_missing: - dh_missing --fail-missing -X .la +override_dh_installchangelogs: + DEB_BUILD_OPTIONS=notrimdch dh_installchangelogs NEWS override_dh_makeshlibs: dh_makeshlibs -plibxfce4ui-2-0 -Xlibxfce4kbd-private diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..d5c03d3 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,4 @@ +# lintian false positive +missing-build-dependency-for-dh-addon +# HTML documentation is generated from source code with gtk-doc-tool +libxfce4ui source: source-is-missing [docs/reference/html/libxfce4ui-XfceDialogs.html] diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..6da18ac --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,2 @@ +--- +Bug-Submit: https://gitlab.xfce.org/xfce/libxfce4ui/-/issues diff --git a/debian/watch b/debian/watch index 39199eb..2675501 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=4 -https://archive.xfce.org/src/xfce/@PACKAGE@/(\d[\d\.]+)/ \ +https://archive.xfce.org/src/xfce/@PACKAGE@/4.18/ \ @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ diff --git a/depcomp b/depcomp index 65cbf70..715e343 100755 --- a/depcomp +++ b/depcomp @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/docs/Makefile.am b/docs/Makefile.am index f3e19ca..dcd9622 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,72 +1,2 @@ -AUTOMAKE_OPTIONS = 1.11 - -# The name of the module. -DOC_MODULE=libxfce4ui - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--deprecated-guards="XFCE_DISABLE_DEPRECATED" - -# Extra options to pass to gtkdoc-scangobj -SCANGOBJ_OPTIONS= - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=../libxfce4ui - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS= - -# Used for dependencies -HFILE_GLOB=$(top_srcdir)/libxfce4ui/*.h -CFILE_GLOB=$(top_srcdir)/libxfce4ui/*.c - -# Header files to ignore when scanning -IGNORE_HFILES= \ - libxfce4ui.h \ - libxfce4ui-private.h \ - xfce-heading.h \ - libxfce4ui-enum-types.h \ - libxfce4ui-alias.h \ - stamp-libxfce4ui-marshal.h \ - libxfce4ui-marshal.h \ - libxfce4ui-resources.h - -# Extra files to add when scanning (relative to $srcdir) -EXTRA_HFILES= - -# Images to copy into HTML directory -HTML_IMAGES = - -# Extra SGML files that are included by DOC_MAIN_SGML_FILE -content_files = \ - version.xml - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(LIBXFCE4UTIL_CFLAGS) \ - $(GTK3_CFLAGS) \ - $(GTK_DOC_EXTRA_CFLAGS) - -GTKDOC_LIBS = \ - $(LIBXFCE4UTIL_LIBS) \ - $(GTK3_LIBS) \ - $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la - -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += \ - version.xml.in - -# required for gtk-doc -dist-hook: all - -# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: +SUBDIRS =\ + reference diff --git a/docs/Makefile.in b/docs/Makefile.in index e1f5217..135c3de 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,30 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# -*- mode: makefile -*- -# -# gtk-doc.make - make rules for gtk-doc -# Copyright (C) 2003 James Henstridge -# 2004-2007 Damon Chaplin -# 2007-2017 Stefan Sauer -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -#################################### -# Everything below here is generic # -#################################### VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -114,17 +90,17 @@ host_triplet = @host@ target_triplet = @target@ subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = version.xml +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -140,15 +116,72 @@ am__v_at_0 = @ am__v_at_1 = SOURCES = DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \ - $(top_srcdir)/gtk-doc.make +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ @@ -163,6 +196,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -177,8 +212,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -374,150 +411,13 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = 1.11 - -# The name of the module. -DOC_MODULE = libxfce4ui - -# The top-level SGML file. -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS = --deprecated-guards="XFCE_DISABLE_DEPRECATED" - -# Extra options to pass to gtkdoc-scangobj -SCANGOBJ_OPTIONS = - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR = ../libxfce4ui - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS = --sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS = - -# Used for dependencies -HFILE_GLOB = $(top_srcdir)/libxfce4ui/*.h -CFILE_GLOB = $(top_srcdir)/libxfce4ui/*.c - -# Header files to ignore when scanning -IGNORE_HFILES = \ - libxfce4ui.h \ - libxfce4ui-private.h \ - xfce-heading.h \ - libxfce4ui-enum-types.h \ - libxfce4ui-alias.h \ - stamp-libxfce4ui-marshal.h \ - libxfce4ui-marshal.h \ - libxfce4ui-resources.h - - -# Extra files to add when scanning (relative to $srcdir) -EXTRA_HFILES = - -# Images to copy into HTML directory -HTML_IMAGES = - -# Extra SGML files that are included by DOC_MAIN_SGML_FILE -content_files = \ - version.xml - - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(LIBXFCE4UTIL_CFLAGS) \ - $(GTK3_CFLAGS) \ - $(GTK_DOC_EXTRA_CFLAGS) - -GTKDOC_LIBS = \ - $(LIBXFCE4UTIL_LIBS) \ - $(GTK3_LIBS) \ - $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la - -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) -TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -SETUP_FILES = \ - $(content_files) \ - $(expand_content_files) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - - -# Other files to distribute -EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in -DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ - html-build.stamp pdf-build.stamp \ - sgml.stamp html.stamp pdf.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test -@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp - -#### setup #### -GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@) -GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) -GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; - -#### scan #### -GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@) -GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) -GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; -GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@) -GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) -GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; - -#### xml #### -GTK_DOC_V_XML = $(GTK_DOC_V_XML_@AM_V@) -GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@) -GTK_DOC_V_XML_0 = @echo " DOC Building XML"; - -#### html #### -GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@) -GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@) -GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; -GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@) -GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@) -GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; - -#### pdf #### -GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@) -GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@) -GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; -all: all-am +SUBDIRS = \ + reference + +all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -537,7 +437,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; -$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -547,21 +446,111 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -595,23 +584,45 @@ distdir-am: $(DISTFILES) || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am -check: check-am -@ENABLE_GTK_DOC_FALSE@all-local: -all-am: Makefile all-local -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: if test -z '$(STRIP)'; then \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ @@ -625,7 +636,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -634,293 +644,90 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive -clean-am: clean-generic clean-libtool clean-local mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-local +distclean-am: clean-am distclean-generic distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive html-am: -info: info-am +info: info-recursive info-am: -install-data-am: install-data-local +install-data-am: -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-dvi-am: install-exec-am: -install-html: install-html-am +install-html: install-html-recursive install-html-am: -install-info: install-info-am +install-info: install-info-recursive install-info-am: install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive install-pdf-am: -install-ps: install-ps-am +install-ps: install-ps-recursive install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local +maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: -uninstall-am: uninstall-local +uninstall-am: -.MAKE: install-am install-strip +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local cscopelist-am ctags-am dist-hook \ - distclean distclean-generic distclean-libtool distclean-local \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-local +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am .PRECIOUS: Makefile -gtkdoc-check.test: Makefile - $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ - echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ - chmod +x $@ - -all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -.PHONY: all-gtk-doc - -@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc - -docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) - -$(REPORT_FILES): sgml-build.stamp - -setup-build.stamp: - -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file`; \ - test -d "$$destdir" || mkdir -p "$$destdir"; \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ - fi - $(AM_V_at)touch setup-build.stamp - -scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) - $(GTK_DOC_V_SCAN)_source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ - fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ - else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - $(AM_V_at)touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent - $(GTK_DOC_V_XML)_source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - $(AM_V_at)touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -$(DOC_MAIN_SGML_FILE): sgml-build.stamp - @true - -xml/gtkdocentities.ent: Makefile - $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ - echo ""; \ - echo ""; \ - echo ""; \ - echo ""; \ - echo ""; \ - echo ""; \ - echo ""; \ - ) > $@ - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) - $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ - mkhtml_options=""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - mkhtml_options="$$mkhtml_options --verbose"; \ - fi; \ - fi; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$$?" = "0"; then \ - mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ - fi; \ - cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - -@test "x$(HTML_IMAGES)" = "x" || \ - for file in $(HTML_IMAGES) ; do \ - test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - test -f $$file && cp $$file $(abs_builddir)/html; \ - done; - $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - $(AM_V_at)touch html-build.stamp - -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) - $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ - mkpdf_options=""; \ - gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - mkpdf_options="$$mkpdf_options --verbose"; \ - fi; \ - fi; \ - if test "x$(HTML_IMAGES)" != "x"; then \ - for img in $(HTML_IMAGES); do \ - part=`dirname $$img`; \ - echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ - if test $$? != 0; then \ - mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ - fi; \ - done; \ - fi; \ - gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - $(AM_V_at)touch pdf-build.stamp - -############## - -clean-local: - @rm -f *~ *.bak - @rm -rf .libs - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ - rm -f $(DOC_MODULE).types; \ - fi - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ - rm -f $(DOC_MODULE)-sections.txt; \ - fi - -distclean-local: - @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ - fi - -maintainer-clean-local: - @rm -rf xml html - -install-data-local: - @installfiles=`echo $(builddir)/html/*`; \ - if test "$$installfiles" = '$(builddir)/html/*'; \ - then echo 1>&2 'Nothing to install' ; \ - else \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - $(mkinstalldirs) $${installdir} ; \ - for i in $$installfiles; do \ - echo ' $(INSTALL_DATA) '$$i ; \ - $(INSTALL_DATA) $$i $${installdir}; \ - done; \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - fi; \ - $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ - fi - -uninstall-local: - @if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - rm -rf $${installdir} - -# -# Require gtk-doc when making dist -# -@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs -@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: -@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" -@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" -@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" -@HAVE_GTK_DOC_FALSE@ @false - -dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/html - @cp ./html/* $(distdir)/html - @-cp ./$(DOC_MODULE).pdf $(distdir)/ - @-cp ./$(DOC_MODULE).types $(distdir)/ - @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ - @cd $(distdir) && rm -f $(DISTCLEANFILES) - @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs - -# required for gtk-doc -dist-hook: all - -# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/docs/html/home.png b/docs/html/home.png deleted file mode 100644 index b293af531b3796ffdc346a08654277d8b8398f2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`1)eUBAr-fhC6+z-|NnoFgBDXq zKI2Db1wYoLw4|@MnLb8Nu*~?OCh+^gTAJQ>`iGR2| z(wR1LoM$b~R~B#;eJ01{59R(^U2~tZL)f#CYgcR+EMpN9F=fgAc1S zI*b-}e9+45*u0>lKs&=@$~?WE5#lye;e_ z!V)?`)YE^G&Z{az+wQ6hU)+RBCS?h$%$8iYetCKPqx<`+wgvy5ZI#2x74+3YSjN-z ziQ9(7t}l<-a9lIdxI0DspwaK@gYD+Vm(F&+V!qU(ez42xrQ01&GZRnq2VNVN`|h$6 jZ(^SMsz^!W$HINA^@@S5-SwqFw=j6R`njxgN@xNATtG!d diff --git a/docs/html/right-insensitive.png b/docs/html/right-insensitive.png deleted file mode 100644 index a3696bf9999998d124ad602a1971bf828a673ce4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$4YcLn>}1OVlLX-&gy;@yCaI zd#jh8G-6osQR>PB_TS&%Ust%mdKI;Vst06>gghyVZp diff --git a/docs/html/right.png b/docs/html/right.png deleted file mode 100644 index 73d25da4c7a8a995fc6740b1ec0f9ccc733a72a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^`0({Ar-f-o>Am+EEGAKC_USE zi{~l@?MZPaks&XA*DsPY*}KnWzCve{@1~iR>(+1o?f+++{=CaSPBwMfxz6R#YJID z-_+dIy3{)E6>EaktaciyDWkwf6fjbiE$1m4UUH<&P zj{B93eeJsUnRlC(Z{7MzERTDS`$l1NN%cj>n&QYTlpA`rG>i%w8-!bzAJv!TDix kH##3#t@Lf*+omYmdKI;Vst0316<&;S4c diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am new file mode 100644 index 0000000..00c3b08 --- /dev/null +++ b/docs/reference/Makefile.am @@ -0,0 +1,45 @@ + +# The name of the module. +DOC_MODULE=libxfce4ui + +# The top-level SGML file. +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml + +# Extra options to supply to gtkdoc-scan +SCAN_OPTIONS= --deprecated-guards="XFCE_DISABLE_DEPRECATED" + +# The directory containing the source code. Relative to $(srcdir) +DOC_SOURCE_DIR=$(top_srcdir)/libxfce4ui + +# Extra options to supply to gtkdoc-mkdb +MKDB_OPTIONS=--xml-mode --output-format=xml + +# Extra options to supply to gtkdoc-fixref +FIXXREF_OPTIONS= + +# Used for dependencies +HFILE_GLOB= +CFILE_GLOB= + +# Header files to ignore when scanning + + +IGNORE_HFILES= +# Extra files to add when scanning (relative to $srcdir) +EXTRA_HFILES= + +# Images to copy into HTML directory +HTML_IMAGES = + +# Extra SGML files that are included by DOC_MAIN_SGML_FILE +content_files= + +# CFLAGS and LDFLAGS for compiling scan program. Only needed +# if $(DOC_MODULE).types is non-empty. +GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(LIBXFCE4UTIL_CFLAGS) $(GTK3_CFLAGS) +GTKDOC_LIBS= $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la + + +include $(top_srcdir)/gtk-doc.make + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in new file mode 100644 index 0000000..6efe067 --- /dev/null +++ b/docs/reference/Makefile.in @@ -0,0 +1,899 @@ +# Makefile.in generated by automake 1.16.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2021 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +#################################### +# Everything below here is generic # +#################################### +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = docs/reference +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EPOXY_CFLAGS = @EPOXY_CFLAGS@ +EPOXY_LIBS = @EPOXY_LIBS@ +EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ +EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILECMD = @FILECMD@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ +GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ +GLADEUI2_LIBS = @GLADEUI2_LIBS@ +GLADEUI2_MODULEDIR = @GLADEUI2_MODULEDIR@ +GLADEUI2_PIXMAPDIR = @GLADEUI2_PIXMAPDIR@ +GLADEUI2_REQUIRED_VERSION = @GLADEUI2_REQUIRED_VERSION@ +GLADEUI2_VERSION = @GLADEUI2_VERSION@ +GLIBTOP_CFLAGS = @GLIBTOP_CFLAGS@ +GLIBTOP_LIBS = @GLIBTOP_LIBS@ +GLIBTOP_REQUIRED_VERSION = @GLIBTOP_REQUIRED_VERSION@ +GLIBTOP_VERSION = @GLIBTOP_VERSION@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@ +GLIB_VERSION = @GLIB_VERSION@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +GUDEV_CFLAGS = @GUDEV_CFLAGS@ +GUDEV_LIBS = @GUDEV_LIBS@ +GUDEV_REQUIRED_VERSION = @GUDEV_REQUIRED_VERSION@ +GUDEV_VERSION = @GUDEV_VERSION@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSM_CFLAGS = @LIBSM_CFLAGS@ +LIBSM_LDFLAGS = @LIBSM_LDFLAGS@ +LIBSM_LIBS = @LIBSM_LIBS@ +LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@ +LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@ +LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ +LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@ +LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ +LIBXFCE4KBD_PRIVATE_VERINFO = @LIBXFCE4KBD_PRIVATE_VERINFO@ +LIBXFCE4KBD_PRIVATE_VERSION_API = @LIBXFCE4KBD_PRIVATE_VERSION_API@ +LIBXFCE4UI_VERINFO = @LIBXFCE4UI_VERINFO@ +LIBXFCE4UI_VERSION_API = @LIBXFCE4UI_VERSION_API@ +LIBXFCE4UI_VERSION_MAJOR = @LIBXFCE4UI_VERSION_MAJOR@ +LIBXFCE4UI_VERSION_MICRO = @LIBXFCE4UI_VERSION_MICRO@ +LIBXFCE4UI_VERSION_MINOR = @LIBXFCE4UI_VERSION_MINOR@ +LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ +LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ +LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ +LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NO_UNDEFINED = @NO_UNDEFINED@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLATFORM_CFLAGS = @PLATFORM_CFLAGS@ +PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ +PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XFCONF_CFLAGS = @XFCONF_CFLAGS@ +XFCONF_LIBS = @XFCONF_LIBS@ +XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ +XFCONF_VERSION = @XFCONF_VERSION@ +XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +_GI_EXP_DATADIR = @_GI_EXP_DATADIR@ +_GI_EXP_LIBDIR = @_GI_EXP_LIBDIR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# The name of the module. +DOC_MODULE = libxfce4ui + +# The top-level SGML file. +DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml + +# Extra options to supply to gtkdoc-scan +SCAN_OPTIONS = --deprecated-guards="XFCE_DISABLE_DEPRECATED" + +# The directory containing the source code. Relative to $(srcdir) +DOC_SOURCE_DIR = $(top_srcdir)/libxfce4ui + +# Extra options to supply to gtkdoc-mkdb +MKDB_OPTIONS = --xml-mode --output-format=xml + +# Extra options to supply to gtkdoc-fixref +FIXXREF_OPTIONS = + +# Used for dependencies +HFILE_GLOB = +CFILE_GLOB = + +# Header files to ignore when scanning +IGNORE_HFILES = +# Extra files to add when scanning (relative to $srcdir) +EXTRA_HFILES = + +# Images to copy into HTML directory +HTML_IMAGES = + +# Extra SGML files that are included by DOC_MAIN_SGML_FILE +content_files = + +# CFLAGS and LDFLAGS for compiling scan program. Only needed +# if $(DOC_MODULE).types is non-empty. +GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(LIBXFCE4UTIL_CFLAGS) $(GTK3_CFLAGS) +GTKDOC_LIBS = $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(expand_content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +EXTRA_DIST = \ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + sgml.stamp html.stamp pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).actions \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_@AM_V@) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/reference/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign docs/reference/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; +$(top_srcdir)/gtk-doc.make $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-local + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-data-local + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-local + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile + + +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc + +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +$(REPORT_FILES): sgml-build.stamp + +setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ + fi + $(AM_V_at)touch setup-build.stamp + +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\--verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + $(AM_V_at)touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent + $(GTK_DOC_V_XML)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + $(AM_V_at)touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + ) > $@ + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\--verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\--path"; \ + if test "$$?" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + test -f $$file && cp $$file $(abs_builddir)/html; \ + done; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\--verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\--imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + $(AM_V_at)touch pdf-build.stamp + +############## + +clean-local: + @rm -f *~ *.bak + @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi + @if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi + +distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ + fi + +maintainer-clean-local: + @rm -rf xml html + +install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} + +# +# Require gtk-doc when making dist +# +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local + @mkdir $(distdir)/html + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/docs/html/XfceFilenameInput.html b/docs/reference/html/XfceFilenameInput.html similarity index 87% rename from docs/html/XfceFilenameInput.html rename to docs/reference/html/XfceFilenameInput.html index 1977044..5fd44de 100644 --- a/docs/html/XfceFilenameInput.html +++ b/docs/reference/html/XfceFilenameInput.html @@ -2,13 +2,13 @@ -XfceFilenameInput: Libxfce4ui Reference Manual - - +XfceFilenameInput: libxfce4ui Reference Manual + + - + @@ -70,7 +70,7 @@

Xfce -GtkEntry * +GtkEntry * xfce_filename_input_get_entry () @@ -105,13 +105,13 @@

Xfce -gint +int max-text-length Write / Construct Only -gchar * +char * original-filename Write / Construct Only @@ -157,9 +157,9 @@

Xfce

Object Hierarchy

    GObject
     ╰── GInitiallyUnowned
-        ╰── GtkWidget
-            ╰── GtkContainer
-                ╰── GtkBox
+        ╰── GtkWidget
+            ╰── GtkContainer
+                ╰── GtkBox
                     ╰── XfceFilenameInput
 
@@ -167,7 +167,7 @@

Xfce

Implemented Interfaces

XfceFilenameInput implements - AtkImplementorIface, GtkBuildable and GtkOrientable.

+ AtkImplementorIface, GtkBuildable and GtkOrientable.

Includes

@@ -204,7 +204,7 @@

Xfce

Returns

the string representing the current text.

-

[transfer none]

+

[transfer none]

Since: 4.16

@@ -238,9 +238,9 @@

Xfce

xfce_filename_input_get_entry ()

-
GtkEntry *
+
GtkEntry *
 xfce_filename_input_get_entry (XfceFilenameInput *filename_input);
-

Gets the GtkEntry associated to filename_input

+

Gets the GtkEntry associated to filename_input

Parameters

@@ -258,8 +258,8 @@

Xfce

Returns

-

A GtkEntry.

-

[transfer none]

+

A GtkEntry.

+

[transfer none]

Since: 4.16

@@ -267,7 +267,7 @@

Xfce

xfce_filename_input_sensitise_widget ()

void
-xfce_filename_input_sensitise_widget (GtkWidget *widget);
+xfce_filename_input_sensitise_widget (GtkWidget *widget);

A convenience function to be connected as a callback for the "text-valid" signal (for example, using g_connect_swapped) for the simple case where the desired effect of this signal is to set the sensitivity of a single GtkWidget (for example, a GtkButton).

@@ -281,7 +281,7 @@

Xfce

- +

widget

a GtkWidget

a GtkWidget

 
@@ -293,7 +293,7 @@

Xfce

xfce_filename_input_desensitise_widget ()

void
 xfce_filename_input_desensitise_widget
-                               (GtkWidget *widget);
+ (GtkWidget *widget);

A convenience function to be connected as a callback for the "text-invalid" signal (for example, using g_connect_swapped) for the simple case where the desired effect of this signal is to set the sensitivity of a single GtkWidget (for example, a GtkButton).

@@ -307,7 +307,7 @@

Xfce

widget

-

a GtkWidget

+

a GtkWidget

 

@@ -320,13 +320,14 @@

Xfce

XfceFilenameInput

typedef struct _XfceFilenameInput XfceFilenameInput;
+

An opaque structure with only private fields.

Property Details

The “max-text-length” property

-
  “max-text-length”          gint
+
  “max-text-length”          int

The maximum permitted length of a filename. A value of -1 indicates no maximum length.

Owner: XfceFilenameInput

@@ -338,7 +339,7 @@

Xfce

The “original-filename” property

-
  “original-filename”        gchar *
+
  “original-filename”        char *

The original name of the file, to be used as the initial text displayed in the GtkEntry. A NULL value indicates no original filename.

@@ -420,6 +421,6 @@

Xfce

+
Generated by GTK-Doc V1.34.0
\ No newline at end of file diff --git a/docs/html/XfceSMClient.html b/docs/reference/html/XfceSMClient.html similarity index 94% rename from docs/html/XfceSMClient.html rename to docs/reference/html/XfceSMClient.html index b46dd29..6d94105 100644 --- a/docs/html/XfceSMClient.html +++ b/docs/reference/html/XfceSMClient.html @@ -2,13 +2,13 @@ -XfceSMClient: Libxfce4ui Reference Manual - - +XfceSMClient: libxfce4ui Reference Manual + + - - + + @@ -23,7 +23,7 @@ Home Up Prev -Next +Next
@@ -221,7 +221,7 @@

XfceSMCli -gint +int argc Write / Construct Only @@ -232,19 +232,19 @@

XfceSMCli -gchar * +char * client-id Read / Write / Construct Only -gchar * +char * current-directory Read / Write -gchar * +char * desktop-file Read / Write @@ -347,7 +347,8 @@

XfceSMCli

Object Hierarchy

    GEnum
     ├── XfceSMClientRestartStyle
-    ╰── XfceSMClientShutdownHint
+    ├── XfceSMClientShutdownHint
+    ╰── XfceSmCLientErrorEnum
     GObject
     ╰── XfceSMClient
 
@@ -376,7 +377,7 @@

XfceSMCli the program's argc and argv before GTK+ etc. has a chance to mess around with it, so XfceSMClient can later construct an accurate restart command. Instead of calling -gtk_init() or gtk_init_with_args(), instead you'd do something +gtk_init() or gtk_init_with_args(), instead you'd do something like:

@@ -386,10 +387,10 @@

XfceSMCli 2 3 4 -

+
GOptionContext *context = g_option_context_new("");
-g_option_context_add_group(context, gtk_get_option_group(TRUE));
-g_option_context_add_group(context, xfce_sm_client_get_option_group(argc, argv);
-g_option_context_parse(context, &argc, &argv, NULL);
GOptionContext *context = g_option_context_new("");
+g_option_context_add_group(context, gtk_get_option_group(TRUE));
+g_option_context_add_group(context, xfce_sm_client_get_option_group(argc, argv);
+g_option_context_parse(context, &argc, &argv, NULL);
@@ -435,17 +436,14 @@

XfceSMCli the returned GOptionGroup with g_option_context_parse()), as the command line parsing will figure out many of the SM client's required property values for you.

-

If you are not using Gtk or Glib's command-line option parser, -take a look at xfce_sm_client_new_with_argv() and -xfce_sm_client_new_full().

If you have already created an XfceSMClient instance using -this function or one of the xfce_sm_client_new_*() functions, -this will return the same instance.

+this function, this will return the same instance, i.e. you should +*only* unref the first instance.

[constructor]

Returns

-

A new or existing XfceSMClient.

-

[transfer full]

+

A new XfceSMClient instance -transfer full- on the first call only, +other calls to this function are transfer none


@@ -501,7 +499,7 @@

XfceSMCli

Returns

A new XfceSMClient instance.

-

[transfer full]

+

[transfer full]


@@ -570,7 +568,7 @@

XfceSMCli

Returns

A new XfceSMClient instance.

-

[transfer full]

+

[transfer full]


@@ -597,7 +595,7 @@

XfceSMCli

error

A GError location.

-[out][allow-none][transfer full] +[out][nullable][transfer full] @@ -701,8 +699,8 @@

XfceSMCli the session manager of the .desktop file so it can present localized names and an icon in session listings and the splash screen, this also calls g_set_application_name() and -gtk_window_set_default_icon_name() (or -gtk_window_set_default_icon_from_file()) if the Name and Icon +gtk_window_set_default_icon_name() (or +gtk_window_set_default_icon_from_file()) if the Name and Icon keys are present, respectively.

If a relative path to the file is provided, this function will search the standard application directories as specified by the

@@ -819,8 +817,7 @@

XfceSMCli

This function will use a standard location and naming scheme and handle state cleanup (setting of the discard command) for you.

Before calling this function, the application must have a -valid program identifier set (see xfce_sm_client_set_program()) -and a valid client ID (see xfce_sm_client_get_client_id()).

+valid client ID (see xfce_sm_client_get_client_id()).

Parameters

@@ -1280,7 +1277,7 @@

XfceSMCli

Property Details

The “argc” property

-
  “argc”                     gint
+
  “argc”                     int

Argument count passed to program.

Owner: XfceSMClient

Flags: Write / Construct Only

@@ -1297,7 +1294,7 @@

XfceSMCli

The “client-id” property

-
  “client-id”                gchar *
+
  “client-id”                char *

A string uniquely identifying the current instance of this client.

Owner: XfceSMClient

Flags: Read / Write / Construct Only

@@ -1306,7 +1303,7 @@

XfceSMCli

The “current-directory” property

-
  “current-directory”        gchar *
+
  “current-directory”        char *

The directory that should be used as the working directory the next time this client is restarted.

Owner: XfceSMClient

Flags: Read / Write

@@ -1315,7 +1312,7 @@

XfceSMCli

The “desktop-file” property

-
  “desktop-file”             gchar *
+
  “desktop-file”             char *

The application's .desktop file.

Owner: XfceSMClient

Flags: Read / Write

@@ -1545,6 +1542,6 @@

XfceSMCli

+
Generated by GTK-Doc V1.34.0

\ No newline at end of file diff --git a/docs/reference/html/XfceScreensaver.html b/docs/reference/html/XfceScreensaver.html new file mode 100644 index 0000000..ebd8afd --- /dev/null +++ b/docs/reference/html/XfceScreensaver.html @@ -0,0 +1,250 @@ + + + + +XfceScreensaver: libxfce4ui Reference Manual + + + + + + + + + +

+ + + + + + +
+
+
+ + +
+

XfceScreensaver

+

XfceScreensaver — screensaver related shared functions

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+XfceScreensaver * + +xfce_screensaver_new () +
+void + +xfce_screensaver_inhibit () +
+gboolean + +xfce_screensaver_lock () +
+
+
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + +
+char *heartbeat-commandRead / Write / Construct
+char *lock-commandRead / Write / Construct
gbooleanlock-on-sleepRead / Write / Construct
+
+
+

Types and Values

+
++++ + + + + +
 XfceScreensaver
+
+
+

Object Hierarchy

+
    GObject
+    ╰── XfceScreensaver
+
+
+
+

Includes

+
#include <libxfce4ui/libxfce4ui.h>
+
+
+
+

Description

+
+
+

Functions

+
+

xfce_screensaver_new ()

+
XfceScreensaver *
+xfce_screensaver_new (void);
+

Creates a new XfceScreensaver object or increases the reference count +of the current object.

+
+

Returns

+

An XfceScreensaver object, to be released with +g_object_unref() when no longer used.

+

[transfer full]

+
+

Since: 4.18.2

+
+
+
+

xfce_screensaver_inhibit ()

+
void
+xfce_screensaver_inhibit (XfceScreensaver *saver,
+                          gboolean inhibit);
+

Calling this function with inhibit + as TRUE will prevent the user's +screensaver from activating. This is useful when the user is watching +a movie or giving a presentation.

+

Calling this function with inhibit + as FALSE will remove any current +screensaver inhibit the XfceScreensaver object has.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

saver

the XfceScreensaver object

 

inhibit

whether to inhibit the screensaver from activating

 
+
+

Since: 4.18.2

+
+
+
+

xfce_screensaver_lock ()

+
gboolean
+xfce_screensaver_lock (XfceScreensaver *saver);
+

Attempts to lock the screen, either with one of the screensaver +D-Bus proxies, the Xfconf lock command, or one of the +fallback scripts such as xdg-screensaver.

+
+

Parameters

+
+++++ + + + + + +

saver

the XfceScreensaver object

 
+
+
+

Returns

+

TRUE if the lock attempt returns success, FALSE otherwise.

+
+

Since: 4.18.2

+
+
+
+

Types and Values

+
+

XfceScreensaver

+
typedef struct _XfceScreensaver XfceScreensaver;
+
+
+
+

Property Details

+
+

The “heartbeat-command” property

+
  “heartbeat-command”        char *
+

Inhibit the screensaver from activating, e.g. xscreensaver-command --deactivate.

+

Owner: XfceScreensaver

+

Flags: Read / Write / Construct

+

Default value: NULL

+
+
+
+

The “lock-command” property

+
  “lock-command”             char *
+

Lock the desktop, e.g. xscreensaver-command --lock.

+

Owner: XfceScreensaver

+

Flags: Read / Write / Construct

+

Default value: NULL

+
+
+
+

The “lock-on-sleep” property

+
  “lock-on-sleep”            gboolean
+

Whether to lock before suspend/hibernate.

+

Owner: XfceScreensaver

+

Flags: Read / Write / Construct

+

Default value: FALSE

+
+
+
+ + + \ No newline at end of file diff --git a/docs/html/XfceTitledDialog.html b/docs/reference/html/XfceTitledDialog.html similarity index 77% rename from docs/html/XfceTitledDialog.html rename to docs/reference/html/XfceTitledDialog.html index f6f3675..82324c1 100644 --- a/docs/html/XfceTitledDialog.html +++ b/docs/reference/html/XfceTitledDialog.html @@ -2,13 +2,13 @@ -XfceTitledDialog: Libxfce4ui Reference Manual - - +XfceTitledDialog: libxfce4ui Reference Manual + + - + @@ -54,7 +54,7 @@

XfceT -GtkWidget * +GtkWidget * xfce_titled_dialog_new () @@ -62,7 +62,7 @@

XfceT -GtkWidget * +GtkWidget * xfce_titled_dialog_new_with_buttons () @@ -70,7 +70,7 @@

XfceT -GtkWidget * +GtkWidget * xfce_titled_dialog_new_with_mixed_buttons () @@ -86,7 +86,7 @@

XfceT -GtkWidget * +GtkWidget * xfce_titled_dialog_add_button () @@ -136,7 +136,7 @@

XfceT -gchar * +char * subtitle Read / Write @@ -159,11 +159,11 @@

XfceT

Object Hierarchy

    GObject
     ╰── GInitiallyUnowned
-        ╰── GtkWidget
-            ╰── GtkContainer
-                ╰── GtkBin
-                    ╰── GtkWindow
-                        ╰── GtkDialog
+        ╰── GtkWidget
+            ╰── GtkContainer
+                ╰── GtkBin
+                    ╰── GtkWindow
+                        ╰── GtkDialog
                             ╰── XfceTitledDialog
 

@@ -171,7 +171,7 @@

XfceT

Implemented Interfaces

XfceTitledDialog implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

Includes

@@ -187,7 +187,7 @@

XfceT

Functions

xfce_titled_dialog_new ()

-
GtkWidget *
+
GtkWidget *
 xfce_titled_dialog_new (void);

Allocates a new XfceTitledDialog instance.

@@ -198,17 +198,17 @@

XfceT

xfce_titled_dialog_new_with_buttons ()

-
GtkWidget *
+
GtkWidget *
 xfce_titled_dialog_new_with_buttons (const gchar *title,
-                                     GtkWindow *parent,
-                                     GtkDialogFlags flags,
+                                     GtkWindow *parent,
+                                     GtkDialogFlags flags,
                                      const gchar *first_button_text,
                                      ...);

xfce_titled_dialog_new_with_buttons has been deprecated since version 4.16 and should not be used in newly-written code.

Use xfce_titled_dialog_new_with_mixed_buttons instead.

-

See the documentation of gtk_dialog_new_with_buttons() for details about the +

See the documentation of gtk_dialog_new_with_buttons() for details about the parameters and the returned dialog.

Parameters

@@ -222,22 +222,22 @@

XfceT

title

title of the dialog, or NULL.

-[allow-none] +[nullable]

parent

transient parent window of the dialog, or NULL.

-[allow-none] +[nullable]

flags

-

from GtkDialogFlags.

+

from GtkDialogFlags.

 

first_button_text

stock ID or text to go in first, or NULL.

-[allow-none] +[nullable]

...

@@ -255,11 +255,11 @@

XfceT

xfce_titled_dialog_new_with_mixed_buttons ()

-
GtkWidget *
+
GtkWidget *
 xfce_titled_dialog_new_with_mixed_buttons
                                (const gchar *title,
-                                GtkWindow *parent,
-                                GtkDialogFlags flags,
+                                GtkWindow *parent,
+                                GtkDialogFlags flags,
                                 const gchar *first_button_icon_name,
                                 const gchar *first_button_text,
                                 ...);
@@ -277,16 +277,16 @@

XfceT

title

title of the dialog, or NULL.

-[allow-none] +[nullable]

parent

transient parent window of the dialog, or NULL.

-[allow-none] +[nullable]

flags

-

from GtkDialogFlags.

+

from GtkDialogFlags.

  @@ -297,7 +297,7 @@

XfceT

first_button_text

text to go in first, or NULL.

-[allow-none] +[nullable]

...

@@ -318,11 +318,11 @@

XfceT

xfce_titled_dialog_create_action_area ()

void
 xfce_titled_dialog_create_action_area (XfceTitledDialog *titled_dialog);
-

This function creates a custom action area (of type GtkButtonBox) and has to +

This function creates a custom action area (of type GtkButtonBox) and has to be used in combination with xfce_titled_dialog_add_action_widget.

When using the XfceTitledDialogClass directly to create dialogs this function is -useful to keep action widgets out of the GtkHeaderBar in which they would -normally end up by calling gtk_dialog_add_action_widget.

+useful to keep action widgets out of the GtkHeaderBar in which they would +normally end up by calling gtk_dialog_add_action_widget.

Parameters

@@ -343,14 +343,14 @@

XfceT

xfce_titled_dialog_add_button ()

-
GtkWidget *
+
GtkWidget *
 xfce_titled_dialog_add_button (XfceTitledDialog *titled_dialog,
                                const gchar *button_text,
                                gint response_id);
-

This function is a replacement for gtk_dialog_add_button and assumes that +

This function is a replacement for gtk_dialog_add_button and assumes that you have called xfce_titled_dialog_create_action_area before.

-

Buttons with GTK_RESPONSE_HELP will be added to the secondary group of children -(see gtk_button_box_set_child_secondary for reference).

+

Buttons with GTK_RESPONSE_HELP will be added to the secondary group of children +(see gtk_button_box_set_child_secondary for reference).

Parameters

@@ -382,7 +382,7 @@

XfceT

Returns

the GtkButton widget that was added.

-

[transfer none]

+

[transfer none]

Since: 4.16

@@ -391,12 +391,12 @@

XfceT

xfce_titled_dialog_add_action_widget ()

void
 xfce_titled_dialog_add_action_widget (XfceTitledDialog *titled_dialog,
-                                      GtkWidget *child,
+                                      GtkWidget *child,
                                       gint response_id);
-

This function is a replacement for gtk_dialog_add_action_widget and assumes that +

This function is a replacement for gtk_dialog_add_action_widget and assumes that you have called xfce_titled_dialog_create_action_area before.

-

Children with GTK_RESPONSE_HELP will be added to the secondary group of children -(see gtk_button_box_set_child_secondary for reference).

+

Children with GTK_RESPONSE_HELP will be added to the secondary group of children +(see gtk_button_box_set_child_secondary for reference).

Parameters

@@ -438,7 +438,7 @@

XfceT as the default widget for the dialog. Pressing “Enter” normally activates the default widget.

-

This function is a replacement for gtk_dialog_set_default_response, which does +

This function is a replacement for gtk_dialog_set_default_response, which does not work with XfceTitledDialog.

Parameters

@@ -473,7 +473,7 @@

XfceT , or NULL if no subtitle is displayed in the titled_dialog . -This is just a convenience function around gtk_header_bar_get_subtitle.

+This is just a convenience function around gtk_header_bar_get_subtitle.

Parameters

@@ -507,7 +507,9 @@

XfceT subtitle is NULL no subtitle will be displayed by the titled_dialog . -This is just a convenience function around gtk_header_bar_set_subtitle.

+This is just a convenience function around gtk_header_bar_set_subtitle +when dialogs use header bars. Otherwise a simple label and separator are +shown at the top of dialog.

Parameters

@@ -525,8 +527,8 @@

XfceT

- +, or NULL.

+

subtitle

the new subtitle for the titled_dialog -, or NULL.

 [nullable]
@@ -545,7 +547,7 @@

XfceT

Property Details

The “subtitle” property

-
  “subtitle”                 gchar *
+
  “subtitle”                 char *

The subtitle displayed below the main dialog title.

Owner: XfceTitledDialog

Flags: Read / Write

@@ -554,6 +556,6 @@

XfceT

+
Generated by GTK-Doc V1.34.0

\ No newline at end of file diff --git a/docs/html/annotation-glossary.html b/docs/reference/html/annotation-glossary.html similarity index 70% rename from docs/html/annotation-glossary.html rename to docs/reference/html/annotation-glossary.html index 737937a..2023668 100644 --- a/docs/html/annotation-glossary.html +++ b/docs/reference/html/annotation-glossary.html @@ -2,19 +2,19 @@ -Annotation Glossary: Libxfce4ui Reference Manual - - - +Annotation Glossary: libxfce4ui Reference Manual + + + - + - - +
@@ -110,6 +110,10 @@
+xfce_gtk_menu_append_separator, function in Gtk Extensions +
+
+
xfce_gtk_menu_append_seperator, function in Gtk Extensions
@@ -179,6 +183,6 @@
+
Generated by GTK-Doc V1.34.0

\ No newline at end of file diff --git a/docs/reference/html/api-index-4-18.html b/docs/reference/html/api-index-4-18.html new file mode 100644 index 0000000..2064381 --- /dev/null +++ b/docs/reference/html/api-index-4-18.html @@ -0,0 +1,56 @@ + + + + +Index of new symbols in 4.18: libxfce4ui Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 4.18

+

G

+
+xfce_gtk_toggle_tool_button_new_from_action_entry, function in Gtk Extensions +
+
+

G

+
+xfce_gdk_device_grab, function in Gdk Extensions +
+
+

S

+
+xfce_screensaver_inhibit, function in XfceScreensaver +
+
+
+xfce_screensaver_lock, function in XfceScreensaver +
+
+
+xfce_screensaver_new, function in XfceScreensaver +
+
+
+ + + \ No newline at end of file diff --git a/docs/reference/html/api-index-deprecated.html b/docs/reference/html/api-index-deprecated.html new file mode 100644 index 0000000..700d594 --- /dev/null +++ b/docs/reference/html/api-index-deprecated.html @@ -0,0 +1,45 @@ + + + + +Index of deprecated symbols: libxfce4ui Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of deprecated symbols

+

S

+
+xfce_spawn_command_line_on_screen, function in Spawn +
+
+
+xfce_spawn_on_screen, function in Spawn +
+
+

T

+
+xfce_titled_dialog_new_with_buttons, function in XfceTitledDialog +
+
+
+ + + \ No newline at end of file diff --git a/docs/html/api-index-full.html b/docs/reference/html/api-index-full.html similarity index 88% rename from docs/html/api-index-full.html rename to docs/reference/html/api-index-full.html index 3a9924e..4f5e1e9 100644 --- a/docs/html/api-index-full.html +++ b/docs/reference/html/api-index-full.html @@ -2,13 +2,13 @@ -Index of all symbols: Libxfce4ui Reference Manual - - - - - - +Index of all symbols: libxfce4ui Reference Manual + + + + + + @@ -36,8 +36,8 @@ W Home -Prev -Next +Prev +Next

@@ -123,6 +123,10 @@

G

+xfce_gdk_device_grab, function in Gdk Extensions +
+
+
xfce_gdk_screen_get_active, function in Gdk Extensions
@@ -163,6 +167,10 @@
+xfce_gtk_execute_tab_accel, function in Gtk Extensions +
+
+
xfce_gtk_frame_box_new, function in Gtk Extensions
@@ -175,6 +183,10 @@
+xfce_gtk_handle_tab_accels, function in Gtk Extensions +
+
+
xfce_gtk_image_menu_item_new, function in Gtk Extensions
@@ -183,6 +195,14 @@
+xfce_gtk_label_set_a11y_relation, function in Gtk Extensions +
+
+
+xfce_gtk_menu_append_separator, function in Gtk Extensions +
+
+
xfce_gtk_menu_append_seperator, function in Gtk Extensions
@@ -211,6 +231,10 @@
+xfce_gtk_toggle_tool_button_new_from_action_entry, function in Gtk Extensions +
+
+
xfce_gtk_tool_button_new_from_action_entry, function in Gtk Extensions
@@ -280,6 +304,34 @@

S

+XfceScreensaver, struct in XfceScreensaver +
+
+
+XfceScreensaver:heartbeat-command, object property in XfceScreensaver +
+
+
+XfceScreensaver:lock-command, object property in XfceScreensaver +
+
+
+XfceScreensaver:lock-on-sleep, object property in XfceScreensaver +
+
+
+xfce_screensaver_inhibit, function in XfceScreensaver +
+
+
+xfce_screensaver_lock, function in XfceScreensaver +
+
+
+xfce_screensaver_new, function in XfceScreensaver +
+
+
XfceSMClient, struct in XfceSMClient
@@ -511,6 +563,6 @@
+
Generated by GTK-Doc V1.34.0
\ No newline at end of file diff --git a/docs/reference/html/home.png b/docs/reference/html/home.png new file mode 100644 index 0000000000000000000000000000000000000000..9346b336a784463192c7daab5133a3673dd69845 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRMbARQqaxysz9Q}BI-m)~Y zggoA|1V*z2{cQ=d;!=?fvu4~`n82RKrk1UubNXTJj1GP|o-=>$A29f{JgJ9K`^t{Q z-oWs>M&_hvT&MjX@T4-&sBW+1^4oB5G4r2q!qGktZ!n*!)hjrjd0_4L6;4%u<}orJ u%Vo~x?#i!!ww+1OGuHe}T=cKQUzn^_t)8|WlnDbmjKR~@&t;ucLK6T -Libxfce4ui Reference Manual: Libxfce4ui Reference Manual - - +libxfce4ui Reference Manual: libxfce4ui Reference Manual + + - +
-
-
-
-

-Nick Schermer -

-
- -Software developer
-
-
-
-

The Xfce development team

- -
-
-

Version 4.16.1 -

-
-
-

- Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 or - any later version published by the Free Software Foundation; with no - Invariant Sections, with no Front-Cover Texts, and with no Back-Cover - Texts. The complete license text is available from the Free Software Foundation. -

-
-

Apr 2019

+
+

+ For libxfce4ui 4.18.6. + The latest version of this documentation can be found on-line at + https://developer.xfce.org/libxfce4ui/. +

+

@@ -78,10 +56,17 @@

The Xfce development team

V. Xfce Session Management Support
-
+
+
XfceSMClient — Session management client -
+ +
+XfceScreensaver — screensaver related shared functions +
+
Index of all symbols
+
Index of deprecated symbols
+
Index of new symbols in 4.18
Index of new symbols in 4.16
Index of new symbols in 4.14
Index of new symbols in 4.12
@@ -90,6 +75,6 @@

The Xfce development team

+
Generated by GTK-Doc V1.34.0
\ No newline at end of file diff --git a/docs/reference/html/left-insensitive.png b/docs/reference/html/left-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..3269393a7f72af744a772c437bd7b3976c23709d GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefH0HbvDJm`3=E7Co-U3d7N^fnTIWJ3j{^~q!iyia4kV=mdU|Jhfgdm;SLIpiYJ7wv^kjFiECCc&8T30!RG0~&BG=X zlu#U4@Z`))V`EG9e^NqDr#{!5k|)wT* zYTNt0`@q%TAD$){%#eQ?;$^ly8}yZCU%T~u0XM^%t?f#e znB*EuLv2rP%K3BMvFO}YmnR}KSgH;`EHL$)^!tH~iBxZ#h^zJi*#P5Xb6B50U@nx2 mU;T=yfcwnSOsS9SKd{M#MlNkCuvG>I8-u5-pUXO@geCx5`k@p6 literal 0 HcmV?d00001 diff --git a/docs/reference/html/left.png b/docs/reference/html/left.png new file mode 100644 index 0000000000000000000000000000000000000000..2abde032b0c98b756b12d380da4318205cd78470 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRMaSLay~*pwMJb7sn8b(^oI8=R24v(*CjE{-BFv z0BhvLm?o9(UC{-Ci?lD?Ve-7-xypA!PTC(0^;>UheG4Altep3@`rO0#Rjs1)RxCLr zE5mee>7m*=%yEk+GVvGkRy0O&*&MTd5SjH(lgq~7r%6oRW$l1p-*S}iC>@fyDsz%y z`UIW8^Ao=maGhj3E8{7Cd_qof`K4oa->23`>&M2+XBtd2J`8jogQu&X%Q~loCIG_? BVG#fT literal 0 HcmV?d00001 diff --git a/docs/html/libxfce4ui-Gdk-Extensions.html b/docs/reference/html/libxfce4ui-Gdk-Extensions.html similarity index 50% rename from docs/html/libxfce4ui-Gdk-Extensions.html rename to docs/reference/html/libxfce4ui-Gdk-Extensions.html index 4733255..a725e0d 100644 --- a/docs/html/libxfce4ui-Gdk-Extensions.html +++ b/docs/reference/html/libxfce4ui-Gdk-Extensions.html @@ -2,13 +2,13 @@ -Gdk Extensions: Libxfce4ui Reference Manual - - +Gdk Extensions: libxfce4ui Reference Manual + + - + @@ -51,7 +51,7 @@

-GdkScreen * +GdkScreen * xfce_gdk_screen_get_active () @@ -59,12 +59,20 @@

-GdkRectangle * +GdkRectangle * xfce_gdk_screen_get_geometry () + + +gboolean + + +xfce_gdk_device_grab () + +

@@ -81,11 +89,11 @@

Functions

xfce_gdk_screen_get_active ()

-
GdkScreen *
+
GdkScreen *
 xfce_gdk_screen_get_active (gint *monitor_return);
-

Returns the currently active GdkScreen, that is, the screen which +

Returns the currently active GdkScreen, that is, the screen which currently contains the pointer. If no active screen was found, the -default GdkScreen is returned.

+default GdkScreen is returned.

Parameters

@@ -96,36 +104,86 @@

- - + +

monitor_return

Address to store the monitor number to or NULL. -Under gtk3 this will always be set to '0'.

[out][allow-none]

Address to store the monitor number to or NULL.

[out][nullable]

Returns

-

the currently active GdkScreen.

-

[transfer full]

+

the currently active GdkScreen.

+

[transfer none]


xfce_gdk_screen_get_geometry ()

-
GdkRectangle *
+
GdkRectangle *
 xfce_gdk_screen_get_geometry (void);
-

Returns the width and height of the default GdkScreen. +

Returns the width and height of the default GdkScreen. This is a replacement for gdk_screen_width/gdk_screen_height.

Returns

-

a newly created GdkRectangle +

a newly created GdkRectangle containing the width and height of the screen.

-

[transfer full]

+

[transfer full]

Since: 4.14

+
+
+

xfce_gdk_device_grab ()

+
gboolean
+xfce_gdk_device_grab (GdkSeat *seat,
+                      GdkWindow *window,
+                      GdkSeatCapabilities capabilities,
+                      GdkCursor *cursor);
+

Similar to gdk_seat_grab but tries to grab the seat five times with 100ms +between each attempt.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

seat

A GdkSeat.

 

window

The GdkWindow which will own the grab.

 

capabilities

Capabilities that will be grabbed.

 

cursor

The cursor to display while the grab is active. If this +is NULL then the normal cursors are used for window and +its descendants, and the cursor for window is used +elsewhere.

[nullable]
+
+
+

Returns

+

TRUE on success, FALSE otherwise.

+
+

Since: 4.18

+

+
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui-Gtk-Extensions.html b/docs/reference/html/libxfce4ui-Gtk-Extensions.html similarity index 53% rename from docs/html/libxfce4ui-Gtk-Extensions.html rename to docs/reference/html/libxfce4ui-Gtk-Extensions.html index 297c43f..7b1b77b 100644 --- a/docs/html/libxfce4ui-Gtk-Extensions.html +++ b/docs/reference/html/libxfce4ui-Gtk-Extensions.html @@ -2,13 +2,13 @@ -Gtk Extensions: Libxfce4ui Reference Manual - - +Gtk Extensions: libxfce4ui Reference Manual + + - + @@ -51,7 +51,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_menu_item_new () @@ -59,7 +59,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_image_menu_item_new () @@ -67,7 +67,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_image_menu_item_new_from_icon_name () @@ -75,7 +75,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_check_menu_item_new () @@ -83,7 +83,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_radio_menu_item_new () @@ -91,7 +91,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_menu_item_new_from_action_entry () @@ -99,7 +99,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_toggle_menu_item_new_from_action_entry () @@ -107,7 +107,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_tool_button_new_from_action_entry () @@ -115,6 +115,14 @@

+GtkWidget * + + +xfce_gtk_toggle_tool_button_new_from_action_entry () + + + + void @@ -154,6 +162,22 @@

+gboolean + + +xfce_gtk_handle_tab_accels () + + + + +gboolean + + +xfce_gtk_execute_tab_accel () + + + + void @@ -162,7 +186,15 @@

-GtkWidget * +void + + +xfce_gtk_menu_append_separator () + + + + +GtkWidget * xfce_gtk_button_new_mixed () @@ -170,7 +202,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_frame_box_new () @@ -178,7 +210,7 @@

-GtkWidget * +GtkWidget * xfce_gtk_frame_box_new_with_content () @@ -240,6 +272,14 @@

xfce_has_gtk_frame_extents () + + +void + + +xfce_gtk_label_set_a11y_relation () + + @@ -275,14 +315,14 @@

Functions

xfce_gtk_menu_item_new ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_menu_item_new (const gchar *label_text,
                         const gchar *tooltip_text,
                         const gchar *accel_path,
                         GCallback callback,
                         GObject *callback_param,
-                        GtkMenuShell *menu_to_append_item);
-

Convenience method to create a GtkMenuItem and preconfigure it with the passed parameters.

+ GtkMenuShell *menu_to_append_item);
+

Convenience method to create a GtkMenuItem and preconfigure it with the passed parameters.

Parameters

@@ -294,56 +334,56 @@

- + - - + + - - + + - + - - + + - - + +

label_text

Label to use for the GtkMenuItem

Label to use for the GtkMenuItem

 

tooltip_text

Tooltip to add on the passed item, or NULL

 

Tooltip to add on the passed item, or NULL.

[nullable]

accel_path

Unique path, used to identify the accelerator, or NULL

 

Unique path, used to identify the accelerator, or NULL.

[nullable]

callback

GCallback which will be triggered on activation, or NULL.

[scope notified][scope notified][nullable]

callback_param

optional callback parameter, or NULL.

 

optional callback parameter, or NULL.

[nullable]

menu_to_append_item

GtkMenuShell on which the item should be appended, or NULL

 

GtkMenuShell on which the item should be appended, or NULL.

[nullable]

Returns

-

A new GtkMenuItem.

-

[transfer full]

+

A new GtkMenuItem.

+

[transfer floating]

Since: 4.16


xfce_gtk_image_menu_item_new ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_image_menu_item_new (const gchar *label_text,
                               const gchar *tooltip_text,
                               const gchar *accel_path,
                               GCallback callback,
                               GObject *callback_param,
-                              GtkWidget *image,
-                              GtkMenuShell *menu_to_append_item);
-

Convenience method to create a deprecated GtkImageMenuItem and preconfigure it with the passed parameters. + GtkWidget *image, + GtkMenuShell *menu_to_append_item);

+

Convenience method to create a deprecated GtkImageMenuItem and preconfigure it with the passed parameters. In order to prevent G_GNUC_BEGIN_IGNORE_DEPRECATIONS in all xfce projects, this method can be used

Parameters

@@ -356,53 +396,53 @@

label_text

-

Label to use for the GtkImageMenuItem

+

Label to use for the GtkImageMenuItem

 

tooltip_text

-

Tooltip to add on the passed item, or NULL

-  +

Tooltip to add on the passed item, or NULL.

+[nullable]

accel_path

-

Unique path, used to identify the accelerator, or NULL

-  +

Unique path, used to identify the accelerator, or NULL.

+[nullable]

callback

GCallback which will be triggered on activation, or NULL.

-[scope notified] +[scope notified][nullable]

callback_param

-

optional callback parameter, or NULL.

-  +

optional callback parameter, or NULL.

+[nullable]

image

-

a widget to set as the image for the menu item, or NULL

-  +

a widget to set as the image for the menu item, or NULL.

+[nullable]

menu_to_append_item

-

GtkMenuShell on which the item should be appended, or NULL

-  +

GtkMenuShell on which the item should be appended, or NULL.

+[nullable]

Returns

-

A new GtkImageMenuItem.

-

[transfer full]

+

A new GtkImageMenuItem.

+

[transfer floating]

Since: 4.16


xfce_gtk_image_menu_item_new_from_icon_name ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_image_menu_item_new_from_icon_name
                                (const gchar *label_text,
                                 const gchar *tooltip_text,
@@ -410,8 +450,8 @@ 

GCallback callback, GObject *callback_param, const gchar *icon_name, - GtkMenuShell *menu_to_append_item);

-

Convenience method to create a GtkImageMenuItem and preconfigure it with the passed parameters.

+
GtkMenuShell *menu_to_append_item);
+

Convenience method to create a GtkImageMenuItem and preconfigure it with the passed parameters.

Parameters

@@ -423,61 +463,61 @@

- + - - + + - - + + - + - - + + - - + + - - + +

label_text

Label to use for the GtkImageMenuItem

Label to use for the GtkImageMenuItem

 

tooltip_text

Tooltip to add on the passed item, or NULL

 

Tooltip to add on the passed item, or NULL.

[nullable]

accel_path

Unique path, used to identify the accelerator, or NULL

 

Unique path, used to identify the accelerator, or NULL.

[nullable]

callback

GCallback which will be triggered on activation, or NULL.

[scope notified][scope notified][nullable]

callback_param

optional callback parameter, or NULL.

 

optional callback parameter, or NULL.

[nullable]

icon_name

name of the icon to use for the GtkImageMenuItem, or NULL

 

name of the icon to use for the GtkImageMenuItem, or NULL.

[nullable]

menu_to_append_item

GtkMenuShell on which the item should be appended, or NULL

 

GtkMenuShell on which the item should be appended, or NULL.

[nullable]

Returns

-

A new GtkImageMenuItem.

-

[transfer full]

+

A new GtkImageMenuItem.

+

[transfer floating]

Since: 4.16


xfce_gtk_check_menu_item_new ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_check_menu_item_new (const gchar *label_text,
                               const gchar *tooltip_text,
                               const gchar *accel_path,
                               GCallback callback,
                               GObject *callback_param,
                               gboolean active,
-                              GtkMenuShell *menu_to_append_item);
-

Convenience method to create a GtkCheckMenuItem and preconfigure it with the passed parameters.

+ GtkMenuShell *menu_to_append_item);
+

Convenience method to create a GtkCheckMenuItem and preconfigure it with the passed parameters.

Parameters

@@ -489,28 +529,28 @@

- + - - + + - - + + - + - - + + @@ -519,32 +559,32 @@

- - + +

label_text

Label to use for the GtkCheckMenuItem

Label to use for the GtkCheckMenuItem

 

tooltip_text

Tooltip to add on the passed item, or NULL

 

Tooltip to add on the passed item, or NULL.

[nullable]

accel_path

Unique path, used to identify the accelerator, or NULL

 

Unique path, used to identify the accelerator, or NULL.

[nullable]

callback

GCallback which will be triggered on activation, or NULL.

[scope notified][scope notified][nullable]

callback_param

optional callback parameter, or NULL.

 

optional callback parameter, or NULL.

[nullable]

active

menu_to_append_item

GtkMenuShell on which the item should be appended, or NULL

 

GtkMenuShell on which the item should be appended, or NULL.

[nullable]

Returns

-

A new GtkCheckMenuItem.

-

[transfer full]

+

A new GtkCheckMenuItem.

+

[transfer floating]

Since: 4.16


xfce_gtk_radio_menu_item_new ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_radio_menu_item_new (const gchar *label_text,
                               const gchar *tooltip_text,
                               const gchar *accel_path,
                               GCallback callback,
                               GObject *callback_param,
                               gboolean active,
-                              GtkMenuShell *menu_to_append_item);
-

Convenience method to create a GtkCheckMenuItem and preconfigure it with the passed parameters. -In order to simplify usage, a GtkCheckMenuItem is created and drawn as radio-item

+ GtkMenuShell *menu_to_append_item);
+

Convenience method to create a GtkCheckMenuItem and preconfigure it with the passed parameters. +In order to simplify usage, a GtkCheckMenuItem is created and drawn as radio-item

Parameters

@@ -556,28 +596,28 @@

- + - - + + - - + + - + - - + + @@ -586,27 +626,27 @@

- - + +

label_text

Label to use for the GtkCheckMenuItem

Label to use for the GtkCheckMenuItem

 

tooltip_text

Tooltip to add on the passed item, or NULL

 

Tooltip to add on the passed item, or NULL.

[nullable]

accel_path

Unique path, used to identify the accelerator, or NULL

 

Unique path, used to identify the accelerator, or NULL.

[nullable]

callback

GCallback which will be triggered on activation, or NULL.

[scope notified][scope notified][nullable]

callback_param

optional callback parameter, or NULL.

 

optional callback parameter, or NULL.

[nullable]

active

menu_to_append_item

GtkMenuShell on which the item should be appended, or NULL

 

GtkMenuShell on which the item should be appended, or NULL.

[nullable]

Returns

-

A new GtkCheckMenuItem.

-

[transfer full]

+

A new GtkCheckMenuItem.

+

[transfer floating]

Since: 4.16


xfce_gtk_menu_item_new_from_action_entry ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_menu_item_new_from_action_entry
                                (const XfceGtkActionEntry *action_entry,
                                 GObject *callback_param,
-                                GtkMenuShell *menu_to_append_item);
+ GtkMenuShell *menu_to_append_item);

Method to create a menu item from the passed action entry

Parameters

@@ -619,38 +659,38 @@

action_entry

-

Label to use for the GtkCheckMenuItem

+

Label to use for the GtkCheckMenuItem

 

callback_param

-

optional callback parameter, or NULL.

-  +

optional callback parameter, or NULL.

+[nullable]

menu_to_append_item

-

GtkMenuShell on which the item should be appended, or NULL

-  +

GtkMenuShell on which the item should be appended, or NULL.

+[nullable]

Returns

-

A new GtkMenuItem or NULL.

-

[transfer full]

+

A new GtkMenuItem or NULL.

+

[transfer floating][nullable]

Since: 4.16


xfce_gtk_toggle_menu_item_new_from_action_entry ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_toggle_menu_item_new_from_action_entry
                                (const XfceGtkActionEntry *action_entry,
                                 GObject *callback_param,
                                 gboolean active,
-                                GtkMenuShell *menu_to_append_item);
+ GtkMenuShell *menu_to_append_item);

Method to create a toggle menu item from the passed action entry

Parameters

@@ -663,13 +703,13 @@

action_entry

-

Label to use for the GtkCheckMenuItem

+

Label to use for the GtkCheckMenuItem

 

callback_param

-

optional callback parameter, or NULL.

-  +

optional callback parameter, or NULL.

+[nullable]

active

@@ -678,28 +718,28 @@

menu_to_append_item

-

GtkMenuShell on which the item should be appended, or NULL

-  +

GtkMenuShell on which the item should be appended, or NULL.

+[nullable]

Returns

-

A new GtkMenuItem or NULL.

-

[transfer full]

+

A new GtkMenuItem or NULL.

+

[transfer floating][nullable]

Since: 4.16


xfce_gtk_tool_button_new_from_action_entry ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_tool_button_new_from_action_entry
                                (const XfceGtkActionEntry *action_entry,
                                 GObject *callback_param,
-                                GtkToolbar *toolbar_to_append_item);
-

Method to create a toolbar button from the passed action entry

+ GtkToolbar *toolbar_to_append_item);
+

Method to create a toolbar button from the passed action entry.

Parameters

@@ -711,17 +751,17 @@

- + - - + + - + @@ -729,13 +769,62 @@

Returns

-

A new GtkTolButton.

-

[transfer full]

+

A new GtkToolButton.

+

[transfer floating]

Since: 4.16


+

xfce_gtk_toggle_tool_button_new_from_action_entry ()

+
GtkWidget *
+xfce_gtk_toggle_tool_button_new_from_action_entry
+                               (const XfceGtkActionEntry *action_entry,
+                                GObject *callback_param,
+                                gboolean active,
+                                GtkToolbar *toolbar_to_append_item);
+

Method to create a toolbar toggle-button from the passed action entry.

+
+

Parameters

+

action_entry

Label to use for the GtkTolButton

Label to use for the GtkToolButton

 

callback_param

optional callback parameter, or NULL.

 

optional callback parameter, or NULL.

[nullable]

toolbar_to_append_item

GtkToolBar on which the item should be appended

GtkToolbar on which the item should be appended

 
+++++ + + + + + + + + + + + + + + + + + + + + + + +

action_entry

Label to use for the GtkToggleToolButton

 

callback_param

optional callback parameter, or NULL.

[nullable]

active

boolean value indicating whether the toggle is initially active.

 

toolbar_to_append_item

GtkToolbar on which the item should be appended

 
+
+
+

Returns

+

A new GtkToggleToolButton.

+

[transfer floating]

+
+

Since: 4.17.6

+
+
+

xfce_gtk_accel_map_add_entries ()

void
 xfce_gtk_accel_map_add_entries (const XfceGtkActionEntry *action_entries,
@@ -770,7 +859,7 @@ 

xfce_gtk_accel_group_connect_action_entries ()

void
 xfce_gtk_accel_group_connect_action_entries
-                               (GtkAccelGroup *accel_group,
+                               (GtkAccelGroup *accel_group,
                                 const XfceGtkActionEntry *action_entries,
                                 guint n_action_entries,
                                 gpointer callback_data);
@@ -787,7 +876,7 @@

accel_group

-

the GtkAccelGroup to connect to

+

the GtkAccelGroup to connect to

  @@ -815,7 +904,7 @@

xfce_gtk_accel_group_disconnect_action_entries ()

void
 xfce_gtk_accel_group_disconnect_action_entries
-                               (GtkAccelGroup *accel_group,
+                               (GtkAccelGroup *accel_group,
                                 const XfceGtkActionEntry *action_entries,
                                 guint n_action_entries);

This method will disconnect each accel_path from the XfceGtkActionEntry in action_entries.

@@ -830,7 +919,7 @@

accel_group

-

the GtkAccelGroup to connect to

+

the GtkAccelGroup to connect to

  @@ -886,7 +975,7 @@

Returns

The matching XfceGtkActionEntry or NULL if not found.

-

[transfer none]

+

[transfer none][nullable]

Since: 4.16

@@ -923,9 +1012,113 @@


+

xfce_gtk_handle_tab_accels ()

+
gboolean
+xfce_gtk_handle_tab_accels (GdkEventKey *key_event,
+                            GtkAccelGroup *accel_group,
+                            gpointer data,
+                            XfceGtkActionEntry *entries,
+                            size_t entry_count);
+

The Tab key is used to navigate the interface by GTK+ so we need to handle shortcuts with the Tab accelerator manually. +Tab sometimes becomes ISO_Left_Tab (e.g. in Ctrl+Shift+Tab) so check both here.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

key_event

the GdkEventKey that might trigger a shortcut

 

accel_group

the GtkAccelGroup that will be get queried

 

data

a pointer of data that will be passed to the callback if a tab-shortcut is found

 

entries

a XfceGtkActionEntry[]

 

entry_count

the number of entries in entries +

 
+
+
+

Returns

+

a boolean that is GDK_EVENT_STOP (TRUE) if the event was handled, otherwise it is GDK_EVENT_PROPAGATE (FALSE)

+
+
+
+
+

xfce_gtk_execute_tab_accel ()

+
gboolean
+xfce_gtk_execute_tab_accel (const gchar *accel_path,
+                            gpointer data,
+                            XfceGtkActionEntry *entries,
+                            size_t entry_count);
+

Activates the callback function of the XfceGtkActionEntry that corresponds to accel_path +. If no such action +exists in entries +, then nothing happens.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

accel_path

the accelerator path of the action that we want to activate

 

data

a pointer of data that will be passed to the callback if a tab-shortcut is found

 

entries

a XfceGtkActionEntry[]

 

entry_count

the number of entries in entries +

 
+
+
+

Returns

+

a boolean that is TRUE if the action was found, otherwise it is FALSE

+
+
+
+

xfce_gtk_menu_append_seperator ()

void
-xfce_gtk_menu_append_seperator (GtkMenuShell *menu);
+xfce_gtk_menu_append_seperator (GtkMenuShell *menu);

Convenience method do add separators, used to prevent code duplication

Parameters

@@ -937,7 +1130,30 @@

menu

-

GtkMenuShell on which the separator should be appended

+

GtkMenuShell on which the separator should be appended

+  + +

+
+

Since: 4.16

+ +
+
+

xfce_gtk_menu_append_separator ()

+
void
+xfce_gtk_menu_append_separator (GtkMenuShell *menu);
+

Convenience method do add separators, used to prevent code duplication

+
+

Parameters

+
+++++ + + +

menu

GtkMenuShell on which the separator should be appended

 
@@ -947,12 +1163,12 @@


xfce_gtk_button_new_mixed ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_button_new_mixed (const gchar *stock_id,
                            const gchar *label);
-

Creates a new GtkButton containing a mnemonic label and a stock icon. +

Creates a new GtkButton containing a mnemonic label and a stock icon. The stock_id - could be something like GTK_STOCK_OK or GTK_STOCK_APPLY.

+ could be something like GTK_STOCK_OK or GTK_STOCK_APPLY.

When the stock_id is NULL a normal mnemonic button will be created, when label @@ -969,36 +1185,36 @@

stock_id

-

the name of the stock item.

-  +

the name of the stock item.

+[nullable]

label

-

the text of the button, with an underscore in front of -the mnemonic character.

-  +

the text of the button, with an underscore +in front of the mnemonic character.

+[nullable]

Returns

-

the newly created GtkButton widget.

-

[transfer full]

+

the newly created GtkButton widget.

+

[transfer floating]


xfce_gtk_frame_box_new ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_frame_box_new (const gchar *label,
-                        GtkWidget **container_return);
-

Creates an Xfce-styled frame. The frame is a GtkFrame, without + GtkWidget **container_return);

+

Creates an Xfce-styled frame. The frame is a GtkFrame, without outline and an optional bolded text label. The contents of the frame are indented on the left. -The return value is the GtkFrame itself. The container_return +The return value is the GtkFrame itself. The container_return is -a GtkAlignment widget to which children of the frame should be added.

+a GtkAlignment widget to which children of the frame should be added.

See also: xfce_gtk_frame_box_new_with_content().

Returns

-

the newly created GtkFrame widget.

-

[transfer full]

+

the newly created GtkFrame widget.

+

[transfer floating]


xfce_gtk_frame_box_new_with_content ()

-
GtkWidget *
+
GtkWidget *
 xfce_gtk_frame_box_new_with_content (const gchar *label,
-                                     GtkWidget *content);
+ GtkWidget *content);

Creates a widget with xfce_gtk_frame_box_new() and adds the content - GtkWidget to the frame.

+ GtkWidget to the frame.

Parameters

@@ -1053,7 +1269,7 @@

- + @@ -1061,8 +1277,8 @@

Returns

-

the newly created GtkFrame widget.

-

[transfer full]

+

the newly created GtkFrame widget.

+

[transfer floating]


@@ -1070,14 +1286,14 @@

xfce_gtk_window_center_on_active_screen ()

void
 xfce_gtk_window_center_on_active_screen
-                               (GtkWindow *window);
+ (GtkWindow *window);

Determines the screen that contains the pointer and centers the window on it. If it failes to determine the current pointer position, window is centered on the default screen.

This function only works properly if you call it before realizing the -window and you haven't set a fixed window position using gtk_window_move().

+window and you haven't set a fixed window position using gtk_window_move().

See also: xfce_gdk_screen_get_active().

Parameters

@@ -1089,7 +1305,7 @@

- +

content

the GtkWidget to put inside the frame.

the GtkWidget to put inside the frame.

 

window

the GtkWindow to center.

the GtkWindow to center.

 
@@ -1099,18 +1315,18 @@

xfce_gtk_menu_popup_until_mapped ()

gboolean
-xfce_gtk_menu_popup_until_mapped (GtkMenu *menu,
-                                  GtkWidget *parent_menu_shell,
-                                  GtkWidget *parent_menu_item,
-                                  GtkMenuPositionFunc func,
+xfce_gtk_menu_popup_until_mapped (GtkMenu *menu,
+                                  GtkWidget *parent_menu_shell,
+                                  GtkWidget *parent_menu_item,
+                                  GtkMenuPositionFunc func,
                                   gpointer data,
                                   guint button,
                                   guint32 activate_time);
-

Attempts to pop up a GtkMenu for a short duration. Unlike the original -gtk_menu_popup(), this function will verify that the menu has been mapped +

Attempts to pop up a GtkMenu for a short duration. Unlike the original +gtk_menu_popup(), this function will verify that the menu has been mapped or will keep trying for up to 250ms. It will also return a value indicating whether the menu was eventually mapped or not. Following is an excerpt from -the GTK+ Documentation on GtkMenu.

+the GTK+ Documentation on GtkMenu.

Displays a menu and makes it available for selection.

Applications can use this function to display context-sensitive menus, and will typically supply NULL for the parent_menu_shell @@ -1129,7 +1345,7 @@

requests for mouse/keyboard grab requests. To function properly, this needs to be the timestamp of the user event (such as a mouse click or key press) that caused the initiation of the popup. Only if no such event is available, -gtk_get_current_event_time() can be used instead.

+
gtk_get_current_event_time() can be used instead.

Parameters

@@ -1141,28 +1357,28 @@

- + - + - + - + - + @@ -1187,8 +1403,8 @@

xfce_widget_reparent ()

gboolean
-xfce_widget_reparent (GtkWidget *widget,
-                      GtkWidget *new_parent);
+xfce_widget_reparent (GtkWidget *widget, + GtkWidget *new_parent);

Moves a widget from one GtkContainer to another, handling reference count issues to avoid destroying the widget.

@@ -1202,12 +1418,12 @@

- + - + @@ -1256,7 +1472,7 @@

If no desktop file of name is found it will fallback to returning a GIcon based on g_themed_icon_new_with_default_fallbacks and -gtk_icon_theme_lookup_by_gicon.

+
gtk_icon_theme_lookup_by_gicon.

Parameters

menu

a GtkMenu.

a GtkMenu.

 

parent_menu_shell

the menu shell containing the triggering menu item, or NULL.

[allow-none][nullable]

parent_menu_item

the menu item whose activation triggered the popup, or NULL.

[allow-none][nullable]

func

a user supplied function used to position the menu, or NULL.

[scope call][allow-none][scope call][nullable]

data

user supplied data to be passed to func.

[allow-none][nullable]

button

widget

a GtkWidget.

a GtkWidget.

 

new_parent

a GtkContainer to move the widget into

a GtkContainer to move the widget into

 
@@ -1275,7 +1491,7 @@

Returns

a new GThemedIcon.

-

[transfer full]

+

[transfer full]

Since: 4.16

@@ -1283,9 +1499,9 @@

xfce_gtk_menu_item_set_accel_label ()

void
-xfce_gtk_menu_item_set_accel_label (GtkMenuItem *menu_item,
+xfce_gtk_menu_item_set_accel_label (GtkMenuItem *menu_item,
                                     const gchar *accel_path);
-

Use the passed accel_path show the related GtkAccelLabel with the correct accelerator on the item.

+

Use the passed accel_path show the related GtkAccelLabel with the correct accelerator on the item.

Parameters

@@ -1297,13 +1513,13 @@

- + - - + +

menu_item

GtkMenuItem on which the accel label is to set

GtkMenuItem on which the accel label is to set

 

accel_path

Unique path, used to identify the accelerator, or NULL to show no accelerator

 

Unique path, used to identify the accelerator, or NULL to show no accelerator.

[nullable]
@@ -1314,11 +1530,11 @@

xfce_has_gtk_frame_extents ()

gboolean
-xfce_has_gtk_frame_extents (GdkWindow *window,
-                            GtkBorder *extents);
-

This function can be called to determine if a GdkWindow is using client-side decorations +xfce_has_gtk_frame_extents (GdkWindow *window, + GtkBorder *extents); +

This function can be called to determine if a GdkWindow is using client-side decorations which is indicated by the _GTK_FRAME_EXTENTS X11 atom. It furthermore sets a pointer -of type GtkBorder to the actual extents.

+of type GtkBorder to the actual extents.

Parameters

@@ -1330,12 +1546,12 @@

- + - + @@ -1343,15 +1559,53 @@

Returns

-

TRUE if a GdkWindow has the _GTK_FRAME_EXTENTS atom set.

+

TRUE if a GdkWindow has the _GTK_FRAME_EXTENTS atom set.

Since: 4.16

+
+
+

xfce_gtk_label_set_a11y_relation ()

+
void
+xfce_gtk_label_set_a11y_relation (GtkLabel *label,
+                                  GtkWidget *widget);
+

Sets the ATK_RELATION_LABEL_FOR relation on label + for widget +, which means +accessiblity tools will identify label + as descriptive item for the specified +widget +.

+
+

Parameters

+

window

A GdkWindow

A GdkWindow

 

extents

A pointer to a GtkBorder to copy to.

A pointer to a GtkBorder to copy to.

 
+++++ + + + + + + + + + + + + +

label

a GtkLabel.

 

widget

a GtkWidget.

 
+
+

Types and Values

enum XfceGtkMenuItem

+

List of item types which are supported by the XfceGtkActionEntry. +To be extended if required.

Members

@@ -1363,23 +1617,31 @@

- - + + - - + + - - + + - - + +

XFCE_GTK_MENU_ITEM

   +

see GtkMenuItem

+
 

XFCE_GTK_IMAGE_MENU_ITEM

   +

see GtkImageMenuItem

+
 

XFCE_GTK_CHECK_MENU_ITEM

   +

see GtkCheckMenuItem

+
 

XFCE_GTK_RADIO_MENU_ITEM

   +

see GtkRadioMenuItem

+
 
@@ -1389,32 +1651,84 @@

XfceGtkActionEntry

typedef struct {
-  /*
-   * Replacement for the deprecated GtkActionEntry
-   * The idea is to provide a fixed list of XfceGtkActionEntrys
-   * - use 'xfce_gtk_translate_action_entries' once to translate the list
-   * - use 'xfce_gtk_accel_map_add_entries' once to register the provided accelerators
-   * - use 'xfce_gtk_get_action_entry_by_id' to find a single entry, e.g. by using a enumeration
-   * - use 'xfce_gtk_***_new_from_action_entry' to create the specific menu- or tool-items from the entry
-  */
-
-  guint            id;                     /* unique identifier for instances of this structure (you might want to use a enum) */
-  const gchar     *accel_path;             /* The unique path, used to identify the accelerator */
-  const gchar     *default_accelerator;    /* The default key and modifier to trigger the callback linked to the entry */
+  guint            id;
+  const gchar     *accel_path;
+  const gchar     *default_accelerator;
 
   /* menu_item data is optional, only relevant if there exists a menu_item for that accelerator */
-  XfceGtkMenuItem  menu_item_type;         /* The type of the item which should be used for creation */
-  gchar           *menu_item_label_text;   /* text which should be shown in the menu */
-  gchar           *menu_item_tooltip_text; /* optional tooltip of the item */
-  const gchar     *menu_item_icon_name;    /* optional icon name which will be used to find a image for the item */
+  XfceGtkMenuItem  menu_item_type;
+  gchar           *menu_item_label_text;
+  gchar           *menu_item_tooltip_text;
+  const gchar     *menu_item_icon_name;
 
-  GCallback        callback;               /* The callback which will be triggered on activation */
+  GCallback        callback;
 } XfceGtkActionEntry;
 
+

Replacement for the deprecated GtkActionEntry. +The idea is to provide a fixed list of XfceGtkActionEntrys:

+
+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

guint id;

unique identifier for instances of this structure (you might want to use a enum)

 

const gchar *accel_path;

the unique path, used to identify the accelerator

 

const gchar *default_accelerator;

the default key and modifier to trigger the callback linked to the entry

 

XfceGtkMenuItem menu_item_type;

the type of the item which should be used for creation

 

gchar *menu_item_label_text;

text which should be shown in the menu

 

gchar *menu_item_tooltip_text;

optional tooltip of the item

 

const gchar *menu_item_icon_name;

optional icon name which will be used to find a image for the item

 

GCallback callback;

the callback which will be triggered on activation. The callback has to return TRUE +to signal that the accelerator was activated and handled

 
+

+
Generated by GTK-Doc V1.34.0
\ No newline at end of file diff --git a/docs/html/libxfce4ui-Spawn.html b/docs/reference/html/libxfce4ui-Spawn.html similarity index 75% rename from docs/html/libxfce4ui-Spawn.html rename to docs/reference/html/libxfce4ui-Spawn.html index 883a168..bc704ba 100644 --- a/docs/html/libxfce4ui-Spawn.html +++ b/docs/reference/html/libxfce4ui-Spawn.html @@ -2,13 +2,13 @@ -Spawn: Libxfce4ui Reference Manual - - +Spawn: libxfce4ui Reference Manual + + - + @@ -106,7 +106,7 @@

Spawn

xfce_spawn_on_screen_with_child_watch ()

gboolean
-xfce_spawn_on_screen_with_child_watch (GdkScreen *screen,
+xfce_spawn_on_screen_with_child_watch (GdkScreen *screen,
                                        const gchar *working_directory,
                                        gchar **argv,
                                        gchar **envp,
@@ -144,23 +144,23 @@ 

Spawn 16 17 18

-
static void
-child_watch_callback (GObject *object,
-                      gint     status)
+        
static void
+child_watch_callback (GObject *object,
+                      gint     status)
 {
-  g_message ("Child exit status is %d", status);
+  g_message ("Child exit status is %d", status);
 }
 
-static void
-spawn_something (void)
+static void
+spawn_something (void)
 {
-  GClosure *child_watch;
+  GClosure *child_watch;
 
-  child_watch = g_cclosure_new_swap (G_CALLBACK (child_watch_callback),
-                                     object, NULL);
-  xfce_spawn_on_screen_with_child_watch (...,
-                                         child_watch,
-                                         ...);
+  child_watch = g_cclosure_new_swap (G_CALLBACK (child_watch_callback),
+                                     object, NULL);
+  xfce_spawn_on_screen_with_child_watch (...,
+                                         child_watch,
+                                         ...);
 }
@@ -179,15 +179,15 @@

Spawn

screen

-

a GdkScreen or NULL to use the active screen, +

a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().

-[allow-none] +[nullable]

working_directory

child's current working directory or NULL to inherit parent's.

-[allow-none] +[nullable]

argv

@@ -198,7 +198,7 @@

Spawn

envp

child's environment vector or NULL to inherit parent's.

-[allow-none] +[nullable]

flags

@@ -219,25 +219,25 @@

Spawn the event time here if possible to make focus stealing prevention work property. If you don't have direct access to the event time you could use -gtk_get_current_event_time() or if nothing is +gtk_get_current_event_time() or if nothing is available 0 is valid too.

 

startup_icon_name

application icon or NULL.

-[allow-none] +[nullable]

child_watch_closure

closure that is triggered when the child exists or NULL.

-[allow-none] +[nullable]

error

return location for errors or NULL.

-[out][allow-none][transfer full] +[out][nullable][transfer full]

@@ -252,7 +252,7 @@

Spawn

xfce_spawn_on_screen ()

gboolean
-xfce_spawn_on_screen (GdkScreen *screen,
+xfce_spawn_on_screen (GdkScreen *screen,
                       const gchar *working_directory,
                       gchar **argv,
                       gchar **envp,
@@ -265,7 +265,7 @@ 

Spawn

xfce_spawn_on_screen has been deprecated since version 4.16 and should not be used in newly-written code.

Use xfce_spawn instead.

-

Like gdk_spawn_on_screen(), but also supports startup notification +

Like gdk_spawn_on_screen() (GDK 2), but also supports startup notification (if Libxfce4ui was built with startup notification support).

Parameters

@@ -278,15 +278,15 @@

Spawn

screen

-

a GdkScreen or NULL to use the active screen, +

a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().

-[allow-none] +[nullable]

working_directory

child's current working directory or NULL to inherit parent's.

-[allow-none] +[nullable]

argv

@@ -297,7 +297,7 @@

Spawn

envp

child's environment vector or NULL to inherit parent's.

-[allow-none] +[nullable]

flags

@@ -317,19 +317,19 @@

Spawn the event time here if possible to make focus stealing prevention work property. If you don't have direct access to the event time you could use -gtk_get_current_event_time() or if nothing is +gtk_get_current_event_time() or if nothing is available 0 is valid too.

 

startup_icon_name

application icon or NULL.

-[allow-none] +[nullable]

error

return location for errors or NULL.

-[out][allow-none][transfer full] +[out][nullable][transfer full]

@@ -344,7 +344,7 @@

Spawn

xfce_spawn ()

gboolean
-xfce_spawn (GdkScreen *screen,
+xfce_spawn (GdkScreen *screen,
             const gchar *working_directory,
             gchar **argv,
             gchar **envp,
@@ -354,7 +354,7 @@ 

Spawn const gchar *startup_icon_name, gboolean child_process, GError **error);

-

Like gdk_spawn_on_screen(), but also supports startup notification +

Like gdk_spawn_on_screen() (GDK 2), but also supports startup notification (if Libxfce4ui was built with startup notification support).

Parameters

@@ -367,15 +367,15 @@

Spawn

screen

-

a GdkScreen or NULL to use the active screen, +

a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().

-[allow-none] +[nullable]

working_directory

child's current working directory or NULL to inherit parent's.

-[allow-none] +[nullable]

argv

@@ -386,7 +386,7 @@

Spawn

envp

child's environment vector or NULL to inherit parent's.

-[allow-none] +[nullable]

flags

@@ -406,14 +406,14 @@

Spawn the event time here if possible to make focus stealing prevention work property. If you don't have direct access to the event time you could use -gtk_get_current_event_time() or if nothing is +gtk_get_current_event_time() or if nothing is available 0 is valid too.

 

startup_icon_name

application icon or NULL.

-[allow-none] +[nullable]

child_process

@@ -424,7 +424,7 @@

Spawn

error

return location for errors or NULL.

-[out][allow-none][transfer full] +[out][nullable][transfer full]

@@ -440,7 +440,7 @@

Spawn

xfce_spawn_command_line_on_screen ()

gboolean
-xfce_spawn_command_line_on_screen (GdkScreen *screen,
+xfce_spawn_command_line_on_screen (GdkScreen *screen,
                                    const gchar *command_line,
                                    gboolean in_terminal,
                                    gboolean startup_notify,
@@ -465,8 +465,8 @@ 

Spawn

screen

-

a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().

-[allow-none] +

a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().

+[nullable]

command_line

@@ -487,7 +487,7 @@

Spawn

error

location for a GError or NULL.

-[out][allow-none][transfer full] +[out][nullable][transfer full]

@@ -504,7 +504,7 @@

Spawn

xfce_spawn_command_line ()

gboolean
-xfce_spawn_command_line (GdkScreen *screen,
+xfce_spawn_command_line (GdkScreen *screen,
                          const gchar *command_line,
                          gboolean in_terminal,
                          gboolean startup_notify,
@@ -526,8 +526,8 @@ 

Spawn

screen

-

a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().

-[allow-none] +

a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().

+[nullable]

command_line

@@ -553,7 +553,7 @@

Spawn

error

location for a GError or NULL.

-[out][allow-none][transfer full] +[out][nullable][transfer full]

@@ -570,6 +570,6 @@

Spawn

+
Generated by GTK-Doc V1.34.0

\ No newline at end of file diff --git a/docs/html/libxfce4ui-XfceDialogs.html b/docs/reference/html/libxfce4ui-XfceDialogs.html similarity index 74% rename from docs/html/libxfce4ui-XfceDialogs.html rename to docs/reference/html/libxfce4ui-XfceDialogs.html index 08671bb..2c48683 100644 --- a/docs/html/libxfce4ui-XfceDialogs.html +++ b/docs/reference/html/libxfce4ui-XfceDialogs.html @@ -2,13 +2,13 @@ -XfceDialogs: Libxfce4ui Reference Manual - - +XfceDialogs: libxfce4ui Reference Manual + + - + @@ -51,7 +51,7 @@

-GtkWidget * +GtkWidget * xfce_message_dialog_new () @@ -59,7 +59,7 @@

-GtkWidget * +GtkWidget * xfce_message_dialog_new_valist () @@ -166,8 +166,8 @@

Functions

xfce_message_dialog_new ()

-
GtkWidget *
-xfce_message_dialog_new (GtkWindow *parent,
+
GtkWidget *
+xfce_message_dialog_new (GtkWindow *parent,
                          const gchar *title,
                          const gchar *stock_id,
                          const gchar *primary_text,
@@ -237,26 +237,28 @@ 

-
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 24, 24);
+        
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 24, 24);
 
-GtkWidget *dialog = xfce_message_dialog (parent, "Question",
-                                         GTK_STOCK_DIALOG_QUESTION,
-                                         "There are unsaved modifications",
-                                         "The menu has been modified, do you want to save it before quitting?",
-                                         GTK_STOCK_SAVE, GTK_RESPONSE_YES,
-                                         XFCE_BUTTON_TYPE_MIXED, "edit-delete", _("Forget modifications"), GTK_RESPONSE_APPLY,
-                                         XFCE_BUTTON_TYPE_PIXBUF, pixbuf, "Quit", GTK_RESPONSE_NO,
-                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                         NULL);
+GtkWidget *dialog = xfce_message_dialog (parent, "Question",
+                                         GTK_STOCK_DIALOG_QUESTION,
+                                         "There are unsaved modifications",
+                                         "The menu has been modified, do you want to save it before quitting?",
+                                         GTK_STOCK_SAVE, GTK_RESPONSE_YES,
+                                         XFCE_BUTTON_TYPE_MIXED, "edit-delete", _("Forget modifications"), GTK_RESPONSE_APPLY,
+                                         XFCE_BUTTON_TYPE_PIXBUF, pixbuf, "Quit", GTK_RESPONSE_NO,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                         NULL);
 
-g_object_unref (G_OBJECT (pixbuf));
+g_object_unref (G_OBJECT (pixbuf));

-
+

The caller is responsible for destroying the dialog with gtk_widget_destroy() +when it is no longer required.

+

Parameters

@@ -268,12 +270,12 @@

- + - + @@ -305,15 +307,15 @@

Returns

-

A new GtkMessageDialog.

-

[transfer full]

+

A new GtkMessageDialog.

+

[transfer none]


xfce_message_dialog_new_valist ()

-
GtkWidget *
-xfce_message_dialog_new_valist (GtkWindow *parent,
+
GtkWidget *
+xfce_message_dialog_new_valist (GtkWindow *parent,
                                 const gchar *title,
                                 const gchar *icon_stock_id,
                                 const gchar *primary_text,
@@ -334,12 +336,12 @@ 

- + - + @@ -371,15 +373,15 @@

Returns

-

A new GtkMessageDialog.

-

[transfer full]

+

A new GtkMessageDialog.

+

[transfer none]


xfce_message_dialog ()

gint
-xfce_message_dialog (GtkWindow *parent,
+xfce_message_dialog (GtkWindow *parent,
                      const gchar *title,
                      const gchar *stock_id,
                      const gchar *primary_text,
@@ -387,7 +389,7 @@ 

const gchar *first_button_text, ...);

Create a new dialog as in xfce_message_dialog_new(), then runs the -dialog using gtk_dialog_run and return the response id selected by the user.

+dialog using gtk_dialog_run and return the response id selected by the user.

See xfce_message_dialog_new() for more information.

Parameters

@@ -401,12 +403,12 @@

- + - + @@ -445,7 +447,7 @@

xfce_dialog_show_help ()

void
-xfce_dialog_show_help (GtkWindow *parent,
+xfce_dialog_show_help (GtkWindow *parent,
                        const gchar *component,
                        const gchar *page,
                        const gchar *offset);
@@ -455,7 +457,7 @@

page and offset the following information -is also send to the server: user language and the xfce_version_string().

+is also send to the server: user language and the xfce_version_string().

See also: xfce_dialog_show_help_with_version().

Parameters

@@ -469,26 +471,26 @@

- + - + - + - +

parent

transient parent of the dialog, or NULL.

[allow-none][nullable]

title

title of the dialog, or NULL.

[allow-none][nullable]

stock_id

parent

transient parent of the dialog, or NULL.

[allow-none][nullable]

title

title of the dialog, or NULL.

[allow-none][nullable]

icon_stock_id

parent

transient parent of the dialog, or NULL.

[allow-none][nullable]

title

title of the dialog, or NULL.

[allow-none][nullable]

stock_id

parent

transient parent of the dialog, or NULL.

[allow-none][nullable]

component

name of the component opening the help page or NULL. If the value is NULL the target will be the main page of the documentation website.

[allow-none][nullable]

page

subpage of the component on the website or NULL.

[allow-none][nullable]

offset

anchor offset in page or NULL.

[allow-none][nullable]
@@ -499,7 +501,7 @@

xfce_dialog_show_help_with_version ()

void
-xfce_dialog_show_help_with_version (GtkWindow *parent,
+xfce_dialog_show_help_with_version (GtkWindow *parent,
                                     const gchar *component,
                                     const gchar *page,
                                     const gchar *offset,
@@ -510,7 +512,7 @@ 

page and offset the following information -is also sent to the server: user language and the xfce_version_string() +is also sent to the server: user language and the xfce_version_string() or version if set.

See also: xfce_dialog_show_help().

@@ -526,31 +528,31 @@

parent

transient parent of the dialog, or NULL.

-[allow-none] +[nullable]

component

name of the component opening the help page or NULL. If the value is NULL the target will be the main page of the documentation website.

-[allow-none] +[nullable]

page

subpage of the component on the website or NULL.

-[allow-none] +[nullable]

offset

anchor offset in page or NULL.

-[allow-none] +[nullable]

version

-

alternative version, or NULL to use xfce_version_string().

-[allow-none] +

alternative version, or NULL to use xfce_version_string().

+[nullable]

@@ -561,7 +563,7 @@

xfce_dialog_show_info ()

void
-xfce_dialog_show_info (GtkWindow *parent,
+xfce_dialog_show_info (GtkWindow *parent,
                        const gchar *secondary_text,
                        const gchar *primary_format,
                        ...);
@@ -580,12 +582,12 @@

parent

transient parent of the dialog, or NULL.

-[allow-none] +[nullable]

secondary_text

secondary text of the dialog or NULL.

-[allow-none] +[nullable]

primary_format

@@ -606,7 +608,7 @@

xfce_dialog_show_warning ()

void
-xfce_dialog_show_warning (GtkWindow *parent,
+xfce_dialog_show_warning (GtkWindow *parent,
                           const gchar *secondary_text,
                           const gchar *primary_format,
                           ...);
@@ -625,12 +627,12 @@

parent

transient parent of the dialog, or NULL.

-[allow-none] +[nullable]

secondary_text

secondary text of the dialog or NULL.

-[allow-none] +[nullable]

primary_format

@@ -651,7 +653,7 @@

xfce_dialog_show_error ()

void
-xfce_dialog_show_error (GtkWindow *parent,
+xfce_dialog_show_error (GtkWindow *parent,
                         const GError *error,
                         const gchar *primary_format,
                         ...);
@@ -672,12 +674,12 @@

parent

transient parent of the dialog, or NULL.

-[allow-none] +[nullable]

error

a GError, which gives a more precise description of the problem or NULL.

-[allow-none] +[nullable]

primary_format

@@ -698,7 +700,7 @@

xfce_dialog_confirm ()

gboolean
-xfce_dialog_confirm (GtkWindow *parent,
+xfce_dialog_confirm (GtkWindow *parent,
                      const gchar *stock_id,
                      const gchar *confirm_label,
                      const gchar *secondary_text,
@@ -708,7 +710,7 @@ 

action if given.

If stock_id - is equal to GTK_STOCK_YES, the 'Cancel' button becomes a 'No' button.

+ is equal to GTK_STOCK_YES, the 'Cancel' button becomes a 'No' button.

Parameters

@@ -721,34 +723,34 @@

- + - + - + - + - + - +

parent

transient parent of the dialog, or NULL.

[allow-none][nullable]

stock_id

the stock name of the confirm button, for example GTK_STOCK_YES or GTK_STOCK_CLEAR.

the stock name of the confirm button, for example GTK_STOCK_YES or GTK_STOCK_CLEAR.

 

confirm_label

if non-NULL, this text is used on the confirm button together with the stock_id icon.

[allow-none][nullable]

secondary_text

secondary text in the dialog.

[allow-none][nullable]

primary_format

the printf()-style format for the dialog question.

[allow-none][nullable]

...

argument list for the primary_format .

[allow-none][nullable]
@@ -762,7 +764,7 @@

xfce_dialog_confirm_close_tabs ()

gint
-xfce_dialog_confirm_close_tabs (GtkWindow *parent,
+xfce_dialog_confirm_close_tabs (GtkWindow *parent,
                                 gint num_tabs,
                                 gboolean show_confirm_box,
                                 gboolean *confirm_box_checked);
@@ -797,7 +799,7 @@

parent

transient parent of the dialog, or NULL.

-[allow-none] +[nullable]

num_tabs

@@ -812,16 +814,16 @@

confirm_box_checked

state of confirmation checkbox.

-[allow-none] +[nullable]

Returns

-

GTK_RESPONSE_CANCEL if cancelled, GTK_RESPONSE_YES if the user -wants to close the window, GTK_RESPONSE_CLOSE if the user wants to close the tab, -and GTK_RESPONSE_NONE for an error.

+

GTK_RESPONSE_CANCEL if cancelled, GTK_RESPONSE_YES if the user +wants to close the window, GTK_RESPONSE_CLOSE if the user wants to close the tab, +and GTK_RESPONSE_NONE for an error.

Since: 4.16

@@ -848,6 +850,6 @@

+
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui-extensions.html b/docs/reference/html/libxfce4ui-extensions.html similarity index 82% rename from docs/html/libxfce4ui-extensions.html rename to docs/reference/html/libxfce4ui-extensions.html index 4d64166..ca4124c 100644 --- a/docs/html/libxfce4ui-extensions.html +++ b/docs/reference/html/libxfce4ui-extensions.html @@ -2,13 +2,13 @@ -Part III. Xfce UI Extensions: Libxfce4ui Reference Manual - - - +Part III. Xfce UI Extensions: libxfce4ui Reference Manual + + + - + @@ -35,6 +35,6 @@ +
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui-fundamentals.html b/docs/reference/html/libxfce4ui-fundamentals.html similarity index 83% rename from docs/html/libxfce4ui-fundamentals.html rename to docs/reference/html/libxfce4ui-fundamentals.html index 28ea2e3..ba89e5f 100644 --- a/docs/html/libxfce4ui-fundamentals.html +++ b/docs/reference/html/libxfce4ui-fundamentals.html @@ -2,13 +2,13 @@ -Part II. Xfce Fundamentals: Libxfce4ui Reference Manual - - - +Part II. Xfce Fundamentals: libxfce4ui Reference Manual + + + - + @@ -35,6 +35,6 @@ +
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui-introduction.html b/docs/reference/html/libxfce4ui-introduction.html similarity index 76% rename from docs/html/libxfce4ui-introduction.html rename to docs/reference/html/libxfce4ui-introduction.html index 928fb3e..a4f4a3a 100644 --- a/docs/html/libxfce4ui-introduction.html +++ b/docs/reference/html/libxfce4ui-introduction.html @@ -2,13 +2,13 @@ -Part I. Introduction: Libxfce4ui Reference Manual - - - - +Part I. Introduction: libxfce4ui Reference Manual + + + + - + @@ -27,6 +27,6 @@

+
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui-libxfce4ui-config.html b/docs/reference/html/libxfce4ui-libxfce4ui-config.html similarity index 86% rename from docs/html/libxfce4ui-libxfce4ui-config.html rename to docs/reference/html/libxfce4ui-libxfce4ui-config.html index fa1074a..b52a38e 100644 --- a/docs/html/libxfce4ui-libxfce4ui-config.html +++ b/docs/reference/html/libxfce4ui-libxfce4ui-config.html @@ -2,13 +2,13 @@ -libxfce4ui config: Libxfce4ui Reference Manual - - +libxfce4ui config: libxfce4ui Reference Manual + + - + @@ -136,12 +136,12 @@

const gchar *mismatch;
-mismatch = libxfce4ui_check_version (LIBXFCE4UI_MAJOR_VERSION,
-                                     LIBXFCE4UI_MINOR_VERSION,
-                                     LIBXFCE4UI_MICRO_VERSION);
-if (G_UNLIKELY (mismatch != NULL))
-  g_error ("Version mismatch: %s", mismatch);
+
const gchar *mismatch;
+mismatch = libxfce4ui_check_version (LIBXFCE4UI_MAJOR_VERSION,
+                                     LIBXFCE4UI_MINOR_VERSION,
+                                     LIBXFCE4UI_MICRO_VERSION);
+if (G_UNLIKELY (mismatch != NULL))
+  g_error ("Version mismatch: %s", mismatch);
@@ -205,12 +205,12 @@

minor

-

The minor version of the library, i.e. 16

+

The minor version of the library, i.e. 18

 

micro

-

The micro release of the library, i.e. 1

+

The micro release of the library, i.e. 6

  @@ -251,7 +251,7 @@

LIBXFCE4UI_MINOR_VERSION

-
#define LIBXFCE4UI_MINOR_VERSION (16)
+
#define LIBXFCE4UI_MINOR_VERSION (18)
 

A macro that evaluates to the minor version of libxfce4ui, in a format that can be used by the C pre-processor.

@@ -259,7 +259,7 @@

LIBXFCE4UI_MICRO_VERSION

-
#define LIBXFCE4UI_MICRO_VERSION (1)
+
#define LIBXFCE4UI_MICRO_VERSION (6)
 

A macro that evaluates to the micro version of libxfce4ui, in a format that can be used by the C pre-processor.

@@ -267,6 +267,6 @@

-
Generated by GTK-Doc V1.32 +
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui-sm.html b/docs/reference/html/libxfce4ui-sm.html similarity index 72% rename from docs/html/libxfce4ui-sm.html rename to docs/reference/html/libxfce4ui-sm.html index b023604..b6cc0f5 100644 --- a/docs/html/libxfce4ui-sm.html +++ b/docs/reference/html/libxfce4ui-sm.html @@ -2,13 +2,13 @@ -Part V. Xfce Session Management Support: Libxfce4ui Reference Manual - - - +Part V. Xfce Session Management Support: libxfce4ui Reference Manual + + + - + @@ -24,12 +24,17 @@
Part V. Xfce Session Management Support

Table of Contents

-
+
+
XfceSMClient — Session management client -
+
+
+XfceScreensaver — screensaver related shared functions +
+
+
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui-widgets.html b/docs/reference/html/libxfce4ui-widgets.html similarity index 83% rename from docs/html/libxfce4ui-widgets.html rename to docs/reference/html/libxfce4ui-widgets.html index c78fb91..8625ba9 100644 --- a/docs/html/libxfce4ui-widgets.html +++ b/docs/reference/html/libxfce4ui-widgets.html @@ -2,13 +2,13 @@ -Part IV. Xfce UI Widget: Libxfce4ui Reference Manual - - - +Part IV. Xfce UI Widget: libxfce4ui Reference Manual + + + - + @@ -38,6 +38,6 @@ +
Generated by GTK-Doc V1.34.0 \ No newline at end of file diff --git a/docs/html/libxfce4ui.devhelp2 b/docs/reference/html/libxfce4ui.devhelp2 similarity index 85% rename from docs/html/libxfce4ui.devhelp2 rename to docs/reference/html/libxfce4ui.devhelp2 index 79584bf..a03728d 100644 --- a/docs/html/libxfce4ui.devhelp2 +++ b/docs/reference/html/libxfce4ui.devhelp2 @@ -1,5 +1,5 @@ - + @@ -17,8 +17,11 @@ + + + @@ -41,6 +44,7 @@ + @@ -49,12 +53,16 @@ + + + + @@ -65,6 +73,7 @@ + @@ -140,6 +149,13 @@ + + + + + + + @@ -158,5 +174,13 @@ + + + + + + + + diff --git a/docs/reference/html/right-insensitive.png b/docs/reference/html/right-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..4c95785b907b978f36674cd98bf5302669c15c1b GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefG`u!(zUX23=E7+o-U3d7N^fn+URvSL8NuRG*{E) z?#-+97X-^pidQ*u@StO1(S@7g8g>nnA24$?ty?)cmuaa|Y>ez2*_Ia?6HP4j{3LIs zTr!s1ao_Sz^~3e4zRJGAjKZGn=XP#)Wmuo-QN>teTzzI!&R*jMI^Oa#7_ukLYdicf zOx;1mb-rt04s-c|uIH8fnX}$)XJa^0_-F3(pA%=sGI<|(n_*&=yYt96+n5InXn_GN+EraJI9q(O+n{6MQKErp&KxRvpfn0xh z`sSMqH(2Z%?kaFBTf06W^y=UDA9gR9YrwNS*1pjB((0K%&+SbAx3`XA&dKZ}j*nX7 QfdRze>FVdQ&MBb@09|aA9{>OV literal 0 HcmV?d00001 diff --git a/docs/reference/html/right.png b/docs/reference/html/right.png new file mode 100644 index 0000000000000000000000000000000000000000..76260ec8865f4e13cd269ec62eccd78a33adba3c GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRMbR+#PqI2*V^#7sn8b(^oI8=W9$9IsUQVezxzH zy`G{eu0`y#boSlU-NAlQG~=D)BPJG4k(^0qdDa(AdQvI0d|vJT=i7_<_D6`Cy?Dm; zP0@1EeB~D|O$oQe*sxL-P;q{2UCr}fN-o#M~tpZzsGyfNz46SZlIJCbKH zZQscEqpOfBCPDgxzACwHGSRJaopUzr*FR_KPpkxheNzTDP+%{a~ox zRb6~e-_l%s#;V|Jw-)bO$G_X=4F`Y7SBoCzyjAZQ8BPW>ywAP8?pbBsZ|wt?+h6S6&uqY)kkMnwQQEd@7k`4t@sCCO z@7MoiEI4Q_#IB70vhu7Ab+>SXLxu@LWH Qzz|~aboFyt=akR{08E^fv;Y7A literal 0 HcmV?d00001 diff --git a/docs/reference/html/up.png b/docs/reference/html/up.png new file mode 100644 index 0000000000000000000000000000000000000000..80b4b37e997d69b2e128bc3090bc447ccb74bbe9 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRFevZLys@4W>+6GUE!tU04Ii{0w_tkMIDB?rA5 zttYTN + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + + + %gtkdocentities; ]> - + - Libxfce4ui Reference Manual - Version - Apr 2019 - + &package_name; Reference Manual + + For &package_string;. + The latest version of this documentation can be found on-line at + https://developer.xfce.org/&package_name;/. + - 2019 - The Xfce Development Team + 2024 + The Xfce development team - - - - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 or - any later version published by the Free Software Foundation; with no - Invariant Sections, with no Front-Cover Texts, and with no Back-Cover - Texts. The complete license text is available from the Free Software Foundation. - - - - - - Nick - Schermer - -
nick@xfce.org
- Software developer -
-
- - The Xfce development team - -
xfce4-dev@xfce.org
-
-
-
@@ -73,11 +50,22 @@ Xfce Session Management Support + - + Index of all symbols + + Index of deprecated symbols + + + + Index of new symbols in 4.18 + + + + Index of new symbols in 4.16 diff --git a/docs/libxfce4ui-overrides.txt b/docs/reference/libxfce4ui-overrides.txt similarity index 100% rename from docs/libxfce4ui-overrides.txt rename to docs/reference/libxfce4ui-overrides.txt diff --git a/docs/libxfce4ui-sections.txt b/docs/reference/libxfce4ui-sections.txt similarity index 89% rename from docs/libxfce4ui-sections.txt rename to docs/reference/libxfce4ui-sections.txt index a50a1a1..df5da8d 100644 --- a/docs/libxfce4ui-sections.txt +++ b/docs/reference/libxfce4ui-sections.txt @@ -26,6 +26,7 @@ xfce_spawn_command_line xfce-gdk-extensions xfce_gdk_screen_get_active xfce_gdk_screen_get_geometry +xfce_gdk_device_grab
@@ -40,12 +41,16 @@ xfce_gtk_radio_menu_item_new xfce_gtk_menu_item_new_from_action_entry xfce_gtk_toggle_menu_item_new_from_action_entry xfce_gtk_tool_button_new_from_action_entry +xfce_gtk_toggle_tool_button_new_from_action_entry xfce_gtk_accel_map_add_entries xfce_gtk_accel_group_connect_action_entries xfce_gtk_accel_group_disconnect_action_entries xfce_gtk_get_action_entry_by_id xfce_gtk_translate_action_entries +xfce_gtk_handle_tab_accels +xfce_gtk_execute_tab_accel xfce_gtk_menu_append_seperator +xfce_gtk_menu_append_separator xfce_gtk_button_new_mixed xfce_gtk_frame_box_new xfce_gtk_frame_box_new_with_content @@ -56,6 +61,7 @@ xfce_icon_name_from_desktop_id xfce_gicon_from_name xfce_gtk_menu_item_set_accel_label xfce_has_gtk_frame_extents +xfce_gtk_label_set_a11y_relation
@@ -142,6 +148,20 @@ xfce_sm_client_get_type xfce_sm_client_restart_style_get_type xfce_sm_client_shutdown_hint_get_type xfce_sm_client_error_quark +xfce_sm_client_error_enum_get_type +XFCE_TYPE_SM_CLIENT_ERROR_ENUM +
+ +
+xfce-screensaver +XfceScreensaver +xfce_screensaver_new +xfce_screensaver_inhibit +xfce_screensaver_lock + +XfceScreenSaver +XFCE_TYPE_SCREENSAVER +xfce_screensaver_get_type
diff --git a/docs/libxfce4ui.types b/docs/reference/libxfce4ui.types similarity index 72% rename from docs/libxfce4ui.types rename to docs/reference/libxfce4ui.types index 57265ee..c7580f4 100644 --- a/docs/libxfce4ui.types +++ b/docs/reference/libxfce4ui.types @@ -1,7 +1,7 @@ -#include - xfce_filename_input_get_type -xfce_titled_dialog_get_type +xfce_sm_client_error_enum_get_type xfce_sm_client_get_type xfce_sm_client_restart_style_get_type xfce_sm_client_shutdown_hint_get_type +xfce_screensaver_get_type +xfce_titled_dialog_get_type diff --git a/docs/version.xml b/docs/version.xml deleted file mode 100644 index 27593c8..0000000 --- a/docs/version.xml +++ /dev/null @@ -1 +0,0 @@ -4.16.1 diff --git a/docs/version.xml.in b/docs/version.xml.in deleted file mode 100644 index a24f987..0000000 --- a/docs/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@PACKAGE_VERSION@ diff --git a/glade/Makefile.in b/glade/Makefile.in index 06b8704..a3cf0b9 100644 --- a/glade/Makefile.in +++ b/glade/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,11 +92,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -229,8 +229,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -273,6 +271,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -287,8 +287,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -768,7 +770,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/glade/icons/16x16/Makefile.in b/glade/icons/16x16/Makefile.in index be61c48..f6a5829 100644 --- a/glade/icons/16x16/Makefile.in +++ b/glade/icons/16x16/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,11 +91,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade/icons/16x16 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -168,6 +168,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -182,8 +184,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -447,7 +451,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/glade/icons/22x22/Makefile.in b/glade/icons/22x22/Makefile.in index cfec1bb..604b439 100644 --- a/glade/icons/22x22/Makefile.in +++ b/glade/icons/22x22/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,11 +91,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade/icons/22x22 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -168,6 +168,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -182,8 +184,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -447,7 +451,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/glade/icons/Makefile.in b/glade/icons/Makefile.in index 775918d..012045e 100644 --- a/glade/icons/Makefile.in +++ b/glade/icons/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -90,11 +90,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade/icons ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -154,8 +154,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -198,6 +196,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -212,8 +212,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -550,7 +552,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/gtk-doc.make b/gtk-doc.make index 7d9a27f..fb2e7e2 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -57,6 +57,7 @@ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ + $(DOC_MODULE).actions \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ $(DOC_MODULE).interfaces \ @@ -135,7 +136,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\--verbose"; \ if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ @@ -197,13 +198,13 @@ GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\--verbose"; \ if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\--path"; \ if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ @@ -226,7 +227,7 @@ GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ - gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\--verbose"; \ if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ @@ -235,7 +236,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ part=`dirname $$img`; \ - echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\--imgdir=$$part "; \ if test $$? != 0; then \ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ @@ -249,10 +250,10 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont clean-local: @rm -f *~ *.bak @rm -rf .libs - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + @if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + @if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-sections" ; then \ rm -f $(DOC_MODULE)-sections.txt; \ fi diff --git a/icons/128x128/Makefile.in b/icons/128x128/Makefile.in index 39657c1..6ff7c13 100644 --- a/icons/128x128/Makefile.in +++ b/icons/128x128/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,11 +91,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons/128x128 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -168,6 +168,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -182,8 +184,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -450,7 +454,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/icons/16x16/Makefile.in b/icons/16x16/Makefile.in index 4936c66..e3dfa9e 100644 --- a/icons/16x16/Makefile.in +++ b/icons/16x16/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,11 +91,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons/16x16 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -168,6 +168,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -182,8 +184,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -450,7 +454,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in index c5dbe6b..2619362 100644 --- a/icons/48x48/Makefile.in +++ b/icons/48x48/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,11 +91,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons/48x48 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -168,6 +168,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -182,8 +184,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -450,7 +454,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/icons/Makefile.in b/icons/Makefile.in index b59e5a3..7e467e1 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -90,11 +90,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -154,8 +154,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -198,6 +196,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -212,8 +212,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -553,7 +555,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in index 6bbc24c..269a7b2 100644 --- a/icons/scalable/Makefile.in +++ b/icons/scalable/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,11 +91,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons/scalable ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -168,6 +168,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -182,8 +184,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -450,7 +454,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/install-sh b/install-sh index 8175c64..7c56c9c 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2023-11-23.18; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,19 +104,29 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Report bugs to . +GNU Automake home page: . +General help using GNU software: ." while test $# -ne 0; do case $1 in @@ -137,8 +152,13 @@ while test $# -ne 0; do -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ do fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ do then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ do prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -451,7 +456,18 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,6 +493,13 @@ do then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -491,9 +514,9 @@ do # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff --git a/libxfce4kbd-private/Makefile.am b/libxfce4kbd-private/Makefile.am index c481c36..d522292 100644 --- a/libxfce4kbd-private/Makefile.am +++ b/libxfce4kbd-private/Makefile.am @@ -15,6 +15,8 @@ libxfce4kbd_headers = \ xfce-shortcuts-provider.h \ xfce-shortcuts-grabber.h \ xfce-shortcut-dialog.h \ + xfce-shortcuts-editor.h \ + xfce-shortcuts-editor-dialog.h \ xfce-shortcuts.h \ xfce-shortcuts-xfwm4.h @@ -28,6 +30,8 @@ libxfce4kbd_sources = \ xfce-shortcuts-provider.c \ xfce-shortcuts-grabber.c \ xfce-shortcut-dialog.c \ + xfce-shortcuts-editor.c \ + xfce-shortcuts-editor-dialog.c \ xfce-shortcuts.c \ xfce-shortcuts-xfwm4.c diff --git a/libxfce4kbd-private/Makefile.in b/libxfce4kbd-private/Makefile.in index c9db9ac..f1a9d6f 100644 --- a/libxfce4kbd-private/Makefile.in +++ b/libxfce4kbd-private/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -95,11 +95,11 @@ host_triplet = @host@ target_triplet = @target@ subdir = libxfce4kbd-private ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am \ @@ -149,10 +149,13 @@ am__DEPENDENCIES_1 = @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) am__libxfce4kbd_private_3_la_SOURCES_DIST = xfce-shortcuts-provider.h \ xfce-shortcuts-grabber.h xfce-shortcut-dialog.h \ + xfce-shortcuts-editor.h xfce-shortcuts-editor-dialog.h \ xfce-shortcuts.h xfce-shortcuts-xfwm4.h \ xfce-shortcuts-marshal.c xfce-shortcuts-marshal.h \ xfce-shortcuts-provider.c xfce-shortcuts-grabber.c \ - xfce-shortcut-dialog.c xfce-shortcuts.c xfce-shortcuts-xfwm4.c + xfce-shortcut-dialog.c xfce-shortcuts-editor.c \ + xfce-shortcuts-editor-dialog.c xfce-shortcuts.c \ + xfce-shortcuts-xfwm4.c am__objects_1 = @ENABLE_KEYBOARD_LIBRARY_TRUE@am__objects_2 = libxfce4kbd_private_3_la-xfce-shortcuts-marshal.lo @ENABLE_KEYBOARD_LIBRARY_TRUE@am__objects_3 = $(am__objects_1) \ @@ -160,6 +163,8 @@ am__objects_1 = @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-provider.lo \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-grabber.lo \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-editor.lo \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.lo \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts.lo \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.lo @ENABLE_KEYBOARD_LIBRARY_TRUE@am_libxfce4kbd_private_3_la_OBJECTS = \ @@ -193,6 +198,8 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = \ ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Plo \ + ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.Plo \ + ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor.Plo \ ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Plo \ ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Plo \ ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Plo \ @@ -227,7 +234,9 @@ am__can_run_installinfo = \ DATA = $(pkgconfig_DATA) $(settings_DATA) am__libxfce4kbd3_private_include_HEADERS_DIST = \ xfce-shortcuts-provider.h xfce-shortcuts-grabber.h \ - xfce-shortcut-dialog.h xfce-shortcuts.h xfce-shortcuts-xfwm4.h + xfce-shortcut-dialog.h xfce-shortcuts-editor.h \ + xfce-shortcuts-editor-dialog.h xfce-shortcuts.h \ + xfce-shortcuts-xfwm4.h HEADERS = $(libxfce4kbd3_private_include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -246,8 +255,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(srcdir)/libxfce4kbd-private-3.pc.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -265,6 +272,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -279,8 +288,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -489,6 +500,8 @@ top_srcdir = @top_srcdir@ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-provider.h \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-grabber.h \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcut-dialog.h \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-editor.h \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-editor-dialog.h \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts.h \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-xfwm4.h @@ -502,6 +515,8 @@ top_srcdir = @top_srcdir@ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-provider.c \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-grabber.c \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcut-dialog.c \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-editor.c \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-editor-dialog.c \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts.c \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-xfwm4.c @@ -636,6 +651,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Plo@am__quote@ # am--include-marker @@ -697,6 +714,20 @@ libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo: xfce-shortcut-dialog.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo `test -f 'xfce-shortcut-dialog.c' || echo '$(srcdir)/'`xfce-shortcut-dialog.c +libxfce4kbd_private_3_la-xfce-shortcuts-editor.lo: xfce-shortcuts-editor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts-editor.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts-editor.lo `test -f 'xfce-shortcuts-editor.c' || echo '$(srcdir)/'`xfce-shortcuts-editor.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-editor.c' object='libxfce4kbd_private_3_la-xfce-shortcuts-editor.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcuts-editor.lo `test -f 'xfce-shortcuts-editor.c' || echo '$(srcdir)/'`xfce-shortcuts-editor.c + +libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.lo: xfce-shortcuts-editor-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.lo `test -f 'xfce-shortcuts-editor-dialog.c' || echo '$(srcdir)/'`xfce-shortcuts-editor-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-editor-dialog.c' object='libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.lo `test -f 'xfce-shortcuts-editor-dialog.c' || echo '$(srcdir)/'`xfce-shortcuts-editor-dialog.c + libxfce4kbd_private_3_la-xfce-shortcuts.lo: xfce-shortcuts.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts.lo `test -f 'xfce-shortcuts.c' || echo '$(srcdir)/'`xfce-shortcuts.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts.Plo @@ -832,7 +863,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @ENABLE_KEYBOARD_LIBRARY_FALSE@dist-hook: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -879,7 +909,8 @@ installdirs: done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -917,6 +948,8 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ distclean: distclean-am -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Plo + -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.Plo + -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor.Plo -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Plo -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Plo -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Plo @@ -969,6 +1002,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Plo + -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor-dialog.Plo + -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-editor.Plo -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Plo -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Plo -rm -f ./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Plo @@ -994,7 +1029,7 @@ uninstall-am: uninstall-libLTLIBRARIES \ uninstall-libxfce4kbd3_private_includeHEADERS \ uninstall-pkgconfigDATA uninstall-settingsDATA -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c index bef7f6e..5a8af97 100644 --- a/libxfce4kbd-private/xfce-shortcut-dialog.c +++ b/libxfce4kbd-private/xfce-shortcut-dialog.c @@ -129,7 +129,10 @@ xfce_shortcut_dialog_class_init (XfceShortcutDialogClass *klass) GObjectClass *gobject_class; /* Make sure to use the translations from libxfce4ui */ - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); +#ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +#endif gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = xfce_shortcut_dialog_finalize; @@ -204,9 +207,9 @@ xfce_shortcut_dialog_create_contents (XfceShortcutDialog *dialog, const gchar *action_type; const gchar *title; const gchar *icon_name; - const gchar *explanation_label; const gchar *text; const gchar *format; + gchar *explanation_label; gchar *markup; if (g_utf8_collate (provider, "xfwm4") == 0) @@ -275,6 +278,7 @@ xfce_shortcut_dialog_create_contents (XfceShortcutDialog *dialog, gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_container_add (GTK_CONTAINER (content_box), label); gtk_widget_show (label); + g_free (explanation_label); /* Box and labels to display the shortcut currently being grabbed. * It will be updated to key-press events. */ @@ -323,7 +327,8 @@ xfce_shortcut_dialog_run (XfceShortcutDialog *dialog, /* Take control on the keyboard */ if (gdk_seat_grab (seat, - gdk_screen_get_root_window (gdk_display_get_default_screen (display)), + parent != NULL ? gtk_widget_get_window (parent) + : gdk_screen_get_root_window (gdk_display_get_default_screen (display)), GDK_SEAT_CAPABILITY_KEYBOARD, TRUE, NULL, NULL, xfce_shortcut_dialog_prepare_grab, NULL) == GDK_GRAB_SUCCESS) { @@ -428,7 +433,7 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog, g_free (escaped_label); g_strfreev (keys); - return FALSE; + return TRUE; } @@ -469,7 +474,7 @@ xfce_shortcut_dialog_key_released (XfceShortcutDialog *dialog, gtk_widget_hide (dialog->key_box); } - return FALSE; + return TRUE; } diff --git a/libxfce4kbd-private/xfce-shortcuts-editor-dialog.c b/libxfce4kbd-private/xfce-shortcuts-editor-dialog.c new file mode 100644 index 0000000..c3139fc --- /dev/null +++ b/libxfce4kbd-private/xfce-shortcuts-editor-dialog.c @@ -0,0 +1,145 @@ +/* vi:set expandtab sw=2 sts=2: */ +/* + * Copyright (c) 2021 Sergios - Anestis Kefalidis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + + + +struct _XfceShortcutsEditorDialogClass +{ + XfceTitledDialogClass __parent__; +}; + +struct _XfceShortcutsEditorDialog +{ + XfceTitledDialog __parent__; +}; + + + +G_DEFINE_TYPE (XfceShortcutsEditorDialog, xfce_shortcuts_editor_dialog, XFCE_TYPE_TITLED_DIALOG) + + + +static void +xfce_shortcuts_editor_dialog_class_init (XfceShortcutsEditorDialogClass *klass) +{ + /* Make sure to use the translations from libxfce4ui */ + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); +#ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +#endif +} + + + +static void +xfce_shortcuts_editor_dialog_init (XfceShortcutsEditorDialog *dialog) +{ + ; +} + + + +/** + * xfce_shortcuts_editor_dialog_new: + * @argument_count : #int, the number of arguments, including this one. + * + * Returns a dialog that includes a XfceShortcutsEditor. + * See xfce_shortcuts_editor_new_variadic for the expected types of the variable argument list. + * + * Since: 4.17.2 + **/ +GtkWidget* +xfce_shortcuts_editor_dialog_new (int argument_count, ...) +{ + XfceShortcutsEditorDialog *dialog; + va_list argument_list; + + va_start (argument_list, argument_count); + + dialog = g_object_new (XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG, NULL); + gtk_window_set_title (GTK_WINDOW (dialog), _("Shortcuts Editor")); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), xfce_shortcuts_editor_new_variadic (argument_count, argument_list), TRUE, TRUE, 0); + + /* set a reasonable default size */ + gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 600); + + gtk_widget_show (GTK_WIDGET (dialog)); + + va_end (argument_list); + + return GTK_WIDGET (dialog); +} + + + +/** + * xfce_shortcuts_editor_dialog_new_with_parent: + * @parent : #GtkWindow, the parent window of the dialog, used in gtk_window_set_transient_for (can be NULL). + * @argument_count : #int, the number of arguments, including this one. + * + * Returns a dialog that includes a XfceShortcutsEditor. + * See xfce_shortcuts_editor_new_variadic for the expected types of the variable argument list. + * + * Since: 4.17.5 + **/ +GtkWidget* +xfce_shortcuts_editor_dialog_new_with_parent (GtkWindow *parent, + int argument_count, + ... ) +{ + XfceShortcutsEditorDialog *dialog; + va_list argument_list; + + va_start (argument_list, argument_count); + + /* create the dialog and its content */ + dialog = g_object_new (XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG, NULL); + gtk_window_set_title (GTK_WINDOW (dialog), _("Shortcuts Editor")); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), xfce_shortcuts_editor_new_variadic (argument_count, argument_list), TRUE, TRUE, 0); + + /* set a reasonable default size */ + gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 600); + + /* center the dialog on top of the parent widget */ + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent)); + + gtk_widget_show (GTK_WIDGET (dialog)); + + va_end (argument_list); + + return GTK_WIDGET (dialog); +} \ No newline at end of file diff --git a/libxfce4kbd-private/xfce-shortcuts-editor-dialog.h b/libxfce4kbd-private/xfce-shortcuts-editor-dialog.h new file mode 100644 index 0000000..73bbffc --- /dev/null +++ b/libxfce4kbd-private/xfce-shortcuts-editor-dialog.h @@ -0,0 +1,50 @@ +/* vi:set expandtab sw=2 sts=2: */ +/* + * Copyright (c) 2021 Sergios - Anestis Kefalidis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __XFCE_SHORTCUTS_EDITOR_DIALOG_H__ +#define __XFCE_SHORTCUTS_EDITOR_DIALOG_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef struct _XfceShortcutsEditorDialogClass XfceShortcutsEditorDialogClass; +typedef struct _XfceShortcutsEditorDialog XfceShortcutsEditorDialog; + +#define XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG (xfce_shortcuts_editor_dialog_get_type ()) +#define XFCE_SHORTCUTS_EDITOR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG, XfceShortcutsEditorDialog)) +#define XFCE_SHORTCUTS_EDITOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG, XfceShortcutsEditorDialogClass)) +#define XFCE_IS_SHORTCUTS_EDITOR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG)) +#define XFCE_IS_SHORTCUTS_EDITOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG)) +#define XFCE_SHORTCUTS_EDITOR_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_SHORTCUTS_EDITOR_DIALOG, XfceShortcutsEditorDialogClass)) + +GType xfce_shortcuts_editor_dialog_get_type (void) G_GNUC_CONST; + +GtkWidget *xfce_shortcuts_editor_dialog_new (int argument_count, + ...) G_GNUC_MALLOC; + +GtkWidget *xfce_shortcuts_editor_dialog_new_with_parent (GtkWindow *parent, + int argument_count, + ... ) G_GNUC_MALLOC; + +G_END_DECLS + +#endif /* !__XFCE_SHORTCUTS_EDITOR_DIALOG_H__ */ diff --git a/libxfce4kbd-private/xfce-shortcuts-editor.c b/libxfce4kbd-private/xfce-shortcuts-editor.c new file mode 100644 index 0000000..34a1f78 --- /dev/null +++ b/libxfce4kbd-private/xfce-shortcuts-editor.c @@ -0,0 +1,581 @@ +/* vi:set expandtab sw=2 sts=2: */ +/* + * Copyright (c) 2021 Sergios - Anestis Kefalidis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + + + +typedef struct +{ + XfceShortcutsEditor *editor; + XfceGtkActionEntry *entry; + const gchar *displayed_label; +} ShortcutEditClickedData; + +typedef struct +{ + GtkWidget *shortcut_button; + XfceGtkActionEntry *entry; +} ShortcutOtherClickedData; + +typedef struct +{ + gboolean in_use; + GdkModifierType mods; + guint key; + const gchar *current_path; + gchar *other_path; +} ShortcutInfo; + + + +static void xfce_shortcuts_editor_finalize (GObject *object); +static void xfce_shortcuts_editor_create_contents (XfceShortcutsEditor *editor); +static void xfce_shortcuts_editor_shortcut_clicked (GtkWidget *widget, + ShortcutEditClickedData *data); +static void xfce_shortcuts_editor_shortcut_clear_clicked (GtkWidget *widget, + ShortcutOtherClickedData *data); +static void xfce_shortcuts_editor_shortcut_reset_clicked (GtkWidget *widget, + ShortcutOtherClickedData *data); +static void xfce_shortcuts_editor_shortcut_check (gpointer data, + const gchar *path, + guint key, + GdkModifierType mods, + gboolean changed); +static gboolean xfce_shortcuts_editor_validate_shortcut (XfceShortcutDialog *editor, + const gchar *shortcut, + ShortcutEditClickedData *data); +static void free_data (gpointer data, + GClosure *closure); + + + +struct _XfceShortcutsEditorClass +{ + GtkVBoxClass __parent__; +}; + +struct _XfceShortcutsEditor +{ + GtkVBox __parent__; + + XfceShortcutsEditorSection *arrays; + size_t arrays_count; +}; + + + +G_DEFINE_TYPE (XfceShortcutsEditor, xfce_shortcuts_editor, GTK_TYPE_BOX) + + + +static void +xfce_shortcuts_editor_class_init (XfceShortcutsEditorClass *klass) +{ + GObjectClass *gobject_class; + + /* Make sure to use the translations from libxfce4ui */ + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); +#ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +#endif + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = xfce_shortcuts_editor_finalize; +} + + + +static void +xfce_shortcuts_editor_init (XfceShortcutsEditor *editor) +{ + ; +} + + + +static void +xfce_shortcuts_editor_finalize (GObject *object) +{ + XfceShortcutsEditor *editor = XFCE_SHORTCUTS_EDITOR (object); + + for (size_t i = 0; i < editor->arrays_count; i++) + g_free (editor->arrays[i].section_name); + g_free (editor->arrays); + + (*G_OBJECT_CLASS (xfce_shortcuts_editor_parent_class)->finalize) (object); +} + + + +/** + * xfce_shortcuts_editor_new: + * @argument_count : #int, the number of arguments, including this one. + * + * A variable arguments version of xfce_shortcuts_editor_new_variadic. + * + * Since: 4.17.2 + **/ +GtkWidget* +xfce_shortcuts_editor_new (int argument_count, ...) +{ + GtkWidget *editor; + va_list argument_list; + + va_start (argument_list, argument_count); + + editor = xfce_shortcuts_editor_new_variadic (argument_count, argument_list); + + va_end (argument_list); + + return editor; +} + + + +/** + * xfce_shortcuts_editor_new_array: + * @sections : an array of XfceShortcutsEditorSection triads (see + * xfce_shortcuts_editor_new_variadic for a description). + * @n_sections : #int, the size of the array. + * + * A vectorized version of xfce_shortcuts_editor_new. + * + * Since: 4.17.5 + **/ +GtkWidget* +xfce_shortcuts_editor_new_array (XfceShortcutsEditorSection *sections, + int n_sections) +{ + XfceShortcutsEditor *editor; + + editor = g_object_new (XFCE_TYPE_SHORTCUTS_EDITOR, NULL); + + editor->arrays_count = n_sections; + editor->arrays = g_new (XfceShortcutsEditorSection, n_sections); + + for (int i = 0; i < n_sections; i++) + { + editor->arrays[i].section_name = g_strdup (sections[i].section_name); + editor->arrays[i].entries = sections[i].entries; + editor->arrays[i].size = sections[i].size; + } + + xfce_shortcuts_editor_create_contents (editor); + + gtk_widget_show (GTK_WIDGET (editor)); + + return GTK_WIDGET (editor); +} + + + +/** + * xfce_shortcuts_editor_new_variadic: + * @argument_count : #int, the number of arguments, including this one. + * @argument_list : a #va_list containing the arguments + * + * Create a new Shortcuts Editor from XfceGtkActionEntry arrays. + * + * The @argument_list consists of triads of arguments. + * The types of a triad are the following: (gchar*, XfceGtkActionEntry[], size_t). + * + * The first member of a triad is the name of the section in the editor. Specify + * %NULL or an empty string so that no section appears. + * The second member of a triad is the array of XfceGtkActionEntries which are + * used to handle the shortcuts. + * The third member is the size of that array. + * + * Since: 4.17.2 + **/ +GtkWidget* +xfce_shortcuts_editor_new_variadic (int argument_count, + va_list argument_list) +{ + XfceShortcutsEditor *editor; + + if (argument_count % 3 != 1) + return NULL; + + editor = g_object_new (XFCE_TYPE_SHORTCUTS_EDITOR, NULL); + + editor->arrays_count = (argument_count - 1) / 3; + editor->arrays = g_new (XfceShortcutsEditorSection, editor->arrays_count); + + for (int i = 0; i * 3 + 1 < argument_count; i++) + { + editor->arrays[i].section_name = g_strdup (va_arg (argument_list, gchar*)); + editor->arrays[i].entries = va_arg (argument_list, XfceGtkActionEntry*); + editor->arrays[i].size = va_arg (argument_list, size_t); + } + + xfce_shortcuts_editor_create_contents (editor); + + gtk_widget_show (GTK_WIDGET (editor)); + + return GTK_WIDGET (editor); +} + + + +static void +free_data (gpointer data, + GClosure *closure) +{ + g_free (data); +} + + + +static void +xfce_shortcuts_editor_create_contents (XfceShortcutsEditor *editor) +{ + GtkAdjustment *adjustment; + GtkWidget *vbox; + GtkWidget *frame; + GtkWidget *swin; + GtkWidget *grid; + GtkWidget *label; + GtkWidget *box; + GtkWidget *box2; + GtkWidget *shortcut_button; + GtkWidget *clear_button; + GtkWidget *reset_button; + size_t row; + + vbox = GTK_WIDGET (editor); + + frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); + gtk_widget_show (frame); + + swin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_set_hexpand (swin, TRUE); + gtk_widget_set_vexpand (swin, TRUE); + gtk_container_add (GTK_CONTAINER (frame), swin); + gtk_widget_show (swin); + + adjustment = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (swin)); + gtk_adjustment_set_value (adjustment, 0); + gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (swin), adjustment); + + grid = gtk_grid_new (); + gtk_grid_set_column_spacing (GTK_GRID (grid), 12); + gtk_grid_set_row_spacing (GTK_GRID (grid), 6); + gtk_widget_set_margin_top (GTK_WIDGET (grid), 6); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 12); + gtk_widget_set_margin_end (GTK_WIDGET (grid), 16); + gtk_container_add (GTK_CONTAINER (swin), grid); + gtk_widget_show (grid); + + row = 0; + for (size_t array_idx = 0; array_idx < editor->arrays_count; array_idx++) + { + gchar *markup; + + /* leave an empty row before each section */ + if (array_idx != 0) + { + label = gtk_label_new (""); + gtk_grid_attach (GTK_GRID (grid), label, 0, row, 2, 1); + gtk_widget_show (label); + row++; + } + + /* section name */ + if (! xfce_str_is_empty (editor->arrays[array_idx].section_name)) + { + label = gtk_label_new (""); + markup = g_strconcat ("", editor->arrays[array_idx].section_name, "", NULL); + gtk_label_set_markup (GTK_LABEL (label), markup); + g_free (markup); + gtk_widget_set_vexpand (label, TRUE); + gtk_widget_set_hexpand (label, TRUE); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_grid_attach (GTK_GRID (grid), label, 0, row, 1, 1); + gtk_widget_show (label); + row++; + } + + /* section shortcut entries */ + for (size_t entry_idx = 0; entry_idx < editor->arrays[array_idx].size; entry_idx++) + { + ShortcutEditClickedData *data; + ShortcutOtherClickedData *clear_data; + ShortcutOtherClickedData *reset_data; + XfceGtkActionEntry entry; + GtkAccelKey key; + gchar *shortcut_text; + + entry = editor->arrays[array_idx].entries[entry_idx]; + + /* ignore entries that don't do something when activated */ + if (entry.callback == NULL) + continue; + + /* ignore entries that don't have an accelerator path */ + if (entry.accel_path == NULL || g_strcmp0 (entry.accel_path, "") == 0) + continue; + + data = g_new (ShortcutEditClickedData, 1); + clear_data = g_new (ShortcutOtherClickedData, 1); + reset_data = g_new (ShortcutOtherClickedData, 1); + + label = gtk_label_new_with_mnemonic (entry.menu_item_label_text); + data->displayed_label = gtk_label_get_text (GTK_LABEL (label)); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_widget_set_tooltip_text (label, data->displayed_label); + gtk_widget_set_hexpand (label, TRUE); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_margin_start (label, 10); + gtk_grid_attach (GTK_GRID (grid), label, 0, row, 1, 1); + gtk_widget_show (label); + + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + gtk_grid_attach (GTK_GRID (grid), box, 1, row, 1, 1); + gtk_widget_show (box); + + /* contains the edit shortcut button and the clear button */ + box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start (GTK_BOX (box), box2, TRUE, TRUE, 0); + gtk_widget_show (box2); + gtk_style_context_add_class (gtk_widget_get_style_context (box2), "linked"); + + /* edit shortcut button */ + gtk_accel_map_lookup_entry (entry.accel_path, &key); + shortcut_text = gtk_accelerator_get_label (key.accel_key, key.accel_mods); + shortcut_button = gtk_button_new_with_label (key.accel_key > 0 ? shortcut_text : "..."); + gtk_widget_set_tooltip_text (shortcut_button, _("The current shortcut. Click to edit...")); + g_free (shortcut_text); + gtk_box_pack_start (GTK_BOX (box2), shortcut_button, TRUE, TRUE, 0); + gtk_widget_show (shortcut_button); + + data->editor = editor; + data->entry = editor->arrays[array_idx].entries + entry_idx; + g_signal_connect_data (G_OBJECT (shortcut_button), "clicked", G_CALLBACK (xfce_shortcuts_editor_shortcut_clicked), data, free_data, 0); + + /* clear button */ + clear_button = gtk_button_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_BUTTON); + gtk_widget_set_tooltip_text (clear_button, _("Clear the shortcut")); + gtk_box_pack_end (GTK_BOX (box2), clear_button, FALSE, TRUE, 0); + gtk_widget_show (clear_button); + + clear_data->shortcut_button = shortcut_button; + clear_data->entry = editor->arrays[array_idx].entries + entry_idx; + g_signal_connect_data (G_OBJECT (clear_button), "clicked", G_CALLBACK (xfce_shortcuts_editor_shortcut_clear_clicked), clear_data, free_data, 0); + + /* reset button */ + reset_button = gtk_button_new_from_icon_name ("edit-undo", GTK_ICON_SIZE_BUTTON); + gtk_widget_set_tooltip_text (reset_button, _("Restore the default shortcut")); + gtk_box_pack_end (GTK_BOX (box), reset_button, FALSE, FALSE, 0); + gtk_widget_show (reset_button); + + reset_data->shortcut_button = shortcut_button; + reset_data->entry = editor->arrays[array_idx].entries + entry_idx; + g_signal_connect_data (G_OBJECT (reset_button), "clicked", G_CALLBACK (xfce_shortcuts_editor_shortcut_reset_clicked), reset_data, free_data, 0); + + row++; + } + } +} + + + +static void +xfce_shortcuts_editor_shortcut_check (gpointer data, + const gchar *path, + guint key, + GdkModifierType mods, + gboolean changed) +{ + ShortcutInfo *info = (ShortcutInfo*) data; + if (info->in_use) + return; + + info->in_use = info->mods == mods && + info->key == key && + g_strcmp0 (info->current_path, path) != 0; + + if (info->in_use) + info->other_path = g_strdup (path); +} + + + +static gboolean +xfce_shortcuts_editor_validate_shortcut (XfceShortcutDialog *editor, + const gchar *shortcut, + ShortcutEditClickedData *data) +{ + GdkModifierType accel_mods; + guint accel_key; + ShortcutInfo info; + gchar *command, *message; + + g_return_val_if_fail (XFCE_IS_SHORTCUT_DIALOG (editor), FALSE); + g_return_val_if_fail (shortcut != NULL, FALSE); + + /* Ignore empty shortcuts */ + if (G_UNLIKELY (g_utf8_strlen (shortcut, -1) == 0)) + return FALSE; + + gtk_accelerator_parse (shortcut, &accel_key, &accel_mods); + if (accel_key == 0) + return FALSE; + + info.in_use = FALSE; + info.mods = accel_mods; + info.key = accel_key; + info.current_path = data->entry->accel_path; + info.other_path = NULL; + + gtk_accel_map_foreach_unfiltered (&info, xfce_shortcuts_editor_shortcut_check); + + if (info.in_use) + { + command = g_strrstr (info.other_path, "/"); + command = command == NULL ? + info.other_path : + command + 1; /* skip leading slash */ + + message = g_strdup_printf (_("This keyboard shortcut is currently used by: '%s'"), + command); + xfce_dialog_show_warning (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (editor))), message, + _("Keyboard shortcut already in use")); + g_free (message); + g_free (info.other_path); + + return FALSE; + } + else if (! gtk_accel_map_change_entry (data->entry->accel_path, accel_key, accel_mods, TRUE)) + return FALSE; + + return TRUE; +} + + + +static void +xfce_shortcuts_editor_shortcut_clicked (GtkWidget *widget, + ShortcutEditClickedData *data) +{ + GtkWidget *dialog; + gint response; + const gchar *shortcut; + GdkModifierType accel_mods; + guint accel_key; + gchar *label; + + dialog = xfce_shortcut_dialog_new ("", data->displayed_label, ""); + + g_signal_connect (dialog, "validate-shortcut", G_CALLBACK (xfce_shortcuts_editor_validate_shortcut), data); + + response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (dialog), gtk_widget_get_toplevel (GTK_WIDGET (data->editor))); + + if (G_LIKELY (response == GTK_RESPONSE_OK)) + { + shortcut = xfce_shortcut_dialog_get_shortcut (XFCE_SHORTCUT_DIALOG (dialog)); + gtk_accelerator_parse (shortcut, &accel_key, &accel_mods); + + label = gtk_accelerator_get_label (accel_key, accel_mods); + gtk_button_set_label (GTK_BUTTON (widget), label); + + g_free (label); + } + + gtk_widget_destroy (dialog); +} + + + +static void +xfce_shortcuts_editor_shortcut_clear_clicked (GtkWidget *widget, + ShortcutOtherClickedData *data) +{ + if (gtk_accel_map_change_entry (data->entry->accel_path, 0, 0, TRUE)) + gtk_button_set_label (GTK_BUTTON (data->shortcut_button), "..."); +} + + + +static void +xfce_shortcuts_editor_shortcut_reset_clicked (GtkWidget *widget, + ShortcutOtherClickedData *data) +{ + GdkModifierType accel_mods; + guint accel_key; + gchar *label; + ShortcutInfo info; + gchar *command, *message; + + gtk_accelerator_parse (data->entry->default_accelerator, &accel_key, &accel_mods); + + /* check if the default accelerator is used by another action */ + info.in_use = FALSE; + info.mods = accel_mods; + info.key = accel_key; + info.current_path = data->entry->accel_path; + info.other_path = NULL; + + gtk_accel_map_foreach_unfiltered (&info, xfce_shortcuts_editor_shortcut_check); + + /* an empty default accelerator is always available */ + if (g_strcmp0 (data->entry->default_accelerator, "") != 0 && info.in_use == TRUE) + { + command = g_strrstr (info.other_path, "/"); + command = command == NULL ? + info.other_path : + command + 1; /* skip leading slash */ + + message = g_strdup_printf (_("This keyboard shortcut is currently used by: '%s'"), + command); + xfce_dialog_show_warning (GTK_WINDOW (gtk_widget_get_toplevel (widget)), message, + _("Keyboard shortcut already in use")); + g_free (message); + } + /* if the default accelerator is available change to that */ + else if (gtk_accel_map_change_entry (data->entry->accel_path, accel_key, accel_mods, TRUE)) + { + if (accel_key > 0) + label = gtk_accelerator_get_label (accel_key, accel_mods); + else + label = g_strdup ("..."); + gtk_button_set_label (GTK_BUTTON (data->shortcut_button), label); + + g_free (label); + } + + g_free (info.other_path); +} \ No newline at end of file diff --git a/libxfce4kbd-private/xfce-shortcuts-editor.h b/libxfce4kbd-private/xfce-shortcuts-editor.h new file mode 100644 index 0000000..c1b584c --- /dev/null +++ b/libxfce4kbd-private/xfce-shortcuts-editor.h @@ -0,0 +1,57 @@ +/* vi:set expandtab sw=2 sts=2: */ +/* + * Copyright (c) 2021 Sergios - Anestis Kefalidis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __XFCE_SHORTCUTS_EDITOR_H__ +#define __XFCE_SHORTCUTS_EDITOR_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef struct _XfceShortcutsEditorClass XfceShortcutsEditorClass; +typedef struct _XfceShortcutsEditor XfceShortcutsEditor; + +#define XFCE_TYPE_SHORTCUTS_EDITOR (xfce_shortcuts_editor_get_type ()) +#define XFCE_SHORTCUTS_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_SHORTCUTS_EDITOR, XfceShortcutsEditor)) +#define XFCE_SHORTCUTS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_SHORTCUTS_EDITOR, XfceShortcutsEditorClass)) +#define XFCE_IS_SHORTCUTS_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_SHORTCUTS_EDITOR)) +#define XFCE_IS_SHORTCUTS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_SHORTCUTS_EDITOR)) +#define XFCE_SHORTCUTS_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_SHORTCUTS_EDITOR, XfceShortcutsEditorClass)) + +typedef struct +{ + gchar *section_name; + XfceGtkActionEntry *entries; + size_t size; +} XfceShortcutsEditorSection; + +GType xfce_shortcuts_editor_get_type (void) G_GNUC_CONST; + +GtkWidget *xfce_shortcuts_editor_new (int argument_count, + ...) G_GNUC_MALLOC; +GtkWidget *xfce_shortcuts_editor_new_array (XfceShortcutsEditorSection *sections, + int n_sections) G_GNUC_MALLOC; +GtkWidget *xfce_shortcuts_editor_new_variadic (int argument_count, + va_list argument_list) G_GNUC_MALLOC; + +G_END_DECLS + +#endif /* !__XFCE_SHORTCUTS_EDITOR_DIALOG_H__ */ diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c index 60ddfd7..71341c8 100644 --- a/libxfce4kbd-private/xfce-shortcuts-grabber.c +++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c @@ -41,10 +41,23 @@ -#define XFCE_SHORTCUTS_GRABBER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFCE_TYPE_SHORTCUTS_GRABBER, XfceShortcutsGrabberPrivate)) #define MODIFIERS_ERROR ((GdkModifierType)(-1)) #define MODIFIERS_NONE 0 +/* + * It is not clear what the correct behavior is in this regard, so this is disabled rather + * than removed, in order to preserve the changes that took place during cycle 4.17 and to + * facilitate a possible reversal of this choice. + * The arguments for this deactivation are in essence: + * - Xfce users are used to the previous behavior and see this as a regression + * - The old behavior better matches the behavior of other keyboard shortcuts in Xfce (xfwm4, + * GTK 3 apps) + * - Adding an option for this is like solving a bug by adding an option and therefore does + * not seem to be a good idea + * See also https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/91 + */ +#define TRACK_LAYOUT_CHANGE FALSE + typedef struct _XfceKey XfceKey; @@ -54,40 +67,54 @@ static void xfce_shortcuts_grabber_constructed (GObject static void xfce_shortcuts_grabber_finalize (GObject *object); static void xfce_shortcuts_grabber_keys_changed (GdkKeymap *keymap, XfceShortcutsGrabber *grabber); -static void xfce_shortcuts_grabber_grab_all (XfceShortcutsGrabber *grabber); +static void xfce_shortcuts_grabber_regrab_all (XfceShortcutsGrabber *grabber); static void xfce_shortcuts_grabber_ungrab_all (XfceShortcutsGrabber *grabber); static void xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, - XfceKey *key, - gboolean grab); + XfceKey *key); +static void xfce_shortcuts_grabber_ungrab (XfceShortcutsGrabber *grabber, + XfceKey *key); static GdkFilterReturn xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, - XfceShortcutsGrabber *grabber); + gpointer data); struct _XfceShortcutsGrabberPrivate { + /* Maps a shortcut string to a pointer to XfceKey */ GHashTable *keys; -}; -typedef enum -{ - UNDEFINED_GRAB_STATE = 0, /* Initial value after g_new0(XfceKey) */ - NOT_GRABBED, - GRABBED, -} XfceKeyGrabState; + /* Maps an XfceXGrab to a reference count. + * The reference count tracks the number of shortcuts that grab the XfceXGrab. */ + GHashTable *grabbed_keycodes; + + gint xkbEventType, xkbStateGroup; +}; struct _XfceKey { guint keyval; - guint modifiers; - GArray *keycodes; - XfceKeyGrabState grab_state; + GdkModifierType modifiers; + + /* Information about how the key has been grabbed */ + guint n_keys; /* Equals 0 if the key isn't grabbed */ + GdkKeymapKey *keys; + GdkModifierType non_virtual_modifiers; + guint numlock_modifier; }; +typedef struct +{ + guint keycode; + GdkModifierType non_virtual_modifiers; + guint numlock_modifier; +} XfceXGrab; + +typedef guint XfceXGrabRefcount; -G_DEFINE_TYPE (XfceShortcutsGrabber, xfce_shortcuts_grabber, G_TYPE_OBJECT) + +G_DEFINE_TYPE_WITH_PRIVATE (XfceShortcutsGrabber, xfce_shortcuts_grabber, G_TYPE_OBJECT) @@ -96,8 +123,6 @@ xfce_shortcuts_grabber_class_init (XfceShortcutsGrabberClass *klass) { GObjectClass *gobject_class; - g_type_class_add_private (klass, sizeof (XfceShortcutsGrabberPrivate)); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->constructed = xfce_shortcuts_grabber_constructed; gobject_class->finalize = xfce_shortcuts_grabber_finalize; @@ -116,14 +141,54 @@ xfce_shortcuts_grabber_class_init (XfceShortcutsGrabberClass *klass) +static void +free_key (gpointer data) +{ + XfceKey *key = data; + g_free (key->keys); + g_free (key); +} + +static gboolean +xgrab_equal (gconstpointer data1, gconstpointer data2) +{ + const XfceXGrab *a = data1; + const XfceXGrab *b = data2; + + if (a == b) + return TRUE; + + return a->keycode == b->keycode && + a->non_virtual_modifiers == b->non_virtual_modifiers && + a->numlock_modifier == b->numlock_modifier; +} + +static void +xgrab_free (gpointer data) +{ + XfceXGrab *g = data; + g_free (g); +} + +static guint +xgrab_hash (gconstpointer data) +{ + const XfceXGrab *g = data; + return g->keycode ^ g->non_virtual_modifiers ^ g->numlock_modifier; +} + + + + static void xfce_shortcuts_grabber_init (XfceShortcutsGrabber *grabber) { GdkDisplay *display; GdkKeymap *keymap; - grabber->priv = XFCE_SHORTCUTS_GRABBER_GET_PRIVATE (grabber); - grabber->priv->keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + grabber->priv = xfce_shortcuts_grabber_get_instance_private (grabber); + grabber->priv->keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, free_key); + grabber->priv->grabbed_keycodes = g_hash_table_new_full (xgrab_hash, xgrab_equal, xgrab_free, g_free); /* Workaround: Make sure modmap is up to date * There is possibly a bug in GTK+ where virtual modifiers are not @@ -141,20 +206,30 @@ static void xfce_shortcuts_grabber_constructed (GObject *object) { GdkDisplay *display; + Display *xdisplay; GdkKeymap *keymap; XfceShortcutsGrabber *grabber = XFCE_SHORTCUTS_GRABBER (object); display = gdk_display_get_default (); + xdisplay = GDK_DISPLAY_XDISPLAY (display); keymap = gdk_keymap_get_for_display (display); g_signal_connect (keymap, "keys-changed", G_CALLBACK (xfce_shortcuts_grabber_keys_changed), grabber); + if (G_UNLIKELY (!XkbQueryExtension (xdisplay, 0, &grabber->priv->xkbEventType, 0, 0, 0))) + grabber->priv->xkbEventType = -1; +#if TRACK_LAYOUT_CHANGE + grabber->priv->xkbStateGroup = -1; +#else + grabber->priv->xkbStateGroup = 0; +#endif + /* Flush events before adding the event filter */ - XAllowEvents (GDK_DISPLAY_XDISPLAY (display), AsyncBoth, CurrentTime); + XAllowEvents (xdisplay, AsyncBoth, CurrentTime); /* Add event filter */ - gdk_window_add_filter (NULL, (GdkFilterFunc) xfce_shortcuts_grabber_event_filter, grabber); + gdk_window_add_filter (NULL, xfce_shortcuts_grabber_event_filter, grabber); } @@ -166,6 +241,7 @@ xfce_shortcuts_grabber_finalize (GObject *object) xfce_shortcuts_grabber_ungrab_all (grabber); g_hash_table_unref (grabber->priv->keys); + g_hash_table_unref (grabber->priv->grabbed_keycodes); (*G_OBJECT_CLASS (xfce_shortcuts_grabber_parent_class)->finalize) (object); } @@ -180,29 +256,73 @@ xfce_shortcuts_grabber_keys_changed (GdkKeymap *keymap, TRACE ("Keys changed, regrabbing"); - xfce_shortcuts_grabber_grab_all (grabber); + xfce_shortcuts_grabber_regrab_all (grabber); } static gboolean -grab_key (const gchar *shortcut, - XfceKey *key, - XfceShortcutsGrabber *grabber) +xfce_shortcuts_grabber_xgrab (XfceXGrab g, gboolean grab) { - xfce_shortcuts_grabber_grab (grabber, key, TRUE); - return FALSE; -} + GdkDisplay *display = gdk_display_get_default (); + Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); + Window root_window; + guint k; + gboolean success = TRUE; + + /* Ignorable modifiers */ + const guint mod_masks [] = { + 0, + GDK_MOD2_MASK, + g.numlock_modifier | GDK_MOD2_MASK, + GDK_LOCK_MASK, + g.numlock_modifier | GDK_LOCK_MASK, + GDK_MOD5_MASK, + g.numlock_modifier | GDK_MOD5_MASK, + GDK_MOD2_MASK | GDK_LOCK_MASK, + g.numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK, + GDK_MOD2_MASK | GDK_MOD5_MASK, + g.numlock_modifier | GDK_MOD2_MASK | GDK_MOD5_MASK, + GDK_LOCK_MASK | GDK_MOD5_MASK, + g.numlock_modifier | GDK_LOCK_MASK | GDK_MOD5_MASK, + GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK, + g.numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK, + }; + + /* Retrieve the root window of the screen */ + root_window = GDK_WINDOW_XID (gdk_screen_get_root_window (gdk_display_get_default_screen (display))); + + TRACE ("%s keycode %u, non_virtual_modifiers 0x%x", + grab ? "Grabbing" : "Ungrabbing", + g.keycode, g.non_virtual_modifiers); + gdk_x11_display_error_trap_push (display); + for (k = 0; k < G_N_ELEMENTS (mod_masks); k++) + { + /* Take ignorable modifiers into account when grabbing/ungrabbing */ + if (grab) + XGrabKey (xdisplay, + g.keycode, + g.non_virtual_modifiers | mod_masks [k], + root_window, + False, GrabModeAsync, GrabModeAsync); + else + XUngrabKey (xdisplay, + g.keycode, + g.non_virtual_modifiers | mod_masks [k], + root_window); + } -static void -xfce_shortcuts_grabber_grab_all (XfceShortcutsGrabber *grabber) -{ - g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber)); - g_hash_table_foreach (grabber->priv->keys, - (GHFunc) (void (*)(void)) grab_key, - grabber); + gdk_display_flush (display); + if (gdk_x11_display_error_trap_pop (display)) + { + g_warning ("Failed to %s keycode %u", + grab ? "grab" : "ungrab", g.keycode); + success = FALSE; + } + + return success; } @@ -212,7 +332,7 @@ ungrab_key (const gchar *shortcut, XfceKey *key, XfceShortcutsGrabber *grabber) { - xfce_shortcuts_grabber_grab (grabber, key, FALSE); + xfce_shortcuts_grabber_ungrab (grabber, key); return FALSE; } @@ -229,165 +349,417 @@ xfce_shortcuts_grabber_ungrab_all (XfceShortcutsGrabber *grabber) -static void -xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, - XfceKey *key, - gboolean grab) +static gboolean +get_entries_for_keyval (GdkKeymap *keymap, + gint group, + guint keyval, + GdkKeymapKey **keys_out, + guint *n_keys_out) { - GdkModifierType numlock_modifier; - GdkKeymapKey *keys; - GdkDisplay *display; - GdkKeymap *keymap; - gchar *shortcut_name; - guint modifiers; - guint k; - gint i; - gint j; - gint n_keys; - gint screens; + GdkKeymapKey *keys; + gint n_keys; - g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber)); - g_return_if_fail (key != NULL); + *keys_out = NULL; + *n_keys_out = 0; - if (key->grab_state == (grab ? GRABBED : NOT_GRABBED)) { - TRACE (grab ? "Key already grabbed" : "Key already ungrabbed"); - return; + /* Get all keys generating keyval */ + if (!gdk_keymap_get_entries_for_keyval (keymap, keyval, &keys, &n_keys)) + { + TRACE ("Got no keys for keyval"); + return FALSE; + } + + if (G_UNLIKELY (n_keys <= 0)) + { + g_free (keys); + return FALSE; + } + + /* Filter keys by group */ + { + gboolean group0_only = TRUE; + + /* For keys such as F12: + * keys1[i].group is always 0 (even if n_keys1 >= 2) + * and thus n_matches will be zero if group != 0 */ + for (gint i = 0; i < n_keys; i++) + { + if (keys[i].group != 0) + { + group0_only = FALSE; + break; + } + } + + if (!group0_only) + { + /* Remove keys that do not match the group*/ + for (gint i = 0; i < n_keys;) + if (keys[i].group == group) + i++; + else + keys[i] = keys[--n_keys]; + } } - key->grab_state = UNDEFINED_GRAB_STATE; - display = gdk_display_get_default (); - screens = 1; - keymap = gdk_keymap_get_for_display (display); + if (G_UNLIKELY (n_keys == 0)) + { + g_free (keys); + return FALSE; + } - /* Map virtual modifiers to non-virtual modifiers */ - modifiers = key->modifiers; - gdk_keymap_map_virtual_modifiers (keymap, &modifiers); + *keys_out = keys; + *n_keys_out = n_keys; + return TRUE; +} - /* Debugging information */ - shortcut_name = gtk_accelerator_name (key->keyval, modifiers); - TRACE (grab ? "Grabbing %s" : "Ungrabbing %s", shortcut_name); - TRACE ("Keyval: %d", key->keyval); - TRACE ("Modifiers: 0x%x", modifiers); - g_free (shortcut_name); +static gboolean +map_virtual_modifiers (GdkKeymap *keymap, + GdkModifierType virtual_modifiers, + GdkModifierType *non_virtual_modifiers) +{ + /* Map virtual modifiers to non-virtual modifiers */ + GdkModifierType non_virtual = virtual_modifiers; + if (!gdk_keymap_map_virtual_modifiers (keymap, &non_virtual)) + return FALSE; - if (modifiers == key->modifiers && - (GDK_SUPER_MASK | GDK_HYPER_MASK | GDK_META_MASK) & modifiers) + if (non_virtual == virtual_modifiers && + (GDK_SUPER_MASK | GDK_HYPER_MASK | GDK_META_MASK) & non_virtual) { TRACE ("Failed to map virtual modifiers"); - return; + return FALSE; + } + + *non_virtual_modifiers = non_virtual; + return TRUE; +} + + + + +static void +xfce_shortcuts_grabber_regrab_all (XfceShortcutsGrabber *grabber) +{ + GdkDisplay *display; + Display *xdisplay; + GdkKeymap *keymap; + guint numlock_modifier; + GHashTable *grabbed_keycodes; + GHashTableIter iter; + gpointer hash_value; + guint n_already_grabbed = 0; + guint n_regrab = 0; + XfceKey **regrab; /* list of keys to re-grab */ + guint i; + gint group; + + g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber)); + + display = gdk_display_get_default (); + xdisplay = GDK_DISPLAY_XDISPLAY (display); + keymap = gdk_keymap_get_for_display (display); + numlock_modifier = XkbKeysymToModifiers (xdisplay, GDK_KEY_Num_Lock); + grabbed_keycodes = grabber->priv->grabbed_keycodes; + group = grabber->priv->xkbStateGroup; + if (G_UNLIKELY (group == -1)) + group = 0; + + regrab = g_new (XfceKey *, g_hash_table_size (grabber->priv->keys)); + + /* Phase 1: Ungrab all keys that need to be re-grabbed + * and collect them into the 'regrab' list */ + g_hash_table_iter_init (&iter, grabber->priv->keys); + while (g_hash_table_iter_next (&iter, NULL, &hash_value)) + { + XfceKey *const key = hash_value; + GdkKeymapKey *keys; + GdkModifierType non_virtual_modifiers; + guint n_keys; + gboolean already_grabbed; + + if (!map_virtual_modifiers (keymap, key->modifiers, &non_virtual_modifiers)) + continue; + if (!get_entries_for_keyval (keymap, group, key->keyval, &keys, &n_keys)) + continue; + + already_grabbed = TRUE; + if (key->n_keys == n_keys && + key->non_virtual_modifiers == non_virtual_modifiers && + key->numlock_modifier == numlock_modifier) + { + guint j; + for (j = 0; j < n_keys; j++) + if (memcmp (&key->keys[j], &keys[j], sizeof(*keys)) != 0) + { + already_grabbed = FALSE; + break; + } + } + else + already_grabbed = FALSE; + + if (already_grabbed) + { + n_already_grabbed++; + g_free (keys); + } + else + { + /* Undo current X11 grabs of the key */ + if (key->n_keys != 0) + xfce_shortcuts_grabber_ungrab (grabber, key); + + /* Set key->keys to the keycodes that need to be grabbed in phase 2 */ + if (G_UNLIKELY (key->keys)) + { + g_free (key->keys); + key->keys = NULL; + } + key->n_keys = n_keys; + if (n_keys != 0) + key->keys = keys; + else + g_free (keys); + key->non_virtual_modifiers = non_virtual_modifiers; + key->numlock_modifier = numlock_modifier; + + /* Remember to grab the key in phase 2 */ + if (n_keys != 0) + regrab[n_regrab++] = key; + } + } + + TRACE ("n_already_grabbed=%u, n_regrab=%u", n_already_grabbed, n_regrab); + + /* Phase 2: Grab all keys that have been stored in the 'regrab' list */ + for (i = 0; i < n_regrab; i++) + { + XfceKey *const key = regrab[i]; + guint j; + +#ifdef DEBUG_TRACE + { + gchar *shortcut_name = gtk_accelerator_name (key->keyval, key->non_virtual_modifiers); + TRACE (key->n_keys==0 ? "Grabbing %s" : "Regrabbing %s", shortcut_name); + TRACE (" key->keyval: %d", key->keyval); + TRACE (" key->modifiers: 0x%x", key->modifiers); + TRACE (" key->non_virtual_modifiers: 0x%x", key->non_virtual_modifiers); + TRACE (" key->n_keys: %u", key->n_keys); + g_free (shortcut_name); } +#endif - /* Get all keys generating keyval */ - if (!gdk_keymap_get_entries_for_keyval (keymap,key->keyval, - &keys, &n_keys)) + /* Grab all hardware keys generating keyval */ + for (j = 0; j < key->n_keys;) + { + XfceXGrab g; + gpointer refcount; + + g.keycode = key->keys[j].keycode; + g.non_virtual_modifiers = key->non_virtual_modifiers; + g.numlock_modifier = key->numlock_modifier; + if (!g_hash_table_lookup_extended (grabbed_keycodes, &g, NULL, &refcount)) + { + if (xfce_shortcuts_grabber_xgrab (g, TRUE)) + { + XfceXGrab *g1 = g_new (XfceXGrab, 1); + XfceXGrabRefcount *refcount1 = g_new (XfceXGrabRefcount, 1); + *g1 = g; + *refcount1 = 1; + g_hash_table_insert (grabbed_keycodes, g1, refcount1); + j++; + } + else + /* Failed to grab key->keys[j], remove it from key->keys */ + key->keys[j] = key->keys[--key->n_keys]; + } + else + { + // 'g' has already been grabbed, increment its refcount only + XfceXGrabRefcount *refcount1 = refcount; + (*refcount1)++; + TRACE ("keycode %u, non_virtual_modifiers 0x%x: ++refcount = %u", + g.keycode, g.non_virtual_modifiers, *refcount1); + j++; + } + } + + if (key->n_keys == 0 && key->keys != NULL) + { + g_free (key->keys); + key->keys = NULL; + } + } + + g_free (regrab); +} + + + +static void +xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, XfceKey *key) +{ + GdkDisplay *display; + Display *xdisplay; + GdkKeymap *keymap; + guint numlock_modifier; + GHashTable *grabbed_keycodes; + GdkKeymapKey *keys; + GdkModifierType non_virtual_modifiers; + guint i, n_keys; + gint group; + + display = gdk_display_get_default (); + xdisplay = GDK_DISPLAY_XDISPLAY (display); + keymap = gdk_keymap_get_for_display (display); + numlock_modifier = XkbKeysymToModifiers (xdisplay, GDK_KEY_Num_Lock); + grabbed_keycodes = grabber->priv->grabbed_keycodes; + group = grabber->priv->xkbStateGroup; + if (G_UNLIKELY (group == -1)) + group = 0; + + if (!map_virtual_modifiers (keymap, key->modifiers, &non_virtual_modifiers)) + return; + if (!get_entries_for_keyval (keymap, group, key->keyval, &keys, &n_keys)) + return; + +#ifdef DEBUG_TRACE + { + char *shortcut_name = gtk_accelerator_name (key->keyval, non_virtual_modifiers); + TRACE (key->n_keys==0 ? "Grabbing %s" : "Regrabbing %s", shortcut_name); + TRACE (" key->keyval: %d", key->keyval); + TRACE (" key->modifiers: 0x%x", key->modifiers); + TRACE (" non_virtual_modifiers: 0x%x", non_virtual_modifiers); + TRACE (" n_keys: %u", n_keys); + g_free (shortcut_name); + } +#endif + + /* Undo old grabs (just in case there are some old grabs) */ + if (G_UNLIKELY (key->n_keys != 0)) { - TRACE ("Got no keys for keyval"); - return; + g_warning ("keyval %u already grabbed", key->keyval); + xfce_shortcuts_grabber_ungrab (grabber, key); } - if (n_keys == 0) + /* Grab all hardware keys generating keyval */ + for (i = 0; i < n_keys;) { - g_free (keys); + XfceXGrab g; + gpointer refcount; - TRACE ("Got 0 keys for keyval"); - return; + g.keycode = keys[i].keycode; + g.non_virtual_modifiers = non_virtual_modifiers; + g.numlock_modifier = numlock_modifier; + if (!g_hash_table_lookup_extended (grabbed_keycodes, &g, NULL, &refcount)) + { + if (xfce_shortcuts_grabber_xgrab (g, TRUE)) + { + XfceXGrab *g1 = g_new (XfceXGrab, 1); + XfceXGrabRefcount *refcount1 = g_new (XfceXGrabRefcount, 1); + *g1 = g; + *refcount1 = 1; + g_hash_table_insert (grabbed_keycodes, g1, refcount1); + TRACE ("group %d, keycode %u, non_virtual_modifiers 0x%x: refcount := %u", + keys[i].group, g.keycode, g.non_virtual_modifiers, *refcount1); + i++; + } + else + /* Failed to grab keys[i], remove it from keys */ + keys[i] = keys[--n_keys]; + } + else + { + // 'g' has already been grabbed, increment its refcount only + XfceXGrabRefcount *refcount1 = refcount; + (*refcount1)++; + TRACE ("group %d, keycode %u, non_virtual_modifiers 0x%x: ++refcount = %u", + keys[i].group, g.keycode, g.non_virtual_modifiers, *refcount1); + i++; + } } - numlock_modifier = - XkbKeysymToModifiers (GDK_DISPLAY_XDISPLAY (display), GDK_KEY_Num_Lock); + /* Set key->keys to the list of keys that been succesfully grabbed */ + g_free (key->keys); + key->keys = NULL; + key->n_keys = n_keys; + if (n_keys != 0) + key->keys = keys; + else + g_free (keys); + key->non_virtual_modifiers = non_virtual_modifiers; + key->numlock_modifier = numlock_modifier; +} - key->grab_state = (grab ? GRABBED : NOT_GRABBED); - for (i = 0; i < n_keys; i ++) - { - /* Grab all hardware keys generating keyval */ +static void +xfce_shortcuts_grabber_ungrab (XfceShortcutsGrabber *grabber, XfceKey *key) +{ + GHashTable *grabbed_keycodes; + guint i; + + grabbed_keycodes = grabber->priv->grabbed_keycodes; + +#ifdef DEBUG_TRACE + { + gchar *shortcut_name = gtk_accelerator_name (key->keyval, key->non_virtual_modifiers); + TRACE ("Ungrabbing %s", shortcut_name); + TRACE (" key->keyval: %d", key->keyval); + TRACE (" key->modifiers: 0x%x", key->modifiers); + TRACE (" key->non_virtual_modifiers: 0x%x", key->non_virtual_modifiers); + TRACE (" key->n_keys: %u", key->n_keys); + g_free (shortcut_name); + } +#endif - TRACE ("Keycode: %d", keys[i].keycode); + for (i = 0; i < key->n_keys; i++) + { + XfceXGrab g; + gpointer refcount; - for (j = 0; j < screens; j++) + g.keycode = key->keys[i].keycode; + g.non_virtual_modifiers = key->non_virtual_modifiers; + g.numlock_modifier = key->numlock_modifier; + if (G_LIKELY (g_hash_table_lookup_extended (grabbed_keycodes, &g, NULL, &refcount))) { - /* Do the grab on all screens */ - Window root_window; - - /* Ignorable modifiers */ - guint mod_masks [] = { - 0, - GDK_MOD2_MASK, - numlock_modifier | GDK_MOD2_MASK, - GDK_LOCK_MASK, - numlock_modifier | GDK_LOCK_MASK, - GDK_MOD5_MASK, - numlock_modifier | GDK_MOD5_MASK, - GDK_MOD2_MASK | GDK_LOCK_MASK, - numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK, - GDK_MOD2_MASK | GDK_MOD5_MASK, - numlock_modifier | GDK_MOD2_MASK | GDK_MOD5_MASK, - GDK_LOCK_MASK | GDK_MOD5_MASK, - numlock_modifier | GDK_LOCK_MASK | GDK_MOD5_MASK, - GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK, - numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK, - }; - - /* Retrieve the root window of the screen */ - root_window = GDK_WINDOW_XID (gdk_screen_get_root_window (gdk_display_get_default_screen (display))); - gdk_x11_display_error_trap_push (display); - - for (k = 0; k < G_N_ELEMENTS (mod_masks); k++) + XfceXGrabRefcount *refcount1 = refcount; + if (G_LIKELY (*refcount1 != 0)) { - /* Take ignorable modifiers into account when grabbing */ - if (grab) - XGrabKey (GDK_DISPLAY_XDISPLAY (display), - keys[i].keycode, - modifiers | mod_masks [k], - root_window, - False, - GrabModeAsync, - GrabModeAsync); - else + (*refcount1)--; + TRACE ("group %d, keycode %u, non_virtual_modifiers 0x%x: --refcount = %u", + key->keys[i].group, g.keycode, g.non_virtual_modifiers, *refcount1); + if(*refcount1 == 0) { - if (i >= (gint) key->keycodes->len) - break; - XUngrabKey (GDK_DISPLAY_XDISPLAY (display), - g_array_index (key->keycodes, guint, i), - modifiers | mod_masks [k], - root_window); + xfce_shortcuts_grabber_xgrab (g, FALSE); + g_hash_table_remove (grabbed_keycodes, &g); } } - - gdk_display_flush (display); - - if (gdk_x11_display_error_trap_pop (display)) + else { - TRACE (grab ? "Failed to grab" : "Failed to ungrab"); - key->grab_state = UNDEFINED_GRAB_STATE; + g_warning ("corrupted refcount"); } } - /* Remember the old keycode, as we need it to ungrab. */ - if (grab) - g_array_append_val (key->keycodes, keys[i].keycode); else - g_array_index (key->keycodes, guint, i) = UINT_MAX; - } - - /* Cleanup elements containing UINT_MAX from the key->keycodes array */ - for (i = key->keycodes->len - 1; i >= 0; i --) - { - if (g_array_index (key->keycodes, guint, i) == UINT_MAX) - g_array_remove_index_fast (key->keycodes, i); + { + g_warning ("corrupted hashtable"); + } } - g_free (keys); + g_free (key->keys); + key->keys = NULL; + key->n_keys = 0; + key->non_virtual_modifiers = 0; + key->numlock_modifier = 0; } struct EventKeyFindContext { - XfceShortcutsGrabber *grabber; - GdkModifierType modifiers; - guint keyval; - const gchar *result; + GdkModifierType modifiers; + guint keyval; + const gchar *result; }; @@ -416,11 +788,34 @@ find_event_key (const gchar *shortcut, +static gboolean +is_modifier_key (struct EventKeyFindContext context) +{ + if (context.modifiers == 0) + { + switch (context.keyval) + { + case GDK_KEY_Control_L: + case GDK_KEY_Control_R: + case GDK_KEY_Alt_L: + case GDK_KEY_Alt_R: + case GDK_KEY_Super_L: + case GDK_KEY_Super_R: + return TRUE; + } + } + + return FALSE; +} + + + static GdkFilterReturn -xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, - GdkEvent *event, - XfceShortcutsGrabber *grabber) +xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, + GdkEvent *event, + gpointer data) { + XfceShortcutsGrabber *const grabber = data; struct EventKeyFindContext context; GdkKeymap *keymap; GdkModifierType consumed, modifiers; @@ -430,14 +825,34 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, gchar *raw_shortcut_name; gint timestamp; + /* We only activate single modifier keys on release event to allow combinations + * such as Super to open a menu and Super+T to open a terminal: see + * https://gitlab.xfce.org/xfce/libxfce4ui/-/issues/1 */ + static gboolean single_modifier_down = FALSE; + g_return_val_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber), GDK_FILTER_CONTINUE); xevent = (XEvent *) gdk_xevent; - if (xevent->type != KeyPress) +#if TRACK_LAYOUT_CHANGE + if (xevent->type == grabber->priv->xkbEventType) + { + const XkbEvent *e = (const XkbEvent*) xevent; + if (e->any.xkb_type == XkbStateNotify) + { + if (grabber->priv->xkbStateGroup != e->state.group) + { + TRACE ("xkb event: any.xkb_type=XkbStateNotify, state.group=%d", e->state.group); + grabber->priv->xkbStateGroup = e->state.group; + xfce_shortcuts_grabber_regrab_all (grabber); + } + } + } +#endif + + if (xevent->type != KeyPress && !(xevent->type == KeyRelease && single_modifier_down)) return GDK_FILTER_CONTINUE; - context.grabber = grabber; context.result = NULL; timestamp = xevent->xkey.time; @@ -448,9 +863,13 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, mod_mask = gtk_accelerator_get_default_mod_mask (); modifiers = xevent->xkey.state; + /* Remove modifier added to single modifier key on release event */ + if (xevent->type == KeyRelease && single_modifier_down) + modifiers = 0; + gdk_keymap_translate_keyboard_state (keymap, xevent->xkey.keycode, modifiers, - XkbGroupForCoreState (xevent->xkey.state), + grabber->priv->xkbStateGroup, &keyval, NULL, NULL, &consumed); /* We want Alt + Print to be Alt + Print not SysReq. See bug #7897 */ @@ -496,14 +915,25 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, TRACE ("Looking for %s", raw_shortcut_name); g_free (raw_shortcut_name); - g_hash_table_foreach (grabber->priv->keys, - (GHFunc) (void (*)(void)) find_event_key, - &context); + g_hash_table_find (grabber->priv->keys, + (GHRFunc) (void (*)(void)) find_event_key, + &context); + single_modifier_down = FALSE; if (G_LIKELY (context.result != NULL)) - /* We had a positive match */ - g_signal_emit_by_name (grabber, "shortcut-activated", - context.result, timestamp); + { + /* We had a positive match */ + if (xevent->type == KeyPress && is_modifier_key (context)) + { + /* Will be activated on release event */ + single_modifier_down = TRUE; + } + else + { + g_signal_emit_by_name (grabber, "shortcut-activated", + context.result, timestamp); + } + } gdk_display_flush (display); gdk_x11_display_error_trap_pop_ignored (display); @@ -531,19 +961,18 @@ xfce_shortcuts_grabber_add (XfceShortcutsGrabber *grabber, g_return_if_fail (shortcut != NULL); key = g_new0 (XfceKey, 1); - key->keycodes = g_array_new (FALSE, TRUE, sizeof (guint)); gtk_accelerator_parse (shortcut, &key->keyval, &key->modifiers); + TRACE ("parse %s -> keyval=0x%x, modifiers=0x%x", shortcut, key->keyval, key->modifiers); if (G_LIKELY (key->keyval != 0)) { - xfce_shortcuts_grabber_grab (grabber, key, TRUE); + xfce_shortcuts_grabber_grab (grabber, key); g_hash_table_insert (grabber->priv->keys, g_strdup (shortcut), key); } else { - g_array_free (key->keycodes, TRUE); - g_free (key); + free_key (key); } } @@ -562,7 +991,7 @@ xfce_shortcuts_grabber_remove (XfceShortcutsGrabber *grabber, if (G_LIKELY (key != NULL)) { - xfce_shortcuts_grabber_grab (grabber, key, FALSE); + xfce_shortcuts_grabber_ungrab (grabber, key); g_hash_table_remove (grabber->priv->keys, shortcut); } } diff --git a/libxfce4kbd-private/xfce-shortcuts-provider.c b/libxfce4kbd-private/xfce-shortcuts-provider.c index b7f7a47..7086d66 100644 --- a/libxfce4kbd-private/xfce-shortcuts-provider.c +++ b/libxfce4kbd-private/xfce-shortcuts-provider.c @@ -36,11 +36,6 @@ -#define XFCE_SHORTCUTS_PROVIDER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - XFCE_TYPE_SHORTCUTS_PROVIDER, XfceShortcutsProviderPrivate)) - - - /* Property identifiers */ enum { @@ -90,7 +85,7 @@ struct _XfceShortcutsProviderContext -G_DEFINE_TYPE (XfceShortcutsProvider, xfce_shortcuts_provider, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (XfceShortcutsProvider, xfce_shortcuts_provider, G_TYPE_OBJECT) @@ -99,8 +94,6 @@ xfce_shortcuts_provider_class_init (XfceShortcutsProviderClass *klass) { GObjectClass *gobject_class; - g_type_class_add_private (klass, sizeof (XfceShortcutsProviderPrivate)); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->constructed = xfce_shortcuts_provider_constructed; gobject_class->finalize = xfce_shortcuts_provider_finalize; @@ -145,7 +138,7 @@ xfce_shortcuts_provider_class_init (XfceShortcutsProviderClass *klass) static void xfce_shortcuts_provider_init (XfceShortcutsProvider *provider) { - provider->priv = XFCE_SHORTCUTS_PROVIDER_GET_PRIVATE (provider); + provider->priv = xfce_shortcuts_provider_get_instance_private (provider); provider->priv->channel = xfconf_channel_new ("xfce4-keyboard-shortcuts"); @@ -160,11 +153,11 @@ xfce_shortcuts_provider_constructed (GObject *object) { XfceShortcutsProvider *provider = XFCE_SHORTCUTS_PROVIDER (object); - xfce_shortcuts_provider_register (provider); - provider->priv->default_base_property = g_strdup_printf ("/%s/default", provider->priv->name); provider->priv->custom_base_property = g_strdup_printf ("/%s/custom", provider->priv->name); + xfce_shortcuts_provider_register (provider); + if (!xfce_shortcuts_provider_is_custom (provider)) xfce_shortcuts_provider_reset_to_defaults (provider); } @@ -403,7 +396,6 @@ _xfce_shortcuts_provider_clone_default (const gchar *property, XfceShortcutsProvider *provider) { const gchar *shortcut; - const gchar *command; gchar *custom_property; g_return_val_if_fail (XFCE_IS_SHORTCUTS_PROVIDER (provider), TRUE); @@ -413,9 +405,8 @@ _xfce_shortcuts_provider_clone_default (const gchar *property, return FALSE; shortcut = property + strlen (provider->priv->default_base_property) + strlen ("/"); - command = g_value_get_string (value); - DBG ("shortcut = %s, command = %s", shortcut, command); + DBG ("shortcut = %s, command = %s", shortcut, g_value_get_string (value)); custom_property = g_strconcat (provider->priv->custom_base_property, "/", shortcut, NULL); xfconf_channel_set_property (provider->priv->channel, custom_property, value); @@ -560,6 +551,7 @@ xfce_shortcuts_provider_get_shortcut (XfceShortcutsProvider *provider, { property2 = g_strconcat (property, "/startup-notify", NULL); snotify = xfconf_channel_get_bool (provider->priv->channel, property2, FALSE); + g_free (property2); sc = g_slice_new0 (XfceShortcut); sc->command = command; @@ -601,39 +593,9 @@ xfce_shortcuts_provider_has_shortcut (XfceShortcutsProvider *provider, * GTK+ used and this might be stored in Xfconf. We need * to check for this too. */ - const gchar *primary; - const gchar *p, *s; - GString *replaced; gchar *with_control_shortcut; - replaced = g_string_sized_new (strlen (shortcut)); - primary = "Primary"; - - /* Replace Primary in the string by Control using the same logic - * as exo_str_replace. */ - - while (*shortcut != '\0') - { - if (G_UNLIKELY (*shortcut == *primary)) - { - /* compare the pattern to the current string */ - for (p = primary + 1, s = shortcut + 1; *p == *s; ++s, ++p) - if (*p == '\0' || *s == '\0') - break; - - /* check if the pattern fully matched */ - if (G_LIKELY (*p == '\0')) - { - g_string_append (replaced, "Control"); - shortcut = s; - continue; - } - } - - g_string_append_c (replaced, *shortcut++); - } - - with_control_shortcut = g_string_free (replaced, FALSE); + with_control_shortcut = xfce_str_replace (shortcut, "Primary", "Control"); DBG ("Looking for old GTK+ shortcut %s", with_control_shortcut); @@ -701,7 +663,7 @@ xfce_shortcuts_provider_reset_shortcut (XfceShortcutsProvider *provider, DBG ("property = %s", property); - xfconf_channel_reset_property (provider->priv->channel, property, FALSE); + xfconf_channel_reset_property (provider->priv->channel, property, TRUE); g_free (property); } @@ -711,6 +673,7 @@ void xfce_shortcuts_free (GList *shortcuts) { g_list_foreach (shortcuts, (GFunc) (void (*)(void)) xfce_shortcut_free, NULL); + g_list_free (shortcuts); } diff --git a/libxfce4kbd-private/xfce-shortcuts-xfwm4.c b/libxfce4kbd-private/xfce-shortcuts-xfwm4.c index 9caf627..0e13d48 100644 --- a/libxfce4kbd-private/xfce-shortcuts-xfwm4.c +++ b/libxfce4kbd-private/xfce-shortcuts-xfwm4.c @@ -60,6 +60,10 @@ const ShortcutTemplate xfwm4_shortcut_values[] = { { N_("Fill window vertically"), "fill_vert_key" }, { N_("Toggle above"), "above_key" }, { N_("Toggle fullscreen"), "fullscreen_key" }, + { N_("Move window to lower monitor"), "move_window_to_monitor_down_key" }, + { N_("Move window to left monitor"), "move_window_to_monitor_left_key" }, + { N_("Move window to right monitor"), "move_window_to_monitor_right_key" }, + { N_("Move window to upper monitor"), "move_window_to_monitor_up_key" }, { N_("Move window to upper workspace"), "move_window_up_workspace_key" }, { N_("Move window to bottom workspace"), "move_window_down_workspace_key" }, { N_("Move window to left workspace"), "move_window_left_workspace_key" }, @@ -120,7 +124,10 @@ xfce_shortcuts_xfwm4_get_feature_name (const gchar *feature) guint i; /* Make sure to use the translations from libxfce4ui */ - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); +#ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +#endif /* We need to get the human readable string of the action name */ for (i = 0; xfwm4_shortcut_values[i].name != NULL; ++i) diff --git a/libxfce4kbd-private/xfce-shortcuts.c b/libxfce4kbd-private/xfce-shortcuts.c index c81fa5e..79adac8 100644 --- a/libxfce4kbd-private/xfce-shortcuts.c +++ b/libxfce4kbd-private/xfce-shortcuts.c @@ -93,7 +93,10 @@ xfce_shortcut_conflict_dialog (GtkWindow *parent, handled = FALSE; /* Make sure to use the translations from libxfce4ui */ - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); +#ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +#endif if (g_utf8_collate (owner, other) == 0 && ignore_same_provider) return GTK_RESPONSE_ACCEPT; diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml index c22428e..32901e3 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml @@ -29,6 +29,7 @@ + @@ -85,14 +86,14 @@ - - - - - - - - + + + + + + + + diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am index bc5afac..dde64ab 100644 --- a/libxfce4ui/Makefile.am +++ b/libxfce4ui/Makefile.am @@ -23,6 +23,7 @@ libxfce4ui_headers = \ xfce-dialogs.h \ xfce-gdk-extensions.h \ xfce-gtk-extensions.h \ + xfce-screensaver.h \ xfce-spawn.h \ xfce-filename-input.h \ xfce-titled-dialog.h \ @@ -47,6 +48,7 @@ libxfce4ui_sources = \ xfce-gdk-extensions.c \ xfce-gtk-extensions.c \ xfce-sm-client.c \ + xfce-screensaver.c \ xfce-spawn.c \ xfce-filename-input.c \ xfce-titled-dialog.c @@ -72,6 +74,7 @@ libxfce4ui_2_la_CFLAGS = \ $(GDK_CFLAGS) \ $(GTK3_CFLAGS) \ $(LIBX11_CFLAGS) \ + $(XFCONF_CFLAGS) \ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) @@ -89,6 +92,7 @@ libxfce4ui_2_la_LIBADD = \ $(GDK_LIBS) \ $(GTK3_LIBS) \ $(LIBX11_LIBS) \ + $(XFCONF_LIBS) \ $(LIBSTARTUP_NOTIFICATION_LIBS) \ $(LIBXFCE4UTIL_LIBS) @@ -118,7 +122,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=. if HAVE_INTROSPECTION -introspection_sources = $(libxfce4ui_2_la_SOURCES) +introspection_sources = $(filter-out %private.h, $(libxfce4ui_2_la_SOURCES)) Libxfce4ui-2.0.gir: libxfce4ui-2.la Makefile Libxfce4ui_2_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0 Libxfce4util-1.0 diff --git a/libxfce4ui/Makefile.in b/libxfce4ui/Makefile.in index f576376..403e2a8 100644 --- a/libxfce4ui/Makefile.in +++ b/libxfce4ui/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -99,11 +99,11 @@ target_triplet = @target@ subdir = libxfce4ui ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libxfce4ui2_include_HEADERS) \ @@ -146,7 +146,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libxfce4ui_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am__objects_1 = am__objects_2 = $(am__objects_1) am__objects_3 = libxfce4ui_2_la-libxfce4ui-aliasdef.lo \ @@ -159,6 +160,7 @@ am__objects_4 = $(am__objects_2) $(am__objects_3) \ libxfce4ui_2_la-xfce-gdk-extensions.lo \ libxfce4ui_2_la-xfce-gtk-extensions.lo \ libxfce4ui_2_la-xfce-sm-client.lo \ + libxfce4ui_2_la-xfce-screensaver.lo \ libxfce4ui_2_la-xfce-spawn.lo \ libxfce4ui_2_la-xfce-filename-input.lo \ libxfce4ui_2_la-xfce-titled-dialog.lo @@ -197,6 +199,7 @@ am__depfiles_remade = \ ./$(DEPDIR)/libxfce4ui_2_la-xfce-filename-input.Plo \ ./$(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Plo \ ./$(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Plo \ + ./$(DEPDIR)/libxfce4ui_2_la-xfce-screensaver.Plo \ ./$(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Plo \ ./$(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Plo \ ./$(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Plo @@ -245,8 +248,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -402,6 +403,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -442,6 +444,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -456,8 +460,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -677,6 +683,7 @@ libxfce4ui_headers = \ xfce-dialogs.h \ xfce-gdk-extensions.h \ xfce-gtk-extensions.h \ + xfce-screensaver.h \ xfce-spawn.h \ xfce-filename-input.h \ xfce-titled-dialog.h \ @@ -701,6 +708,7 @@ libxfce4ui_sources = \ xfce-gdk-extensions.c \ xfce-gtk-extensions.c \ xfce-sm-client.c \ + xfce-screensaver.c \ xfce-spawn.c \ xfce-filename-input.c \ xfce-titled-dialog.c @@ -719,6 +727,7 @@ libxfce4ui_2_la_CFLAGS = \ $(GDK_CFLAGS) \ $(GTK3_CFLAGS) \ $(LIBX11_CFLAGS) \ + $(XFCONF_CFLAGS) \ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) @@ -736,6 +745,7 @@ libxfce4ui_2_la_LIBADD = \ $(GDK_LIBS) \ $(GTK3_LIBS) \ $(LIBX11_LIBS) \ + $(XFCONF_LIBS) \ $(LIBSTARTUP_NOTIFICATION_LIBS) \ $(LIBXFCE4UTIL_LIBS) @@ -760,7 +770,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(prefix)/share/gir-1.0 \ --includedir=. -@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libxfce4ui_2_la_SOURCES) +@HAVE_INTROSPECTION_TRUE@introspection_sources = $(filter-out %private.h, $(libxfce4ui_2_la_SOURCES)) @HAVE_INTROSPECTION_TRUE@Libxfce4ui_2_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0 Libxfce4util-1.0 @HAVE_INTROSPECTION_TRUE@Libxfce4ui_2_0_gir_CFLAGS = $(AM_CPPFLAGS) @HAVE_INTROSPECTION_TRUE@Libxfce4ui_2_0_gir_LIBS = libxfce4ui-2.la @@ -887,6 +897,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-filename-input.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-screensaver.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Plo@am__quote@ # am--include-marker @@ -981,6 +992,13 @@ libxfce4ui_2_la-xfce-sm-client.lo: xfce-sm-client.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-sm-client.lo `test -f 'xfce-sm-client.c' || echo '$(srcdir)/'`xfce-sm-client.c +libxfce4ui_2_la-xfce-screensaver.lo: xfce-screensaver.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-screensaver.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-screensaver.Tpo -c -o libxfce4ui_2_la-xfce-screensaver.lo `test -f 'xfce-screensaver.c' || echo '$(srcdir)/'`xfce-screensaver.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-screensaver.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-screensaver.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-screensaver.c' object='libxfce4ui_2_la-xfce-screensaver.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-screensaver.lo `test -f 'xfce-screensaver.c' || echo '$(srcdir)/'`xfce-screensaver.c + libxfce4ui_2_la-xfce-spawn.lo: xfce-spawn.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-spawn.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Tpo -c -o libxfce4ui_2_la-xfce-spawn.lo `test -f 'xfce-spawn.c' || echo '$(srcdir)/'`xfce-spawn.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Plo @@ -1272,7 +1290,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1327,7 +1345,6 @@ abicheck.sh.log: abicheck.sh @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -1375,7 +1392,8 @@ installdirs: done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1425,6 +1443,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-filename-input.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Plo + -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-screensaver.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Plo @@ -1483,6 +1502,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-filename-input.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Plo + -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-screensaver.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Plo -rm -f ./$(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Plo @@ -1506,7 +1526,8 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-libxfce4ui2_includeHEADERS uninstall-pkgconfigDATA \ uninstall-typelibDATA uninstall-vapiDATA -.MAKE: all check check-am install install-am install-strip +.MAKE: all check check-am install install-am install-exec \ + install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ check-am clean clean-generic clean-libLTLIBRARIES \ diff --git a/libxfce4ui/libxfce4ui-alias.h b/libxfce4ui/libxfce4ui-alias.h index fe1a595..0ade2a8 100644 --- a/libxfce4ui/libxfce4ui-alias.h +++ b/libxfce4ui/libxfce4ui-alias.h @@ -4,6 +4,9 @@ #include +/* silence '-Wdeprecated-declarations' warnings from our own deprecations */ +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + #ifdef __LIBXFCE4UI_CONFIG_H__ #if 1 extern __typeof (libxfce4ui_check_version) IA__libxfce4ui_check_version __attribute((visibility("hidden"))); @@ -66,6 +69,9 @@ extern __typeof (xfce_gdk_screen_get_active) IA__xfce_gdk_screen_get_active __at extern __typeof (xfce_gdk_screen_get_geometry) IA__xfce_gdk_screen_get_geometry __attribute((visibility("hidden"))); #define xfce_gdk_screen_get_geometry IA__xfce_gdk_screen_get_geometry +extern __typeof (xfce_gdk_device_grab) IA__xfce_gdk_device_grab __attribute((visibility("hidden"))); +#define xfce_gdk_device_grab IA__xfce_gdk_device_grab + #endif #endif #ifdef __XFCE_GTK_EXTENSIONS_H__ @@ -94,6 +100,9 @@ extern __typeof (xfce_gtk_toggle_menu_item_new_from_action_entry) IA__xfce_gtk_t extern __typeof (xfce_gtk_tool_button_new_from_action_entry) IA__xfce_gtk_tool_button_new_from_action_entry __attribute((visibility("hidden"))); #define xfce_gtk_tool_button_new_from_action_entry IA__xfce_gtk_tool_button_new_from_action_entry +extern __typeof (xfce_gtk_toggle_tool_button_new_from_action_entry) IA__xfce_gtk_toggle_tool_button_new_from_action_entry __attribute((visibility("hidden"))); +#define xfce_gtk_toggle_tool_button_new_from_action_entry IA__xfce_gtk_toggle_tool_button_new_from_action_entry + extern __typeof (xfce_gtk_accel_map_add_entries) IA__xfce_gtk_accel_map_add_entries __attribute((visibility("hidden"))); #define xfce_gtk_accel_map_add_entries IA__xfce_gtk_accel_map_add_entries @@ -109,9 +118,18 @@ extern __typeof (xfce_gtk_get_action_entry_by_id) IA__xfce_gtk_get_action_entry_ extern __typeof (xfce_gtk_translate_action_entries) IA__xfce_gtk_translate_action_entries __attribute((visibility("hidden"))); #define xfce_gtk_translate_action_entries IA__xfce_gtk_translate_action_entries +extern __typeof (xfce_gtk_handle_tab_accels) IA__xfce_gtk_handle_tab_accels __attribute((visibility("hidden"))); +#define xfce_gtk_handle_tab_accels IA__xfce_gtk_handle_tab_accels + +extern __typeof (xfce_gtk_execute_tab_accel) IA__xfce_gtk_execute_tab_accel __attribute((visibility("hidden"))); +#define xfce_gtk_execute_tab_accel IA__xfce_gtk_execute_tab_accel + extern __typeof (xfce_gtk_menu_append_seperator) IA__xfce_gtk_menu_append_seperator __attribute((visibility("hidden"))); #define xfce_gtk_menu_append_seperator IA__xfce_gtk_menu_append_seperator +extern __typeof (xfce_gtk_menu_append_separator) IA__xfce_gtk_menu_append_separator __attribute((visibility("hidden"))); +#define xfce_gtk_menu_append_separator IA__xfce_gtk_menu_append_separator + extern __typeof (xfce_gtk_button_new_mixed) IA__xfce_gtk_button_new_mixed __attribute((visibility("hidden"))) G_GNUC_MALLOC; #define xfce_gtk_button_new_mixed IA__xfce_gtk_button_new_mixed @@ -142,6 +160,9 @@ extern __typeof (xfce_gtk_menu_item_set_accel_label) IA__xfce_gtk_menu_item_set_ extern __typeof (xfce_has_gtk_frame_extents) IA__xfce_has_gtk_frame_extents __attribute((visibility("hidden"))); #define xfce_has_gtk_frame_extents IA__xfce_has_gtk_frame_extents +extern __typeof (xfce_gtk_label_set_a11y_relation) IA__xfce_gtk_label_set_a11y_relation __attribute((visibility("hidden"))); +#define xfce_gtk_label_set_a11y_relation IA__xfce_gtk_label_set_a11y_relation + #endif #endif #ifdef __XFCE_SPAWN_H__ @@ -253,6 +274,22 @@ extern __typeof (xfce_sm_client_set_current_directory) IA__xfce_sm_client_set_cu extern __typeof (xfce_sm_client_get_current_directory) IA__xfce_sm_client_get_current_directory __attribute((visibility("hidden"))); #define xfce_sm_client_get_current_directory IA__xfce_sm_client_get_current_directory +#endif +#endif +#ifdef __XFCE_SCREENSAVER_H__ +#if 1 +extern __typeof (xfce_screensaver_get_type) IA__xfce_screensaver_get_type __attribute((visibility("hidden"))); +#define xfce_screensaver_get_type IA__xfce_screensaver_get_type + +extern __typeof (xfce_screensaver_new) IA__xfce_screensaver_new __attribute((visibility("hidden"))); +#define xfce_screensaver_new IA__xfce_screensaver_new + +extern __typeof (xfce_screensaver_inhibit) IA__xfce_screensaver_inhibit __attribute((visibility("hidden"))); +#define xfce_screensaver_inhibit IA__xfce_screensaver_inhibit + +extern __typeof (xfce_screensaver_lock) IA__xfce_screensaver_lock __attribute((visibility("hidden"))); +#define xfce_screensaver_lock IA__xfce_screensaver_lock + #endif #endif #ifdef __XFCE_TITLED_DIALOG_H__ @@ -290,4 +327,6 @@ extern __typeof (xfce_titled_dialog_set_default_response) IA__xfce_titled_dialog #endif #endif +G_GNUC_END_IGNORE_DEPRECATIONS + #endif /* HAVE_GNUC_VISIBILITY */ diff --git a/libxfce4ui/libxfce4ui-aliasdef.c b/libxfce4ui/libxfce4ui-aliasdef.c index d40b091..c655346 100644 --- a/libxfce4ui/libxfce4ui-aliasdef.c +++ b/libxfce4ui/libxfce4ui-aliasdef.c @@ -4,6 +4,9 @@ #include +/* silence '-Wdeprecated-declarations' warnings from our own deprecations */ +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + #if 1 #ifdef __LIBXFCE4UI_CONFIG_C__ #undef libxfce4ui_check_version @@ -66,6 +69,9 @@ extern __typeof (xfce_gdk_screen_get_active) xfce_gdk_screen_get_active __attrib #undef xfce_gdk_screen_get_geometry extern __typeof (xfce_gdk_screen_get_geometry) xfce_gdk_screen_get_geometry __attribute((alias("IA__xfce_gdk_screen_get_geometry"), visibility("default"))); +#undef xfce_gdk_device_grab +extern __typeof (xfce_gdk_device_grab) xfce_gdk_device_grab __attribute((alias("IA__xfce_gdk_device_grab"), visibility("default"))); + #endif #endif #if 1 @@ -94,6 +100,9 @@ extern __typeof (xfce_gtk_toggle_menu_item_new_from_action_entry) xfce_gtk_toggl #undef xfce_gtk_tool_button_new_from_action_entry extern __typeof (xfce_gtk_tool_button_new_from_action_entry) xfce_gtk_tool_button_new_from_action_entry __attribute((alias("IA__xfce_gtk_tool_button_new_from_action_entry"), visibility("default"))); +#undef xfce_gtk_toggle_tool_button_new_from_action_entry +extern __typeof (xfce_gtk_toggle_tool_button_new_from_action_entry) xfce_gtk_toggle_tool_button_new_from_action_entry __attribute((alias("IA__xfce_gtk_toggle_tool_button_new_from_action_entry"), visibility("default"))); + #undef xfce_gtk_accel_map_add_entries extern __typeof (xfce_gtk_accel_map_add_entries) xfce_gtk_accel_map_add_entries __attribute((alias("IA__xfce_gtk_accel_map_add_entries"), visibility("default"))); @@ -109,9 +118,18 @@ extern __typeof (xfce_gtk_get_action_entry_by_id) xfce_gtk_get_action_entry_by_i #undef xfce_gtk_translate_action_entries extern __typeof (xfce_gtk_translate_action_entries) xfce_gtk_translate_action_entries __attribute((alias("IA__xfce_gtk_translate_action_entries"), visibility("default"))); +#undef xfce_gtk_handle_tab_accels +extern __typeof (xfce_gtk_handle_tab_accels) xfce_gtk_handle_tab_accels __attribute((alias("IA__xfce_gtk_handle_tab_accels"), visibility("default"))); + +#undef xfce_gtk_execute_tab_accel +extern __typeof (xfce_gtk_execute_tab_accel) xfce_gtk_execute_tab_accel __attribute((alias("IA__xfce_gtk_execute_tab_accel"), visibility("default"))); + #undef xfce_gtk_menu_append_seperator extern __typeof (xfce_gtk_menu_append_seperator) xfce_gtk_menu_append_seperator __attribute((alias("IA__xfce_gtk_menu_append_seperator"), visibility("default"))); +#undef xfce_gtk_menu_append_separator +extern __typeof (xfce_gtk_menu_append_separator) xfce_gtk_menu_append_separator __attribute((alias("IA__xfce_gtk_menu_append_separator"), visibility("default"))); + #undef xfce_gtk_button_new_mixed extern __typeof (xfce_gtk_button_new_mixed) xfce_gtk_button_new_mixed __attribute((alias("IA__xfce_gtk_button_new_mixed"), visibility("default"))); @@ -142,6 +160,9 @@ extern __typeof (xfce_gtk_menu_item_set_accel_label) xfce_gtk_menu_item_set_acce #undef xfce_has_gtk_frame_extents extern __typeof (xfce_has_gtk_frame_extents) xfce_has_gtk_frame_extents __attribute((alias("IA__xfce_has_gtk_frame_extents"), visibility("default"))); +#undef xfce_gtk_label_set_a11y_relation +extern __typeof (xfce_gtk_label_set_a11y_relation) xfce_gtk_label_set_a11y_relation __attribute((alias("IA__xfce_gtk_label_set_a11y_relation"), visibility("default"))); + #endif #endif #if 1 @@ -253,6 +274,22 @@ extern __typeof (xfce_sm_client_set_current_directory) xfce_sm_client_set_curren #undef xfce_sm_client_get_current_directory extern __typeof (xfce_sm_client_get_current_directory) xfce_sm_client_get_current_directory __attribute((alias("IA__xfce_sm_client_get_current_directory"), visibility("default"))); +#endif +#endif +#if 1 +#ifdef __XFCE_SCREENSAVER_C__ +#undef xfce_screensaver_get_type +extern __typeof (xfce_screensaver_get_type) xfce_screensaver_get_type __attribute((alias("IA__xfce_screensaver_get_type"), visibility("default"))); + +#undef xfce_screensaver_new +extern __typeof (xfce_screensaver_new) xfce_screensaver_new __attribute((alias("IA__xfce_screensaver_new"), visibility("default"))); + +#undef xfce_screensaver_inhibit +extern __typeof (xfce_screensaver_inhibit) xfce_screensaver_inhibit __attribute((alias("IA__xfce_screensaver_inhibit"), visibility("default"))); + +#undef xfce_screensaver_lock +extern __typeof (xfce_screensaver_lock) xfce_screensaver_lock __attribute((alias("IA__xfce_screensaver_lock"), visibility("default"))); + #endif #endif #if 1 @@ -290,4 +327,6 @@ extern __typeof (xfce_titled_dialog_set_default_response) xfce_titled_dialog_set #endif #endif +G_GNUC_END_IGNORE_DEPRECATIONS + #endif /* HAVE_GNUC_VISIBILITY */ diff --git a/libxfce4ui/libxfce4ui-config.h b/libxfce4ui/libxfce4ui-config.h index 6fb8e76..6cecaec 100644 --- a/libxfce4ui/libxfce4ui-config.h +++ b/libxfce4ui/libxfce4ui-config.h @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file may disappear or change contents." #endif @@ -44,7 +44,7 @@ G_BEGIN_DECLS * that can be used by the C pre-processor. * */ -#define LIBXFCE4UI_MINOR_VERSION (16) +#define LIBXFCE4UI_MINOR_VERSION (18) /** * LIBXFCE4UI_MICRO_VERSION: @@ -53,13 +53,13 @@ G_BEGIN_DECLS * that can be used by the C pre-processor. * */ -#define LIBXFCE4UI_MICRO_VERSION (1) +#define LIBXFCE4UI_MICRO_VERSION (6) /** * LIBXFCE4UI_CHECK_VERSION: * @major : The major version of the library, i.e. 4 - * @minor : The minor version of the library, i.e. 16 - * @micro : The micro release of the library, i.e. 1 + * @minor : The minor version of the library, i.e. 18 + * @micro : The micro release of the library, i.e. 6 * * A macro to compare libxfce4ui versions to determine if a particular * function is available. diff --git a/libxfce4ui/libxfce4ui-config.h.in b/libxfce4ui/libxfce4ui-config.h.in index a99bfba..2138125 100644 --- a/libxfce4ui/libxfce4ui-config.h.in +++ b/libxfce4ui/libxfce4ui-config.h.in @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file may disappear or change contents." #endif diff --git a/libxfce4ui/libxfce4ui-private.h b/libxfce4ui/libxfce4ui-private.h index 8ab5b31..bd94cf4 100644 --- a/libxfce4ui/libxfce4ui-private.h +++ b/libxfce4ui/libxfce4ui-private.h @@ -28,9 +28,6 @@ G_BEGIN_DECLS -/* support for canonical representations of strings */ -#define I_(string) (g_intern_static_string ((string))) - #ifndef NDEBUG #define _libxfce4ui_assert(expr) g_assert (expr) #define _libxfce4ui_assert_not_reached() g_assert_not_reached () diff --git a/libxfce4ui/libxfce4ui-resources.c b/libxfce4ui/libxfce4ui-resources.c index ffec894..0612e51 100644 --- a/libxfce4ui/libxfce4ui-resources.c +++ b/libxfce4ui/libxfce4ui-resources.c @@ -1,248 +1,11 @@ #include #if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) -# define SECTION __attribute__ ((section (".gresource.libxfce4ui"), aligned (8))) +# define SECTION __attribute__ ((section (".gresource.libxfce4ui"), aligned (sizeof(void *) > 8 ? sizeof(void *) : 8))) #else # define SECTION #endif -#ifdef _MSC_VER -static const SECTION union { const guint8 data[3722]; const double alignment; void * const ptr;} libxfce4ui_resource_data = { { - 0107, 0126, 0141, 0162, 0151, 0141, 0156, 0164, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, - 0030, 0000, 0000, 0000, 0254, 0000, 0000, 0000, 0000, 0000, 0000, 0050, 0005, 0000, 0000, 0000, - 0000, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 0003, 0000, 0000, 0000, - 0005, 0000, 0000, 0000, 0113, 0120, 0220, 0013, 0001, 0000, 0000, 0000, 0254, 0000, 0000, 0000, - 0004, 0000, 0114, 0000, 0260, 0000, 0000, 0000, 0264, 0000, 0000, 0000, 0324, 0265, 0002, 0000, - 0377, 0377, 0377, 0377, 0264, 0000, 0000, 0000, 0001, 0000, 0114, 0000, 0270, 0000, 0000, 0000, - 0274, 0000, 0000, 0000, 0236, 0123, 0076, 0042, 0003, 0000, 0000, 0000, 0274, 0000, 0000, 0000, - 0013, 0000, 0114, 0000, 0310, 0000, 0000, 0000, 0314, 0000, 0000, 0000, 0240, 0124, 0352, 0031, - 0000, 0000, 0000, 0000, 0314, 0000, 0000, 0000, 0005, 0000, 0114, 0000, 0324, 0000, 0000, 0000, - 0330, 0000, 0000, 0000, 0301, 0307, 0017, 0171, 0002, 0000, 0000, 0000, 0330, 0000, 0000, 0000, - 0027, 0000, 0166, 0000, 0360, 0000, 0000, 0000, 0211, 0016, 0000, 0000, 0157, 0162, 0147, 0057, - 0003, 0000, 0000, 0000, 0057, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0154, 0151, 0142, 0170, - 0146, 0143, 0145, 0064, 0165, 0151, 0057, 0000, 0004, 0000, 0000, 0000, 0170, 0146, 0143, 0145, - 0057, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 0154, 0151, 0142, 0170, 0146, 0143, 0145, 0064, - 0165, 0151, 0055, 0144, 0151, 0141, 0154, 0157, 0147, 0055, 0165, 0151, 0056, 0165, 0151, 0000, - 0211, 0015, 0000, 0000, 0000, 0000, 0000, 0000, 0074, 0077, 0170, 0155, 0154, 0040, 0166, 0145, - 0162, 0163, 0151, 0157, 0156, 0075, 0042, 0061, 0056, 0060, 0042, 0040, 0145, 0156, 0143, 0157, - 0144, 0151, 0156, 0147, 0075, 0042, 0125, 0124, 0106, 0055, 0070, 0042, 0077, 0076, 0012, 0074, - 0041, 0055, 0055, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0164, 0145, 0144, 0040, 0167, 0151, - 0164, 0150, 0040, 0147, 0154, 0141, 0144, 0145, 0040, 0063, 0056, 0061, 0070, 0056, 0063, 0040, - 0055, 0055, 0076, 0012, 0074, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0076, 0012, - 0040, 0040, 0074, 0162, 0145, 0161, 0165, 0151, 0162, 0145, 0163, 0040, 0154, 0151, 0142, 0075, - 0042, 0147, 0164, 0153, 0053, 0042, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, 0075, 0042, - 0063, 0056, 0061, 0062, 0042, 0057, 0076, 0012, 0040, 0040, 0074, 0157, 0142, 0152, 0145, 0143, - 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0163, 0163, - 0141, 0147, 0145, 0104, 0151, 0141, 0154, 0157, 0147, 0042, 0040, 0151, 0144, 0075, 0042, 0170, - 0146, 0143, 0145, 0064, 0165, 0151, 0055, 0144, 0151, 0141, 0154, 0157, 0147, 0042, 0076, 0012, - 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, - 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, - 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, - 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, - 0155, 0145, 0075, 0042, 0155, 0145, 0163, 0163, 0141, 0147, 0145, 0137, 0164, 0171, 0160, 0145, - 0042, 0076, 0107, 0124, 0113, 0137, 0115, 0105, 0123, 0123, 0101, 0107, 0105, 0137, 0117, 0124, - 0110, 0105, 0122, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, - 0040, 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0151, 0156, 0164, 0145, 0162, 0156, - 0141, 0154, 0055, 0143, 0150, 0151, 0154, 0144, 0075, 0042, 0166, 0142, 0157, 0170, 0042, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, - 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0102, 0157, 0170, 0042, 0040, 0151, 0144, - 0075, 0042, 0144, 0151, 0141, 0154, 0157, 0147, 0055, 0166, 0142, 0157, 0170, 0061, 0042, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, - 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, - 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, - 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0157, 0162, 0151, - 0145, 0156, 0164, 0141, 0164, 0151, 0157, 0156, 0042, 0076, 0166, 0145, 0162, 0164, 0151, 0143, - 0141, 0154, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0151, 0156, 0164, - 0145, 0162, 0156, 0141, 0154, 0055, 0143, 0150, 0151, 0154, 0144, 0075, 0042, 0141, 0143, 0164, - 0151, 0157, 0156, 0137, 0141, 0162, 0145, 0141, 0042, 0076, 0012, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, - 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0102, 0165, 0164, 0164, 0157, 0156, 0102, 0157, 0170, - 0042, 0040, 0151, 0144, 0075, 0042, 0144, 0151, 0141, 0154, 0157, 0147, 0055, 0141, 0143, 0164, - 0151, 0157, 0156, 0137, 0141, 0162, 0145, 0141, 0042, 0076, 0012, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, - 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, - 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, - 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, - 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, - 0155, 0145, 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, - 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0171, - 0157, 0165, 0164, 0137, 0163, 0164, 0171, 0154, 0145, 0042, 0076, 0145, 0170, 0160, 0141, 0156, - 0144, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0160, 0154, 0141, 0143, 0145, 0150, 0157, 0154, 0144, 0145, 0162, 0057, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, 0143, 0150, 0151, 0154, - 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0154, 0141, 0143, 0145, 0150, 0157, 0154, 0144, 0145, - 0162, 0057, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0012, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, - 0141, 0156, 0144, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, - 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, - 0042, 0146, 0151, 0154, 0154, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, - 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, - 0145, 0075, 0042, 0160, 0157, 0163, 0151, 0164, 0151, 0157, 0156, 0042, 0076, 0060, 0074, 0057, - 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0012, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0012, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0012, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0157, 0142, 0152, 0145, 0143, - 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0102, 0157, 0170, 0042, - 0040, 0151, 0144, 0075, 0042, 0142, 0157, 0170, 0042, 0076, 0012, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, - 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, - 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, - 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, - 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, - 0155, 0145, 0075, 0042, 0155, 0141, 0162, 0147, 0151, 0156, 0137, 0142, 0157, 0164, 0164, 0157, - 0155, 0042, 0076, 0060, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, - 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0155, 0141, 0162, 0147, - 0151, 0156, 0137, 0162, 0151, 0147, 0150, 0164, 0042, 0076, 0066, 0074, 0057, 0160, 0162, 0157, - 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, - 0145, 0075, 0042, 0150, 0141, 0154, 0151, 0147, 0156, 0042, 0076, 0107, 0124, 0113, 0137, 0101, - 0114, 0111, 0107, 0116, 0137, 0123, 0124, 0101, 0122, 0124, 0074, 0057, 0160, 0162, 0157, 0160, - 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, - 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0111, 0155, 0141, 0147, 0145, 0042, - 0040, 0151, 0144, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0163, 0164, 0157, 0143, 0153, 0137, - 0151, 0144, 0042, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, - 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, - 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, - 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, - 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, - 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, - 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0170, 0160, 0141, 0144, 0042, 0076, - 0062, 0064, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, - 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0163, 0164, - 0157, 0143, 0153, 0042, 0076, 0147, 0164, 0153, 0055, 0155, 0151, 0163, 0163, 0151, 0156, 0147, - 0055, 0151, 0155, 0141, 0147, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, - 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, - 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, - 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, - 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, - 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0146, 0151, 0154, 0154, 0042, - 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, - 0042, 0160, 0157, 0163, 0151, 0164, 0151, 0157, 0156, 0042, 0076, 0060, 0074, 0057, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, 0143, - 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, - 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0102, 0157, 0170, 0042, 0040, 0151, - 0144, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0055, 0142, 0157, 0170, 0042, 0076, 0012, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, - 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, - 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, - 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, - 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, - 0155, 0145, 0075, 0042, 0155, 0141, 0162, 0147, 0151, 0156, 0137, 0154, 0145, 0146, 0164, 0042, - 0076, 0060, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, - 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0155, 0141, - 0162, 0147, 0151, 0156, 0137, 0162, 0151, 0147, 0150, 0164, 0042, 0076, 0060, 0074, 0057, 0160, - 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, - 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0155, 0141, 0162, 0147, 0151, 0156, 0137, - 0164, 0157, 0160, 0042, 0076, 0060, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, - 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, - 0075, 0042, 0155, 0141, 0162, 0147, 0151, 0156, 0137, 0142, 0157, 0164, 0164, 0157, 0155, 0042, - 0076, 0060, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, - 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0157, 0162, - 0151, 0145, 0156, 0164, 0141, 0164, 0151, 0157, 0156, 0042, 0076, 0166, 0145, 0162, 0164, 0151, - 0143, 0141, 0154, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0163, - 0160, 0141, 0143, 0151, 0156, 0147, 0042, 0076, 0066, 0074, 0057, 0160, 0162, 0157, 0160, 0145, - 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0160, 0154, 0141, 0143, 0145, 0150, 0157, 0154, 0144, 0145, 0162, 0057, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, - 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0074, 0160, 0154, 0141, 0143, 0145, 0150, 0157, 0154, 0144, 0145, 0162, 0057, 0076, 0012, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, - 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, - 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, - 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, - 0042, 0146, 0151, 0154, 0154, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, - 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, - 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0160, 0141, 0144, 0144, 0151, 0156, 0147, 0042, 0076, - 0060, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, - 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0160, 0157, 0163, - 0151, 0164, 0151, 0157, 0156, 0042, 0076, 0061, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, - 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0012, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, 0143, 0150, 0151, 0154, 0144, - 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0057, 0157, 0142, - 0152, 0145, 0143, 0164, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, - 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, - 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0124, 0162, - 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, 0040, 0040, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, 0160, 0145, - 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0146, 0151, 0154, 0154, 0042, 0076, - 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0012, - 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, 0162, 0157, - 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0160, 0141, 0144, 0144, - 0151, 0156, 0147, 0042, 0076, 0064, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, - 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, 0160, - 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0160, 0157, - 0163, 0151, 0164, 0151, 0157, 0156, 0042, 0076, 0061, 0074, 0057, 0160, 0162, 0157, 0160, 0145, - 0162, 0164, 0171, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0074, - 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0012, 0040, 0040, 0040, 0040, 0040, 0040, - 0040, 0040, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0040, 0040, 0040, - 0040, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0012, 0040, 0040, 0040, 0040, 0074, - 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0012, 0040, 0040, 0074, 0057, 0157, 0142, 0152, 0145, - 0143, 0164, 0076, 0012, 0074, 0057, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0076, - 0012, 0000, 0000, 0050, 0165, 0165, 0141, 0171, 0051 -} }; -#else /* _MSC_VER */ static const SECTION union { const guint8 data[3722]; const double alignment; void * const ptr;} libxfce4ui_resource_data = { "\107\126\141\162\151\141\156\164\000\000\000\000\000\000\000\000" "\030\000\000\000\254\000\000\000\000\000\000\050\005\000\000\000" @@ -477,7 +240,6 @@ static const SECTION union { const guint8 data[3722]; const double alignment; vo "\057\143\150\151\154\144\076\012\040\040\074\057\157\142\152\145" "\143\164\076\012\074\057\151\156\164\145\162\146\141\143\145\076" "\012\000\000\050\165\165\141\171\051" }; -#endif /* !_MSC_VER */ static GStaticResource static_resource = { libxfce4ui_resource_data.data, sizeof (libxfce4ui_resource_data.data) - 1 /* nul terminator */, NULL, NULL, NULL }; @@ -487,6 +249,35 @@ GResource *libxfce4ui_get_resource (void) { return g_static_resource_get_resource (&static_resource); } +/* GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +/* + * Modified by the GLib Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GLib Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GLib at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __G_CONSTRUCTOR_H__ +#define __G_CONSTRUCTOR_H__ + /* If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and destructors, in a usable way, including e.g. on library unload. If not you're on @@ -514,8 +305,16 @@ GResource *libxfce4ui_get_resource (void) #define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void); #define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void); -#elif defined (_MSC_VER) && (_MSC_VER >= 1500) -/* Visual studio 2008 and later has _Pragma */ +#elif defined (_MSC_VER) + +/* + * Only try to include gslist.h if not already included via glib.h, + * so that items using gconstructor.h outside of GLib (such as + * GResources) continue to build properly. + */ +#ifndef __G_LIB_H__ +#include "gslist.h" +#endif #include @@ -546,6 +345,7 @@ GResource *libxfce4ui_get_resource (void) #define G_MSVC_CTOR(_func,_sym_prefix) \ static void _func(void); \ extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void); \ int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ __pragma(section(".CRT$XCU",read)) \ @@ -554,33 +354,12 @@ GResource *libxfce4ui_get_resource (void) #define G_MSVC_DTOR(_func,_sym_prefix) \ static void _func(void); \ extern int (* _array ## _func)(void); \ + int _func ## _constructor(void); \ int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ __pragma(section(".CRT$XCU",read)) \ __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; -#elif defined (_MSC_VER) - -#define G_HAS_CONSTRUCTORS 1 - -/* Pre Visual studio 2008 must use #pragma section */ -#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 -#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 - -#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ - section(".CRT$XCU",read) -#define G_DEFINE_CONSTRUCTOR(_func) \ - static void _func(void); \ - static int _func ## _wrapper(void) { _func(); return 0; } \ - __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper; - -#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ - section(".CRT$XCU",read) -#define G_DEFINE_DESTRUCTOR(_func) \ - static void _func(void); \ - static int _func ## _constructor(void) { atexit (_func); return 0; } \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; - #elif defined(__SUNPRO_C) /* This is not tested, but i believe it should work, based on: @@ -609,28 +388,29 @@ GResource *libxfce4ui_get_resource (void) #endif #endif /* __GTK_DOC_IGNORE__ */ +#endif /* __G_CONSTRUCTOR_H__ */ #ifdef G_HAS_CONSTRUCTORS #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA -#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor) +#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(libxfce4uiresource_constructor) #endif -G_DEFINE_CONSTRUCTOR(resource_constructor) +G_DEFINE_CONSTRUCTOR(libxfce4uiresource_constructor) #ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA -#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor) +#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(libxfce4uiresource_destructor) #endif -G_DEFINE_DESTRUCTOR(resource_destructor) +G_DEFINE_DESTRUCTOR(libxfce4uiresource_destructor) #else #warning "Constructor not supported on this compiler, linking in resources will not work" #endif -static void resource_constructor (void) +static void libxfce4uiresource_constructor (void) { g_static_resource_init (&static_resource); } -static void resource_destructor (void) +static void libxfce4uiresource_destructor (void) { g_static_resource_fini (&static_resource); } diff --git a/libxfce4ui/libxfce4ui.h b/libxfce4ui/libxfce4ui.h index 6dc15f8..32b0b2f 100644 --- a/libxfce4ui/libxfce4ui.h +++ b/libxfce4ui/libxfce4ui.h @@ -22,7 +22,7 @@ #include -#define LIBXFCE4UI_INSIDE_LIBXFCE4UI_H +#define _LIBXFCE4UI_INSIDE_LIBXFCE4UI_H #include #include @@ -31,9 +31,10 @@ #include #include #include +#include #include #include -#undef LIBXFCE4UI_INSIDE_LIBXFCE4UI_H +#undef _LIBXFCE4UI_INSIDE_LIBXFCE4UI_H #endif /* !__LIBXFCE4UI_H__ */ diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols index 2fbf29c..5f5360c 100644 --- a/libxfce4ui/libxfce4ui.symbols +++ b/libxfce4ui/libxfce4ui.symbols @@ -75,6 +75,7 @@ xfce_message_dialog G_GNUC_NULL_TERMINATED #if IN_SOURCE(__XFCE_GDK_EXTENSIONS_C__) xfce_gdk_screen_get_active xfce_gdk_screen_get_geometry +xfce_gdk_device_grab #endif #endif @@ -89,12 +90,16 @@ xfce_gtk_radio_menu_item_new xfce_gtk_menu_item_new_from_action_entry xfce_gtk_toggle_menu_item_new_from_action_entry xfce_gtk_tool_button_new_from_action_entry +xfce_gtk_toggle_tool_button_new_from_action_entry xfce_gtk_accel_map_add_entries xfce_gtk_accel_group_connect_action_entries xfce_gtk_accel_group_disconnect_action_entries xfce_gtk_get_action_entry_by_id xfce_gtk_translate_action_entries +xfce_gtk_handle_tab_accels +xfce_gtk_execute_tab_accel xfce_gtk_menu_append_seperator +xfce_gtk_menu_append_separator xfce_gtk_button_new_mixed G_GNUC_MALLOC xfce_gtk_frame_box_new G_GNUC_MALLOC xfce_gtk_frame_box_new_with_content G_GNUC_MALLOC @@ -105,6 +110,7 @@ xfce_icon_name_from_desktop_id xfce_gicon_from_name xfce_gtk_menu_item_set_accel_label xfce_has_gtk_frame_extents +xfce_gtk_label_set_a11y_relation #endif #endif @@ -159,6 +165,16 @@ xfce_sm_client_get_current_directory #endif #endif +/* xfce-screensaver functions */ +#if IN_HEADER(__XFCE_SCREENSAVER_H__) +#if IN_SOURCE(__XFCE_SCREENSAVER_C__) +xfce_screensaver_get_type +xfce_screensaver_new +xfce_screensaver_inhibit +xfce_screensaver_lock +#endif +#endif + /* xfce-titled-dialog functions */ #if IN_HEADER(__XFCE_TITLED_DIALOG_H__) #if IN_SOURCE(__XFCE_TITLED_DIALOG_C__) diff --git a/libxfce4ui/make-libxfce4ui-alias.pl b/libxfce4ui/make-libxfce4ui-alias.pl index 8caa42e..a787698 100644 --- a/libxfce4ui/make-libxfce4ui-alias.pl +++ b/libxfce4ui/make-libxfce4ui-alias.pl @@ -34,6 +34,9 @@ #include +/* silence '-Wdeprecated-declarations' warnings from our own deprecations */ +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + EOF my $in_comment = 0; @@ -149,6 +152,8 @@ print <data)); + g_list_free (children); if (parent) { @@ -737,8 +738,8 @@ xfce_message_dialog_new_valist (GtkWindow *parent, /** * xfce_message_dialog_new: - * @parent : (allow-none): transient parent of the dialog, or %NULL. - * @title : (allow-none): title of the dialog, or %NULL. + * @parent : (nullable): transient parent of the dialog, or %NULL. + * @title : (nullable): title of the dialog, or %NULL. * @stock_id : gtk stock icon name to show in the dialog. * @primary_text : primary text shown in large bold font. * @secondary_text : secondary text shown in normal font. @@ -807,7 +808,10 @@ xfce_message_dialog_new_valist (GtkWindow *parent, * * * - * Return value: (transfer full): A new #GtkMessageDialog. + * The caller is responsible for destroying the dialog with gtk_widget_destroy() + * when it is no longer required. + * + * Return value: (transfer none): A new #GtkMessageDialog. **/ GtkWidget * xfce_message_dialog_new (GtkWindow *parent, @@ -835,8 +839,8 @@ xfce_message_dialog_new (GtkWindow *parent, /** * xfce_message_dialog: - * @parent : (allow-none): transient parent of the dialog, or %NULL. - * @title : (allow-none): title of the dialog, or %NULL. + * @parent : (nullable): transient parent of the dialog, or %NULL. + * @title : (nullable): title of the dialog, or %NULL. * @stock_id : gtk stock icon name to show in the dialog. * @primary_text : primary text shown in large bold font. * @secondary_text : secondary text shown in normal font. diff --git a/libxfce4ui/xfce-dialogs.h b/libxfce4ui/xfce-dialogs.h index 6dee289..b0cf388 100644 --- a/libxfce4ui/xfce-dialogs.h +++ b/libxfce4ui/xfce-dialogs.h @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file is not part of the public API." #endif diff --git a/libxfce4ui/xfce-filename-input.c b/libxfce4ui/xfce-filename-input.c index 9c4a705..ebc292a 100644 --- a/libxfce4ui/xfce-filename-input.c +++ b/libxfce4ui/xfce-filename-input.c @@ -68,16 +68,18 @@ enum -static void xfce_filename_input_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void xfce_filename_input_finalize (GObject *object); -static void xfce_filename_input_entry_changed (GtkEditable *editable, - gpointer data); -static gboolean xfce_filename_input_entry_undo (GtkWidget *widget, - GdkEvent *event, - gpointer data); +static void xfce_filename_input_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void xfce_filename_input_finalize (GObject *object); +static void xfce_filename_input_entry_changed (GtkEditable *editable, + gpointer data); +static gboolean xfce_filename_input_entry_undo (GtkWidget *widget, + GdkEvent *event, + gpointer data); +static gboolean xfce_filename_input_whitespace_warning_timer (gpointer data); +static void xfce_filename_input_whitespace_warning_timer_destroy (gpointer data); @@ -90,6 +92,11 @@ struct _XfceFilenameInputClass void (*text_invalid) (XfceFilenameInput *filename_input); }; +/** + * XfceFilenameInput: + * + * An opaque structure with only private fields. + **/ struct _XfceFilenameInput { GtkBox parent; @@ -100,8 +107,14 @@ struct _XfceFilenameInput GRegex *whitespace_regex; GRegex *dir_sep_regex; - gint max_text_length; + gint max_text_length; gchar *original_filename; + + gchar *too_long_mssg; + gchar *sep_illegal_mssg; + gchar *whitespace_mssg; + + guint whitespace_warning_timer_id; }; static guint signals[N_SIGS]; @@ -215,11 +228,16 @@ xfce_filename_input_init (XfceFilenameInput *filename_input) gtk_widget_set_valign (GTK_WIDGET (filename_input->entry), GTK_ALIGN_CENTER); gtk_box_pack_start (GTK_BOX (filename_input), GTK_WIDGET (filename_input->entry), FALSE, FALSE, 0); + /* retrieve the error and warning messages */ + filename_input->too_long_mssg = _("Filename is too long"); + filename_input->sep_illegal_mssg = _("Directory separator illegal in file name"); + filename_input->whitespace_mssg = _("Filenames should not start or end with a space"); + /* set up the GtkLabel to display any error or warning messages */ filename_input->label = GTK_LABEL (gtk_label_new("")); gtk_label_set_xalign (filename_input->label, 0.0f); - gtk_widget_set_hexpand (GTK_WIDGET (filename_input->label), TRUE); gtk_box_pack_start (GTK_BOX (filename_input), GTK_WIDGET (filename_input->label), FALSE, FALSE, 0); + gtk_label_set_line_wrap (filename_input->label, TRUE); /* allow reverting the filename with ctrl + z */ g_signal_connect (filename_input->entry, "key-press-event", @@ -264,6 +282,10 @@ xfce_filename_input_finalize (GObject *object) { XfceFilenameInput *filename_input = XFCE_FILENAME_INPUT (object); + /* cancel any pending timer */ + if (filename_input->whitespace_warning_timer_id != 0) + g_source_remove (filename_input->whitespace_warning_timer_id); + g_regex_unref (filename_input->whitespace_regex); g_regex_unref (filename_input->dir_sep_regex); @@ -389,6 +411,10 @@ xfce_filename_input_entry_changed (GtkEditable *editable, filename_input = XFCE_FILENAME_INPUT (data); label = filename_input->label; + /* cancel any pending timer to display a warning about the text starting or ending with whitespace */ + if (filename_input->whitespace_warning_timer_id != 0) + g_source_remove (filename_input->whitespace_warning_timer_id); + /* get the string representing the current text of the GtkEntry */ text_length = gtk_entry_get_text_length (entry); text = gtk_entry_get_text (entry); /* NB this string must not be modified or freed, @@ -411,7 +437,7 @@ xfce_filename_input_entry_changed (GtkEditable *editable, else if (match_ds) { /* the string contains a directory separator */ - label_text = _("Directory separator illegal in file name"); + label_text = filename_input->sep_illegal_mssg; icon_name = "dialog-error"; new_text_valid = FALSE; } @@ -419,16 +445,21 @@ xfce_filename_input_entry_changed (GtkEditable *editable, text_length > filename_input->max_text_length) { /* the string is too long */ - label_text = _("Filename is too long"); + label_text = filename_input->too_long_mssg; icon_name = "dialog-error"; new_text_valid = FALSE; } else if (match_ws) { /* the string starts or ends with whitespace - * this does not make the filename invalid, but we warn the user about it */ - label_text = _("Filenames should not start or end with a space"); - icon_name = "dialog-warning"; + * this does not make the filename invalid, but we set a timer so that the user will be warned about this if + the input remains unchanged for a time */ + filename_input->whitespace_warning_timer_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000, + xfce_filename_input_whitespace_warning_timer, + filename_input, + xfce_filename_input_whitespace_warning_timer_destroy); + icon_name = NULL; + label_text = ""; new_text_valid = TRUE; } @@ -478,5 +509,30 @@ xfce_filename_input_entry_undo (GtkWidget *widget, return GDK_EVENT_PROPAGATE; } +static gboolean +xfce_filename_input_whitespace_warning_timer (gpointer data) +{ + XfceFilenameInput *filename_input; + + g_return_val_if_fail (XFCE_IS_FILENAME_INPUT (data), FALSE); + filename_input = XFCE_FILENAME_INPUT (data); + + /* update the icon in the GtkEntry and the message in the GtkLabel */ + gtk_entry_set_icon_from_icon_name (filename_input->entry, + GTK_ENTRY_ICON_SECONDARY, + "dialog-warning"); + gtk_label_set_text (filename_input->label, filename_input->whitespace_mssg); + + return FALSE; +} + +static void +xfce_filename_input_whitespace_warning_timer_destroy (gpointer data) +{ + g_return_if_fail (XFCE_IS_FILENAME_INPUT (data)); + + XFCE_FILENAME_INPUT (data)->whitespace_warning_timer_id = 0; +} + #define __XFCE_FILENAME_INPUT_C__ #include diff --git a/libxfce4ui/xfce-filename-input.h b/libxfce4ui/xfce-filename-input.h index e8982c0..bbbb1b8 100644 --- a/libxfce4ui/xfce-filename-input.h +++ b/libxfce4ui/xfce-filename-input.h @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file is not part of the public API." #endif diff --git a/libxfce4ui/xfce-gdk-extensions.c b/libxfce4ui/xfce-gdk-extensions.c index 9711fa6..74c0da4 100644 --- a/libxfce4ui/xfce-gdk-extensions.c +++ b/libxfce4ui/xfce-gdk-extensions.c @@ -46,21 +46,45 @@ +/** + * xfce_gdk_monitor_get_number: + * @monitor : a #GdkMonitor. + * + * Returns the index of the @monitor in its display. + * + * Return value: index of the @monitor + **/ +static gint +xfce_gdk_monitor_get_number (GdkMonitor *monitor) +{ + GdkDisplay *display; + int num_monitors; + + display = gdk_monitor_get_display (monitor); + num_monitors = gdk_display_get_n_monitors (display); + for (int i = 0; i < num_monitors; i++) + if (gdk_display_get_monitor (display, i) == monitor) + return i; + + return -1; +} + + /** * xfce_gdk_screen_get_active: - * @monitor_return : (out) (allow-none): Address to store the monitor number to or %NULL. - * Under gtk3 this will always be set to '0'. + * @monitor_return : (out) (nullable): Address to store the monitor number to or %NULL. * * Returns the currently active #GdkScreen, that is, the screen which * currently contains the pointer. If no active screen was found, the * default #GdkScreen is returned. * - * Return value: (transfer full): the currently active #GdkScreen. + * Return value: (transfer none): the currently active #GdkScreen. **/ GdkScreen * xfce_gdk_screen_get_active (gint *monitor_return) { GdkDisplay *display; + GdkMonitor *monitor; gint rootx, rooty; GdkScreen *screen; @@ -80,7 +104,10 @@ xfce_gdk_screen_get_active (gint *monitor_return) { /* return the monitor number */ if (monitor_return != NULL) - *monitor_return = 0; + { + monitor = gdk_display_get_monitor_at_point (display, rootx, rooty); + *monitor_return = xfce_gdk_monitor_get_number (monitor); + } } return screen; @@ -134,5 +161,49 @@ xfce_gdk_screen_get_geometry (void) } + +/** + * xfce_gdk_device_grab: + * @seat : A #GdkSeat. + * @window : The #GdkWindow which will own the grab. + * @capabilities : Capabilities that will be grabbed. + * @cursor : (nullable): The cursor to display while the grab is active. If this + * is %NULL then the normal cursors are used for window and + * its descendants, and the cursor for window is used + * elsewhere. + * + * Similar to gdk_seat_grab but tries to grab the seat five times with 100ms + * between each attempt. + * + * Return value: %TRUE on success, %FALSE otherwise. + * + * Since: 4.18 + **/ +gboolean +xfce_gdk_device_grab (GdkSeat *seat, + GdkWindow *window, + GdkSeatCapabilities capabilities, + GdkCursor *cursor) +{ + GdkGrabStatus status; + gint attempts = 0; + + while (TRUE) { + status = gdk_seat_grab (seat, window, capabilities, FALSE, cursor, NULL, + NULL, NULL); + + if (status == GDK_GRAB_SUCCESS) + return TRUE; + if (attempts++ >= 5) + return FALSE; + + /* Wait 100ms before trying again, useful when invoked by global hotkey + * because xfsettings will grab the key for a moment */ + g_usleep(100000); + } + + return FALSE; +} + #define __XFCE_GDK_EXTENSIONS_C__ #include diff --git a/libxfce4ui/xfce-gdk-extensions.h b/libxfce4ui/xfce-gdk-extensions.h index 7d2cdc4..5f9564f 100644 --- a/libxfce4ui/xfce-gdk-extensions.h +++ b/libxfce4ui/xfce-gdk-extensions.h @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file is not part of the public API." #endif @@ -33,6 +33,11 @@ GdkScreen *xfce_gdk_screen_get_active (gint *monitor_return); GdkRectangle *xfce_gdk_screen_get_geometry (void); +gboolean xfce_gdk_device_grab (GdkSeat *seat, + GdkWindow *window, + GdkSeatCapabilities capabilities, + GdkCursor *cursor); + G_END_DECLS #endif /* !__XFCE_GDK_EXTENSIONS_H__ */ diff --git a/libxfce4ui/xfce-gtk-extensions.c b/libxfce4ui/xfce-gtk-extensions.c index bb3367b..eab8333 100644 --- a/libxfce4ui/xfce-gtk-extensions.c +++ b/libxfce4ui/xfce-gtk-extensions.c @@ -56,11 +56,11 @@ /** * xfce_gtk_menu_item_fill_base: * @item : #GtkMenuItem which should be filled - * @tooltip_text : Tooltip to add on the passed item, or NULL - * @accel_path : Unique path, used to identify the accelerator, or NULL - * @callback: (scope notified): #GCallback which will be triggered on activation, or NULL - * @callback_param : optional callback parameter, or NULL. - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @tooltip_text: (nullable): Tooltip to add on the passed item, or NULL + * @accel_path: (nullable): Unique path, used to identify the accelerator, or NULL + * @callback: (scope notified) (nullable): #GCallback which will be triggered on activation, or NULL + * @callback_param: (nullable): optional callback parameter, or NULL. + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * internal Convenience method to fill a menu item. * @@ -92,15 +92,15 @@ xfce_gtk_menu_item_fill_base (GtkWidget *item, /** * xfce_gtk_menu_item_new: * @label_text : Label to use for the #GtkMenuItem - * @tooltip_text : Tooltip to add on the passed item, or NULL - * @accel_path : Unique path, used to identify the accelerator, or NULL - * @callback: (scope notified): #GCallback which will be triggered on activation, or NULL - * @callback_param : optional callback parameter, or NULL. - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @tooltip_text: (nullable): Tooltip to add on the passed item, or NULL + * @accel_path: (nullable): Unique path, used to identify the accelerator, or NULL + * @callback: (scope notified) (nullable): #GCallback which will be triggered on activation, or NULL + * @callback_param: (nullable): optional callback parameter, or NULL. + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * Convenience method to create a #GtkMenuItem and preconfigure it with the passed parameters. * - * Return value: (transfer full): A new #GtkMenuItem. + * Return value: (transfer floating): A new #GtkMenuItem. * * Since: 4.16 **/ @@ -124,16 +124,16 @@ xfce_gtk_menu_item_new (const gchar *label_text, /** * xfce_gtk_image_menu_item_new_from_icon_name: * @label_text : Label to use for the #GtkImageMenuItem - * @tooltip_text : Tooltip to add on the passed item, or NULL - * @accel_path : Unique path, used to identify the accelerator, or NULL - * @callback: (scope notified): #GCallback which will be triggered on activation, or NULL - * @callback_param : optional callback parameter, or NULL. - * @icon_name : name of the icon to use for the #GtkImageMenuItem, or NULL - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @tooltip_text: (nullable): Tooltip to add on the passed item, or NULL + * @accel_path: (nullable): Unique path, used to identify the accelerator, or NULL + * @callback: (scope notified) (nullable): #GCallback which will be triggered on activation, or NULL + * @callback_param: (nullable): optional callback parameter, or NULL. + * @icon_name: (nullable): name of the icon to use for the #GtkImageMenuItem, or NULL + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * Convenience method to create a #GtkImageMenuItem and preconfigure it with the passed parameters. * - * Return value: (transfer full): A new #GtkImageMenuItem. + * Return value: (transfer floating): A new #GtkImageMenuItem. * * Since: 4.16 **/ @@ -158,17 +158,17 @@ xfce_gtk_image_menu_item_new_from_icon_name (const gchar *label_text, /** * xfce_gtk_image_menu_item_new: * @label_text : Label to use for the #GtkImageMenuItem - * @tooltip_text : Tooltip to add on the passed item, or NULL - * @accel_path : Unique path, used to identify the accelerator, or NULL - * @callback: (scope notified): #GCallback which will be triggered on activation, or NULL - * @callback_param : optional callback parameter, or NULL. - * @image : a widget to set as the image for the menu item, or NULL - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @tooltip_text: (nullable): Tooltip to add on the passed item, or NULL + * @accel_path: (nullable): Unique path, used to identify the accelerator, or NULL + * @callback: (scope notified) (nullable): #GCallback which will be triggered on activation, or NULL + * @callback_param: (nullable): optional callback parameter, or NULL. + * @image: (nullable): a widget to set as the image for the menu item, or NULL + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * Convenience method to create a deprecated #GtkImageMenuItem and preconfigure it with the passed parameters. * In order to prevent G_GNUC_BEGIN_IGNORE_DEPRECATIONS in all xfce projects, this method can be used * - * Return value: (transfer full): A new #GtkImageMenuItem. + * Return value: (transfer floating): A new #GtkImageMenuItem. * * Since: 4.16 **/ @@ -201,16 +201,16 @@ xfce_gtk_image_menu_item_new (const gchar *label_text, /** * xfce_gtk_check_menu_item_new: * @label_text : Label to use for the #GtkCheckMenuItem - * @tooltip_text : Tooltip to add on the passed item, or NULL - * @accel_path : Unique path, used to identify the accelerator, or NULL - * @callback: (scope notified): #GCallback which will be triggered on activation, or NULL - * @callback_param : optional callback parameter, or NULL. + * @tooltip_text: (nullable): Tooltip to add on the passed item, or NULL + * @accel_path: (nullable): Unique path, used to identify the accelerator, or NULL + * @callback: (scope notified) (nullable): #GCallback which will be triggered on activation, or NULL + * @callback_param: (nullable): optional callback parameter, or NULL. * @active : boolean value indicating whether the check box is active. - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * Convenience method to create a #GtkCheckMenuItem and preconfigure it with the passed parameters. * - * Return value: (transfer full): A new #GtkCheckMenuItem. + * Return value: (transfer floating): A new #GtkCheckMenuItem. * * Since: 4.16 **/ @@ -241,17 +241,17 @@ xfce_gtk_check_menu_item_new (const gchar *label_text, /** * xfce_gtk_radio_menu_item_new: * @label_text : Label to use for the #GtkCheckMenuItem - * @tooltip_text : Tooltip to add on the passed item, or NULL - * @accel_path : Unique path, used to identify the accelerator, or NULL - * @callback: (scope notified): #GCallback which will be triggered on activation, or NULL - * @callback_param : optional callback parameter, or NULL. + * @tooltip_text: (nullable): Tooltip to add on the passed item, or NULL + * @accel_path: (nullable): Unique path, used to identify the accelerator, or NULL + * @callback: (scope notified) (nullable): #GCallback which will be triggered on activation, or NULL + * @callback_param: (nullable): optional callback parameter, or NULL. * @active : boolean value indicating whether the check box is active. - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * Convenience method to create a #GtkCheckMenuItem and preconfigure it with the passed parameters. * In order to simplify usage, a #GtkCheckMenuItem is created and drawn as radio-item * - * Return value: (transfer full): A new #GtkCheckMenuItem. + * Return value: (transfer floating): A new #GtkCheckMenuItem. * * Since: 4.16 **/ @@ -278,12 +278,12 @@ xfce_gtk_radio_menu_item_new (const gchar *label_text, /** * xfce_gtk_menu_item_new_from_action_entry: * @action_entry : Label to use for the #GtkCheckMenuItem - * @callback_param : optional callback parameter, or NULL. - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @callback_param: (nullable): optional callback parameter, or NULL. + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * Method to create a menu item from the passed action entry * - * Return value: (transfer full): A new #GtkMenuItem or NULL + * Return value: (transfer floating) (nullable): A new #GtkMenuItem or NULL * * Since: 4.16 **/ @@ -315,13 +315,13 @@ xfce_gtk_menu_item_new_from_action_entry (const XfceGtkActionEntry *action_entry /** * xfce_gtk_toggle_menu_item_new_from_action_entry: * @action_entry : Label to use for the #GtkCheckMenuItem - * @callback_param : optional callback parameter, or NULL. + * @callback_param: (nullable): optional callback parameter, or NULL. * @active : boolean value indicating whether the check box is active. - * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL + * @menu_to_append_item: (nullable): #GtkMenuShell on which the item should be appended, or NULL * * Method to create a toggle menu item from the passed action entry * - * Return value: (transfer full): A new #GtkMenuItem or NULL + * Return value: (transfer floating) (nullable): A new #GtkMenuItem or NULL * * Since: 4.16 **/ @@ -353,13 +353,13 @@ xfce_gtk_toggle_menu_item_new_from_action_entry (const XfceGtkActionEntry *actio /** * xfce_gtk_tool_button_new_from_action_entry: - * @action_entry : Label to use for the #GtkTolButton - * @callback_param : optional callback parameter, or NULL. - * @toolbar_to_append_item : #GtkToolBar on which the item should be appended + * @action_entry : Label to use for the #GtkToolButton + * @callback_param: (nullable): optional callback parameter, or %NULL. + * @toolbar_to_append_item : #GtkToolbar on which the item should be appended * - * Method to create a toolbar button from the passed action entry + * Method to create a toolbar button from the passed action entry. * - * Return value: (transfer full): A new #GtkTolButton + * Return value: (transfer floating): A new #GtkToolButton * * Since: 4.16 **/ @@ -383,6 +383,46 @@ xfce_gtk_tool_button_new_from_action_entry (const XfceGtkActionEntry *action_ent +/** + * xfce_gtk_toggle_tool_button_new_from_action_entry: + * @action_entry : Label to use for the #GtkToggleToolButton + * @callback_param: (nullable): optional callback parameter, or %NULL. + * @active : boolean value indicating whether the toggle is initially active. + * @toolbar_to_append_item : #GtkToolbar on which the item should be appended + * + * Method to create a toolbar toggle-button from the passed action entry. + * + * Return value: (transfer floating): A new #GtkToggleToolButton + * + * Since: 4.17.6 + **/ +GtkWidget* +xfce_gtk_toggle_tool_button_new_from_action_entry (const XfceGtkActionEntry *action_entry, + GObject *callback_param, + gboolean active, + GtkToolbar *toolbar_to_append_item) +{ + GtkToolButton *tool_item; + GtkWidget *image; + + g_return_val_if_fail (action_entry != NULL, NULL); + + tool_item = GTK_TOOL_BUTTON (gtk_toggle_tool_button_new ()); + image = gtk_image_new_from_icon_name (action_entry->menu_item_icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_tool_button_set_label (tool_item, action_entry->menu_item_label_text); + gtk_tool_button_set_icon_widget (tool_item, image); + gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), action_entry->menu_item_tooltip_text); + gtk_toolbar_insert (toolbar_to_append_item, GTK_TOOL_ITEM (tool_item), -1); + + /* 'gtk_check_menu_item_set_active' has to be done before 'g_signal_connect_swapped', to don't trigger the callback */ + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (tool_item), active); + g_signal_connect_swapped (G_OBJECT (tool_item), "toggled", action_entry->callback, callback_param); + + return GTK_WIDGET (tool_item); +} + + + /** * xfce_gtk_menu_append_seperator: * @menu : #GtkMenuShell on which the separator should be appended @@ -404,6 +444,27 @@ xfce_gtk_menu_append_seperator (GtkMenuShell *menu) +/** + * xfce_gtk_menu_append_separator: + * @menu : #GtkMenuShell on which the separator should be appended + * + * Convenience method do add separators, used to prevent code duplication + * + * Since: 4.16 + **/ +void +xfce_gtk_menu_append_separator (GtkMenuShell *menu) +{ + GtkWidget *item; + + g_return_if_fail (GTK_IS_MENU_SHELL (menu)); + + item = gtk_separator_menu_item_new (); + gtk_menu_shell_append (menu, item); +} + + + /** * xfce_gtk_accel_map_add_entries: * @action_entries : array of action_entries to be added @@ -513,7 +574,7 @@ xfce_gtk_accel_group_disconnect_action_entries (GtkAccelGroup *accel_ * * Convenience method to find a specific action_entry from an array of action_entries * - * Return value: (transfer none): The matching #XfceGtkActionEntry or NULL if not found + * Return value: (transfer none) (nullable): The matching #XfceGtkActionEntry or NULL if not found * * Since: 4.16 **/ @@ -555,11 +616,89 @@ xfce_gtk_translate_action_entries (XfceGtkActionEntry *action_entries, +/** + * xfce_gtk_handle_tab_accels + * @key_event : the #GdkEventKey that might trigger a shortcut + * @accel_group : the #GtkAccelGroup that will be get queried + * @data : a pointer of data that will be passed to the callback if a tab-shortcut is found + * @entries : a #XfceGtkActionEntry[] + * @entry_count : the number of entries in @entries + * + * The Tab key is used to navigate the interface by GTK+ so we need to handle shortcuts with the Tab accelerator manually. + * Tab sometimes becomes ISO_Left_Tab (e.g. in Ctrl+Shift+Tab) so check both here. + * + * Return value: a boolean that is GDK_EVENT_STOP (TRUE) if the event was handled, otherwise it is GDK_EVENT_PROPAGATE (FALSE) +**/ +gboolean +xfce_gtk_handle_tab_accels (GdkEventKey *key_event, + GtkAccelGroup *accel_group, + gpointer data, + XfceGtkActionEntry *entries, + size_t entry_count) +{ + const guint modifiers = key_event->state & gtk_accelerator_get_default_mod_mask (); + + g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), GDK_EVENT_PROPAGATE); + + if (G_UNLIKELY (key_event->keyval == GDK_KEY_Tab || key_event->keyval == GDK_KEY_ISO_Left_Tab) && key_event->type == GDK_KEY_PRESS) + { + GtkAccelGroupEntry *group_entries; + guint group_entries_count = 0; + + group_entries = gtk_accel_group_query (accel_group, key_event->keyval, modifiers, &group_entries_count); + if (group_entries_count > 1) + { + g_warning ("Error: Found multiple shortcuts that include the Tab key and the same modifiers. Using first match"); + } + if (group_entries_count > 0) + { + const gchar *path = g_quark_to_string (group_entries[0].accel_path_quark); + return xfce_gtk_execute_tab_accel (path, data, entries, entry_count); + } + } + + return GDK_EVENT_PROPAGATE; +} + + + +/** + * xfce_gtk_execute_tab_accel + * @accel_path : the accelerator path of the action that we want to activate + * @data : a pointer of data that will be passed to the callback if a tab-shortcut is found + * @entries : a #XfceGtkActionEntry[] + * @entry_count : the number of entries in @entries + * + * Activates the callback function of the #XfceGtkActionEntry that corresponds to @accel_path. If no such action + * exists in @entries, then nothing happens. + * + * Return value: a boolean that is TRUE if the action was found, otherwise it is FALSE +**/ +gboolean +xfce_gtk_execute_tab_accel (const gchar *accel_path, + gpointer data, + XfceGtkActionEntry *entries, + size_t entry_count) +{ + for (size_t i = 0; i < entry_count; i++) + { + if (g_strcmp0 (accel_path, entries[i].accel_path) == 0) + { + ((void (*) (void *)) entries[i].callback) (data); + return GDK_EVENT_STOP; + } + } + + return GDK_EVENT_PROPAGATE; +} + + + /** * xfce_gtk_button_new_mixed: - * @stock_id : the name of the stock item. - * @label : the text of the button, with an underscore in front of - * the mnemonic character. + * @stock_id: (nullable): the name of the stock item. + * @label: (nullable): the text of the button, with an underscore + * in front of the mnemonic character. * * Creates a new #GtkButton containing a mnemonic label and a stock icon. * The @stock_id could be something like #GTK_STOCK_OK or #GTK_STOCK_APPLY. @@ -568,7 +707,7 @@ xfce_gtk_translate_action_entries (XfceGtkActionEntry *action_entries, * when @label is %NULL a stock button will be created. This behaviour * is added for xfce_message_dialog_new(). * - * Return value: (transfer full): the newly created #GtkButton widget. + * Return value: (transfer floating): the newly created #GtkButton widget. **/ GtkWidget * xfce_gtk_button_new_mixed (const gchar *stock_id, @@ -603,7 +742,7 @@ xfce_gtk_button_new_mixed (const gchar *stock_id, /** * xfce_gtk_frame_box_new: * @label : the text to use as the label of the frame. - * @container_return : (out) (allow-none): return location for the frame's container. + * @container_return : (out) (nullable): return location for the frame's container. * * Creates an Xfce-styled frame. The frame is a #GtkFrame, without * outline and an optional bolded text label. The contents of the @@ -613,7 +752,7 @@ xfce_gtk_button_new_mixed (const gchar *stock_id, * * See also: xfce_gtk_frame_box_new_with_content(). * - * Return value: (transfer full): the newly created #GtkFrame widget. + * Return value: (transfer floating): the newly created #GtkFrame widget. **/ GtkWidget * xfce_gtk_frame_box_new (const gchar *label, @@ -667,7 +806,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS * Creates a widget with xfce_gtk_frame_box_new() and adds the * @content #GtkWidget to the frame. * - * Return value: (transfer full): the newly created #GtkFrame widget. + * Return value: (transfer floating): the newly created #GtkFrame widget. **/ GtkWidget * xfce_gtk_frame_box_new_with_content (const gchar *label, @@ -718,10 +857,10 @@ xfce_gtk_window_center_on_active_screen (GtkWindow *window) /** * xfce_gtk_menu_popup_until_mapped: * @menu: a #GtkMenu. - * @parent_menu_shell: (allow-none): the menu shell containing the triggering menu item, or %NULL. - * @parent_menu_item: (allow-none): the menu item whose activation triggered the popup, or %NULL. - * @func: (scope call) (allow-none): a user supplied function used to position the menu, or %NULL. - * @data: (allow-none): user supplied data to be passed to func. + * @parent_menu_shell: (nullable): the menu shell containing the triggering menu item, or %NULL. + * @parent_menu_item: (nullable): the menu item whose activation triggered the popup, or %NULL. + * @func: (scope call) (nullable): a user supplied function used to position the menu, or %NULL. + * @data: (nullable): user supplied data to be passed to func. * @button: the mouse button which was pressed to initiate the event. * @activate_time: the time at which the activation event occurred. * @@ -837,7 +976,7 @@ xfce_widget_reparent (GtkWidget *widget, gchar * xfce_icon_name_from_desktop_id (const gchar *desktop_id) { - gchar *icon_file; + gchar *icon_file = NULL; gchar *resource; XfceRc *rcfile; @@ -848,16 +987,16 @@ xfce_icon_name_from_desktop_id (const gchar *desktop_id) resource, TRUE); g_free (resource); - if (rcfile && xfce_rc_has_group (rcfile, "Desktop Entry")) { - xfce_rc_set_group (rcfile, "Desktop Entry"); - icon_file = g_strdup (xfce_rc_read_entry (rcfile, "Icon", NULL)); + if (rcfile != NULL) { + if (xfce_rc_has_group (rcfile, "Desktop Entry")) { + xfce_rc_set_group (rcfile, "Desktop Entry"); + icon_file = g_strdup (xfce_rc_read_entry (rcfile, "Icon", NULL)); + } xfce_rc_close (rcfile); - - return icon_file; } - else - return NULL; + + return icon_file; } @@ -915,8 +1054,13 @@ xfce_gicon_from_name (const gchar *name) GTK_ICON_SIZE_BUTTON, GTK_ICON_LOOKUP_FORCE_REGULAR); - if (icon_info) + if (icon_info) { + g_object_unref (icon_info); return gicon; + } + else { + g_object_unref (gicon); + } } return NULL; @@ -927,7 +1071,7 @@ xfce_gicon_from_name (const gchar *name) /** * xfce_gtk_menu_item_set_accel_label: * @menu_item : #GtkMenuItem on which the accel label is to set - * @accel_path : Unique path, used to identify the accelerator, or NULL to show no accelerator + * @accel_path: (nullable): Unique path, used to identify the accelerator, or NULL to show no accelerator * * Use the passed accel_path show the related #GtkAccelLabel with the correct accelerator on the item. * @@ -937,16 +1081,18 @@ void xfce_gtk_menu_item_set_accel_label (GtkMenuItem *menu_item, const gchar *accel_path) { - GtkAccelKey key; - gboolean found = FALSE; + GtkAccelKey key; + GList *list, *lp; + gboolean found = FALSE; g_return_if_fail (GTK_IS_MENU_ITEM (menu_item)); + list = gtk_container_get_children (GTK_CONTAINER (menu_item)); if (accel_path != NULL) found = gtk_accel_map_lookup_entry (accel_path, &key); /* Only show the relevant accelerator, do not automatically connect to the callback */ - for (GList* lp = gtk_container_get_children (GTK_CONTAINER (menu_item)); lp != NULL; lp = lp->next) + for (lp = list; lp != NULL; lp = lp->next) { if (GTK_IS_ACCEL_LABEL (lp->data)) { @@ -955,8 +1101,9 @@ xfce_gtk_menu_item_set_accel_label (GtkMenuItem *menu_item, else gtk_accel_label_set_accel (lp->data, 0, 0); } - } + + g_list_free (list); } @@ -1025,5 +1172,34 @@ xfce_has_gtk_frame_extents (GdkWindow *window, +/** + * xfce_gtk_label_set_a11y_relation: + * @label : a #GtkLabel. + * @widget : a #GtkWidget. + * + * Sets the `ATK_RELATION_LABEL_FOR` relation on @label for @widget, which means + * accessiblity tools will identify @label as descriptive item for the specified + * @widget. + **/ +void +xfce_gtk_label_set_a11y_relation (GtkLabel *label, + GtkWidget *widget) +{ + AtkRelationSet *relations; + AtkRelation *relation; + AtkObject *object; + + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (GTK_IS_LABEL (label)); + + object = gtk_widget_get_accessible (widget); + relations = atk_object_ref_relation_set (gtk_widget_get_accessible (GTK_WIDGET (label))); + relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR); + atk_relation_set_add (relations, relation); + g_object_unref (G_OBJECT (relation)); +} + + + #define __XFCE_GTK_EXTENSIONS_C__ #include diff --git a/libxfce4ui/xfce-gtk-extensions.h b/libxfce4ui/xfce-gtk-extensions.h index 3bcfe76..ec211b6 100644 --- a/libxfce4ui/xfce-gtk-extensions.h +++ b/libxfce4ui/xfce-gtk-extensions.h @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file is not part of the public API." #endif @@ -28,10 +28,16 @@ G_BEGIN_DECLS -/* - * List of item types which are supported by the XfceGtkActionEntry - * To be extended if required -*/ +/** + * XfceGtkMenuItem: + * @XFCE_GTK_MENU_ITEM: see #GtkMenuItem + * @XFCE_GTK_IMAGE_MENU_ITEM: see #GtkImageMenuItem + * @XFCE_GTK_CHECK_MENU_ITEM: see #GtkCheckMenuItem + * @XFCE_GTK_RADIO_MENU_ITEM: see #GtkRadioMenuItem + * + * List of item types which are supported by the #XfceGtkActionEntry. + * To be extended if required. + **/ typedef enum { XFCE_GTK_MENU_ITEM, @@ -42,28 +48,38 @@ typedef enum +/** + * XfceGtkActionEntry: + * @id: unique identifier for instances of this structure (you might want to use a enum) + * @accel_path: the unique path, used to identify the accelerator + * @default_accelerator: the default key and modifier to trigger the callback linked to the entry + * @menu_item_type: the type of the item which should be used for creation + * @menu_item_label_text: text which should be shown in the menu + * @menu_item_tooltip_text: optional tooltip of the item + * @menu_item_icon_name: optional icon name which will be used to find a image for the item + * @callback: the callback which will be triggered on activation. The callback has to return %TRUE + * to signal that the accelerator was activated and handled + * + * Replacement for the deprecated #GtkActionEntry. + * The idea is to provide a fixed list of #XfceGtkActionEntrys: + * - use xfce_gtk_translate_action_entries() once to translate the list + * - use xfce_gtk_accel_map_add_entries() once to register the provided accelerators + * - use xfce_gtk_get_action_entry_by_id() to find a single entry, e.g. by using a enumeration + * - use xfce_gtk_*_new_from_action_entry() to create the specific menu- or tool-items from the entry + **/ struct _XfceGtkActionEntry { - /* - * Replacement for the deprecated GtkActionEntry - * The idea is to provide a fixed list of XfceGtkActionEntrys - * - use 'xfce_gtk_translate_action_entries' once to translate the list - * - use 'xfce_gtk_accel_map_add_entries' once to register the provided accelerators - * - use 'xfce_gtk_get_action_entry_by_id' to find a single entry, e.g. by using a enumeration - * - use 'xfce_gtk_***_new_from_action_entry' to create the specific menu- or tool-items from the entry - */ - - guint id; /* unique identifier for instances of this structure (you might want to use a enum) */ - const gchar *accel_path; /* The unique path, used to identify the accelerator */ - const gchar *default_accelerator; /* The default key and modifier to trigger the callback linked to the entry */ + guint id; + const gchar *accel_path; + const gchar *default_accelerator; /* menu_item data is optional, only relevant if there exists a menu_item for that accelerator */ - XfceGtkMenuItem menu_item_type; /* The type of the item which should be used for creation */ - gchar *menu_item_label_text; /* text which should be shown in the menu */ - gchar *menu_item_tooltip_text; /* optional tooltip of the item */ - const gchar *menu_item_icon_name; /* optional icon name which will be used to find a image for the item */ + XfceGtkMenuItem menu_item_type; + gchar *menu_item_label_text; + gchar *menu_item_tooltip_text; + const gchar *menu_item_icon_name; - GCallback callback; /* The callback which will be triggered on activation */ + GCallback callback; }; typedef struct _XfceGtkActionEntry XfceGtkActionEntry; @@ -113,6 +129,10 @@ GtkWidget *xfce_gtk_toggle_menu_item_new_from_action_entry (const GtkWidget *xfce_gtk_tool_button_new_from_action_entry (const XfceGtkActionEntry *action_entry, GObject *callback_param, GtkToolbar *toolbar_to_append_item); +GtkWidget *xfce_gtk_toggle_tool_button_new_from_action_entry (const XfceGtkActionEntry *action_entry, + GObject *callback_param, + gboolean active, + GtkToolbar *toolbar_to_append_item); void xfce_gtk_accel_map_add_entries (const XfceGtkActionEntry *action_entries, guint n_action_entries); void xfce_gtk_accel_group_connect_action_entries (GtkAccelGroup *accel_group, @@ -127,7 +147,18 @@ const XfceGtkActionEntry *xfce_gtk_get_action_entry_by_id (const guint id); void xfce_gtk_translate_action_entries (XfceGtkActionEntry *action_entries, guint n_action_entries); +gboolean xfce_gtk_handle_tab_accels (GdkEventKey *key_event, + GtkAccelGroup *accel_group, + gpointer data, + XfceGtkActionEntry *entries, + size_t entry_count); + +gboolean xfce_gtk_execute_tab_accel (const gchar *accel_path, + gpointer data, + XfceGtkActionEntry *entries, + size_t entry_count); void xfce_gtk_menu_append_seperator (GtkMenuShell *menu); +void xfce_gtk_menu_append_separator (GtkMenuShell *menu); GtkWidget *xfce_gtk_button_new_mixed (const gchar *stock_id, const gchar *label) G_GNUC_MALLOC; @@ -160,6 +191,9 @@ void xfce_gtk_menu_item_set_accel_label (GtkMe gboolean xfce_has_gtk_frame_extents (GdkWindow *window, GtkBorder *extents); +void xfce_gtk_label_set_a11y_relation (GtkLabel *label, + GtkWidget *widget); + G_END_DECLS #endif /* !__XFCE_GTK_EXTENSIONS_H__ */ diff --git a/libxfce4ui/xfce-screensaver.c b/libxfce4ui/xfce-screensaver.c new file mode 100644 index 0000000..d2acc07 --- /dev/null +++ b/libxfce4ui/xfce-screensaver.c @@ -0,0 +1,678 @@ +/* + * * Copyright (C) 2016 Eric Koegel + * + * Licensed under the GNU General Public License Version 2 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * SECTION:xfce-screensaver + * @title: XfceScreensaver + * @short_description: screensaver related shared functions + * @include: libxfce4ui/libxfce4ui.h + * + * Since: 4.18.2 + **/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "xfce-screensaver.h" + + + +#define NO_REPLY_TIMEOUT 2000 + +static void xfce_screensaver_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); +static void xfce_screensaver_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void xfce_screensaver_constructed (GObject *object); +static void xfce_screensaver_finalize (GObject *object); + + + +/* in order of priority, used to browse the screensaver array below */ +typedef enum +{ + SCREENSAVER_TYPE_XFCE, + SCREENSAVER_TYPE_CINNAMON, + SCREENSAVER_TYPE_MATE, + SCREENSAVER_TYPE_FREEDESKTOP, + SCREENSAVER_TYPE_OTHER +} ScreensaverType; + +enum +{ + PROP_0 = 0, + PROP_HEARTBEAT_COMMAND, + PROP_LOCK_COMMAND, + PROP_LOCK_ON_SLEEP, +}; + +struct _XfceScreensaver +{ + GObject parent; + + GDBusProxy *proxies[SCREENSAVER_TYPE_OTHER]; + guint screensaver_id; + guint cookie; + ScreensaverType screensaver_type; + + gboolean xfconf_initialized; + gchar *heartbeat_command; + gchar *lock_command; + gboolean lock_on_sleep; +}; + +typedef struct +{ + const gchar *name; + const gchar *path; + const gchar *iface; + gboolean running; +} DbusScreensaver; + +static DbusScreensaver dbus_screensavers[] = +{ + { "org.xfce.ScreenSaver", "/org/xfce/ScreenSaver", "org.xfce.ScreenSaver", FALSE }, + { "org.cinnamon.ScreenSaver", "/org/cinnamon/ScreenSaver", "org.cinnamon.ScreenSaver", FALSE }, + { "org.mate.ScreenSaver", "/org/mate/ScreenSaver", "org.mate.ScreenSaver", FALSE }, + { "org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver", "org.freedesktop.ScreenSaver", FALSE }, +}; + + + +G_DEFINE_TYPE (XfceScreensaver, xfce_screensaver, G_TYPE_OBJECT) + + + +static void +xfce_screensaver_class_init (XfceScreensaverClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->get_property = xfce_screensaver_get_property; + object_class->set_property = xfce_screensaver_set_property; + object_class->constructed = xfce_screensaver_constructed; + object_class->finalize = xfce_screensaver_finalize; + +#define XFCE_PARAM_FLAGS (G_PARAM_READWRITE \ + | G_PARAM_CONSTRUCT \ + | G_PARAM_STATIC_NAME \ + | G_PARAM_STATIC_NICK \ + | G_PARAM_STATIC_BLURB) + + g_object_class_install_property (object_class, PROP_HEARTBEAT_COMMAND, + g_param_spec_string ("heartbeat-command", + "heartbeat-command", + "Inhibit the screensaver from activating, " + "e.g. xscreensaver-command --deactivate", + NULL, + XFCE_PARAM_FLAGS)); + + g_object_class_install_property (object_class, PROP_LOCK_COMMAND, + g_param_spec_string ("lock-command", + "lock-command", + "Lock the desktop, e.g. " + "xscreensaver-command --lock", + NULL, + XFCE_PARAM_FLAGS)); + + g_object_class_install_property (object_class, PROP_LOCK_ON_SLEEP, + g_param_spec_boolean ("lock-on-sleep", + "lock-on-sleep", + "Whether to lock before suspend/hibernate", + FALSE, + XFCE_PARAM_FLAGS)); +#undef XFCE_PARAM_FLAGS +} + + + +static void +name_owner_changed (GDBusProxy *proxy, + GParamSpec *pspec, + XfceScreensaver *saver) +{ + /* update current proxy status */ + for (guint i = 0; i < SCREENSAVER_TYPE_OTHER; i++) + { + if (saver->proxies[i] == proxy) + { + gchar *owner = g_dbus_proxy_get_name_owner (proxy); + if (owner == NULL) + { + dbus_screensavers[i].running = FALSE; + if (saver->screensaver_type == i) + { + saver->screensaver_type = SCREENSAVER_TYPE_OTHER; + saver->cookie = 0; + if (saver->screensaver_id != 0) + { + g_source_remove (saver->screensaver_id); + saver->screensaver_id = 0; + } + } + } + else + { + dbus_screensavers[i].running = TRUE; + g_free (owner); + } + break; + } + } + + /* update used screensaver */ + for (guint i = 0; i < SCREENSAVER_TYPE_OTHER; i++) + { + if (dbus_screensavers[i].running && i != saver->screensaver_type) + { + if (i < saver->screensaver_type) + { + gboolean inhibited = saver->cookie != 0 || saver->screensaver_id != 0; + if (inhibited) + xfce_screensaver_inhibit (saver, FALSE); + saver->screensaver_type = i; + if (inhibited) + xfce_screensaver_inhibit (saver, TRUE); + } + else + { + g_warning ("%s running but unused: using %s instead", + dbus_screensavers[i].name, dbus_screensavers[saver->screensaver_type].name); + } + } + } +} + + + +static void +xfce_screensaver_init (XfceScreensaver *saver) +{ + GError *error = NULL; + + saver->screensaver_type = SCREENSAVER_TYPE_OTHER; + + for (guint i = 0; i < SCREENSAVER_TYPE_OTHER; i++) + { + saver->proxies[i] = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION, + NULL, + dbus_screensavers[i].name, + dbus_screensavers[i].path, + dbus_screensavers[i].iface, + NULL, + &error); + if (error != NULL) + { + g_warning ("Failed to get a proxy for %s: %s", dbus_screensavers[i].name, error->message); + g_clear_error (&error); + } + else + { + name_owner_changed (saver->proxies[i], NULL, saver); + g_signal_connect (saver->proxies[i], "notify::g-name-owner", G_CALLBACK (name_owner_changed), saver); + } + } +} + + + +static void +xfce_screensaver_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + XfceScreensaver *saver = XFCE_SCREENSAVER (object); + + switch (property_id) + { + case PROP_HEARTBEAT_COMMAND: + g_value_set_string (value, saver->heartbeat_command); + break; + + case PROP_LOCK_COMMAND: + g_value_set_string (value, saver->lock_command); + break; + + case PROP_LOCK_ON_SLEEP: + g_value_set_boolean (value, saver->lock_on_sleep); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + + +static void +xfce_screensaver_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + XfceScreensaver *saver = XFCE_SCREENSAVER (object); + const gchar *str_value; + + switch (property_id) + { + case PROP_HEARTBEAT_COMMAND: + g_free (saver->heartbeat_command); + saver->heartbeat_command = NULL; + str_value = g_value_get_string (value); + if (!xfce_str_is_empty (str_value)) + saver->heartbeat_command = g_strdup (str_value); + DBG ("saver->heartbeat_command %s", saver->heartbeat_command); + break; + + case PROP_LOCK_COMMAND: + g_free (saver->lock_command); + saver->lock_command = NULL; + str_value = g_value_get_string (value); + if (!xfce_str_is_empty (str_value)) + saver->lock_command = g_strdup (str_value); + DBG ("saver->lock_command %s", saver->lock_command); + break; + + case PROP_LOCK_ON_SLEEP: + saver->lock_on_sleep = g_value_get_boolean (value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + + +static void +xfce_screensaver_constructed (GObject *object) +{ + XfceScreensaver *saver = XFCE_SCREENSAVER (object); + GError *error = NULL; + + saver->xfconf_initialized = xfconf_init (&error); + if (!saver->xfconf_initialized) + { + g_critical ("Xfconf initialization failed: %s", error->message); + g_clear_error (&error); + } + else + { + XfconfChannel *power_channel = xfconf_channel_get ("xfce4-power-manager"); + XfconfChannel *session_channel = xfconf_channel_get ("xfce4-session"); + XfconfChannel *saver_channel = xfconf_channel_get ("xfce4-screensaver"); + xfconf_g_property_bind (power_channel, + "/xfce4-power-manager/heartbeat-command", + G_TYPE_STRING, + G_OBJECT (saver), + "heartbeat-command"); + xfconf_g_property_bind (session_channel, + "/general/LockCommand", + G_TYPE_STRING, + G_OBJECT (saver), + "lock-command"); + + /* keep components having a "lock-on-sleep" setting in sync */ + xfconf_g_property_bind (power_channel, + "/xfce4-power-manager/lock-screen-suspend-hibernate", + G_TYPE_BOOLEAN, + G_OBJECT (saver), + "lock-on-sleep"); + xfconf_g_property_bind (session_channel, + "/shutdown/LockScreen", + G_TYPE_BOOLEAN, + G_OBJECT (saver), + "lock-on-sleep"); + xfconf_g_property_bind (saver_channel, + "/lock/sleep-activation", + G_TYPE_BOOLEAN, + G_OBJECT (saver), + "lock-on-sleep"); + } + + G_OBJECT_CLASS (xfce_screensaver_parent_class)->constructed (object); +} + + + +static void +xfce_screensaver_finalize (GObject *object) +{ + XfceScreensaver *saver = XFCE_SCREENSAVER (object); + + if (saver->screensaver_id != 0) + { + g_source_remove (saver->screensaver_id); + saver->screensaver_id = 0; + } + + for (guint i = 0; i < SCREENSAVER_TYPE_OTHER; i++) + g_clear_object (&saver->proxies[i]); + + if (saver->heartbeat_command) + { + g_free (saver->heartbeat_command); + saver->heartbeat_command = NULL; + } + + if (saver->lock_command) + { + g_free (saver->lock_command); + saver->lock_command = NULL; + } + + if (saver->xfconf_initialized) + xfconf_shutdown (); + + G_OBJECT_CLASS (xfce_screensaver_parent_class)->finalize (object); +} + + + +/** + * xfce_screensaver_new: + * + * Creates a new #XfceScreensaver object or increases the reference count + * of the current object. + * + * Returns: (transfer full): An #XfceScreensaver object, to be released with + * g_object_unref() when no longer used. + * + * Since: 4.18.2 + **/ +XfceScreensaver * +xfce_screensaver_new (void) +{ + static gpointer *saver = NULL; + + if (saver != NULL) + { + g_object_ref (saver); + } + else + { + saver = g_object_new (XFCE_TYPE_SCREENSAVER, NULL); + g_object_add_weak_pointer (G_OBJECT (saver), (gpointer *) &saver); + } + + return XFCE_SCREENSAVER (saver); +} + + + +static gboolean +xfce_reset_screen_saver (gpointer user_data) +{ + XfceScreensaver *saver = user_data; + + TRACE ("entering\n"); + + /* If we found an interface during the setup, use it */ + if (saver->screensaver_type != SCREENSAVER_TYPE_OTHER) + { + GVariant *response = g_dbus_proxy_call_sync (saver->proxies[saver->screensaver_type], + "SimulateUserActivity", + NULL, + G_DBUS_CALL_FLAGS_NONE, + NO_REPLY_TIMEOUT, + NULL, + NULL); + if (response != NULL) + g_variant_unref (response); + } + else if (saver->heartbeat_command) + { + DBG ("running heartbeat command: %s", saver->heartbeat_command); + g_spawn_command_line_async (saver->heartbeat_command, NULL); + } + + /* continue until we're removed */ + return TRUE; +} + + + +/** + * xfce_screensaver_inhibit: + * @saver: the #XfceScreensaver object + * @inhibit: whether to inhibit the screensaver from activating + * + * Calling this function with @inhibit as %TRUE will prevent the user's + * screensaver from activating. This is useful when the user is watching + * a movie or giving a presentation. + * + * Calling this function with @inhibit as %FALSE will remove any current + * screensaver inhibit the #XfceScreensaver object has. + * + * Since: 4.18.2 + **/ +void +xfce_screensaver_inhibit (XfceScreensaver *saver, + gboolean inhibit) +{ + /* SCREENSAVER_TYPE_FREEDESKTOP, SCREENSAVER_TYPE_MATE and SCREENSAVER_TYPE_XFCE + * don't need a periodic timer because they have an actual inhibit/uninhibit setup */ + switch (saver->screensaver_type) + { + case SCREENSAVER_TYPE_XFCE: + case SCREENSAVER_TYPE_MATE: + case SCREENSAVER_TYPE_FREEDESKTOP: + if (inhibit) + { + GVariant *response = g_dbus_proxy_call_sync (saver->proxies[saver->screensaver_type], + "Inhibit", + g_variant_new ("(ss)", + PACKAGE_NAME, + "Inhibit requested"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, NULL); + if (response != NULL) + { + g_variant_get (response, "(u)", &saver->cookie); + g_variant_unref (response); + } + } + else + { + GVariant *response = g_dbus_proxy_call_sync (saver->proxies[saver->screensaver_type], + "UnInhibit", + g_variant_new ("(u)", + saver->cookie), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, NULL); + saver->cookie = 0; + if (response != NULL) + g_variant_unref (response); + } + break; + + case SCREENSAVER_TYPE_CINNAMON: + case SCREENSAVER_TYPE_OTHER: + /* remove any existing keepalive */ + if (saver->screensaver_id != 0) + { + g_source_remove (saver->screensaver_id); + saver->screensaver_id = 0; + } + + if (inhibit) + { + /* Reset the screensaver timers every so often + * so they don't activate */ + saver->screensaver_id = g_timeout_add_seconds (20, + xfce_reset_screen_saver, + saver); + } + break; + + default: + g_warn_if_reached (); + break; + } +} + + + +/** + * xfce_screensaver_lock: + * @saver: the #XfceScreensaver object + * + * Attempts to lock the screen, either with one of the screensaver + * D-Bus proxies, the Xfconf lock command, or one of the + * fallback scripts such as xdg-screensaver. + * + * Returns: %TRUE if the lock attempt returns success, %FALSE otherwise. + * + * Since: 4.18.2 + **/ +gboolean +xfce_screensaver_lock (XfceScreensaver *saver) +{ + GVariant *response; + GError *error = NULL; + gint status; + + /* prioritize user command and don't try anything else it that fails */ + if (saver->lock_command != NULL) + { + gchar **argv; + + DBG ("running lock command: %s", saver->lock_command); + + /* prevent accidental recursive calling of lock command if it calls + * xfce_screensaver_lock() in any way (as e.g. xflock4 does) */ + if (g_getenv ("XFCE_SCREENSAVER_LOCK") != NULL) + { + g_warning ("Recursive call of %s", saver->lock_command); + return FALSE; + } + + if (g_shell_parse_argv (saver->lock_command, NULL, &argv, NULL)) + { + gchar **env = g_environ_setenv (g_get_environ (), "XFCE_SCREENSAVER_LOCK", "", TRUE); + gboolean ret = g_spawn_sync (NULL, argv, env, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &status, NULL) + && g_spawn_check_exit_status (status, NULL); + g_strfreev (env); + g_strfreev (argv); + return ret; + } + + return FALSE; + } + + /* try dbus screensavers */ + for (guint i = 0; i < SCREENSAVER_TYPE_OTHER; i++) + { + if ((saver->screensaver_type == SCREENSAVER_TYPE_OTHER && saver->proxies[i] != NULL) + || saver->screensaver_type == i) + { + switch (i) + { + case SCREENSAVER_TYPE_XFCE: + response = g_dbus_proxy_call_sync (saver->proxies[i], + "Lock", + NULL, + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + break; + + case SCREENSAVER_TYPE_CINNAMON: + response = g_dbus_proxy_call_sync (saver->proxies[i], + "Lock", + g_variant_new ("(s)", PACKAGE_NAME), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + break; + + case SCREENSAVER_TYPE_MATE: + case SCREENSAVER_TYPE_FREEDESKTOP: + response = g_dbus_proxy_call_sync (saver->proxies[i], + "Lock", + NULL, + G_DBUS_CALL_FLAGS_NONE, + NO_REPLY_TIMEOUT, + NULL, + &error); + + /* mate-screensaver does not send a reply in case of success, and for screensavers + * using org.freedesktop.ScreenSaver we're not sure, so if no other error is received + * after a reasonnable timeout, consider it a success */ + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_TIMED_OUT)) + { + response = g_variant_ref_sink (g_variant_new ("()")); + g_clear_error (&error); + } + break; + + default: + g_warn_if_reached (); + continue; + } + + if (response != NULL) + { + g_variant_unref (response); + return TRUE; + } + else + { + /* if it's running and can lock it should succeed, don't try anything else */ + gboolean running = !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NAME_HAS_NO_OWNER); + gboolean can_lock = !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD); + g_clear_error (&error); + if (running && can_lock) + return FALSE; + } + } + } + + /* no user command or dbus interface set up */ + if (g_spawn_command_line_sync ("xdg-screensaver lock", NULL, NULL, &status, NULL) + && g_spawn_check_exit_status (status, NULL)) + return TRUE; + + if (g_spawn_command_line_sync ("xscreensaver-command --lock", NULL, NULL, &status, NULL) + && g_spawn_check_exit_status (status, NULL)) + return TRUE; + + if (g_spawn_command_line_sync ("light-locker-command --lock", NULL, NULL, &status, NULL) + && g_spawn_check_exit_status (status, NULL)) + return TRUE; + + return FALSE; +} diff --git a/libxfce4ui/xfce-screensaver.h b/libxfce4ui/xfce-screensaver.h new file mode 100644 index 0000000..9d77ba5 --- /dev/null +++ b/libxfce4ui/xfce-screensaver.h @@ -0,0 +1,50 @@ +/* + * * Copyright (C) 2016 Eric Koegel + * + * Licensed under the GNU General Public License Version 2 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#error "Only can be included directly, this file is not part of the public API." +#endif + +/* do not change this in __XFCE_SCREENSAVER_H__ or so: it allows xfce4-session and + * xfce4-power-manager <= 4.18.0 to build with libxfce4ui >= 4.18.2 by avoiding + * conflicting types */ +#ifndef __XFCE_SCREENSAVER_H +#define __XFCE_SCREENSAVER_H + +#include + +G_BEGIN_DECLS + +#define XFCE_TYPE_SCREENSAVER (xfce_screensaver_get_type ()) +G_DECLARE_FINAL_TYPE (XfceScreensaver, xfce_screensaver, XFCE, SCREENSAVER, GObject) + +/* for compatibility with xfce4-session and xfce4-power-manager <= 4.18.0 as above */ +typedef XfceScreensaver XfceScreenSaver; + +XfceScreensaver *xfce_screensaver_new (void); + +void xfce_screensaver_inhibit (XfceScreensaver *saver, + gboolean inhibit); + +gboolean xfce_screensaver_lock (XfceScreensaver *saver); + +G_END_DECLS + +#endif /* __XFCE_SCREENSAVER_H */ diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index ff7506b..decccf6 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -140,6 +140,7 @@ struct _XfceSMClient #ifdef HAVE_LIBSM SmcConn session_connection; + IceConn ice_connection; #endif XfceSMClientState state; @@ -798,7 +799,8 @@ xsmp_process_ice_messages(GIOChannel *channel, GIOCondition condition, gpointer client_data) { - IceConn connection = (IceConn)client_data; + XfceSMClient *sm_client = client_data; + IceConn connection = sm_client->ice_connection; IceProcessMessagesStatus status; status = IceProcessMessages(connection, NULL, NULL); @@ -806,7 +808,11 @@ xsmp_process_ice_messages(GIOChannel *channel, g_warning("Disconnected from session manager."); /* We were disconnected */ IceSetShutdownNegotiation(connection, False); - IceCloseConnection(connection); + if(sm_client->session_connection) { + xfce_sm_client_disconnect(sm_client); + } else { + IceCloseConnection(connection); + } } return TRUE; @@ -820,6 +826,7 @@ xsmp_new_ice_connection(IceConn connection, Bool opening, IcePointer *watch_data) { + XfceSMClient *sm_client = client_data; guint input_id; if(opening) { @@ -828,6 +835,7 @@ xsmp_new_ice_connection(IceConn connection, */ GIOChannel *channel; + sm_client->ice_connection = connection; fcntl(IceConnectionNumber(connection), F_SETFD, fcntl(IceConnectionNumber(connection), F_GETFD) | FD_CLOEXEC); @@ -835,7 +843,7 @@ xsmp_new_ice_connection(IceConn connection, input_id = g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI, - xsmp_process_ice_messages, connection); + xsmp_process_ice_messages, sm_client); g_io_channel_unref(channel); @@ -857,9 +865,9 @@ xsmp_ice_io_error_handler(IceConn connection) } static void -xsmp_ice_init(void) +xsmp_ice_init(XfceSMClient *sm_client) { - static volatile gsize inited = 0; + static gsize inited = 0; if(g_once_init_enter(&inited)) { IceIOErrorHandler default_handler; @@ -870,7 +878,7 @@ xsmp_ice_init(void) if(xsmp_ice_installed_handler == default_handler) xsmp_ice_installed_handler = NULL; - IceAddConnectionWatch(xsmp_new_ice_connection, NULL); + IceAddConnectionWatch(xsmp_new_ice_connection, sm_client); g_once_init_leave(&inited, 1); } @@ -1453,15 +1461,12 @@ xfce_sm_client_get_option_group(gint argc, * command line parsing will figure out many of the SM client's * required property values for you. * - * If you are not using Gtk or Glib's command-line option parser, - * take a look at xfce_sm_client_new_with_argv() and - * xfce_sm_client_new_full(). - * * If you have already created an #XfceSMClient instance using - * this function or one of the xfce_sm_client_new_*() functions, - * this will return the same instance. + * this function, this will return the same instance, i.e. you should + * *only* unref the first instance. * - * Returns: (transfer full): A new or existing #XfceSMClient + * Returns: A new #XfceSMClient instance -transfer full- on the first call only, + * other calls to this function are transfer none **/ XfceSMClient * xfce_sm_client_get(void) @@ -1551,7 +1556,7 @@ xfce_sm_client_get_full(XfceSMClientRestartStyle restart_style, /** * xfce_sm_client_connect: * @sm_client: An #XfceSMClient - * @error: (out) (allow-none) (transfer full): A #GError location. + * @error: (out) (nullable) (transfer full): A #GError location. * * Attempts to connect to the session manager. * @@ -1581,7 +1586,7 @@ xfce_sm_client_connect(XfceSMClient *sm_client, return TRUE; #ifdef HAVE_LIBSM - xsmp_ice_init(); + xsmp_ice_init(sm_client); mask = SmcSaveYourselfProcMask | SmcDieProcMask | SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask; @@ -2187,8 +2192,7 @@ xfce_sm_client_get_client_id(XfceSMClient *sm_client) * and handle state cleanup (setting of the discard command) for you. * * Before calling this function, the application must have a - * valid program identifier set (see xfce_sm_client_set_program()) - * and a valid client ID (see xfce_sm_client_get_client_id()). + * valid client ID (see xfce_sm_client_get_client_id()). * * Returns: a file name string, owned by the object or %NULL if * the session client is disabled. diff --git a/libxfce4ui/xfce-sm-client.h b/libxfce4ui/xfce-sm-client.h index 2f0a874..18d2091 100644 --- a/libxfce4ui/xfce-sm-client.h +++ b/libxfce4ui/xfce-sm-client.h @@ -21,7 +21,7 @@ #ifndef __XFCE_SM_CLIENT_H__ #define __XFCE_SM_CLIENT_H__ -#if !defined(LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined(LIBXFCE4UI_COMPILATION) +#if !defined(_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined(LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file is not part of the public API." #endif diff --git a/libxfce4ui/xfce-spawn.c b/libxfce4ui/xfce-spawn.c index f1f75cb..10f96ac 100644 --- a/libxfce4ui/xfce-spawn.c +++ b/libxfce4ui/xfce-spawn.c @@ -100,20 +100,8 @@ typedef struct static gboolean xfce_spawn_startup_timeout (gpointer user_data) { - XfceSpawnData *spawn_data = user_data; - GTimeVal now; - gdouble elapsed; - glong tv_sec; - glong tv_usec; - - g_return_val_if_fail (spawn_data->sn_launcher != NULL, FALSE); - - /* determine the amount of elapsed time */ - g_get_current_time (&now); - sn_launcher_context_get_last_active_time (spawn_data->sn_launcher, &tv_sec, &tv_usec); - elapsed = now.tv_sec - tv_sec + ((gdouble) (now.tv_usec - tv_usec) / G_USEC_PER_SEC); - - return elapsed < XFCE_SPAWN_STARTUP_TIMEOUT; + /* timeout reached, lets stop the startup notification */ + return FALSE; } @@ -292,6 +280,7 @@ xfce_spawn_process (GdkScreen *screen, gboolean child_process) { gboolean succeed; + gboolean is_x11_display = FALSE; gchar **cenvp; guint n; guint n_cenvp; @@ -331,20 +320,28 @@ xfce_spawn_process (GdkScreen *screen, envp = (gchar **) environ; for (n = 0; envp[n] != NULL; ++n); cenvp = g_new0 (gchar *, n + 3); +#ifdef GDK_WINDOWING_X11 + is_x11_display = GDK_IS_X11_DISPLAY (gdk_screen_get_display (screen)); +#endif for (n_cenvp = n = 0; envp[n] != NULL; ++n) { - if (strncmp (envp[n], "DESKTOP_STARTUP_ID", 18) != 0 - && strncmp (envp[n], "DISPLAY", 7) != 0) + if (strncmp (envp[n], "DESKTOP_STARTUP_ID=", 19) != 0 + && (!is_x11_display || strncmp (envp[n], "DISPLAY=", 8) != 0)) cenvp[n_cenvp++] = g_strdup (envp[n]); } - /* add the real display name for the screen */ +#ifdef GDK_WINDOWING_X11 + if (is_x11_display) + { + /* add the real display name for the screen */ G_GNUC_BEGIN_IGNORE_DEPRECATIONS - /* TODO: Move xfwm_make_display_name to libxfce4ui */ - display_name = gdk_screen_make_display_name (screen); + /* TODO: Move xfwm_make_display_name to libxfce4ui */ + display_name = gdk_screen_make_display_name (screen); G_GNUC_END_IGNORE_DEPRECATIONS - cenvp[n_cenvp++] = g_strconcat ("DISPLAY=", display_name, NULL); - g_free (display_name); + cenvp[n_cenvp++] = g_strconcat ("DISPLAY=", display_name, NULL); + g_free (display_name); + } +#endif #ifdef HAVE_LIBSTARTUP_NOTIFICATION /* initialize the sn launcher context */ @@ -429,7 +426,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS if (G_LIKELY (sn_launcher != NULL)) { /* start a timeout to stop the startup notification sequence after - * a certain about of time, to handle applications that do not + * about XFCE_SPAWN_STARTUP_TIMEOUT seconds, to handle applications that do not * properly implement startup notify */ spawn_data->sn_launcher = sn_launcher; spawn_data->timeout_id = g_timeout_add_seconds_full (G_PRIORITY_LOW, @@ -513,12 +510,12 @@ _xfce_spawn_command_line (GdkScreen *screen, /** * xfce_spawn_on_screen_with_child_watch - * @screen : (allow-none): a #GdkScreen or %NULL to use the active screen, + * @screen : (nullable): a #GdkScreen or %NULL to use the active screen, * see xfce_gdk_screen_get_active(). - * @working_directory : (allow-none): child's current working directory or %NULL to + * @working_directory : (nullable): child's current working directory or %NULL to * inherit parent's. * @argv : child's argument vector. - * @envp : (allow-none): child's environment vector or %NULL to inherit + * @envp : (nullable): child's environment vector or %NULL to inherit * parent's. * @flags : flags from #GSpawnFlags. #G_SPAWN_DO_NOT_REAP_CHILD * is not allowed, you should use the @@ -530,10 +527,10 @@ _xfce_spawn_command_line (GdkScreen *screen, * have direct access to the event time you could use * gtk_get_current_event_time() or if nothing is * available 0 is valid too. - * @startup_icon_name : (allow-none): application icon or %NULL. - * @child_watch_closure : (allow-none): closure that is triggered when the child exists + * @startup_icon_name : (nullable): application icon or %NULL. + * @child_watch_closure : (nullable): closure that is triggered when the child exists * or %NULL. - * @error : (out) (allow-none) (transfer full): return location for errors or %NULL. + * @error : (out) (nullable) (transfer full): return location for errors or %NULL. * * Like xfce_spawn_on_screen(), but allows to attach a closure to watch the * child's exit status. This because only one g_child_watch_add() is allowed on @@ -588,12 +585,12 @@ xfce_spawn_on_screen_with_child_watch (GdkScreen *screen, /** * xfce_spawn_on_screen: - * @screen : (allow-none): a #GdkScreen or %NULL to use the active screen, + * @screen : (nullable): a #GdkScreen or %NULL to use the active screen, * see xfce_gdk_screen_get_active(). - * @working_directory : (allow-none): child's current working directory or %NULL to + * @working_directory : (nullable): child's current working directory or %NULL to * inherit parent's. * @argv : child's argument vector. - * @envp : (allow-none): child's environment vector or %NULL to inherit + * @envp : (nullable): child's environment vector or %NULL to inherit * parent's. * @flags : flags from #GSpawnFlags. #G_SPAWN_DO_NOT_REAP_CHILD * is not allowed, use xfce_spawn_on_screen_with_child_watch() @@ -605,10 +602,10 @@ xfce_spawn_on_screen_with_child_watch (GdkScreen *screen, * have direct access to the event time you could use * gtk_get_current_event_time() or if nothing is * available 0 is valid too. - * @startup_icon_name : (allow-none): application icon or %NULL. - * @error : (out) (allow-none) (transfer full): return location for errors or %NULL. + * @startup_icon_name : (nullable): application icon or %NULL. + * @error : (out) (nullable) (transfer full): return location for errors or %NULL. * - * Like gdk_spawn_on_screen(), but also supports startup notification + * Like gdk_spawn_on_screen() (GDK 2), but also supports startup notification * (if Libxfce4ui was built with startup notification support). * * Return value: %TRUE on success, %FALSE if @error is set. @@ -634,12 +631,12 @@ xfce_spawn_on_screen (GdkScreen *screen, /** * xfce_spawn - * @screen : (allow-none): a #GdkScreen or %NULL to use the active screen, + * @screen : (nullable): a #GdkScreen or %NULL to use the active screen, * see xfce_gdk_screen_get_active(). - * @working_directory : (allow-none): child's current working directory or %NULL to + * @working_directory : (nullable): child's current working directory or %NULL to * inherit parent's. * @argv : child's argument vector. - * @envp : (allow-none): child's environment vector or %NULL to inherit + * @envp : (nullable): child's environment vector or %NULL to inherit * parent's. * @flags : flags from #GSpawnFlags. #G_SPAWN_DO_NOT_REAP_CHILD * is not allowed, use xfce_spawn_on_screen_with_child_watch() @@ -651,12 +648,12 @@ xfce_spawn_on_screen (GdkScreen *screen, * have direct access to the event time you could use * gtk_get_current_event_time() or if nothing is * available 0 is valid too. - * @startup_icon_name : (allow-none): application icon or %NULL. + * @startup_icon_name : (nullable): application icon or %NULL. * @child_process : %TRUE if the process should be a child process, * %FALSE if it should be reparented to init. - * @error : (out) (allow-none) (transfer full): return location for errors or %NULL. + * @error : (out) (nullable) (transfer full): return location for errors or %NULL. * - * Like gdk_spawn_on_screen(), but also supports startup notification + * Like gdk_spawn_on_screen() (GDK 2), but also supports startup notification * (if Libxfce4ui was built with startup notification support). * * Return value: %TRUE on success, %FALSE if @error is set. @@ -685,11 +682,11 @@ xfce_spawn (GdkScreen *screen, /** * xfce_spawn_command_line_on_screen: - * @screen : (allow-none): a #GdkScreen or %NULL to use the active screen, see xfce_gdk_screen_get_active(). + * @screen : (nullable): a #GdkScreen or %NULL to use the active screen, see xfce_gdk_screen_get_active(). * @command_line : command line to run. * @in_terminal : whether to run @command_line in a terminal. * @startup_notify : whether to use startup notification. - * @error : (out) (allow-none) (transfer full): location for a #GError or %NULL. + * @error : (out) (nullable) (transfer full): location for a #GError or %NULL. * * Executes the given @command_line and returns %TRUE if the * command terminated successfully. Else, the @error is set @@ -715,12 +712,12 @@ xfce_spawn_command_line_on_screen (GdkScreen *screen, /** * xfce_spawn_command_line: - * @screen : (allow-none): a #GdkScreen or %NULL to use the active screen, see xfce_gdk_screen_get_active(). + * @screen : (nullable): a #GdkScreen or %NULL to use the active screen, see xfce_gdk_screen_get_active(). * @command_line : command line to run. * @in_terminal : whether to run @command_line in a terminal. * @startup_notify : whether to use startup notification. * @child_process : %TRUE if the process should be a child process, %FALSE if it should be reparented to init. - * @error : (out) (allow-none) (transfer full): location for a #GError or %NULL. + * @error : (out) (nullable) (transfer full): location for a #GError or %NULL. * * Executes the given @command_line and returns %TRUE if the * command terminated successfully. Else, the @error is set diff --git a/libxfce4ui/xfce-spawn.h b/libxfce4ui/xfce-spawn.h index dd425b2..e770a3b 100644 --- a/libxfce4ui/xfce-spawn.h +++ b/libxfce4ui/xfce-spawn.h @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file is not part of the public API." #endif @@ -47,7 +47,8 @@ gboolean xfce_spawn_on_screen (GdkScreen *screen, gboolean startup_notify, guint32 startup_timestamp, const gchar *startup_icon_name, - GError **error); + GError **error) +G_GNUC_DEPRECATED_FOR (xfce_spawn()); gboolean xfce_spawn (GdkScreen *screen, const gchar *working_directory, @@ -64,7 +65,8 @@ gboolean xfce_spawn_command_line_on_screen (GdkScreen *screen, const gchar *command_line, gboolean in_terminal, gboolean startup_notify, - GError **error); + GError **error) +G_GNUC_DEPRECATED_FOR (xfce_spawn_command_line()); gboolean xfce_spawn_command_line (GdkScreen *screen, const gchar *command_line, diff --git a/libxfce4ui/xfce-titled-dialog.c b/libxfce4ui/xfce-titled-dialog.c index 1111278..79dcf4b 100644 --- a/libxfce4ui/xfce-titled-dialog.c +++ b/libxfce4ui/xfce-titled-dialog.c @@ -38,6 +38,8 @@ #include +#include + #include #include #include @@ -69,6 +71,7 @@ static void xfce_titled_dialog_set_property (GObject *objec const GValue *value, GParamSpec *pspec); static void xfce_titled_dialog_close (GtkDialog *dialog); +static void xfce_titled_dialog_update_window (XfceTitledDialog *titled_dialog); static void xfce_titled_dialog_update_icon (XfceTitledDialog *titled_dialog); @@ -78,7 +81,11 @@ struct _XfceTitledDialogPrivate GtkWidget *headerbar; GtkWidget *icon; GtkWidget *action_area; + GtkWidget *subtitle_label; + GtkWidget *subtitle_separator; + GdkPixbuf *pixbuf; gchar *subtitle; + gboolean use_header; }; typedef struct _ResponseData ResponseData; @@ -90,7 +97,7 @@ struct _ResponseData -G_DEFINE_TYPE (XfceTitledDialog, xfce_titled_dialog, GTK_TYPE_DIALOG) +G_DEFINE_TYPE_WITH_PRIVATE (XfceTitledDialog, xfce_titled_dialog, GTK_TYPE_DIALOG) @@ -101,9 +108,6 @@ xfce_titled_dialog_class_init (XfceTitledDialogClass *klass) GtkBindingSet *binding_set; GObjectClass *gobject_class; - /* add our private data to the class */ - g_type_class_add_private (klass, sizeof (XfceTitledDialogPrivate)); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->constructor = xfce_titled_dialog_constructor; gobject_class->get_property = xfce_titled_dialog_get_property; @@ -145,7 +149,6 @@ xfce_titled_dialog_constructor (GType type, object = G_OBJECT_CLASS (xfce_titled_dialog_parent_class)->constructor (type, n_construct_params, construct_params); - g_object_set (G_OBJECT (object), "use-header-bar", TRUE, NULL); return object; } @@ -155,25 +158,67 @@ xfce_titled_dialog_constructor (GType type, static void xfce_titled_dialog_init (XfceTitledDialog *titled_dialog) { + GtkSettings *settings; + /* connect the private data */ - titled_dialog->priv = XFCE_TITLED_DIALOG_GET_PRIVATE (titled_dialog); + titled_dialog->priv = xfce_titled_dialog_get_instance_private (titled_dialog); - /* Get the headerbar of the dialog */ - titled_dialog->priv->headerbar = gtk_dialog_get_header_bar (GTK_DIALOG (titled_dialog)); - g_return_if_fail (GTK_IS_HEADER_BAR (titled_dialog->priv->headerbar)); + settings = gtk_settings_get_default (); + g_object_get (settings, "gtk-dialogs-use-header", &titled_dialog->priv->use_header, NULL); + + if (titled_dialog->priv->use_header) + { + g_object_set (G_OBJECT (titled_dialog), "use-header-bar", TRUE, NULL); - /* Don't reserve vertical space for subtitles */ - gtk_header_bar_set_has_subtitle (GTK_HEADER_BAR (titled_dialog->priv->headerbar), FALSE); + /* Get the headerbar of the dialog */ + titled_dialog->priv->headerbar = gtk_dialog_get_header_bar (GTK_DIALOG (titled_dialog)); + g_return_if_fail (GTK_IS_HEADER_BAR (titled_dialog->priv->headerbar)); - /* Pack the window icon into the headerbar */ - titled_dialog->priv->icon = gtk_image_new (); - gtk_header_bar_pack_start (GTK_HEADER_BAR (titled_dialog->priv->headerbar), titled_dialog->priv->icon); - gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (titled_dialog->priv->headerbar), TRUE); - gtk_widget_show (titled_dialog->priv->icon); + /* Don't reserve vertical space for subtitles */ + gtk_header_bar_set_has_subtitle (GTK_HEADER_BAR (titled_dialog->priv->headerbar), FALSE); - /* make sure to update the icon whenever one of the relevant window properties changes */ - g_signal_connect (G_OBJECT (titled_dialog), "notify::icon", G_CALLBACK (xfce_titled_dialog_update_icon), NULL); - g_signal_connect (G_OBJECT (titled_dialog), "notify::icon-name", G_CALLBACK (xfce_titled_dialog_update_icon), NULL); + /* Pack the window icon into the headerbar */ + titled_dialog->priv->icon = gtk_image_new (); + gtk_header_bar_pack_start (GTK_HEADER_BAR (titled_dialog->priv->headerbar), titled_dialog->priv->icon); + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (titled_dialog->priv->headerbar), TRUE); + gtk_widget_show (titled_dialog->priv->icon); + titled_dialog->priv->pixbuf = NULL; + + /* Adjust window buttons and window placement */ + g_signal_connect (G_OBJECT (titled_dialog), "notify::window", G_CALLBACK (xfce_titled_dialog_update_window), NULL); + + /* Make sure to update the icon whenever one of the relevant window properties changes */ + g_signal_connect (G_OBJECT (titled_dialog), "notify::icon", G_CALLBACK (xfce_titled_dialog_update_icon), NULL); + g_signal_connect (G_OBJECT (titled_dialog), "notify::icon-name", G_CALLBACK (xfce_titled_dialog_update_icon), NULL); + } + else + { + GtkWidget *vbox, *widget, *content_area; + + /* remove the main dialog box from the window */ + content_area = gtk_dialog_get_content_area (GTK_DIALOG (titled_dialog)); + g_object_ref (G_OBJECT (content_area)); + gtk_container_remove (GTK_CONTAINER (titled_dialog), content_area); + + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_container_add (GTK_CONTAINER (titled_dialog), vbox); + gtk_widget_show (vbox); + + widget = titled_dialog->priv->subtitle_label = gtk_label_new (NULL); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); + gtk_widget_set_no_show_all (widget, TRUE); + gtk_style_context_add_class (gtk_widget_get_style_context (widget), "xfce-titled-dialog-subtitle"); + gtk_widget_set_margin_start (widget, 8); + gtk_widget_set_margin_end (widget, 8); + + widget = titled_dialog->priv->subtitle_separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); + gtk_widget_set_no_show_all (widget, TRUE); + gtk_style_context_add_class (gtk_widget_get_style_context (widget), "xfce-titled-dialog-separator"); + + gtk_box_pack_start (GTK_BOX (vbox), content_area, TRUE, TRUE, 0); + g_object_unref (G_OBJECT(content_area)); + } } @@ -186,6 +231,13 @@ xfce_titled_dialog_finalize (GObject *object) /* release the subtitle */ g_free (titled_dialog->priv->subtitle); + /* release the pixbuf */ + if (titled_dialog->priv->pixbuf) + { + g_object_unref (titled_dialog->priv->pixbuf); + titled_dialog->priv->pixbuf = NULL; + } + (*G_OBJECT_CLASS (xfce_titled_dialog_parent_class)->finalize) (object); } @@ -254,16 +306,41 @@ xfce_titled_dialog_close (GtkDialog *dialog) +static void +xfce_titled_dialog_update_window (XfceTitledDialog *titled_dialog) +{ + /* skip if the dialog is a normal window by design (e.g. Settings Editor) */ + if (gtk_window_get_type_hint (GTK_WINDOW (titled_dialog)) == GDK_WINDOW_TYPE_HINT_NORMAL) + return; + + /* set type-hint to normal to show min, max and close buttons */ + gtk_window_set_type_hint (GTK_WINDOW (titled_dialog), GDK_WINDOW_TYPE_HINT_NORMAL); + + /* center window on the active screen */ + xfce_gtk_window_center_on_active_screen (GTK_WINDOW (titled_dialog)); +} + + + static void xfce_titled_dialog_update_icon (XfceTitledDialog *titled_dialog) { - const gchar *icon_name = gtk_window_get_icon_name (GTK_WINDOW (titled_dialog)); + const gchar *icon_name; - g_return_if_fail (GTK_IS_HEADER_BAR (titled_dialog->priv->headerbar)); - g_return_if_fail (icon_name != NULL); + icon_name = gtk_window_get_icon_name (GTK_WINDOW (titled_dialog)); - gtk_image_set_from_icon_name (GTK_IMAGE (titled_dialog->priv->icon), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_image_set_pixel_size (GTK_IMAGE (titled_dialog->priv->icon), 24); + if (icon_name) + { + gtk_image_set_from_icon_name (GTK_IMAGE (titled_dialog->priv->icon), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_image_set_pixel_size (GTK_IMAGE (titled_dialog->priv->icon), 24); + } + else + { + if (titled_dialog->priv->pixbuf) + g_object_unref (titled_dialog->priv->pixbuf); + titled_dialog->priv->pixbuf = gtk_window_get_icon (GTK_WINDOW (titled_dialog)); + gtk_image_set_from_pixbuf (GTK_IMAGE (titled_dialog->priv->icon), titled_dialog->priv->pixbuf); + } } @@ -380,10 +457,10 @@ xfce_titled_dialog_new (void) /** * xfce_titled_dialog_new_with_buttons: - * @title : (allow-none): title of the dialog, or %NULL. - * @parent : (allow-none): transient parent window of the dialog, or %NULL. + * @title : (nullable): title of the dialog, or %NULL. + * @parent : (nullable): transient parent window of the dialog, or %NULL. * @flags : from #GtkDialogFlags. - * @first_button_text : (allow-none): stock ID or text to go in first, or %NULL. + * @first_button_text : (nullable): stock ID or text to go in first, or %NULL. * @... : response ID for the first button, then additional buttons, ending with %NULL. * * See the documentation of gtk_dialog_new_with_buttons() for details about the @@ -433,7 +510,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS button = gtk_button_new_from_stock (button_text); G_GNUC_END_IGNORE_DEPRECATIONS gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id); - xfce_titled_dialog_repack_dialog (action_area, headerbar, button, response_id); + if (XFCE_TITLED_DIALOG (dialog)->priv->use_header) + xfce_titled_dialog_repack_dialog (action_area, headerbar, button, response_id); button_text = va_arg (args, const gchar *); } va_end (args); @@ -445,11 +523,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS /** * xfce_titled_dialog_new_with_mixed_buttons: - * @title : (allow-none):title of the dialog, or %NULL. - * @parent : (allow-none): transient parent window of the dialog, or %NULL. + * @title : (nullable): title of the dialog, or %NULL. + * @parent : (nullable): transient parent window of the dialog, or %NULL. * @flags : from #GtkDialogFlags. * @first_button_icon_name : icon name to go in first, or "" for no icon. - * @first_button_text : (allow-none): text to go in first, or %NULL. + * @first_button_text : (nullable): text to go in first, or %NULL. * @... : response ID for the first button, then additional buttons, ending with %NULL. * * Creates an #XfceTitledDialog using xfce_gtk_button_new_mixed. This allows @@ -509,7 +587,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_set_can_default (button, TRUE); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id); - xfce_titled_dialog_repack_dialog (action_area, headerbar, button, response_id); + if (XFCE_TITLED_DIALOG (dialog)->priv->use_header) + xfce_titled_dialog_repack_dialog (action_area, headerbar, button, response_id); gtk_widget_show (button); /* this is to pickup for the next button. @@ -524,7 +603,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS va_end (args); /* since we just removed all buttons from the headerbar we have to show the close button again explicitly */ - gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE); + if (XFCE_TITLED_DIALOG (dialog)->priv->use_header) + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE); return dialog; } @@ -708,11 +788,13 @@ xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog) /** * xfce_titled_dialog_set_subtitle: * @titled_dialog : a #XfceTitledDialog. - * @subtitle : the new subtitle for the @titled_dialog, or %NULL. + * @subtitle: (nullable): the new subtitle for the @titled_dialog, or %NULL. * * Sets the subtitle displayed by @titled_dialog to @subtitle; if * @subtitle is %NULL no subtitle will be displayed by the @titled_dialog. - * This is just a convenience function around #gtk_header_bar_set_subtitle. + * This is just a convenience function around #gtk_header_bar_set_subtitle + * when dialogs use header bars. Otherwise a simple label and separator are + * shown at the top of dialog. **/ void xfce_titled_dialog_set_subtitle (XfceTitledDialog *titled_dialog, @@ -727,9 +809,18 @@ xfce_titled_dialog_set_subtitle (XfceTitledDialog *titled_dialog, /* activate the new subtitle */ titled_dialog->priv->subtitle = g_strdup (subtitle); - /* update the subtitle of the headerbar */ - gtk_header_bar_set_subtitle (GTK_HEADER_BAR (titled_dialog->priv->headerbar), - titled_dialog->priv->subtitle); + if (titled_dialog->priv->use_header) + { + /* update the subtitle of the headerbar */ + gtk_header_bar_set_subtitle (GTK_HEADER_BAR (titled_dialog->priv->headerbar), + titled_dialog->priv->subtitle); + } + else + { + gtk_label_set_label (GTK_LABEL (titled_dialog->priv->subtitle_label), subtitle); + gtk_widget_show (titled_dialog->priv->subtitle_label); + gtk_widget_show (titled_dialog->priv->subtitle_separator); + } /* notify listeners */ g_object_notify (G_OBJECT (titled_dialog), "subtitle"); diff --git a/libxfce4ui/xfce-titled-dialog.h b/libxfce4ui/xfce-titled-dialog.h index 4f436ca..294158b 100644 --- a/libxfce4ui/xfce-titled-dialog.h +++ b/libxfce4ui/xfce-titled-dialog.h @@ -17,7 +17,7 @@ * MA 02110-1301 USA */ -#if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) +#if !defined (_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) #error "Only can be included directly, this file is not part of the public API." #endif @@ -72,7 +72,8 @@ GtkWidget *xfce_titled_dialog_new_with_buttons (const gchar *tit GtkWindow *parent, GtkDialogFlags flags, const gchar *first_button_text, - ...) G_GNUC_MALLOC; + ...) +G_GNUC_MALLOC G_GNUC_DEPRECATED_FOR (xfce_titled_dialog_new_with_mixed_buttons()); GtkWidget *xfce_titled_dialog_new_with_mixed_buttons (const gchar *title, GtkWindow *parent, diff --git a/ltmain.sh b/ltmain.sh index 0cb7f90..5506693 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,12 +1,12 @@ -#! /bin/sh +#! /usr/bin/env sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.6 +# libtool (GNU libtool) 2.4.7.4-1ec8f-dirty # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-14" -package_revision=2.4.6 +VERSION=2.4.7.4-1ec8f-dirty +package_revision=2.4.7.4 ## ------ ## @@ -64,34 +64,25 @@ package_revision=2.4.6 # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-01-20.17; # UTC +scriptversion=2019-02-19.15; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# As a special exception to the GNU General Public License, if you distribute -# this file as part of a program or library that is built using GNU Libtool, -# you may include this file under the same distribution terms that you use -# for the rest of that program. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2004-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# Please report bugs or propose patches to gary@gnu.org. +# Please report bugs or propose patches to: +# ## ------ ## @@ -139,9 +130,12 @@ do _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL # Make sure IFS has a sensible default sp=' ' @@ -159,6 +153,26 @@ if test "${PATH_SEPARATOR+set}" != set; then fi +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} + + +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH + +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS + ## ------------------------- ## ## Locate command utilities. ## @@ -259,7 +273,7 @@ test -z "$SED" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" rm -f conftest.sed SED=$func_path_progs_result } @@ -295,7 +309,7 @@ test -z "$GREP" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" GREP=$func_path_progs_result } @@ -360,6 +374,35 @@ sed_double_backslash="\ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () +{ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false + ;; + '') + break + ;; + *) + check_ifs_backshlash_broken=: + break + ;; + esac + done + IFS=$_G_save_IFS + require_check_ifs_backslash=: +} + ## ----------------- ## ## Global variables. ## @@ -387,7 +430,7 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -580,16 +623,16 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then { $debug_cmd - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" }' else func_append_quoted () { $debug_cmd - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" } fi @@ -1091,85 +1134,203 @@ func_relative_path () } -# func_quote_for_eval ARG... -# -------------------------- -# Aesthetically quote ARGs to be evaled later. -# This function returns two values: -# i) func_quote_for_eval_result -# double-quoted, suitable for a subsequent eval -# ii) func_quote_for_eval_unquoted_result -# has all characters that are still active within double -# quotes backslashified. -func_quote_for_eval () +# func_quote_portable EVAL ARG +# ---------------------------- +# Internal function to portably implement func_quote_arg. Note that we still +# keep attention to performance here so we as much as possible try to avoid +# calling sed binary (so far O(N) complexity as long as func_append is O(1)). +func_quote_portable () { $debug_cmd - func_quote_for_eval_unquoted_result= - func_quote_for_eval_result= - while test 0 -lt $#; do - case $1 in - *[\\\`\"\$]*) - _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; - *) - _G_unquoted_arg=$1 ;; - esac - if test -n "$func_quote_for_eval_unquoted_result"; then - func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" - else - func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + $require_check_ifs_backslash + + func_quote_portable_result=$2 + + # one-time-loop (easy break) + while true + do + if $1; then + func_quote_portable_result=`$ECHO "$2" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` + break fi - case $_G_unquoted_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_quoted_arg=\"$_G_unquoted_arg\" + # Quote for eval. + case $func_quote_portable_result in + *[\\\`\"\$]*) + # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string + # contains the shell wildcard characters. + case $check_ifs_backshlash_broken$func_quote_portable_result in + :*|*[\[\*\?]*) + func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ + | $SED "$sed_quote_subst"` + break + ;; + esac + + func_quote_portable_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_portable_result + do + case $1 in + quote) + func_append func_quote_portable_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_portable_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac + done + done + IFS=$func_quote_portable_old_IFS ;; - *) - _G_quoted_arg=$_G_unquoted_arg - ;; + *) ;; esac - - if test -n "$func_quote_for_eval_result"; then - func_append func_quote_for_eval_result " $_G_quoted_arg" - else - func_append func_quote_for_eval_result "$_G_quoted_arg" - fi - shift + break done + + func_quote_portable_unquoted_result=$func_quote_portable_result + case $func_quote_portable_result in + # double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # many bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_portable_result=\"$func_quote_portable_result\" + ;; + esac } -# func_quote_for_expand ARG -# ------------------------- -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - $debug_cmd +# func_quotefast_eval ARG +# ----------------------- +# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +# but optimized for speed. Result is stored in $func_quotefast_eval. +if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then + printf -v _GL_test_printf_tilde %q '~' + if test '\~' = "$_GL_test_printf_tilde"; then + func_quotefast_eval () + { + printf -v func_quotefast_eval_result %q "$1" + } + else + # Broken older Bash implementations. Make those faster too if possible. + func_quotefast_eval () + { + case $1 in + '~'*) + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + ;; + *) + printf -v func_quotefast_eval_result %q "$1" + ;; + esac + } + fi +else + func_quotefast_eval () + { + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + } +fi - case $1 in - *[\\\`\"]*) - _G_arg=`$ECHO "$1" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) - _G_arg=$1 ;; + +# func_quote_arg MODEs ARG +# ------------------------ +# Quote one ARG to be evaled later. MODEs argument may contain zero or more +# specifiers listed below separated by ',' character. This function returns two +# values: +# i) func_quote_arg_result +# double-quoted (when needed), suitable for a subsequent eval +# ii) func_quote_arg_unquoted_result +# has all characters that are still active within double +# quotes backslashified. Available only if 'unquoted' is specified. +# +# Available modes: +# ---------------- +# 'eval' (default) +# - escape shell special characters +# 'expand' +# - the same as 'eval'; but do not quote variable references +# 'pretty' +# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +# be used later in func_quote to get output like: 'echo "a b"' instead +# of 'echo a\ b'. This is slower than default on some shells. +# 'unquoted' +# - produce also $func_quote_arg_unquoted_result which does not contain +# wrapping double-quotes. +# +# Examples for 'func_quote_arg pretty,unquoted string': +# +# string | *_result | *_unquoted_result +# ------------+-----------------------+------------------- +# " | \" | \" +# a b | "a b" | a b +# "a b" | "\"a b\"" | \"a b\" +# * | "*" | * +# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +# +# Examples for 'func_quote_arg pretty,unquoted,expand string': +# +# string | *_result | *_unquoted_result +# --------------+---------------------+-------------------- +# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +func_quote_arg () +{ + _G_quote_expand=false + case ,$1, in + *,expand,*) + _G_quote_expand=: + ;; esac - case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_arg=\"$_G_arg\" + case ,$1, in + *,pretty,*|*,expand,*|*,unquoted,*) + func_quote_portable $_G_quote_expand "$2" + func_quote_arg_result=$func_quote_portable_result + func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result + ;; + *) + # Faster quote-for-eval for some shells. + func_quotefast_eval "$2" + func_quote_arg_result=$func_quotefast_eval_result ;; esac +} + - func_quote_for_expand_result=$_G_arg +# func_quote MODEs ARGs... +# ------------------------ +# Quote all ARGs to be evaled later and join them into single command. See +# func_quote_arg's description for more info. +func_quote () +{ + $debug_cmd + _G_func_quote_mode=$1 ; shift + func_quote_result= + while test 0 -lt $#; do + func_quote_arg "$_G_func_quote_mode" "$1" + if test -n "$func_quote_result"; then + func_append func_quote_result " $func_quote_arg_result" + else + func_append func_quote_result "$func_quote_arg_result" + fi + shift + done } @@ -1215,8 +1376,8 @@ func_show_eval () _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_for_expand "$_G_cmd" - eval "func_notquiet $func_quote_for_expand_result" + func_quote_arg pretty,expand "$_G_cmd" + eval "func_notquiet $func_quote_arg_result" $opt_dry_run || { eval "$_G_cmd" @@ -1241,8 +1402,8 @@ func_show_eval_locale () _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$_G_cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || { @@ -1369,30 +1530,26 @@ func_lt_ver () # End: #! /bin/sh -# Set a version string for this script. -scriptversion=2015-10-07.11; # UTC - # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# Copyright (C) 2010-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2010-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Please report bugs or propose patches to: +# -# Please report bugs or propose patches to gary@gnu.org. +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC ## ------ ## @@ -1415,7 +1572,7 @@ scriptversion=2015-10-07.11; # UTC # # In order for the '--version' option to work, you will need to have a # suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# warranty; '. +# starting with '# Written by ' and ending with '# Copyright'. # # For '-h' and '--help' to work, you will also need a one line # description of your script's purpose in a comment directly above the @@ -1427,7 +1584,7 @@ scriptversion=2015-10-07.11; # UTC # to display verbose messages only when your user has specified # '--verbose'. # -# After sourcing this file, you can plug processing for additional +# After sourcing this file, you can plug in processing for additional # options by amending the variables from the 'Configuration' section # below, and following the instructions in the 'Option parsing' # section further down. @@ -1476,8 +1633,8 @@ fatal_help="Try '\$progname --help' for more information." ## ------------------------- ## # This section contains functions for adding, removing, and running hooks -# to the main code. A hook is just a named list of of function, that can -# be run in order later on. +# in the main code. A hook is just a list of function names that can be +# run in order later on. # func_hookable FUNC_NAME # ----------------------- @@ -1510,7 +1667,8 @@ func_add_hook () # func_remove_hook FUNC_NAME HOOK_FUNC # ------------------------------------ -# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +# Remove HOOK_FUNC from the list of hook functions to be called by +# FUNC_NAME. func_remove_hook () { $debug_cmd @@ -1519,10 +1677,28 @@ func_remove_hook () } +# func_propagate_result FUNC_NAME_A FUNC_NAME_B +# --------------------------------------------- +# If the *_result variable of FUNC_NAME_A _is set_, assign its value to +# *_result variable of FUNC_NAME_B. +func_propagate_result () +{ + $debug_cmd + + func_propagate_result_result=: + if eval "test \"\${${1}_result+set}\" = set" + then + eval "${2}_result=\$${1}_result" + else + func_propagate_result_result=false + fi +} + + # func_run_hooks FUNC_NAME [ARG]... # --------------------------------- # Run all hook functions registered to FUNC_NAME. -# It is assumed that the list of hook functions contains nothing more +# It's assumed that the list of hook functions contains nothing more # than a whitespace-delimited list of legal shell function names, and # no effort is wasted trying to catch shell meta-characters or preserve # whitespace. @@ -1530,26 +1706,21 @@ func_run_hooks () { $debug_cmd - _G_rc_run_hooks=false - case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; + *) func_fatal_error "'$1' does not support hook functions." ;; esac eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - if eval $_G_hook '"$@"'; then - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift - _G_rc_run_hooks=: + func_unset "${_G_hook}_result" + eval $_G_hook '${1+"$@"}' + func_propagate_result $_G_hook func_run_hooks + if $func_propagate_result_result; then + eval set dummy "$func_run_hooks_result"; shift fi done - - $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result } @@ -1559,14 +1730,16 @@ func_run_hooks () ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, you may remove/edit -# any options that you action, and then pass back the remaining unprocessed -# options in '_result', escaped suitably for -# 'eval'. In this case you also must return $EXIT_SUCCESS to let the -# hook's caller know that it should pay attention to -# '_result'. Returning $EXIT_FAILURE signalizes that -# arguments are left untouched by the hook and therefore caller will ignore the -# result variable. +# full positional parameter list from your hook function. You may remove +# or edit any options that you action, and then pass back the remaining +# unprocessed options in '_result', escaped +# suitably for 'eval'. +# +# The '_result' variable is automatically unset +# before your hook gets called; for best performance, only set the +# *_result variable when necessary (i.e. don't call the 'func_quote' +# function unnecessarily because it can be an expensive operation on some +# machines). # # Like this: # @@ -1578,11 +1751,8 @@ func_run_hooks () # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# # No change in '$@' (ignored completely by this hook). There is -# # no need to do the equivalent (but slower) action: -# # func_quote_for_eval ${1+"$@"} -# # my_options_prep_result=$func_quote_for_eval_result -# false +# # No change in '$@' (ignored completely by this hook). Leave +# # my_options_prep_result variable intact. # } # func_add_hook func_options_prep my_options_prep # @@ -1593,7 +1763,7 @@ func_run_hooks () # # args_changed=false # -# # Note that for efficiency, we parse as many options as we can +# # Note that, for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do @@ -1610,18 +1780,17 @@ func_run_hooks () # args_changed=: # ;; # *) # Make sure the first unrecognised option "$_G_opt" -# # is added back to "$@", we could need that later -# # if $args_changed is true. +# # is added back to "$@" in case we need it later, +# # if $args_changed was set to 'true'. # set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # +# # Only call 'func_quote' here if we processed at least one argument. # if $args_changed; then -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# func_quote eval ${1+"$@"} +# my_silent_option_result=$func_quote_result # fi -# -# $args_changed # } # func_add_hook func_parse_options my_silent_option # @@ -1632,8 +1801,6 @@ func_run_hooks () # # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." -# -# false # } # func_add_hook func_validate_options my_option_validation # @@ -1649,13 +1816,8 @@ func_options_finish () { $debug_cmd - _G_func_options_finish_exit=false - if func_run_hooks func_options ${1+"$@"}; then - func_options_finish_result=$func_run_hooks_result - _G_func_options_finish_exit=: - fi - - $_G_func_options_finish_exit + func_run_hooks func_options ${1+"$@"} + func_propagate_result func_run_hooks func_options_finish } @@ -1668,28 +1830,27 @@ func_options () { $debug_cmd - _G_rc_options=false + _G_options_quoted=false for my_func in options_prep parse_options validate_options options_finish do - if eval func_$my_func '${1+"$@"}'; then - eval _G_res_var='$'"func_${my_func}_result" - eval set dummy "$_G_res_var" ; shift - _G_rc_options=: + func_unset func_${my_func}_result + func_unset func_run_hooks_result + eval func_$my_func '${1+"$@"}' + func_propagate_result func_$my_func func_options + if $func_propagate_result_result; then + eval set dummy "$func_options_result"; shift + _G_options_quoted=: fi done - # Save modified positional parameters for caller. As a top-level - # options-parser function we always need to set the 'func_options_result' - # variable (regardless the $_G_rc_options value). - if $_G_rc_options; then - func_options_result=$_G_res_var - else - func_quote_for_eval ${1+"$@"} - func_options_result=$func_quote_for_eval_result - fi - - $_G_rc_options + $_G_options_quoted || { + # As we (func_options) are top-level options-parser function and + # nobody quoted "$@" for us yet, we need to do it explicitly for + # caller. + func_quote eval ${1+"$@"} + func_options_result=$func_quote_result + } } @@ -1699,8 +1860,7 @@ func_options () # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and # needs to propagate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before -# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). +# modified list must be put in 'func_run_hooks_result' before returning. func_hookable func_options_prep func_options_prep () { @@ -1710,14 +1870,8 @@ func_options_prep () opt_verbose=false opt_warning_types= - _G_rc_options_prep=false - if func_run_hooks func_options_prep ${1+"$@"}; then - _G_rc_options_prep=: - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result - fi - - $_G_rc_options_prep + func_run_hooks func_options_prep ${1+"$@"} + func_propagate_result func_run_hooks func_options_prep } @@ -1729,27 +1883,32 @@ func_parse_options () { $debug_cmd - func_parse_options_result= - - _G_rc_parse_options=false + _G_parse_options_requote=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - if func_run_hooks func_parse_options ${1+"$@"}; then - eval set dummy "$func_run_hooks_result"; shift - _G_rc_parse_options=: + func_run_hooks func_parse_options ${1+"$@"} + func_propagate_result func_run_hooks func_parse_options + if $func_propagate_result_result; then + eval set dummy "$func_parse_options_result"; shift + # Even though we may have changed "$@", we passed the "$@" array + # down into the hook and it quoted it for us (because we are in + # this if-branch). No need to quote it again. + _G_parse_options_requote=false fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + # We expect that one of the options parsed in this function matches + # and thus we remove _G_opt from "$@" and need to re-quote. _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" + func_echo "enabling shell trace mode" >&2 $debug_cmd ;; @@ -1760,7 +1919,7 @@ func_parse_options () --warnings|--warning|-W) if test $# = 0 && func_missing_arg $_G_opt; then - _G_rc_parse_options=: + _G_parse_options_requote=: break fi case " $warning_categories $1" in @@ -1815,7 +1974,7 @@ func_parse_options () shift ;; - --) _G_rc_parse_options=: ; break ;; + --) _G_parse_options_requote=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; *) set dummy "$_G_opt" ${1+"$@"}; shift _G_match_parse_options=false @@ -1823,17 +1982,16 @@ func_parse_options () ;; esac - $_G_match_parse_options && _G_rc_parse_options=: + if $_G_match_parse_options; then + _G_parse_options_requote=: + fi done - - if $_G_rc_parse_options; then + if $_G_parse_options_requote; then # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + func_parse_options_result=$func_quote_result fi - - $_G_rc_parse_options } @@ -1846,21 +2004,14 @@ func_validate_options () { $debug_cmd - _G_rc_validate_options=false - # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if func_run_hooks func_validate_options ${1+"$@"}; then - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result - _G_rc_validate_options=: - fi + func_run_hooks func_validate_options ${1+"$@"} + func_propagate_result func_run_hooks func_validate_options # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - - $_G_rc_validate_options } @@ -1916,8 +2067,8 @@ func_missing_arg () # func_split_equals STRING # ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -# splitting STRING at the '=' sign. +# Set func_split_equals_lhs and func_split_equals_rhs shell variables +# after splitting STRING at the '=' sign. test -z "$_G_HAVE_XSI_OPS" \ && (eval 'x=a/b/c; test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ @@ -1932,8 +2083,9 @@ then func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} - test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs= + if test "x$func_split_equals_lhs" = "x$1"; then + func_split_equals_rhs= + fi }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -1943,7 +2095,7 @@ else func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` func_split_equals_rhs= - test "x$func_split_equals_lhs" = "x$1" \ + test "x$func_split_equals_lhs=" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } fi #func_split_equals @@ -1969,7 +2121,7 @@ else { $debug_cmd - func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` } fi #func_split_short_opt @@ -2011,31 +2163,44 @@ func_usage_message () # func_version # ------------ # Echo version message to standard output and exit. +# The version message is extracted from the calling file's header +# comments, with leading '# ' stripped: +# 1. First display the progname and version +# 2. Followed by the header comment line matching /^# Written by / +# 3. Then a blank line followed by the first following line matching +# /^# Copyright / +# 4. Immediately followed by any lines between the previous matches, +# except lines preceding the intervening completely blank line. +# For example, see the header comments of this file. func_version () { $debug_cmd printf '%s\n' "$progname $scriptversion" $SED -n ' - /(C)/!b go - :more - /\./!{ - N - s|\n# | | - b more - } - :go - /^# Written by /,/# warranty; / { - s|^# || - s|^# *$|| - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - p + /^# Written by /!b + s|^# ||; p; n + + :fwd2blnk + /./ { + n + b fwd2blnk } - /^# Written by / { - s|^# || - p + p; n + + :holdwrnt + s|^# || + s|^# *$|| + /^Copyright /!{ + /./H + n + b holdwrnt } - /^warranty; /q' < "$progpath" + + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + G + s|\(\n\)\n*|\1|g + p; q' < "$progpath" exit $? } @@ -2045,12 +2210,12 @@ func_version () # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" # time-stamp-time-zone: "UTC" # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6' +scriptversion='(GNU libtool) 2.4.7.4-1ec8f-dirty' # func_echo ARG... @@ -2141,7 +2306,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-14 + version: $progname (GNU libtool) 2.4.7.4-1ec8f-dirty automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2197,7 +2362,7 @@ fi # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2375,11 +2540,9 @@ libtool_options_prep () if $_G_rc_lt_options_prep; then # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_options_prep_result=$func_quote_result fi - - $_G_rc_lt_options_prep } func_add_hook func_options_prep libtool_options_prep @@ -2482,11 +2645,9 @@ libtool_parse_options () if $_G_rc_lt_parse_options; then # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_parse_options_result=$func_quote_result fi - - $_G_rc_lt_parse_options } func_add_hook func_parse_options libtool_parse_options @@ -2543,8 +2704,8 @@ libtool_validate_options () } # Pass back the unparsed argument list - func_quote_for_eval ${1+"$@"} - libtool_validate_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_validate_options_result=$func_quote_result } func_add_hook func_validate_options libtool_validate_options @@ -3510,8 +3671,8 @@ func_mode_compile () esac done - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ + func_quote_arg pretty "$libobj" + test "X$libobj" != "X$func_quote_arg_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3584,8 +3745,8 @@ compiler." func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result + func_quote_arg pretty "$srcfile" + qsrcfile=$func_quote_arg_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -3740,7 +3901,8 @@ This mode accepts the following additional options: -prefer-non-pic try to build non-PIC objects only -shared do not build a '.o' file suitable for static linking -static only build a '.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler + -Wc,FLAG + -Xcompiler FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. @@ -3846,6 +4008,8 @@ The following components of LINK-COMMAND are treated specially: -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wa,FLAG + -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) @@ -4188,8 +4352,8 @@ func_mode_install () case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " + func_quote_arg pretty "$nonopt" + install_prog="$func_quote_arg_result " arg=$1 shift else @@ -4199,8 +4363,8 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog "$func_quote_arg_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4257,12 +4421,12 @@ func_mode_install () esac # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog " $func_quote_arg_result" if test -n "$arg2"; then - func_quote_for_eval "$arg2" + func_quote_arg pretty "$arg2" fi - func_append install_shared_prog " $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_arg_result" done test -z "$install_prog" && \ @@ -4273,8 +4437,8 @@ func_mode_install () if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" + func_quote_arg pretty "$install_override_mode" + func_append install_shared_prog " -m $func_quote_arg_result" fi fi @@ -4570,8 +4734,8 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$relink_command" + eval "func_echo $func_quote_arg_result" } if eval "$relink_command"; then : else @@ -5350,7 +5514,8 @@ else if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + func_quote_arg pretty "$ECHO" + qECHO=$func_quote_arg_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5360,7 +5525,7 @@ func_fallback_echo () \$1 _LTECHO_EOF' } - ECHO=\"$qECHO\" + ECHO=$qECHO fi # Very basic option parsing. These options are (a) specific to @@ -6703,9 +6868,9 @@ func_mode_link () while test "$#" -gt 0; do arg=$1 shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" + func_quote_arg pretty,unquoted "$arg" + qarg=$func_quote_arg_unquoted_result + func_append libtool_args " $func_quote_arg_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -6941,6 +7106,13 @@ func_mode_link () prev= continue ;; + xassembler) + func_append compiler_flags " -Xassembler $qarg" + prev= + func_append compile_command " -Xassembler $qarg" + func_append finalize_command " -Xassembler $qarg" + continue + ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -7111,7 +7283,7 @@ func_mode_link () # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7131,7 +7303,7 @@ func_mode_link () esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7161,8 +7333,20 @@ func_mode_link () prev=xcompiler continue ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. + -pthread) + case $host in + *solaris2*) ;; + *) + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + ;; + esac + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -7303,9 +7487,9 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $func_quote_arg_result" + func_append compiler_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7319,16 +7503,21 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $wl$func_quote_arg_result" + func_append compiler_flags " $wl$func_quote_arg_result" + func_append linker_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; + -Xassembler) + prev=xassembler + continue + ;; + -Xcompiler) prev=xcompiler continue @@ -7346,8 +7535,8 @@ func_mode_link () # -msg_* for osf cc -msg_*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; # Flags to be passed through unchanged, with rationale: @@ -7368,14 +7557,14 @@ func_mode_link () # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer # -fuse-ld=* Linker select flags for GCC - # -static-* direct GCC to link specific libraries statically - # -fcilkplus Cilk Plus language extension features for C/C++ + # -Wa,* Pass flags directly to the assembler + # -Werror, -Werror=* Report (specified) warnings as errors -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7396,15 +7585,15 @@ func_mode_link () continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result fi ;; # Some other compiler flag. -* | +*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; *.$objext) @@ -7524,8 +7713,8 @@ func_mode_link () *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; esac # arg @@ -7666,10 +7855,7 @@ func_mode_link () case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -7988,19 +8174,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -8733,7 +8919,7 @@ func_mode_link () test CXX = "$tagname" && { case $host_os in linux*) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 func_suncc_cstd_abi @@ -8906,7 +9092,7 @@ func_mode_link () # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|osf|windows|none) + darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor @@ -8924,9 +9110,6 @@ func_mode_link () revision=$number_minor lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type '$version_type'" - ;; esac ;; no) @@ -9000,7 +9183,7 @@ func_mode_link () versuffix=.$current.$revision ;; - freebsd-elf) + freebsd-elf | midnightbsd-elf) func_arith $current - $age major=.$func_arith_result versuffix=$major.$age.$revision @@ -9226,7 +9409,7 @@ func_mode_link () *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -10037,8 +10220,8 @@ EOF for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10131,8 +10314,8 @@ EOF eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10606,12 +10789,13 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty "$var_value" + relink_command="$var=$func_quote_arg_result; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" + relink_command=$func_quote_arg_unquoted_result fi # Only actually do things if not in dry run mode. @@ -10851,13 +11035,15 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty,unquoted "$var_value" + relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + func_quote_arg pretty,unquoted "$relink_command" + relink_command=$func_quote_arg_unquoted_result if test yes = "$hardcode_automatic"; then relink_command= fi diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 new file mode 100644 index 0000000..2d12f01 --- /dev/null +++ b/m4/gtk-doc.m4 @@ -0,0 +1,113 @@ +# -*- mode: autoconf -*- +# +# gtk-doc.m4 - configure macro to check for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# As a special exception, the above copyright owner gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf when processing the Macro. You need not +# follow the terms of the GNU General Public License when using or +# distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. + +# serial 2 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + + dnl check for tools we added during development + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index a6d21ae..717e769 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see . ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -777,7 +779,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1041,8 +1043,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1066,17 +1068,12 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1125,12 +1122,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1244,7 +1241,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1261,7 +1259,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1291,7 +1289,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1308,7 +1306,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1320,7 +1318,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1342,7 +1340,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1350,7 +1348,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1358,7 +1356,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1378,14 +1376,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1453,7 +1451,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1492,9 +1490,22 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1713,7 +1724,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1756,7 +1767,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2206,26 +2217,35 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2548,7 +2568,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2558,14 +2578,14 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2584,7 +2604,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2621,7 +2641,7 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2654,7 +2674,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -2886,18 +2906,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3465,7 +3473,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3499,14 +3507,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3520,7 +3528,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3557,7 +3565,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3567,7 +3575,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3694,13 +3702,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3726,7 +3734,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3966,7 +3974,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -3984,20 +3992,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4021,7 +4029,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4039,9 +4047,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4063,8 +4071,7 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4329,7 +4336,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4412,7 +4419,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4436,7 +4443,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4704,12 +4711,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - # flang / f18. f95 an alias for gfortran or flang on Debian - flang* | f18* | f95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -4754,7 +4755,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4937,7 +4938,7 @@ m4_if([$1], [CXX], [ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4945,7 +4946,7 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -4954,9 +4955,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5005,23 +5003,20 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5068,7 +5063,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5180,6 +5175,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5194,7 +5190,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5237,7 +5233,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5249,7 +5245,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5265,7 +5261,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5276,7 +5272,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5397,7 +5393,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5580,12 +5576,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5626,7 +5622,7 @@ _LT_EOF fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5674,7 +5670,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5797,7 +5793,6 @@ _LT_EOF if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5819,7 +5814,7 @@ _LT_EOF esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5886,6 +5881,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6445,7 +6441,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -6656,8 +6652,8 @@ if test yes != "$_lt_caught_CXX_error"; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6755,6 +6751,7 @@ if test yes != "$_lt_caught_CXX_error"; then emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6785,7 +6782,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6820,7 +6817,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6885,7 +6882,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6922,7 +6919,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7062,13 +7059,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -7224,7 +7221,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -7308,7 +7305,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7319,7 +7316,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' @@ -8214,6 +8211,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 94b0829..b0b5e9c 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 48bc934..902508b 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index fa04b52..0026c21 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4249 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7.4-1ec8f-dirty]) +m4_define([LT_PACKAGE_REVISION], [2.4.7.4]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7.4-1ec8f-dirty' +macro_revision='2.4.7.4' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c6b26f8..0f7a875 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff --git a/missing b/missing index 625aeb1..1fe1611 100755 --- a/missing +++ b/missing @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/po/POTFILES.in b/po/POTFILES.in index 0448939..efb543f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,6 +14,8 @@ libxfce4ui/xfce-titled-dialog.c # Libxfce4kbd-private sources # libxfce4kbd-private/xfce-shortcuts.c +libxfce4kbd-private/xfce-shortcuts-editor-dialog.c +libxfce4kbd-private/xfce-shortcuts-editor.c libxfce4kbd-private/xfce-shortcut-dialog.c libxfce4kbd-private/xfce-shortcuts-grabber.c libxfce4kbd-private/xfce-shortcuts-provider.c diff --git a/po/am.po b/po/am.po index 79f5200..60c6f73 100644 --- a/po/am.po +++ b/po/am.po @@ -1,17 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# samson , 2016-2018 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Amharic (http://www.transifex.com/xfce/libxfce4ui/language/am/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Amharic (https://app.transifex.com/xfce/teams/16840/am/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,7 +42,7 @@ msgstr "" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_መሰረዣ" @@ -122,37 +125,34 @@ msgstr "" msgid "Show session management options" msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 +msgid "Filename is too long" msgstr "" -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 -msgid "Filename is too long" +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -196,63 +196,92 @@ msgstr "" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "ተግባር" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "የ ትእዛዝ አቋራጭ" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "ትእዛዝ:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "አቋራጭ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "ማጽጃ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "" @@ -361,198 +390,214 @@ msgid "Toggle fullscreen" msgstr "ሙሉ-ስክሪን አድርግ" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "መስኮቱን ወደላይኛው የስራ ገበታ ውሰድ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "መስኮቱን ወደታችናው የስራ ገበታ ውሰድ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "መስኮቱን ወደግራ የስራ ገበታ ውሰድ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "መስኮቱን ወደቀኝ የስራ ገበታ ውሰድ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "መስኮቱን ወደቀድሞው የስራ ገበታ ውሰድ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "መስኮቱን ወደሚቀጥለው የስራ ገበታ ውሰድ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "መስኮቱን ወደ ስራ ቦታ 1 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "መስኮቱን ወደ ስራ ቦታ 2 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "መስኮቱን ወደ ስራ ቦታ 3 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "መስኮቱን ወደ ስራ ቦታ 4 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "መስኮቱን ወደ ስራ ቦታ 5 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "መስኮቱን ወደ ስራ ቦታ 6 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "መስኮቱን ወደ ስራ ቦታ 7 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "መስኮቱን ወደ ስራ ቦታ 8 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "መስኮቱን ወደ ስራ ቦታ 9 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "መስኮቱን ወደ ስራ ቦታ 10 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "መስኮቱን ወደ ስራ ቦታ 11 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "መስኮቱን ወደ ስራ ቦታ 12 ማንቀሳቀሻ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "ዴስክቶፕ ማሳያ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "የ ላይኛው የ ስራ ቦታ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "የ ታችኛው የ ስራ ቦታ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "የ ግራ የ ስራ ቦታ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "የ ቀኝ የ ስራ ቦታ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "ያለፈው የ ስራ ቦታ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "የሚቀጥለው የ ስራ ቦታ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "የ ስራ ቦታ 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "የ ስራ ቦታ 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "የ ስራ ቦታ 3 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "የ ስራ ቦታ 4 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "የ ስራ ቦታ 5 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "የ ስራ ቦታ 6 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "የ ስራ ቦታ 7 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "የ ስራ ቦታ 8 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "የ ስራ ቦታ 9 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "የ ስራ ቦታ 10 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "የ ስራ ቦታ 11 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "የ ስራ ቦታ 12 " -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "የ ስራ ቦታ መጨመሪያ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "አጓዳኝ የ ስራ ቦታ መጨመሪያ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "የ መጨረሻ የ ስራ ቦታ ማጥፊያ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "ንቁ የ ስራ ቦታ ማጥፊያ" @@ -568,116 +613,124 @@ msgstr "ንዑስ አርእስት" msgid "Xfce 4 Widgets" msgstr "" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "የ እትም መረጃ" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "ማስኮት አስተዳዳሪ" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "ክፍል" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "የ ዴስክቶፕ አስተዳዳሪ " -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "የ ፋይል አስተዳዳሪ" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "የ ክፍለ ጊዜ አስተዳዳሪ" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "ስርአት ማሰናጃ" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "የ ማሰናጃዎች አስተዳዳሪ" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "መተግበሪያ ፈላጊ" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." msgstr "" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -685,7 +738,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -694,65 +747,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "ይጻፉ '%s --እርዳታ' መረጃ ለ መጠቀም" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "ማስጀመር አልተቻለም GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "እባክዎን ችግሩን ያሳውቁን ለ <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "እትም %s, የሚሰራጨው በ %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "እትም %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "ተርጓሚዎች" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "" @@ -773,23 +817,23 @@ msgid "About the Xfce Desktop Environment" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "" +msgid "_Help" +msgstr "_እርዳታ" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "ዝጋ _C" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "አካል " #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" +msgid "label" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -797,24 +841,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "ስርአት" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -825,39 +889,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "ስለ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "ምስጋና" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "የ ቅጂ መብት" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "ያልታወቀ" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -873,6 +952,6 @@ msgstr "" msgid "Failed to migrate the old panel configuration" msgstr "" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "" diff --git a/po/ar.po b/po/ar.po index a3a7d8b..026aa91 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# كريم أولاد الشلحة , 2013 -# محمد الحرقان , 2013 -# وجدي أبو سلطان, 2017 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Arabic (http://www.transifex.com/xfce/libxfce4ui/language/ar/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Arabic (https://app.transifex.com/xfce/teams/16840/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,11 +38,12 @@ msgstr "هل تريد قراءة دليل المتوفر على الشبكة؟" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "سيتم توجيهك إلى موقع الوثائق حيث يتم الحفاظ على صفحات المساعدة وترجمتها." +msgstr "" +"سيتم توجيهك إلى موقع الوثائق حيث يتم الحفاظ على صفحات المساعدة وترجمتها." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_إلغاء" @@ -73,13 +75,15 @@ msgstr "إلغاء" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "" +msgstr "هل تريد إغلاق النافذة بعلامات تبويب متعددة؟" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." msgstr "" +"هذه النافذة بها عدة علامات تبويب مفتوحة. سيؤدي إغلاق هذه النافذة أيضًا إلى " +"إغلاق جميع علامات التبويب الخاصة بها." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -87,6 +91,8 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"هذه النافذة بها %d علامات تبويب مفتوحة. سيؤدي إغلاق هذه النافذة أيضًا إلى " +"إغلاق جميع علامات التبويب الخاصة بها." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -124,39 +130,36 @@ msgstr "خيارات إدارة الجلسة" msgid "Show session management options" msgstr "عرض خيارات إدارة الجلسة" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "فشل الاتصال بمدير الجلسة: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "مدير الجلسة لم يقم بإرجاع معرف عميل صالح" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "مسار العمل \"%s\" غير موجود. ولن يستخدم عند توليد \"%s\"." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "اسم الملف طويل جدًا" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "فاصل المجلد في اسم الملف غير مسموح به" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "يجب ألا تبدأ أسماء الملفات أو تنتهي بمسافة" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format @@ -198,63 +201,92 @@ msgstr "هذا الإختصار يستعمله الإجراء '%s'. أي إجر #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "الرجاء استعمال توليفة أخرى." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s تم تشغيله بالفعل." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "تعارض إجراءات %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "هذا الإختصار تم إستعماله حاليا لشيء اخر." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "محرر الإختصارات" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "امسح اﻻختصار" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "استرجاع اﻻختصار اﻻفتراضي" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "اختصار لوحة المفاتيح هذا مستخدم حاليا بواسطة:'%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "اختصار لوحة المفاتيح قيد الاستخدام بالفعل" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "إختصار إجراء مدير النوافذ" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "إجراء" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "إختصار الامر" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "أمر" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "إختصار" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "مسح" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "اضغط على مفاتيح لوحة المفاتيح لتشغيل %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "الرجاء الضغط على مفتاح" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "لا يمكن مسك لوحة المفاتيح." @@ -363,198 +395,214 @@ msgid "Toggle fullscreen" msgstr "بدّل ملء الشاشة" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "انقل النافذة لمساحة العمل العليا" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "حرك النافذة إلى مساحة عمل السفلة" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "حرك النافذة إلى مساحة عمل اليسرى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "حرك النافذة إلى مساحة عمل اليمنى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "حرك النافذة إلى مساحة عمل السابقة" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "حرك النافذة إلى مساحة عمل التالية" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "حرك النافذة إلى مساحة عمل 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "حرك النافذة إلى مساحة عمل 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "حرك النافذة إلى مساحة عمل 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "حرك النافذة إلى مساحة عمل 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "حرك النافذة إلى مساحة عمل 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "حرك النافذة إلى مساحة عمل 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "حرك النافذة إلى مساحة عمل 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "حرك النافذة إلى مساحة عمل 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "حرك النافذة إلى مساحة عمل 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "حرك النافذة إلى مساحة عمل 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "حرك النافذة إلى مساحة عمل 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "حرك النافذة إلى مساحة عمل 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "بلاط النافذة إلى الأعلى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "بلاط النافذة إلى الأسفل" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "بلاط النافذة إلى اليسار" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "بلاط النافذة إلى اليمين" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" -msgstr "" +msgstr "بلاط النافذة إلى الأعلى-يسار" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" -msgstr "" +msgstr "بلاط النافذة إلى الأعلى-يمين" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" -msgstr "" +msgstr "بلاط النافذة إلى الأسفل-يسار" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" -msgstr "" +msgstr "بلاط النافذة إلى الأسفل-يمين" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "أظهر سطح المكتب" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "مساحة العمل العليا" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "مساحة عمل السفلة" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "مساحة عمل اليسرى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "مساحة عمل اليمنى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "مساحة عمل السابقة" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "مساحة عمل التالية" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "مساحة عمل 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "مساحة عمل 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "مساحة عمل 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "مساحة عمل 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "مساحة عمل 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "مساحة عمل 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "مساحة عمل 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "مساحة عمل 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "مساحة عمل 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "مساحة عمل 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "مساحة عمل 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "مساحة عمل 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "إضافة مساحة عمل" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "إضافة مساحة عمل متاخمة" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "حذف مساحة العمل الأخيرة" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "حذف مساحة العمل الحالية" @@ -570,124 +618,140 @@ msgstr "عنوان ثانوي" msgid "Xfce 4 Widgets" msgstr "قطع إكسفس 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "معلومات الإصدار" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "معالجات الرسوميات" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "مدير النوافذ" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "يعالج وضع النوافذ في الشاشة." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "شريط" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" +"يوفر موقعًا رئيسيًا لأزرار النوافذ والمشغلات وقائمة التطبيقات والمزيد." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "مدير سطح المكتب" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "يضبط خلفيات سطح المكتب ، ويتعامل مع الايقونات والمزيد." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "مدير الملفات" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "يدير ملفاتك بطريقة حديثة وسهلة الاستخدام وسريعة." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "مدير الصوت" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "يدير محركات الأقراص والوسائط القابلة للإزالة لـ Thunar." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "مدير الجلسة" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "" +msgstr "يحفظ ويستعيد جلستك ويتعامل مع بدء التشغيل والتشغيل التلقائي والإيقاف." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "إعدادات النظام" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "مدير الإعدادات" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "يعمل على إعداد المظهر والعرض ولوحة المفاتيح والفأرة." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "مكتشف التطبيقات" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "" +msgstr "يبحث بسرعة عن التطبيقات المثبتة على نظامك ويقوم بتشغيلها." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "إعدادات خفية" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "يخزن إعداداتك في نظام إعداد قائم على D-Bus." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "مكتبة القائمة" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "" +msgstr "تنفذ قائمة متوافقة مع freedesktop.org بناءً على GLib و GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "خدمة الصور المصغرة" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "تنفذ مواصفات D-Bus لإدارة الصور المصغرة." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "الرجاء شاهد " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"إذا كنت تعرف أي شخص مفقود من هذه القائمة ؛ لا تتردد وأبلغ عن الخطأ على " +"." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "شكرا لكل من ساهم في جعل هذا البرنامج متوفرا!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "حقوق نسخ إكسفس 4 محفوظة لـ Olivier Fourdan (fourdan@xfce.org). حقوق النشر وتاليف مختلف مكونات محفوظة لمؤلفيها." +msgstr "" +"حقوق نسخ إكسفس 4 محفوظة لـ Olivier Fourdan (fourdan@xfce.org). حقوق النشر " +"وتاليف مختلف مكونات محفوظة لمؤلفيها." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." msgstr "" +"يتم توزيع حزم libxfce4ui و libxfce4util و exo وفقًا لشروط رخصة مكتبة جنو " +"العامة كما نشرتها مؤسسة البرمجيات الحرة ؛ إما الإصدار 2 من الترخيص ، أو (حسب" +" اختيارك) أي إصدار لاحق." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -695,66 +759,61 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" +"يتم توزيع الحزم thunar و xfce4-appfinder و xfce4-panel و xfce4-session و " +"xfce4-settings و xfconf و xfdesktop و xfwm4 وفقًا لشروط رخصة جنو العمومية " +"كما نشرتها مؤسسة البرمجيات الحرة ؛ إما الإصدار 2 من الترخيص ، أو (حسب " +"اختيارك) أي إصدار لاحق." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "أكتب '%s --help' لمعلومات الإستعمال." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "غير قادر على بدء جتك+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "فريق تطوير إكسفس. كل الحقوق محفوظة." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "لُطقًا أبلغ عن العلل إلى <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" -msgstr "tqg jpldg hg;hî," - -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "إصدار %s, موزع من طرف %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "إصدار %s" +msgstr "إخفاق في تحميل الواجهة" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "مطورو اللب" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "المساهمون النشطون" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "صيانة الخوادم من طرف" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "إشراف على الترجمات" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "الإشراف على التوثيق" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "المترجمون" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "مساهمون سابقون" @@ -775,48 +834,70 @@ msgid "About the Xfce Desktop Environment" msgstr "حول بيئة سطح المكتب إكسفس" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "وسم" +msgid "_Help" +msgstr "_مساعدة" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_أغلق" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "جهاز" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "وسم" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "اسم نظام التشغيل" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "نوع نظام التشغيل" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 +msgid "Distributor" +msgstr "الموزع" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Xfce Version" +msgstr "اصدار Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "المعالج المركزي" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "الذاكرة" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "معالج الرسوميات" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "نظام" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce عبارة عن مجموعة من البرامج التي توفر معًا بيئة سطح مكتب كاملة الميزات.\n" +"البرامج التالية هي جزء من نواة Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,55 +907,77 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Xfce هو أيضًا نظام أساسي للتطوير يوفر العديد من المكتبات التي تساعد المبرمجين على إنشاء تطبيقات تتلاءم جيدًا مع بيئة سطح المكتب.\n" +"\n" +"مكونات الإكسفس تحت رخص مجانية أو حرة; رخصة جنو العمومية أو BSDL لتطبيقات و LGPL أو BSDL للمكتبات. أنظر في الثوتيق, شيفرة المصدر أو موقع إكسفس (https://www.xfce.org) للمزيد من المعلومات.\n" +"\n" +"شكرًا لك على اهتمامك بـ Xfce.\n" +"\n" +"\t- فريق تطوير Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "حول" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "شكر وتقدير" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "رخصة الجنو العمومية" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "رخصة الجنو العمومية للمكتبات" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "حقوق النسخ" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "مجهول" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (32-bit مساحة المستخدمين)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "" +msgstr "%s; معرف البناء: %s" #: ../tests/test-ui.c:111 #, c-format msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "" +msgstr "الملف المسمى \"%s\" موجود مسبقًا في المجلد, الملف لم يضاف." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "فشل ترحيل إعداد اللوحة القديمة" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "خصص الإعدادات المخزنة من Xfconf" diff --git a/po/ast.po b/po/ast.po index 1f83088..61606d2 100644 --- a/po/ast.po +++ b/po/ast.po @@ -1,19 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# enolp , 2015-2016 -# Ḷḷumex03 , 2014 -# Ḷḷumex03 , 2014 +# Nick Schermer , 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-04 18:30+0200\n" -"PO-Revision-Date: 2019-05-04 16:30+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Asturian (http://www.transifex.com/xfce/libxfce4ui/language/ast/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Asturian (https://app.transifex.com/xfce/teams/16840/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,108 +29,145 @@ msgstr "Fallu al abrir el restolador pa la documentación en llinia" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format msgid "Do you want to read the %s manual online?" -msgstr "¿Quies lleer el manual %s en llinia?" +msgstr "¿Quies lleer el manual en llinia de %s?" #: ../libxfce4ui/xfce-dialogs.c:267 msgid "Do you want to read the manual online?" msgstr "¿Quies lleer el manual en llinia?" -#: ../libxfce4ui/xfce-dialogs.c:270 -msgid "Online Documentation" -msgstr "Documentación en llinia" - -#: ../libxfce4ui/xfce-dialogs.c:277 +#: ../libxfce4ui/xfce-dialogs.c:273 msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Redireicionarásete al sitiu web de documentación u tán calteníes y tornaes les páxines d'ayuda." +msgstr "" +"Redireicionarásete al sitiu web de documentación u tán calteníes y tornaes " +"les páxines d'ayuda." -#: ../libxfce4ui/xfce-dialogs.c:291 +#. Create cancel button +#: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 +msgid "_Cancel" +msgstr "_Encaboxar" + +#: ../libxfce4ui/xfce-dialogs.c:277 msgid "_Read Online" msgstr "Llee_r en llinia" -#: ../libxfce4ui/xfce-dialogs.c:300 +#: ../libxfce4ui/xfce-dialogs.c:286 msgid "_Always go directly to the online documentation" msgstr "_Dir siempres a la documentación en llinia direutamente" -#: ../libxfce4ui/xfce-dialogs.c:348 -msgid "Information" -msgstr "Información" - -#: ../libxfce4ui/xfce-dialogs.c:358 ../libxfce4ui/xfce-dialogs.c:401 -#: ../libxfce4ui/xfce-dialogs.c:445 +#: ../libxfce4ui/xfce-dialogs.c:335 ../libxfce4ui/xfce-dialogs.c:370 +#: ../libxfce4ui/xfce-dialogs.c:406 msgid "Close" msgstr "Zarrar" -#: ../libxfce4ui/xfce-dialogs.c:391 -msgid "Warning" -msgstr "Avisu" - -#: ../libxfce4ui/xfce-dialogs.c:435 -msgid "Error" -msgstr "Fallu" - -#: ../libxfce4ui/xfce-dialogs.c:494 +#: ../libxfce4ui/xfce-dialogs.c:453 msgid "No" msgstr "Non" -#: ../libxfce4ui/xfce-dialogs.c:496 +#: ../libxfce4ui/xfce-dialogs.c:455 msgid "Yes" -msgstr "" +msgstr "Sí" -#: ../libxfce4ui/xfce-dialogs.c:504 +#: ../libxfce4ui/xfce-dialogs.c:459 #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 msgid "Cancel" msgstr "Encaboxar" -#: ../libxfce4ui/xfce-dialogs.c:511 ../libxfce4ui/xfce-dialogs.c:519 -msgid "Question" -msgstr "Entruga" +#: ../libxfce4ui/xfce-dialogs.c:518 +msgid "Close window with multiple tabs?" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1424 +#: ../libxfce4ui/xfce-dialogs.c:520 +msgid "" +"This window has multiple tabs open. Closing this window will also close all " +"its tabs." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:523 +#, c-format +msgid "" +"This window has %d tabs open. Closing this window will also close all its " +"tabs." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:529 +msgid "Warning" +msgstr "Atención" + +#: ../libxfce4ui/xfce-dialogs.c:534 +msgid "Close T_ab" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:535 +msgid "Close _Window" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:540 +msgid "Do _not ask me again" +msgstr "_Nun entrugame más" + +#: ../libxfce4ui/xfce-sm-client.c:1427 msgid "Session management client ID" msgstr "ID de veceru del alministrador de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1424 +#: ../libxfce4ui/xfce-sm-client.c:1427 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1425 +#: ../libxfce4ui/xfce-sm-client.c:1428 msgid "Disable session management" msgstr "Deshabilitar alministración de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1435 +#: ../libxfce4ui/xfce-sm-client.c:1438 msgid "Session management options" msgstr "Opciones d'alministración de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1436 +#: ../libxfce4ui/xfce-sm-client.c:1439 msgid "Show session management options" msgstr "Amosar opciones d'alministración de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1611 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Fallu al coneutar al xestor de sesión: %s" -#: ../libxfce4ui/xfce-sm-client.c:1617 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "El xestor de sesión nun devolvió una ID de veceru válida" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:421 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Nun esiste'l direutoriu de trabayu «%s». Nun s'usará cuando apruza \"%s\"." +msgstr "" +"Nun esiste'l direutoriu de trabayu «%s». Nun s'usará cuando apruza \"%s\"." + +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 +msgid "Filename is too long" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 +msgid "Filenames should not start or end with a space" +msgstr "" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Esti accesu direutu yá ta usándose pa la aición '%s\". ¿Qué aición quies usar?" +msgstr "" +"Esti accesu direutu yá ta usándose pa la aición '%s\". ¿Qué aición quies " +"usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -152,79 +191,107 @@ msgstr "Caltener '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Esti accesu direutu yá ta usándose pal comandu '%s\". ¿Qué aición quies usar?" +msgstr "" +"Esti accesu direutu yá ta usándose pal comandu '%s\". ¿Qué aición quies " +"usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Esti accesu direutu yá ta usándose pola aición '%s\". ¿Qué aición quies usar?" +msgstr "" +"Esti accesu direutu yá ta usándose pola aición '%s\". ¿Qué aición quies " +"usar?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." -msgstr "Por favor, usa otra combinación de tecles." +msgstr "Usa otra combinación de tecles, por favor." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s yá dispara esta aición." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Aiciones en conflictu pa %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:186 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." -msgstr "Esti accesu direutu yá ta usándose por daqué más." +msgstr "Esti atayu yá s'usa pa daqué más." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:211 +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Accesu direutu d'aición del xestor de ventanes" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "aición" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Accesu direutu de comandu" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:221 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "comandu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" -msgstr "Accesu direutu" +msgstr "Atayu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:249 -msgid "_Cancel" -msgstr "_Encaboxar" +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 +msgid "Clear" +msgstr "Llimpiar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:284 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format -msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." -msgstr "Primi agora les tecles del tecláu que quies usar pa disparar el %s '%s'." - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:312 -msgid "Shortcut:" -msgstr "Accesu direutu:" +msgid "Press keyboard keys to trigger the %s '%s'." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:321 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:504 -msgid "No keys pressed yet, proceed." -msgstr "Entá nun se primieron tecles, procede." +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 +msgid "Please press a key" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:407 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Nun pudo coyese'l tecláu." @@ -333,356 +400,349 @@ msgid "Toggle fullscreen" msgstr "Pantalla completa" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mover ventana a la estaya de trabayu superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mover ventana a la estaya de trabayu inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mover ventana a la estaya de trabayu esquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mover ventana a la estaya de trabayu drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mover ventana a la estaya de trabayu anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mover ventana a la estaya de trabayu siguiente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mover ventana a la estaya de trabayu 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mover ventana a la estaya de trabayu 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mover ventana a la estaya de trabayu 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mover ventana a la estaya de trabayu 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mover ventana a la estaya de trabayu 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mover ventana a la estaya de trabayu 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mover ventana a la estaya de trabayu 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mover ventana a la estaya de trabayu 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mover ventana a la estaya de trabayu 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mover ventana a la estaya de trabayu 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mover ventana a la estaya de trabayu 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mover ventana a la estaya de trabayu 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Mosaicu de ventanes hacia arriba" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Mosaicu de ventanes hacia abajo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Mosaicu de ventanes a la izquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Mosaicu de ventanes a la drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Amosar escritoriu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Estaya de trabayu superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Estaya de trabayu inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Estaya de trabayu esquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Estaya de trabayu drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Estaya de trabayu anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Estaya de trabayu siguiente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Estaya de trabayu 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Estaya de trabayu 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Estaya de trabayu 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Estaya de trabayu 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Estaya de trabayu 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Estaya de trabayu 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Estaya de trabayu 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Estaya de trabayu 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Estaya de trabayu 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Estaya de trabayu 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Estaya de trabayu 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Estaya de trabayu 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Amestar estaya de trabayu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Amestar estaya de trabayu cercana" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Desaniciar la cabera estaya de trabayu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Desaniciar la estaya de trabayu activa" -#: ../glade/libxfce4ui.xml.in.h:1 ../glade/libxfce4ui-2.xml.in.h:1 +#: ../glade/libxfce4ui-2.xml.in.h:1 msgid "Titled Dialog" msgstr "Diálogu tituláu" -#: ../glade/libxfce4ui.xml.in.h:2 ../glade/libxfce4ui-2.xml.in.h:2 +#: ../glade/libxfce4ui-2.xml.in.h:2 msgid "Subtitle" msgstr "Sotítulu" -#: ../glade/libxfce4ui.xml.in.h:3 ../glade/libxfce4ui-2.xml.in.h:3 +#: ../glade/libxfce4ui-2.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Widgets Xfce 4" -#: ../xfce4-about/main.c:52 +#: ../xfce4-about/main.c:58 msgid "Version information" -msgstr "Información de versión" +msgstr "Información de la versión" + +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" -#: ../xfce4-about/main.c:70 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Xestor de ventanes" -#: ../xfce4-about/main.c:71 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Remana l'asitiamientu de ventanes na pantalla." -#: ../xfce4-about/main.c:74 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:75 -msgid "" -"Program launchers, window buttons, applications menu, workspace switcher and" -" more." -msgstr "Llanzadores de programes, botones de ventana, menú d'aplicaciones, cambiador d'estayes de trabayu y más." +#: ../xfce4-about/main.c:152 +msgid "Provides a home for window buttons, launchers, app menu and more." +msgstr "" -#: ../xfce4-about/main.c:79 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Xestor d'escritoriu" -#: ../xfce4-about/main.c:80 -msgid "" -"Sets the background color or image with optional application menu or icons " -"for minimized applications or launchers, devices and folders." -msgstr "Afita la color de fondu o imaxe con menús o iconos p'aplicaciones minimizaes o llanzadores, preseos y cartafueyos opcionales." +#: ../xfce4-about/main.c:157 +msgid "Sets desktop backgrounds, handles icons and more." +msgstr "" -#: ../xfce4-about/main.c:84 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Xestor de ficheros" -#: ../xfce4-about/main.c:85 -msgid "" -"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " -"and fast." -msgstr "Un xestor de ficheros modernu pal escritoriu Unix/Linux, col oxetivu de ser fácil d'usar y rápidu." +#: ../xfce4-about/main.c:162 +msgid "Manages your files in a modern, easy-to-use and fast way." +msgstr "" -#: ../xfce4-about/main.c:89 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "" -#: ../xfce4-about/main.c:90 -msgid "Automatic management of removable drives and media for Thunar." +#: ../xfce4-about/main.c:167 +msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:93 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Xestor de sesión" -#: ../xfce4-about/main.c:94 +#: ../xfce4-about/main.c:172 msgid "" -"Restores your session on startup and allows you to shutdown the computer " -"from Xfce." -msgstr "Restaura la to sesión nel aniciu y permítete apagar l'ordenador dende Xfce." +"Saves and restores your session, handles startup, autostart and shutdown." +msgstr "" -#: ../xfce4-about/main.c:98 -msgid "Setting System" -msgstr "Configurando'l sistema" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Xestor d'axustes" -#: ../xfce4-about/main.c:99 -msgid "" -"Configuration system to control various aspects of the desktop like " -"appearance, display, keyboard and mouse settings." -msgstr "Sistema de configuración pa controlar dellos aspeutos del to escritoriu como los axustes d'aspeutu, pantalla, tecláu y mur." +#: ../xfce4-about/main.c:177 +msgid "Configures appearance, display, keyboard and mouse settings." +msgstr "" -#: ../xfce4-about/main.c:103 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Guetador d'aplicaciones" -#: ../xfce4-about/main.c:104 -msgid "" -"Shows the applications installed on your system in categories, so you can " -"quickly find and launch them." -msgstr "Amuesa les aplicaciones instalaes nel to sistema n'estayes, asina que pues alcontrales y llanzales aína" +#: ../xfce4-about/main.c:182 +msgid "Quickly finds and launches applications installed on your system." +msgstr "" -#: ../xfce4-about/main.c:108 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Degorriu d'axustes" -#: ../xfce4-about/main.c:109 -msgid "D-Bus-based configuration storage system." -msgstr "Sistema d'almacenamientu basáu na configuración D-Bus." - -#: ../xfce4-about/main.c:112 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:187 +msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:113 -msgid "" -"Thumbnail service implementing the thumbnail management D-Bus specification." +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "" -#: ../xfce4-about/main.c:120 -msgid "" -"Xfce is a collection of programs that together provide a full-featured " -"desktop environment. The following programs are part of the Xfce core:" -msgstr "Xfce ye una coleición de programes que xuntos apurren un entornu d'escritoriu completu dafechu. Los siguientes programes son parte del nucleu Xfce:" - -#: ../xfce4-about/main.c:144 -msgid "" -"Xfce is also a development platform providing several libraries, that help " -"programmers create applications that fit in well with the desktop " -"environment." -msgstr "Xfce ye tamién una plataforma de desendolcu qu'apurre abondes biblioteques, qu'ayuden a los programadores a crear aplicaciones qu'encaxen bien nel entornu d'escritoriu." +#: ../xfce4-about/main.c:192 +msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." +msgstr "" -#: ../xfce4-about/main.c:150 -msgid "" -"Xfce components are licensed under free or open source licences; GPL or BSDL" -" for applications and LGPL or BSDL for libraries. Look at the documentation," -" the source code or the Xfce website (https://www.xfce.org) for more " -"information." +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:157 -msgid "Thank you for your interest in Xfce." -msgstr "Gracies pol to interés en Xfce" +#: ../xfce4-about/main.c:197 +msgid "Implements the thumbnail management D-Bus specification." +msgstr "" -#: ../xfce4-about/main.c:161 -msgid "The Xfce Development Team" -msgstr "L'equipu de desendolcu Xfce" +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" -#: ../xfce4-about/main.c:263 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " -"on ." +"on ." msgstr "" -#: ../xfce4-about/main.c:267 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "¡Gracies a tolos qu'ayudaron a facer esti software disponible!" -#: ../xfce4-about/main.c:284 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 tien copyright d'Oliver Fourdan (fourdan@xfce.org). Los distintos componentes tienen copyright de los sos respeutivos autores." +msgstr "" +"Xfce 4 tien copyright d'Oliver Fourdan (fourdan@xfce.org). Los distintos " +"componentes tienen copyright de los sos respeutivos autores." -#: ../xfce4-about/main.c:289 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -690,7 +750,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:296 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -699,120 +759,211 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:443 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Escribi '%s --help' pa la información d'usu." -#: ../xfce4-about/main.c:449 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." -msgstr "Nun pue aniciase GTK+." +msgstr "Imposible aniciar GTK+." -#: ../xfce4-about/main.c:458 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." -msgstr "L'equipu de desendolque de Xfce. Tolos drechos reservaos." +msgstr "L'equipu de desendolcu de XFCE. Tolos drechos reservaos." -#: ../xfce4-about/main.c:459 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." -msgstr "Por favor, informa de fallos a <%s>." +msgstr "Informa de fallos a <%s>." -#: ../xfce4-about/main.c:469 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Fallu al cargar la interfaz" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:483 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Versión %s, distribuyíu por %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:487 -#, c-format -msgid "Version %s" -msgstr "Versión %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:125 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Desendolcadores principales" -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Collaboradores activos" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Sirvidores calteníos por" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" -msgstr "Supervisores de traducción" +msgstr "Supervisión de les traducciones" + +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:159 msgid "Translators" -msgstr "Tornadores" +msgstr "Traductores" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Collaboradores anteriores" #: ../xfce4-about/xfce4-about.desktop.in.h:1 msgid "About Xfce" -msgstr "Tocante Xfce" +msgstr "Tocante a XFCE" #: ../xfce4-about/xfce4-about.desktop.in.h:2 msgid "Information about the Xfce Desktop Environment" msgstr "Información tocante al entornu d'escritoriu Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:1 -msgid "About the Xfce Desktop Environment" -msgstr "Tocante al entornu d'escritoriu Xfce" +msgid "License" +msgstr "Llicencia" #: ../xfce4-about/xfce4-about-dialog.glade.h:2 -msgid "About" -msgstr "Tocante" +msgid "About the Xfce Desktop Environment" +msgstr "Tocante al entornu d'escritoriu XFCE" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "Credits" -msgstr "Créitos" +msgid "_Help" +msgstr "A_yuda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "_Close" +msgstr "_Zarrar" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "Device" +msgstr "Preséu" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "label" +msgstr "etiqueta" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "OS Name" +msgstr "Nome del SO" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "OS Type" +msgstr "Triba del SO" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:9 +msgid "Distributor" +msgstr "Distribuyidor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versión de XFCE" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memoria" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 +msgid "System" +msgstr "Sistema" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 +msgid "" +"Xfce is a collection of programs that together provide a full-featured desktop environment.\n" +"The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 +msgid "" +"Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" +"\n" +"Xfce components are licensed under free or open source licences; GPL or BSDL for applications and LGPL or BSDL for libraries. Look at the documentation, the source code or the Xfce website (https://www.xfce.org) for more information.\n" +"\n" +"Thank you for your interest in Xfce.\n" +"\n" +"\t- The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +msgid "About" +msgstr "Tocante a" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +msgid "Credits" +msgstr "Creitos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" -#: ../xfce4-about/xfce4-about-dialog.glade.h:8 -msgid "License" -msgstr "Llicencia" +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 +msgid "Unknown" +msgstr "Desconocíu" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + +#. translators: This is the name of the OS, followed by the build ID, for +#. * example: +#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or +#. * "Ubuntu 16.04 LTS; Build ID: jki" +#: ../xfce4-about/system-info.c:729 +#, c-format +msgid "%s; Build ID: %s" +msgstr "" -#: ../tests/test-ui.c:138 +#: ../tests/test-ui.c:111 #, c-format msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." msgstr "Yá esiste un ficheru nomáu «%s» nesti direutoriu, amestóse'l ficheru." -#: ../tests/test-ui.c:149 +#: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" -msgstr "Fallu al migrar la configuración vieya de paneles" +msgstr "Fallu al migrar el panel de configuración vieyu" -#: ../tests/test-ui.c:202 ../tests/test-ui.c:222 ../tests/test-ui.c:251 -#: ../tests/test-ui.c:273 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personaliza los axustes atroxaos por Xfconf" diff --git a/po/az.po b/po/az.po new file mode 100644 index 0000000..e526e9b --- /dev/null +++ b/po/az.po @@ -0,0 +1,993 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# Xfce Bot , 2023 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Azerbaijani (https://app.transifex.com/xfce/teams/16840/az/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: az\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:110 +msgid "Failed to open web browser for online documentation" +msgstr "Çevrim içi bəlgələndirmə üçün tor darayıcısının açılışı alınmadı" + +#: ../libxfce4ui/xfce-dialogs.c:265 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "%s qulabuzunu çevrim içi oxumaq istəyirsinizmi?" + +#: ../libxfce4ui/xfce-dialogs.c:267 +msgid "Do you want to read the manual online?" +msgstr "Qulabuzu çevrim içi oxumaq istəyirsinizmi?" + +#: ../libxfce4ui/xfce-dialogs.c:273 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "" +"Yardım yarpaqlarının dəstəklənən, çevirilən bəlgələndirmə saytına " +"yönləndiriləcəksiniz." + +#. Create cancel button +#: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 +msgid "_Cancel" +msgstr "_Dayandır" + +#: ../libxfce4ui/xfce-dialogs.c:277 +msgid "_Read Online" +msgstr "Çevrim içi _Oxu" + +#: ../libxfce4ui/xfce-dialogs.c:286 +msgid "_Always go directly to the online documentation" +msgstr "_Həmişə birbaşa çevrim içi bəlgələndirməyə get" + +#: ../libxfce4ui/xfce-dialogs.c:335 ../libxfce4ui/xfce-dialogs.c:370 +#: ../libxfce4ui/xfce-dialogs.c:406 +msgid "Close" +msgstr "Bağla" + +#: ../libxfce4ui/xfce-dialogs.c:453 +msgid "No" +msgstr "Yox" + +#: ../libxfce4ui/xfce-dialogs.c:455 +msgid "Yes" +msgstr "Hə" + +#: ../libxfce4ui/xfce-dialogs.c:459 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Dayandır" + +#: ../libxfce4ui/xfce-dialogs.c:518 +msgid "Close window with multiple tabs?" +msgstr "Çox səkməli pəncərə bağlansın?" + +#: ../libxfce4ui/xfce-dialogs.c:520 +msgid "" +"This window has multiple tabs open. Closing this window will also close all " +"its tabs." +msgstr "" +"Bu pəncərədə açıq səkmə çoxdur. Onu bağladıqda, onun bütün səkmələri də " +"bağlanacaq." + +#: ../libxfce4ui/xfce-dialogs.c:523 +#, c-format +msgid "" +"This window has %d tabs open. Closing this window will also close all its " +"tabs." +msgstr "" +"Bu pəncərədə %d açıq səkmə var. Onu bağladıqda, onun bütün səkmələri də " +"bağlanacaq." + +#: ../libxfce4ui/xfce-dialogs.c:529 +msgid "Warning" +msgstr "Uyarı" + +#: ../libxfce4ui/xfce-dialogs.c:534 +msgid "Close T_ab" +msgstr "_Səkməni bağla" + +#: ../libxfce4ui/xfce-dialogs.c:535 +msgid "Close _Window" +msgstr "_Pəncərəni bağla" + +#: ../libxfce4ui/xfce-dialogs.c:540 +msgid "Do _not ask me again" +msgstr "Bir daha soruş_ma" + +#: ../libxfce4ui/xfce-sm-client.c:1427 +msgid "Session management client ID" +msgstr "Oturum yönətimi alıcısı kimliyi" + +#: ../libxfce4ui/xfce-sm-client.c:1427 +msgid "ID" +msgstr "Kimlik" + +#: ../libxfce4ui/xfce-sm-client.c:1428 +msgid "Disable session management" +msgstr "Oturum yönətimini bağla" + +#: ../libxfce4ui/xfce-sm-client.c:1438 +msgid "Session management options" +msgstr "Oturum yönətimi seçimləri" + +#: ../libxfce4ui/xfce-sm-client.c:1439 +msgid "Show session management options" +msgstr "Oturum yönətimi seçimlərini göstər" + +#: ../libxfce4ui/xfce-sm-client.c:1609 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Oturum yönətiminə bağlantı alınmadı: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1615 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Oturum yönəldəni, keçərli alıcı kimliyi qaytarmadı" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:397 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "\"%s\" çalışma dizini yoxdur. \"%s\" çıxarkən, o işlədilməyəcək." + +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 +msgid "Filename is too long" +msgstr "Düzüm adı çox uzundur" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Düzüm adındakı dizin ayırıcısı yolverilməzdir" + +#: ../libxfce4ui/xfce-filename-input.c:234 +msgid "Filenames should not start or end with a space" +msgstr "Düzüm adları aralıqla başlamalı ya da bitməli deyil" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "" +"Bu qısayol artıq '%s' eyləmi üçün də işlənməkdədir. Hansı eyləmi işlətmək " +"istəyirsiniz?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "'%s' işlət" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "'%s' tut" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "" +"Bu qısayol artıq '%s' göstərişi üçün də işlənilməkdədir. Hansı eyləmi seçmək" +" istəyirsiniz?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" +"Bu qısayolu '%s' eyləmi də artıq işlətməkdədir. Hansı eyləmi seçmək " +"istəyirsiniz?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 +msgid "Please use another key combination." +msgstr "Başqa düymə birləşimi işlədin." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 +#, c-format +msgid "%s already triggers this action." +msgstr "%s artıq bu eyləmi çağırır." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 +#, c-format +msgid "Conflicting actions for %s" +msgstr "%s üçün çəlişən eyləmlər." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 +msgid "This shortcut is already being used for something else." +msgstr "Bu qısayol başqa bir nəsnə üçün də işlənməkdədir." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Qısayol Düzəldən" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Qısayolu təmizlə" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Varsayılan qısayolları qaytar" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Bu düyməlik qısayolunu indilik işlədir: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Düyməlik qısayolu artıq işlənir" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +msgid "Window Manager Action Shortcut" +msgstr "Pəncərə Yönəldəni Eyləmi Qısayolu" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 +msgid "action" +msgstr "eyləm" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +msgid "Command Shortcut" +msgstr "Göstəriş Qısayolu" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 +msgid "command" +msgstr "göstəriş" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +msgid "Shortcut" +msgstr "Qısayol" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 +msgid "Clear" +msgstr "Təmizlə" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 +#, c-format +msgid "Press keyboard keys to trigger the %s '%s'." +msgstr "%s '%s' çağırmaq üçün düyməlik düymələri basın." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 +msgid "Please press a key" +msgstr "Bir düymə basın" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 +msgid "Could not grab the keyboard." +msgstr "Düyməliyi yaxalamaq olmadı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Pəncərə işləmləri seçməsi" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Yuxarı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Aşağı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Sol" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Sağ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Pəncərələri çevir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Pəncərələri çevir (Tərsinə)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Eyni uyğulama üçün pəncərəni dəyiş" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Uyğulamanı dəyiş" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Pəncərəni bağla" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Pəncərəni yatay olaraq böyüt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Pəncərəni dikək olaraq böyüt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Pəncərəni böyüt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Pəncərəni gizlət" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Pəncərəni daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Pəncərə ölçüsünü dəyiş" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Pəncərəni kölgələndir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Pəncərəni yapışdır" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Pəncərəni yüksəlt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Pəncərəni alçalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Pəncərəni yüksəlt/alçalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Pəncərəni doldur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Pəncərəni yatay olaraq doldur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Pəncərəni dikək olaraq doldur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Yuxarı keç" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Bütün göstərənə keç" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to upper workspace" +msgstr "Pəncərəni üst iş alanına daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to bottom workspace" +msgstr "Pəncərəni alt iş alanına daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to left workspace" +msgstr "Pəncərəni sol iş alanına daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to right workspace" +msgstr "Pəncərəni sağ iş alanına daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to previous workspace" +msgstr "Pəncərəni öncəki iş alanına daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to next workspace" +msgstr "Pəncərəni sıradakı iş alanında daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 1" +msgstr "Pəncərəni iş alanı 1'ə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 2" +msgstr "Pəncərəni iş alanı 2'yə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 3" +msgstr "Pəncərəni iş alanı 3'ə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 4" +msgstr "Pəncərəni iş alanı 4'ə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 5" +msgstr "Pəncərəni iş alanı 5'ə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 6" +msgstr "Pəncərəni iş alanı 6'ya daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 7" +msgstr "Pəncərəni iş alanı 7'yə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 8" +msgstr "Pəncərəni iş alanı 8'ə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Move window to workspace 9" +msgstr "Pəncərəni iş alanı 9'a daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Move window to workspace 10" +msgstr "Pəncərəni iş alanı 10'a daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Move window to workspace 11" +msgstr "Pəncərəni iş alanı 11'ə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Move window to workspace 12" +msgstr "Pəncərəni iş alanı 12'yə daşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top" +msgstr "Pəncərəni üstə döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the bottom" +msgstr "Pəncərəni alta döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the left" +msgstr "Pəncərəni sola döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the right" +msgstr "Pəncərəni sağa döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Tile window to the top-left" +msgstr "Pəncərəni üst-sola döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Tile window to the top-right" +msgstr "Pəncərəni üst-sağa döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Tile window to the bottom-left" +msgstr "Pəncərəni alt-sola döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Tile window to the bottom-right" +msgstr "Pəncərəni alt-sağa döşə" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Show desktop" +msgstr "İş qoyağını göstər" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Upper workspace" +msgstr "Üst iş alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Bottom workspace" +msgstr "Alt iş alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Left workspace" +msgstr "Sol iş alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Right workspace" +msgstr "Sağ iş alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Previous workspace" +msgstr "Öncəki iş alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Next workspace" +msgstr "Sonrakı iş alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 1" +msgstr "İş alanı 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 2" +msgstr "İş alanı 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 3" +msgstr "İş alanı 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 4" +msgstr "İş alanı 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 5" +msgstr "İş alanı 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 6" +msgstr "İş alanı 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 7" +msgstr "İş alanı 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 8" +msgstr "İş alanı 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Workspace 9" +msgstr "İş alanı 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Workspace 10" +msgstr "İş alanı 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Workspace 11" +msgstr "İş alanı 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Workspace 12" +msgstr "İş alanı 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 +msgid "Add workspace" +msgstr "İş alanı artır" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 +msgid "Add adjacent workspace" +msgstr "Bitişik iş alanı artır" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 +msgid "Delete last workspace" +msgstr "Son iş alanını sil" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 +msgid "Delete active workspace" +msgstr "Etgin iş alanını sil" + +#: ../glade/libxfce4ui-2.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Başlıqlı Danışıq" + +#: ../glade/libxfce4ui-2.xml.in.h:2 +msgid "Subtitle" +msgstr "Alt başlıq" + +#: ../glade/libxfce4ui-2.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Xfce 4 Gərəcləri" + +#: ../xfce4-about/main.c:58 +msgid "Version information" +msgstr "Sürüm bilgisi" + +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GİB'lər" + +#: ../xfce4-about/main.c:146 +msgid "Window Manager" +msgstr "Pəncərə Yönəldəni" + +#: ../xfce4-about/main.c:147 +msgid "Handles the placement of windows on the screen." +msgstr "Pəncərənin göstərəndə yerləşimi ilə ilgilənir." + +#: ../xfce4-about/main.c:151 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:152 +msgid "Provides a home for window buttons, launchers, app menu and more." +msgstr "" +"Pəncərə düymələri, başladanlar, uyğulama seçməsi və daha çoxu üçün ev " +"sağlayır." + +#: ../xfce4-about/main.c:156 +msgid "Desktop Manager" +msgstr "İş qoyağı Yönəldəni" + +#: ../xfce4-about/main.c:157 +msgid "Sets desktop backgrounds, handles icons and more." +msgstr "İş qoyağı arxalıqlarını, imgələri, və daha çoxunu ayarlayır." + +#: ../xfce4-about/main.c:161 +msgid "File Manager" +msgstr "Düzüm Yönəldəni" + +#: ../xfce4-about/main.c:162 +msgid "Manages your files in a modern, easy-to-use and fast way." +msgstr "Düzümlərinizi, çağdaş, asan işlənişli, sürətli yol ilə yönəldir." + +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Tutum Yönəldəni" + +#: ../xfce4-about/main.c:167 +msgid "Manages removable drives and media for Thunar." +msgstr "Thunar üçün çıxabilən sürgüləri, ortamları yönəldir." + +#: ../xfce4-about/main.c:171 +msgid "Session Manager" +msgstr "Oturum Yönəldəni" + +#: ../xfce4-about/main.c:172 +msgid "" +"Saves and restores your session, handles startup, autostart and shutdown." +msgstr "" +"Oturumunuzu qoruyur, qaytarır, açılış, özaçılış, söndürmə işlərini ələ alır." + +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Ayarları Yönəldən" + +#: ../xfce4-about/main.c:177 +msgid "Configures appearance, display, keyboard and mouse settings." +msgstr "Görünüş, göstərici, düyməlik, siçan ayarlarını quruluşlayır." + +#: ../xfce4-about/main.c:181 +msgid "Application Finder" +msgstr "Uyğulama Tapıcı" + +#: ../xfce4-about/main.c:182 +msgid "Quickly finds and launches applications installed on your system." +msgstr "Sisteminizdə qurulmuş uyğulamaları tez tapır, başladır. " + +#: ../xfce4-about/main.c:186 +msgid "Settings Daemon" +msgstr "Ayarlar Qulluğu" + +#: ../xfce4-about/main.c:187 +msgid "Stores your settings in a D-Bus-based configuration system." +msgstr "Ayarlarınızı D-Bus dabanlı quruluşlanış sistemində saxlayır." + +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Seçmə Bitikliyi" + +#: ../xfce4-about/main.c:192 +msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." +msgstr "GLib, GIO dabanlı freedesktop.org uyumlu seçməni uyğulayır." + +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Kiçik Görsəl Qulluğu" + +#: ../xfce4-about/main.c:197 +msgid "Implements the thumbnail management D-Bus specification." +msgstr "Kiçik görsəl yönətimi D-Bus özəllşdirməsini uyğulayır. " + +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Buna baxın: " + +#: ../xfce4-about/main.c:312 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" +"Bu sıralanışda əksik birini görürsünüzsə, ilişməyin, böcəyi (yanlışı) " +" üzərindən bildirin." + +#: ../xfce4-about/main.c:316 +msgid "Thanks to all who helped making this software available!" +msgstr "Bu incəgeyimi əlçatan edən hamı sağolsun!" + +#: ../xfce4-about/main.c:333 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" +"Xfce 4 Olivier Fourdan'ın (fourdan@xfce.org) köçürüm özgüsüdür. Seçkin " +"biləşənlər, onların ilgili yazarlarının köçürüm özgüləridir." + +#: ../xfce4-about/main.c:338 +msgid "" +"The libxfce4ui, libxfce4util and exo packages are distributed under the " +"terms of the GNU Library General Public License as published by the Free " +"Software Foundation; either version 2 of the License, or (at your option) " +"any later version." +msgstr "" +"Libxfce 4ui, libxfceutil, exo bağlamaları Özgür Yazılım Quruluşunun " +"yayımlanışı kimi GNU Bitiklik Toplam Kamu Yolverişi qoşulları altında " +"yayılmaqdadır; istər Yolverişin 2., istərsə (seçiminizə uyğun) daha sonrakı " +"sürümü olsun." + +#: ../xfce4-about/main.c:345 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " +"of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf," +" xfdesktop, xfwm4 bağlamaları Özgür Yazılım Quruluşunun yayımlanışı kimi GNU" +" Bitiklik Toplam Kamu Yolverişi qoşulları altında yayılmaqdadır; istər " +"Yolverişin 2., istərsə (seçiminizə uyğun) daha sonrakı sürümü olsun." + +#: ../xfce4-about/main.c:491 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "İşləniş bilgisi üçün '%s --help' yazın." + +#: ../xfce4-about/main.c:497 +msgid "Unable to initialize GTK+." +msgstr "GTK+ hazırlanışı alınmır" + +#: ../xfce4-about/main.c:506 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce gəliştirici birliyi. Bütün özgülər qorunur." + +#: ../xfce4-about/main.c:507 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Böcəkləri <%s> yerinə bildirmənizi istərdik." + +#: ../xfce4-about/main.c:517 +msgid "Failed to load interface" +msgstr "Arayüzün yüklənişi alınmadı" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:144 +msgid "Core developers" +msgstr "Kök gəliştiriciləri" + +#: ../xfce4-about/contributors.h:147 +msgid "Active contributors" +msgstr "İşlək qatqıcılar" + +#: ../xfce4-about/contributors.h:150 +msgid "Servers maintained by" +msgstr "Qulluqçuların baxımını edənlər" + +#: ../xfce4-about/contributors.h:153 +msgid "Translations supervision" +msgstr "Çeviri yükümlüsü" + +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Bəlgələndirmə dənətimi" + +#: ../xfce4-about/contributors.h:159 +msgid "Translators" +msgstr "Çevirmənlər" + +#: ../xfce4-about/contributors.h:162 +msgid "Previous contributors" +msgstr "Öncəki qatqıçılar" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Xfce ilə bağlı" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Xfce İş qoyağı Ortamı ilə bağlı bilgi" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "License" +msgstr "Yolveriş" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About the Xfce Desktop Environment" +msgstr "Xfce İş qoyağı Ortamı ilə bağlı" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "_Help" +msgstr "_Yardım" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "_Close" +msgstr "_Bağla" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "Device" +msgstr "Qurğu" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "label" +msgstr "yarlıq" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "OS Name" +msgstr "İS Adı" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "OS Type" +msgstr "İS Biçimi" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:9 +msgid "Distributor" +msgstr "Paylayıcı" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Sxfce Sürümü" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "OİB" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Yaddaş" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GİB" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 +msgid "System" +msgstr "Sistem" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 +msgid "" +"Xfce is a collection of programs that together provide a full-featured desktop environment.\n" +"The following programs are part of the Xfce core:" +msgstr "" +"Xfce, birlikdə bütün-özəllikli iş qoyağı ortamı sağlayan proqram toplusudur.\n" +"Sıradakı proqramlar Xfce özəyinin bölükləridir:" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 +msgid "" +"Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" +"\n" +"Xfce components are licensed under free or open source licences; GPL or BSDL for applications and LGPL or BSDL for libraries. Look at the documentation, the source code or the Xfce website (https://www.xfce.org) for more information.\n" +"\n" +"Thank you for your interest in Xfce.\n" +"\n" +"\t- The Xfce Development Team" +msgstr "" +"Xfce, eləcə də, yazılımçıların iş qoyağı ortamına yaxşı oturan uyğulamalar yaratmasına yardımçı olan seçkin bitik evləri sağlayan gəliştirmə platformudur.\n" +"\n" +"Xfce biləşənləri, özgür ya da açıq qaynaq yolverişləri altında yolverişlənir; Uyğulamalar üçün GPL ya da BSDL, bitik evləri üçün LGPL ya da BSDL. Daha çox bilgi üçün bəlgələndirmə, qaynaq koduna ya ad Xfce tor saytına (https://www.xfce.org) baxın.\n" +"\n" +"Xfce ilə ilgiləndiyiniz üçün çox sağolun.\n" +"\n" +"\t- Xfce Gəliştirmə Tağımı" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +msgid "About" +msgstr "Bilgi" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +msgid "Credits" +msgstr "Gəliştiricilər" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 +msgid "Copyright" +msgstr "Köçürüm özgüsü" + +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 +msgid "Unknown" +msgstr "Bilinməyən" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (32-bit işlədən alanı)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + +#. translators: This is the name of the OS, followed by the build ID, for +#. * example: +#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or +#. * "Ubuntu 16.04 LTS; Build ID: jki" +#: ../xfce4-about/system-info.c:729 +#, c-format +msgid "%s; Build ID: %s" +msgstr "%s; Yığılış Kimliyi: %s" + +#: ../tests/test-ui.c:111 +#, c-format +msgid "" +"A file named \"%s\" already exists in this directory, the file hasn't been " +"added." +msgstr "\"%s\" adlı düzüm bu dizində artıq var olduğu üçün düzüm artırılmadı." + +#: ../tests/test-ui.c:122 +msgid "Failed to migrate the old panel configuration" +msgstr "Əski panel quruluşlamasını köçürmək alınmadı" + +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 +msgid "Customize settings stored by Xfconf" +msgstr "Xconf'un saxladığı ayarları özəlləşdir" diff --git a/po/be.po b/po/be.po index d48bb6f..e5192f8 100644 --- a/po/be.po +++ b/po/be.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Źmicier Turok , 2019 -# Źmicier Turok , 2018-2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-29 10:06+0000\n" -"Last-Translator: Źmicier Turok \n" -"Language-Team: Belarusian (http://www.transifex.com/xfce/libxfce4ui/language/be/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Belarusian (https://app.transifex.com/xfce/teams/16840/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,11 +38,13 @@ msgstr "Хочаце пачытаць дапаможнік у сеціве?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Вас накіруюць на сайт дакументацыі, дзе старонкі дапаможніка перакладаюцца і падтрымліваюцца суполкай." +msgstr "" +"Вас накіруюць на сайт дакументацыі, дзе старонкі дапаможніка перакладаюцца і" +" падтрымліваюцца суполкай." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Скасаваць" @@ -78,14 +82,18 @@ msgstr "Закрыць акно з некалькімі ўкладкамі?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "У гэтым акне адкрыта некалькі ўкладак. Калі яго закрыць, то закрыюцца і ўсе ўкладкі." +msgstr "" +"У гэтым акне адкрыта некалькі ўкладак. Калі яго закрыць, то закрыюцца і ўсе " +"ўкладкі." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "У акна %d адкрытыя ўкладкі. Калі закрыць акно, \nзакрыюцца і ўкладкі." +msgstr "" +"У акна %d адкрытыя ўкладкі. Калі закрыць акно, \n" +"закрыюцца і ўкладкі." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -123,37 +131,34 @@ msgstr "Параметры кіраўніка сеансаў" msgid "Show session management options" msgstr "Паказаць параметры кіравання сеансам" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Не атрымалася злучыцца з кіраўніком сеансаў: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Кіраўнік сеансаў не вярнуў патрэбны ідэнтыфікатар кліента" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Працоўны каталог \"%s\" не існуе. Ён не будзе выкарыстоўвацца для \"%s\"." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Падзяляльнік каталогаў непрыдатны ў назве файла" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Назва занадта доўгая" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Падзяляльнік каталогаў непрыдатны ў назве файла" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Назвы файлаў не могуць пачынацца ці заканчвацца прагалам" @@ -162,7 +167,9 @@ msgstr "Назвы файлаў не могуць пачынацца ці зак msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Спалучэнне ўжо выкарыстоўваецца для дзеяння \"%s\". Якое дзеянне выкарыстоўваць?" +msgstr "" +"Спалучэнне ўжо выкарыстоўваецца для дзеяння \"%s\". Якое дзеянне " +"выкарыстоўваць?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -186,74 +193,106 @@ msgstr "Пакінуць \"%s\"" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Спалучэнне ўжо выкарыстоўваецца для загада \"%s\". Які загад выкарыстоўваць?" +msgstr "" +"Спалучэнне ўжо выкарыстоўваецца для загада \"%s\". Які загад выкарыстоўваць?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Спалучэнне ўжо выкарыстоўваецца для дзеяння \"%s\". Якое дзеянне выкарыстоўваць?" +msgstr "" +"Спалучэнне ўжо выкарыстоўваецца для дзеяння \"%s\". Якое дзеянне " +"выкарыстоўваць?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Калі ласка, выкарыстайце іншае спалучэнне клавіш." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s ужо выкарыстоўваецца для гэтага дзеяння" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Канфлікт дзеянняў для %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Спалучэнне ўжо выкарыстоўваецца." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Спалучэнне клавіш ўжо выкарыстоўваецца для: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Спалучэнне клавіш ужо выкарыстоўваецца" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Спалучэнне для дзеяння кіраўніка акон" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "дзеянне" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Спалучэнне загада" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "загад" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Спалучэнне" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Ачысціць" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Націсніце клавішы, каб выканаць %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Калі ласка, націсніце клавішу" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Не атрымалася захапіць клавіятуру." @@ -362,198 +401,214 @@ msgid "Toggle fullscreen" msgstr "Рэжым на ўвесь экран" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Перамясціць акно на вышэйшую працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Перамясціць акно на ніжэйшую працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Перамясціць акно на лявейшую працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Перамясціць акно на правейшую працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Перамясціць акно на папярэднюю працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Перамясціць акно на наступную працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Перамясціць акно на працоўную прастору 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Перамясціць акно на працоўную прастору 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Перамясціць акно на працоўную прастору 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Перамясціць акно на працоўную прастору 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Перамясціць акно на працоўную прастору 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Перамясціць акно на працоўную прастору 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Перамясціць акно на працоўную прастору 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Перамясціць акно на працоўную прастору 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Перамясціць акно на працоўную прастору 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Перамясціць акно на працоўную прастору 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Перамясціць акно на працоўную прастору 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Перамясціць акно на працоўную прастору 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Размясціць акно зверху" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Размясціць акно знізу" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Размясціць акно злева" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Размясціць акно справа" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Размясціць акно злева зверху" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Размясціць акно справа зверху" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Размясціць акно злева знізу" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Размясціць акно справа знізу" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Паказаць працоўны стол" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Верхняя працоўная прастора" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Ніжэйшая працоўная прастора" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Левая працоўная прастора" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Правая працоўная прастора" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Папярэдняя працоўная прастора" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Наступная працоўная прастора" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Працоўная прастора 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Працоўная прастора 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Працоўная прастора 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Працоўная прастора 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Працоўная прастора 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Працоўная прастора 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Працоўная прастора 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Працоўная прастора 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Працоўная прастора 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Працоўная прастора 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Працоўная прастора 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Працоўная прастора 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Дадаць працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Дадаць сумежную працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Выдаліць апошнюю працоўную прастору" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Выдаліць бягучую працоўную прастору" @@ -573,186 +628,197 @@ msgstr "Віджэты Xfce 4" msgid "Version information" msgstr "Інфармацыя пра версію" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Кіраўнік акон" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Апрацоўвае размяшчэнне акон на экране." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Панэль" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "Забяспечвае інтэрфейсам для кнопак акон, запускальнікаў, меню і інш." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Кіраўнік працоўнага стала" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Вызначае фон працоўнага стала, значкі і інш." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Кіраўнік файлаў" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Кіруе вашымі файламі." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Кіраўнік тамоў" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Кіруе рухомымі дыскамі і носьбітамі для Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Кіраўнік сеанса" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "Захоўвае і аднаўляе сеанс, апрацоўвае аўтазапуск і выключэнне." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Сістэма налад" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Кіраўнік налад" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Наладжвае выгляд, дысплей, клавіятуру і мыш." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Пошук праграм" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Хутка знаходзіць і запускае ўсталяваныя ў вашай сістэме праграмы." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Дэман налад" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Захоўвае вашыя налады ў заснаванай на D-Bus сістэме канфігурацыі." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Бібліятэка меню" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Рэалізуе заснаванае на GLib і GIO меню па прынцыпах freedesktop.org." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Служба мініяцюр" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Рэалізуе спецыфікацыю мініяцюр для D-Bus." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Глядзіце " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Калі вы ведаеце таго, каго няма ў спісе, паведаміце на ." +msgstr "" +"Калі вы ведаеце таго, каго няма ў спісе, паведаміце на " +"." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Дзякуй усім, хто дапамог стварыць гэтае праграмнае забеспячэнне!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Аўтарскія правы на Xfce 4 належаць Olivier Fourdan (fourdan@xfce.org). Аўтарскія правы на кампаненты належаць іх распрацоўшчыкам." +msgstr "" +"Аўтарскія правы на Xfce 4 належаць Olivier Fourdan (fourdan@xfce.org). " +"Аўтарскія правы на кампаненты належаць іх распрацоўшчыкам." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs і exo распаўсюджваюцца на ўмовах GNU Library General Public License апублікаванай Free Software Foundation версіі 2 альбо пазнейшай." +msgstr "" +"libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs і exo распаўсюджваюцца на " +"ўмовах GNU Library General Public License апублікаванай Free Software " +"Foundation версіі 2 альбо пазнейшай." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop і xfwm4 распаўсюджваюцца на ўмовах GNU Library General Public License апублікаванай Free Software Foundation версіі 2 альбо пазнейшай." +msgstr "" +"thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-" +"utils, xfconf, xfdesktop і xfwm4 распаўсюджваюцца на ўмовах GNU Library " +"General Public License апублікаванай Free Software Foundation версіі 2 альбо" +" пазнейшай." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Увядзіце \"%s --help\", каб праглядзець дапаможнік." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Не атрымалася ініцыялізаваць GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Каманда распрацоўкі Xfce. Усе правы абароненыя." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Калі ласка, паведамляйце пра памылкі на <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Не атрымалася загрузіць інтэрфейс" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Асноўныя распрацоўшчыкі" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Актыўныя ўдзельнікі" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Падтрымка сервераў" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Адказны за пераклад" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Адказны за дакументацыю" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Перакладчыкі" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Папярэднія распрацоўшчыкі" @@ -773,52 +839,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Пра працоўнае асяроддзе Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "адмеціна" +msgid "_Help" +msgstr "_Даведка" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Назва АС" +msgid "_Close" +msgstr "Закры_ць" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Прылада" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Памяць" +msgid "label" +msgstr "адмеціна" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Працэсар" +msgid "OS Name" +msgstr "Назва АС" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Тып АС" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Версія Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Дыстрыбутар" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Версія Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Працэсар" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Памяць" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Сістэма" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce - набор праграм, што разам складаюць паўнавартаснае працоўнае асяроддзе. У ядро Xfce уваходзяць наступныя праграмы:" +msgstr "" +"Xfce - набор праграм, што разам складаюць паўнавартаснае працоўнае " +"асяроддзе. У ядро Xfce уваходзяць наступныя праграмы:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,48 +911,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce - гэта таксама платформа для распрацоўкі, якая падае некалькі бібліятэк, якія дапамагаюць праграмістам ствараць праграмы, якія добра пасуюць працоўнаму асяроддзю.\n\n Кампаненты Xfce ліцэнзуюцца бясплатнымі альбо свабоднымі ліцэнзіямі; GPL або BSDL для праграм і LGPL або BSDL для бібліятэк. Паглядзіце дадатковую інфармацыю ў дакументацыі, зыходным кодзе альбо на сайце Xfce ( https://www.xfce.org ).\n\n Дзякуем за цікавасць да Xfce.\n\n - Каманда распрацоўшчыкаў Xfce" +msgstr "" +"Xfce - гэта таксама платформа для распрацоўкі, якая падае некалькі бібліятэк, якія дапамагаюць праграмістам ствараць праграмы, якія добра пасуюць працоўнаму асяроддзю.\n" +"\n" +" Кампаненты Xfce ліцэнзуюцца бясплатнымі альбо свабоднымі ліцэнзіямі; GPL або BSDL для праграм і LGPL або BSDL для бібліятэк. Паглядзіце дадатковую інфармацыю ў дакументацыі, зыходным кодзе альбо на сайце Xfce ( https://www.xfce.org ).\n" +"\n" +" Дзякуем за цікавасць да Xfce.\n" +"\n" +" - Каманда распрацоўшчыкаў Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Пра праграму" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Цітры" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Аўтарскія правы" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Невядома" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 біты (прастора карыстальніка 32 біты)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 біты" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 біты" @@ -876,7 +967,7 @@ msgstr "32 біты" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Ідэнтыфікатар зборкі: %s" @@ -892,6 +983,6 @@ msgstr "Файл з назвай \"%s\" ужо ёсць у гэтым катал msgid "Failed to migrate the old panel configuration" msgstr "Не атрымалася перанесці канфігурацыю старой панэлі" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Змена налад, што захоўваюцца ў Xfconf" diff --git a/po/bg.po b/po/bg.po index b39d2fa..4db47dc 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,21 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Kiril Kirilov , 2012 -# Kiril Kirilov , 2015-2017,2019-2020 -# Любомир Василев, 2015 -# Красимир Беров, 2017,2019 -# Любомир Василев, 2016 +# Kiril Kirilov , 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-22 12:34+0000\n" -"Last-Translator: Kiril Kirilov \n" -"Language-Team: Bulgarian (http://www.transifex.com/xfce/libxfce4ui/language/bg/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Bulgarian (https://app.transifex.com/xfce/teams/16840/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,7 +24,9 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Не може да бъде отворен уеб четец, с който да бъде прегледана документацията в Интернет" +msgstr "" +"Не може да бъде отворен уеб четец, с който да бъде прегледана документацията" +" в Интернет" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -39,11 +41,13 @@ msgstr "Искате ли да прочетете ръководството в msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Вие ще бъдете препратен(а) към уеб сайта с документацията, където се превеждат и поддържат помощните страници." +msgstr "" +"Ще бъдете пренасочени към уеб сайта с документацията, където се поддържат и " +"превеждат помощните страници." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Отказ" @@ -81,14 +85,18 @@ msgstr "Затваряне на прозореца с множество раз msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Този прозорец има много отворени раздели. Затваряйки прозореца, вие ще затворите и всичките му раздели." +msgstr "" +"Този прозорец има много отворени раздели. Затваряйки прозореца, вие ще " +"затворите и всичките му раздели." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Този прозорец има %d отворени раздели. Затваряйки този прозорец, вие ще затворите и всичките му раздели." +msgstr "" +"Този прозорец има %d отворени раздели. Затваряйки този прозорец, вие ще " +"затворите и всичките му раздели." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -126,37 +134,36 @@ msgstr "Настройки на управлението на сесиите" msgid "Show session management options" msgstr "Показване на настройките за управление на сесиите" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Не може да се осъществи връзка с управителя на сесиите: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Управителят на сесиите не е върнал правилен идентификатор на клиента" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Работната директория „%s“ не съществува. Тя няма да бъде използвана когато размножавате „%s“." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Разделителят на директория е недопустим в името на файла" +msgstr "" +"Работната директория „%s“ не съществува. Тя няма да бъде използвана когато " +"размножавате „%s“." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Името на файла е прекалено дълго" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Разделителят на директория е недопустим в името на файла" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Имената на файловете на трябва да започват и да завършват с интервал" @@ -165,7 +172,9 @@ msgstr "Имената на файловете на трябва да започ msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Тази клавишна комбинация вече е използвана за действието „%s“. Кое действие желаете да използвате?" +msgstr "" +"Тази клавишна комбинация вече е използвана за действието „%s“. Кое действие " +"желаете да използвате?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -189,74 +198,107 @@ msgstr "Запазване на „%s“" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Тази клавишна комбинация вече е използвана за командата „%s“. Кое действие желаете да използвате?" +msgstr "" +"Тази клавишна комбинация вече е използвана за командата „%s“. Кое действие " +"желаете да използвате?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Тази клавишна комбинация вече е използвана за действието „%s“. Кое действие желаете да използвате?" +msgstr "" +"Тази клавишна комбинация вече е използвана за действието „%s“. Кое действие " +"желаете да използвате?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Моля, използвайте друга клавишна комбинация." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s вече се използва за това действие." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Конфликт с действие за %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Тази клавишна комбинация вече е зададена за друго действие." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Редактор на клавишните комбинации" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Текущата клавишна комбинация. Кликнете за да редактирате..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Изчистване на клавишната комбинация" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Възстановяване на стандартната клавишна комбинация" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Клавишната комбинация, вече е използвана от: \"%s\"" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Клавишната комбинация, вече се използва" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Клавишни комбинации за действия с управителя на прозорците" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "действие" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Клавишна комбинация за команда" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "команда" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Клавишна комбинация" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Изчистване" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Натиснете клавишите на клавиатурата за да задействате %s \"%s\"." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Моля, натиснете клавиша" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Не може да бъде прихваната клавиатурата." @@ -302,11 +344,11 @@ msgstr "Затваряне на прозорец" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 msgid "Maximize window horizontally" -msgstr "Увеличаване на прозореца по хоризонтала" +msgstr "Максимизиране на прозореца хоризонтално" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 msgid "Maximize window vertically" -msgstr "Увеличаване на прозореца по вертикала" +msgstr "Максимизиране на прозореца вертикално" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 msgid "Maximize window" @@ -350,11 +392,11 @@ msgstr "Разтягане на прозореца" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 msgid "Fill window horizontally" -msgstr "Разтягане на прозореца по хоризонтала" +msgstr "Разтягане на прозореца хоризонтално" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 msgid "Fill window vertically" -msgstr "Разтягане на прозореца по вертикала" +msgstr "Разтягане на прозореца вертикално" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 msgid "Toggle above" @@ -365,198 +407,214 @@ msgid "Toggle fullscreen" msgstr "Режим на цял екран" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Преместване на прозореца към долният монитор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Преместване на прозореца към левият монитор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Преместване на прозореца към десният монитор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Преместване на прозореца към горният монитор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Преместване на прозореца на горното работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Преместване на прозореца на долното работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Преместване на прозореца на лявото работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Преместване на прозореца на дясното работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Преместване на прозореца на предишното работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Преместване на прозореца на следващото работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Преместване на прозореца на работно място 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Преместване на прозореца на работно място 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Преместване на прозореца на работно място 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Преместване на прозореца на работно място 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Преместване на прозореца на работно място 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Преместване на прозореца на работно място 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Преместване на прозореца на работно място 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Преместване на прозореца на работно място 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Преместване на прозореца на работно място 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Преместване на прозореца на работно място 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Преместване на прозореца на работно място 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Преместване на прозореца на работно място 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Разполагане на прозореца отгоре" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Разполагане на прозореца отдолу" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Разполагане на прозореца отляво" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Разполагане на прозореца отдясно" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Подреждане на прозорците в горния ляв ъгъл" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Подреждане на прозорците в горния десен ъгъл" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Подреждане на прозорците в долния ляв ъгъл" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Подреждане на прозорците в долния десен ъгъл" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Показване на работния плот" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Горно работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Долно работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ляво работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Дясно работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Предишно работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Следващо работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Работно място 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Работно място 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Работно място 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Работно място 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Работно място 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Работно място 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Работно място 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Работно място 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Работно място 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Работно място 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Работно място 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Работно място 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Добавяне на работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Добавяне на съседно работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Премахване на предишното работно място" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Премахване на текущото работно място" @@ -576,186 +634,203 @@ msgstr "Джаджи за Xfce 4" msgid "Version information" msgstr "Информация за версията" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "Графични процесори" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Управител на прозорците" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Управлява разположението на прозорците на екрана." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Панел" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "Включва бутоните за прозорци, стартери, меню за програмите и други." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Управител на работния плот" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Задава фонове за работен плот, работа с икони и други." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Файлов мениджър" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Управлява вашите файлове по модерен, бърз и лесен за ползване начин." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Управление на устройствата" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Управлява вашите сменяеми носители и медии в Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Управление на сесиите" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Запазва и възстановява вашата сесия, работа със стартиращите програми, автоматичното стартиране и изключване." +msgstr "" +"Запазва и възстановява вашата сесия, работа със стартиращите програми, " +"автоматичното стартиране и изключване." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Система за настройки" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Уравление на настройките" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Конфигурира настройките на външният вид, дисплей, клавиатура и мишка." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Търсене на програми" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "Бързо търсене и стартиране на приложенията, инсталирани на вашата система." +msgstr "" +"Бързо търсене и стартиране на приложенията, инсталирани на вашата система." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Диспечер на настройките" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Съхранява вашите настройки в D-Bus базираните системни конфигурации." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Библиотека на меню" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Съвместимо с freedesktop.org меню на базата на GLib и GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Услуга за миниатюри" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Реализира D-Bus спецификациите в управлението на миниатюрите." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Моля, вижте " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Ако установите нещо, което липсва от този списък, не се колебайте и докладвайте грешка на ." +msgstr "" +"Ако установите нещо, което липсва от този списък, не се колебайте и " +"докладвайте грешка на ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Благодарим на всички, които помогнаха за съществуването на този софтуер!" +msgstr "" +"Благодарим на всички, които помогнаха за съществуването на този софтуер!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Авторските права на Xfce 4 принадлежат на Оливие Фордан (fourdan@xfce.org). Авторските права на другите компоненти принадлежат на съответните им автори." +msgstr "" +"Авторските права на Xfce 4 принадлежат на Оливие Фордан (fourdan@xfce.org). " +"Авторските права на другите компоненти принадлежат на съответните им автори." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Пакетите libxfce4ui, libxfce4util и exo се разпространяват съгласно условията на Общия публичен лиценз на библиотеката GNU, публикуван от Фондацията за свободен софтуер; или версия 2 на лиценза, или (по ваш избор) по-късна версия." +msgstr "" +"Пакетите libxfce4ui, libxfce4util и exo се разпространяват съгласно " +"условията на Общия публичен лиценз на библиотеката GNU, публикуван от " +"Фондацията за свободен софтуер; или версия 2 на лиценза, или (по ваш избор) " +"по-късна версия." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Пакетите thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop и xfwm4 се разпространяват съгласно условията на GNU General Public License, публикуван от Фондацията за свободен софтуер; или версия 2 на лиценза, или (по ваш избор) по-късна версия." +msgstr "" +"Пакетите thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop и xfwm4 се разпространяват съгласно " +"условията на GNU General Public License, публикуван от Фондацията за " +"свободен софтуер; или версия 2 на лиценза, или (по ваш избор) по-късна " +"версия." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Напишете „%s --help“, за да получите информация за употребата." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Не може да бъде инициализирана GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Екипът по разработката на Xfce. Всички права запазени." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Моля, докладвайте грешките на <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Не може да бъде зареден интерфейса" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Основни разработчици" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Дейни участници" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Сървърите се поддържат от:" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Отговорници за превода" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Надзор на документацията" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Преводачи" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Предишни участници" @@ -776,52 +851,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Относно работната среда Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "етикет" +msgid "_Help" +msgstr "Помощ" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Име на ОС" +msgid "_Close" +msgstr "Затваряне" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Устройство" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Памет" +msgid "label" +msgstr "етикет" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Процесор" +msgid "OS Name" +msgstr "Име на ОС" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Тип на ОС" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Версия на Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Дистрибутор" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Версия на Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Версия на GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Версия на ядрото" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Процесор" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Памет" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "Графичен процесор" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Система" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce е съвкупност от програми, които заедно предоставят пълнофункционална работна среда.\nСледните приложения са част от Xfce core:" +msgstr "" +"Xfce е съвкупност от програми, които заедно предоставят пълнофункционална работна среда.\n" +"Следните приложения са част от Xfce core:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -830,48 +923,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce е също и платформа за разработка, предоставяща няколко библиотеки, които помагат на програмистите да създават приложения, които добре се вписват в тази работна среда.\n\nXfce компонентите се лицензират под свободен или отворен код; GPL или BSDL за приложенияте и LGPL или BSDL за библиотеките. Вижте документацията, изходния код или уебсайта на Xfce. (https://www.xfce.org) за повече информация.\n\nБлагодари ви за интереса към Xfce.\n\n\t- Екипът по разработка на Xfce" +msgstr "" +"Xfce е също и платформа за разработка, предоставяща няколко библиотеки, които помагат на програмистите да създават приложения, които добре се вписват в тази работна среда.\n" +"\n" +"Xfce компонентите се лицензират под свободен или отворен код; GPL или BSDL за приложенияте и LGPL или BSDL за библиотеките. Вижте документацията, изходния код или уебсайта на Xfce. (https://www.xfce.org) за повече информация.\n" +"\n" +"Благодари ви за интереса към Xfce.\n" +"\n" +"\t- Екипът по разработка на Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Относно" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Принос" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Авторски права" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Неизвестен" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-битово потребителско пространство)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -879,7 +979,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Изграждане на ID : %s" @@ -889,12 +989,13 @@ msgstr "%s; Изграждане на ID : %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Файл с име \"%s\" вече съществува в тази директория, файлът не беше добавен." +msgstr "" +"Файл с име \"%s\" вече съществува в тази директория, файлът не беше добавен." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Неуспешно прехвърляне на старите настройки на панела." -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" -msgstr "Персонализиране на настройките, съхранени от Xfconf" +msgstr "Приспособяване на настройките, съхранени от Xfconf" diff --git a/po/bn.po b/po/bn.po index b02d0c7..0313583 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Israt Jahan , 2010 -# Sadia Afroz , 2010 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Bengali (http://www.transifex.com/xfce/libxfce4ui/language/bn/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Bengali (https://app.transifex.com/xfce/teams/16840/bn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,7 +42,7 @@ msgstr "" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "বাতিল (_C)" @@ -123,37 +125,34 @@ msgstr "সেশন ব্যবস্থাপনা অপশন" msgid "Show session management options" msgstr "সেশন ব্যবস্থাপনা অপশন প্রদর্শন" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "সেশন ব্যবস্থাপকের সাথে সংযুক্ত হতে ব্যর্থ: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "সেশন ব্যবস্থাপন একটি কার্যকর ক্লায়েন্ট আইডি ফেরত দেয়নি" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "\"%s\" ডিরেক্টরিটি নেই। \"%s\" স্পনিং এর সময় এটি ব্যবহার করা হবে না।" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 +msgid "Filename is too long" msgstr "" -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 -msgid "Filename is too long" +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -186,7 +185,9 @@ msgstr "'%s' রাখুন" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "এই শর্টকাটটি ইতোমধ্যেই অন্য কমান্ডে \"%s\" ব্যবহার করা হয়েছে। আপনি কোন অ্যাকশনটি ব্যবহার করতে চান?" +msgstr "" +"এই শর্টকাটটি ইতোমধ্যেই অন্য কমান্ডে \"%s\" ব্যবহার করা হয়েছে। আপনি কোন " +"অ্যাকশনটি ব্যবহার করতে চান?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format @@ -197,63 +198,92 @@ msgstr "" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s এর জন্য অ্যাকশনের মাঝে দ্বন্দ হচ্ছে" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "এই শর্টকাটটি ইতোমধ্যেই অন্যকিছুর জন্য ব্যবহার করা হয়েছে।" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "উইন্ডো ম্যানেজার অ্যাকশন শর্টকাট" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "কমান্ড শর্টকাট" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "শর্টকাট" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "অপসারণ করা" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "কীবোর্ড টেনে আনতে পারেনি।" @@ -362,198 +392,214 @@ msgid "Toggle fullscreen" msgstr "পূর্ণপর্দা টগল" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "উপরের কর্মপরিসরে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "নিচের কর্মপরিসরে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "বাম কর্মপরিসরে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "ডান কর্মপরিসরে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "পূর্ববর্তী কর্মপরিসরে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "পরবর্তী কর্মপরিসরে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "কর্মপরিসর ১-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "কর্মপরিসর ২-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "কর্মপরিসর ৩-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "কর্মপরিসর ৪-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "কর্মপরিসর ৫-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "কর্মপরিসর ৬-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "কর্মপরিসর ৭-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "কর্মপরিসর ৮-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "কর্মপরিসর ৯-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "কর্মপরিসর ১০-এ উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "কর্মপরিসর ১১-তে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "কর্মপরিসর ১২-তে উইন্ডো সরানো হবে" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "ডেস্কটপ প্রদর্শন" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "উপরের কর্মপরিসর" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "নিচের কর্মপরিসর" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "বাম কর্মপরিসর" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "ডান কর্মপরিসর" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "পূর্ববর্তী কর্মপরিসর" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "পরবর্তী কর্মপরিসর" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "কর্মপরিসর ১" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "কর্মপরিসর ২" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "কর্মপরিসর ৩" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "কর্মপরিসর ৪" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "কর্মপরিসর ৫" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "কর্মপরিসর ৬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "কর্মপরিসর ৭" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "কর্মপরিসর ৮" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "কর্মপরিসর ৯" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "কর্মপরিসর ১০" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "কর্মপরিসর ১১" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "কর্মপরিসর ১২" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "কর্মপরিসর যোগ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "সংলগ্ন কর্মপরিসর যোগ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "সর্বশেষ কর্মপরিসর মুছে ফেলুন" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "সক্রিয় কর্মপরিসর মুছে ফেলুন" @@ -569,116 +615,124 @@ msgstr "উপশিরোনাম" msgid "Xfce 4 Widgets" msgstr "Xfce ৪ উইজেডটস" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "সংস্করণ তথ্যাবলী" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "উইন্ডো ব্যবস্থাপক" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "ফাইল ব্যবস্থাপক" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "সেটিংস ব্যবস্থাপক" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "অ্যাপ্লিকেশন অনুসন্ধানকারী" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." msgstr "" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -686,7 +740,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -695,65 +749,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ আরম্ভ করতে ব্যর্থ।" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce ডেভেলপমেন্ট টিম। সকল অধিকার সংরক্ষিত।" -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "অনুগ্রহ করে <%s> এখানে বাগ প্রতিবেদন পাঠান।" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "" @@ -774,23 +819,23 @@ msgid "About the Xfce Desktop Environment" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "লেবেল" +msgid "_Help" +msgstr "সহায়তা (_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "বন্ধ (_C)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "লেবেল" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -798,24 +843,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "সিস্টেম" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,39 +891,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "অজানা" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -874,6 +954,6 @@ msgstr "" msgid "Failed to migrate the old panel configuration" msgstr "পুরোনো প্যানেল কনফিগারেশনে মাইগ্রেট করতে ব্যর্থ" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Xfconf দ্বারা সংরক্ষিত স্বনির্ধারিত সেটিংসমূহ" diff --git a/po/ca.po b/po/ca.po index de46494..2c01296 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,21 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Carles Muñoz Gorriz , 2013 -# Carles Muñoz Gorriz , 2013 -# Davidmp , 2015 -# Robert Antoni Buj Gelonch , 2017-2020 -# Robert Antoni Buj Gelonch , 2016 +# Carles Muñoz Gorriz , 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-20 00:45+0100\n" -"PO-Revision-Date: 2020-12-20 15:02+0000\n" -"Last-Translator: Robert Antoni Buj Gelonch \n" -"Language-Team: Catalan (http://www.transifex.com/xfce/libxfce4ui/language/ca/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Catalan (https://app.transifex.com/xfce/teams/16840/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,11 +39,13 @@ msgstr "Voleu llegir el manual en línia?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Sereu redirigit al lloc web de la documentació on es mantenen i tradueixen les pàgines d'ajuda." +msgstr "" +"Sereu redirigit al lloc web de la documentació on es mantenen i tradueixen " +"les pàgines d'ajuda." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Cancel·la" @@ -81,14 +83,18 @@ msgstr "Tancar una finestra amb diverses pestanyes?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Aquesta finestra té diverses pestanyes obertes. Si es tanca aquesta finestra, també es tancaran totes les seves pestanyes." +msgstr "" +"Aquesta finestra té diverses pestanyes obertes. Si es tanca aquesta " +"finestra, també es tancaran totes les seves pestanyes." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Aquesta finestra té %d pestanyes obertes. Si es tanca aquesta finestra, també es tancaran totes les seves pestanyes." +msgstr "" +"Aquesta finestra té %d pestanyes obertes. Si es tanca aquesta finestra, " +"també es tancaran totes les seves pestanyes." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -126,37 +132,35 @@ msgstr "Opcions de gestió de sessió" msgid "Show session management options" msgstr "Mostra les opcions de gestió de sessió" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Ha fallat la connexió al gestor de sessions: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "El gestor de sessions no ha retornat un id. vàlid de client" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "El directori de treball «%s» no existeix. No s'utilitzarà per generar «%s»." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Separador de directoris no permès al nom del fitxer" +msgstr "" +"El directori de treball «%s» no existeix. No s'utilitzarà per generar «%s»." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "El nom de fitxer és massa llarg" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Separador de directoris no permès al nom del fitxer" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Els noms dels fitxers no han de començar ni acabar amb un espai" @@ -165,7 +169,9 @@ msgstr "Els noms dels fitxers no han de començar ni acabar amb un espai" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Aquesta drecera ja s'està utilitzant per a l'acció «%s». Quina acció voleu utilitzar?" +msgstr "" +"Aquesta drecera ja s'està utilitzant per a l'acció «%s». Quina acció voleu " +"utilitzar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -189,74 +195,107 @@ msgstr "Mantén «%s»" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Aquesta drecera ja s'està utilitzant per a l'ordre «%s». Quina acció voleu utilitzar?" +msgstr "" +"Aquesta drecera ja s'està utilitzant per a l'ordre «%s». Quina acció voleu " +"utilitzar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Aquesta drecera ja s'està utilitzant per a l'acció «%s». Quina acció voleu utilitzar?" +msgstr "" +"Aquesta drecera ja s'està utilitzant per a l'acció «%s». Quina acció voleu " +"utilitzar?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Si us plau, utilitzeu una altra combinació de tecles." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "«%s» ja llança aquesta acció." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Conflicte d'accions per %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Aquesta drecera ja s'està utilitzant per a alguna altra cosa." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor de dreceres" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Drecera actial. Premeu per a editar..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Neteja la drecera" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restaura la drecera per defecte" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Actualment aquesta drecera de teclat és utilitzada per: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Drecera de teclat ja en ús" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Gestor de dreceres" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "acció" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Ordre de la drecera" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "ordre" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Drecera" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Neteja" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Premeu les tecles de teclat per activar %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Premeu una tecla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "No s'ha pogut obtenir el teclat." @@ -365,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Commuta a pantalla sencera" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Mou la finestra al monitor de sota" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Mou la finestra al monitor de l'esquerra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Mou la finestra al monitor de la dreta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Mou la finestra al monitor de sobre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mou la finestra a l'espai de treball superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mou la finestra a l'espai de treball esquerre inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mou la finestra a l'espai de treball esquerre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mou la finestra a l'espai de treball dret" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mou la finestra a l'espai de treball anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mou la finestra a l'espai de treball següent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mou la finestra a l'espai de treball 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mou la finestra a l'espai de treball 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mou la finestra a l'espai de treball 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mou la finestra a l'espai de treball 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mou la finestra a l'espai de treball 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mou la finestra a l'espai de treball 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mou la finestra a l'espai de treball 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mou la finestra a l'espai de treball 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mou la finestra a l'espai de treball 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mou la finestra a l'espai de treball 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mou la finestra a l'espai de treball 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mou la finestra a l'espai de treball 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Ajusta la finestra al centre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Ajusta la finestra a baix" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Ajusta la finestra a l'esquerra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Ajusta la finestra a la dreta" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Ajusta la finestra a dalt a l'esquerra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Ajusta la finestra a dalt a la dreta" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Ajusta la finestra a baix a l'esquerra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Ajusta la finestra a baix a la dreta" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Mostra l'escriptori" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Espai de treball superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Espai de treball inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Espai de treball esquerre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Espai de treball dret" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Espai de treball anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Espai de treball següent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Espai de treball 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Espai de treball 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Espai de treball 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Espai de treball 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Espai de treball 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Espai de treball 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Espai de treball 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Espai de treball 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Espai de treball 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Espai de treball 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Espai de treball 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Espai de treball 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Afegeix un espai de treball" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Afegeix un espai de treball adjacent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Suprimeix l'últim espai de treball" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Suprimeix l'espai de treball actiu" @@ -576,186 +631,207 @@ msgstr "Estris de Xfce 4" msgid "Version information" msgstr "Informació de la versió" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gestor de finestres" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Gestiona la ubicació de les finestres a la pantalla." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Tauler" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Proporciona una llar per als botons de finestres, llançadors, menú d'aplicacions i més." +msgstr "" +"Proporciona una llar per als botons de finestres, llançadors, menú " +"d'aplicacions i més." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gestor d'escriptori" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Estableix el fons d'escriptori, gestiona les icones i molt més." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gestor de fitxers" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Gestiona els fitxers d'una manera moderna, fàcil i ràpida." -#: ../xfce4-about/main.c:155 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "Gestor de volums" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Gestiona les unitats i els suports extraïbles per a Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gestor de sessions" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Desa i restaura la sessió, gestiona l’inici, l’inici automàtic i l’aturada." +msgstr "" +"Desa i restaura la sessió, gestiona l’inici, l’inici automàtic i l’aturada." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Sistema d'ajusts" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gestor d'ajusts" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "Configura els ajusts de l'aparença, la pantalla, el teclat i el ratolí." +msgstr "" +"Configura els ajusts de l'aparença, la pantalla, el teclat i el ratolí." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Cercador d'aplicacions" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "Troba i llança ràpidament les aplicacions instal·lades al vostre sistema." +msgstr "" +"Troba i llança ràpidament les aplicacions instal·lades al vostre sistema." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Dimoni d'ajusts" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Emmagatzema els vostres ajusts en un sistema de configuració basat en D-Bus." +msgstr "" +"Emmagatzema els vostres ajusts en un sistema de configuració basat en D-Bus." -#: ../xfce4-about/main.c:180 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "Una biblioteca de menús" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementa un menú compatible amb freedesktop.org basat en GLib i GIO." +msgstr "" +"Implementa un menú compatible amb freedesktop.org basat en GLib i GIO." -#: ../xfce4-about/main.c:185 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "Servei de miniatures" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementa l'especificació de D-Bus per a la gestió de miniatures." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Consulteu " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Si sabeu d'algú que hagi d'estar en aquesta llista; no dubteu en informar d'aquest error a ." +msgstr "" +"Si sabeu d'algú que hagi d'estar en aquesta llista; no dubteu en informar " +"d'aquest error a ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Gràcies a tots aquells que heu ajudat a fer aquest programari una realitat." +msgstr "" +"Gràcies a tots aquells que heu ajudat a fer aquest programari una realitat." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 té drets d'autor d'Olivier Fourdan (fourdan@xfce.org). Els diferents components tenen els drets d'autor dels seus respectius autors." +msgstr "" +"Xfce 4 té drets d'autor d'Olivier Fourdan (fourdan@xfce.org). Els diferents " +"components tenen els drets d'autor dels seus respectius autors." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Els paquets libxfce4ui, libxfce4util i exo es distribueixen sota els termes de la llicència GNU Library General Public License, tal com l'ha publicada la Free Software Foundation; ja sigui la versió 2 de la llicència o, segons el vostre criteri, qualsevol versió posterior." +msgstr "" +"Els paquets libxfce4ui, libxfce4util i exo es distribueixen sota els termes " +"de la llicència GNU Library General Public License, tal com l'ha publicada " +"la Free Software Foundation; ja sigui la versió 2 de la llicència o, segons " +"el vostre criteri, qualsevol versió posterior." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Els paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop i xfwm4 es distribueixen sota els termes de la llicència GNU General Public License, tal com l'ha publicada la Free Software Foundation; ja sigui la versió 2 de la llicència o, segons el vostre criteri, qualsevol versió posterior." +msgstr "" +"Els paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop i xfwm4 es distribueixen sota els termes " +"de la llicència GNU General Public License, tal com l'ha publicada la Free " +"Software Foundation; ja sigui la versió 2 de la llicència o, segons el " +"vostre criteri, qualsevol versió posterior." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Teclegeu «%s --help» per obtenir la informació de l'ús." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "No es pot inicialitzar GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "L'equip de desenvolupament de Xfce. Tots els drets reservats." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Envieu els errors a <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Ha fallat la càrrega de la interfície" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Desenvolupadors principals" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Contribuïdors actius" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servidors mantinguts per" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervisió de les traduccions" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Supervisió de la documentació" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Traductors" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Contribuïdors anteriors" @@ -776,52 +852,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Quant a l'entorn d'escriptori Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiqueta" +msgid "_Help" +msgstr "A_juda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nom del SO" +msgid "_Close" +msgstr "Tan_ca" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Dispositiu" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memòria" +msgid "label" +msgstr "etiqueta" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Nom del SO" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tipus del SO" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versió de Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distribuïdor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versió de Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Versió del GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Versió del nucli" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memòria" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce és una col·lecció de programes que en conjunt ofereixen un entorn d'escriptori ple de funcionalitats.\nEls següents programes formen part del nucli de Xfce:" +msgstr "" +"Xfce és una col·lecció de programes que en conjunt ofereixen un entorn d'escriptori ple de funcionalitats.\n" +"Els següents programes formen part del nucli de Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -830,48 +924,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce també és una plataforma de desenvolupament que proporciona diverses biblioteques que ajuden els programadors a crear aplicacions que s’adaptin bé a l’entorn d’escriptori.\n\nEls components de Xfce estan llicenciats sota llicències lliures o de codi obert; GPL o BSDL per a les aplicacions i LGPL o BSDL per a les biblioteques. Per més informació consulteu la documentació, el codi font o el lloc web de Xfce (https://www.xfce.org).\n\nGràcies pel vostre interès per Xfce.\n\n\t- L'equip de desenvolupament de Xfce" +msgstr "" +"Xfce també és una plataforma de desenvolupament que proporciona diverses biblioteques que ajuden els programadors a crear aplicacions que s’adaptin bé a l’entorn d’escriptori.\n" +"\n" +"Els components de Xfce estan llicenciats sota llicències lliures o de codi obert; GPL o BSDL per a les aplicacions i LGPL o BSDL per a les biblioteques. Per més informació consulteu la documentació, el codi font o el lloc web de Xfce (https://www.xfce.org).\n" +"\n" +"Gràcies pel vostre interès per Xfce.\n" +"\n" +"\t- L'equip de desenvolupament de Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Quant a" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Crèdits" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Drets d'autor" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Desconegut" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bits (espai d'usuari de 32 bits)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 bits" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 bits" @@ -879,7 +980,7 @@ msgstr "32 bits" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Id. construcció: %s" @@ -889,12 +990,14 @@ msgstr "%s; Id. construcció: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "En aquest directori ja existeix un fitxer amb el nom «%s», no s'ha afegit el fitxer." +msgstr "" +"En aquest directori ja existeix un fitxer amb el nom «%s», no s'ha afegit el" +" fitxer." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Ha fallat la migració de la configuració antiga del tauler" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalitzeu els ajusts emmagatzemats per Xfconf" diff --git a/po/cs.po b/po/cs.po index e5da3f9..5f71504 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Alois Nešpor , 2013 -# Michal Várady , 2014-2017,2019-2020 -# Pavel Borecki , 2018 -# Programy1 Programy1 , 2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-23 19:51+0000\n" -"Last-Translator: Michal Várady \n" -"Language-Team: Czech (http://www.transifex.com/xfce/libxfce4ui/language/cs/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Czech (https://app.transifex.com/xfce/teams/16840/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,7 +23,7 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Nepodařilo se otevřít webový prohlížeč a v něm dokumentaci z Internetu" +msgstr "Otevření online dokumentace ve webovém prohlížeči se nezdařilo" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -38,13 +38,15 @@ msgstr "Chcete si přečíst příručku online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Budete přesměrování na webovou stránku dokumentace, s aktuálními a překládanými stránkami nápovědy." +msgstr "" +"Budete přesměrováni na webovou stránku dokumentace s aktuálními a " +"přeloženými stránkami nápovědy." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" -msgstr "_Storno" +msgstr "_Zrušit" #: ../libxfce4ui/xfce-dialogs.c:277 msgid "_Read Online" @@ -70,7 +72,7 @@ msgstr "Ano" #: ../libxfce4ui/xfce-dialogs.c:459 #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 msgid "Cancel" -msgstr "Storno" +msgstr "Zrušit" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" @@ -80,14 +82,16 @@ msgstr "Zavřít okno s více kartami?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Toto okno má otevřeno více karet. Jeho zavřením zavřete také tyto karty." +msgstr "" +"Toto okno má otevřeno více karet. Jeho zavřením zavřete také tyto karty." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Toto okno má otevřeno %d karet. Jeho zavřením zavřete také tyto karty." +msgstr "" +"Toto okno má otevřeno %d karet. Jeho zavřením zavřete také tyto karty." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -107,15 +111,15 @@ msgstr "Příště se již _nedotazovat" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "Session management client ID" -msgstr "Identif. klienta správy relace" +msgstr "Identifikátor klienta správy relace" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "ID" -msgstr "Identif." +msgstr "ID" #: ../libxfce4ui/xfce-sm-client.c:1428 msgid "Disable session management" -msgstr "Vypnout správu relací" +msgstr "Zakázat správu relací" #: ../libxfce4ui/xfce-sm-client.c:1438 msgid "Session management options" @@ -125,37 +129,34 @@ msgstr "Možnosti správy relace" msgid "Show session management options" msgstr "Zobrazit možnosti správy relace" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Nepodařilo se připojit se ke správci relace: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Správce relace nevrátil platný identifikátor klienta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Pracovní složka „%s“ neexistuje. Při spuštění „%s“ nebude použita." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Oddělovač adresářů není v názvu souboru povolen" +msgstr "Pracovní adresář „%s“ neexistuje. Při spuštění „%s“ nebude použit." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Název souboru je příliš dlouhý" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Oddělovač adresářů není v názvu souboru povolen" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Názvy souborů by neměly začínat ani končit mezerou" @@ -164,7 +165,8 @@ msgstr "Názvy souborů by neměly začínat ani končit mezerou" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Tuto klávesovou zkratku už používá akce %s. Kterou akci chcete použít?" +msgstr "" +"Tuto klávesovou zkratku již používá akce %s. Kterou akci chcete použít?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -188,74 +190,105 @@ msgstr "Ponechat „%s“" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Tuto klávesovou zkratku už používá příkaz %s. Kterou akci chcete použít?" +msgstr "" +"Tuto klávesovou zkratku již používá příkaz %s. Kterou akci chcete použít?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Tuto klávesovou zkratku už používá akce %s. Kterou akci chcete použít?" +msgstr "" +"Tuto klávesovou zkratku již používá akce %s. Kterou akci chcete použít?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Použijte jinou kombinaci kláves" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." -msgstr "%s už spouští tuto akci." +msgstr "%s již spouští tuto akci." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt mezi akcemi pro %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." -msgstr "Tato klávesová zkratka se už používá na jiném místě." +msgstr "Tato klávesová zkratka se již používá na jiném místě." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor klávesových zkratek" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Aktuální klávesová zkratka. Kliknutím upravíte..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Vymazat klávesovou zkratku" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Obnovit výchozí klávesovou zkratku" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Tuto klávesovou zkratku už používá %s" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Klávesová zkratka je již používána" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Klávesová zkratka akce správce oken" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "akce" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Klávesová zkratka příkazu" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "příkaz" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Klávesová zkratka" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" -msgstr "Vyčistit" +msgstr "Vymazat" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Stiskněte klávesu ke spuštění %s „%s“." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Stiskněte klávesu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Nelze zachytávat vstup z klávesnice." @@ -364,198 +397,214 @@ msgid "Toggle fullscreen" msgstr "Přepnout do režimu celé obrazovky" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Přesunout okno na spodní monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Přesunout okno na levý monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Přesunout okno na pravý monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Přesunout okno na vrchní monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Přesunout okno na vrchní pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Přesunout okno na spodní pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Přesunout okno na levou pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Přesunout okno na pravou pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Přesunout okno na předchozí pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Přesunout okno na další pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Přesunout okno na pracovní plochu 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Přesunout okno na pracovní plochu 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Přesunout okno na pracovní plochu 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Přesunout okno na pracovní plochu 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Přesunout okno na pracovní plochu 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Přesunout okno na pracovní plochu 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Přesunout okno na pracovní plochu 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Přesunout okno na pracovní plochu 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Přesunout okno na pracovní plochu 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Přesunout okno na pracovní plochu 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Přesunout okno na pracovní plochu 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Přesunout okno na pracovní plochu 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Umístit okno nahoru" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Umístit okno dolů" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Umístit okno doleva" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Umístit okno doprava" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Umístit okno nahoru doleva" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Umístit okno nahoru doprava" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Umístit okno dolů doleva" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Umístit okno dolů doprava" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Zobrazit pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Vrchní pracovní plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Spodní pracovní plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Levá pracovní plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Pravá pracovní plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Předchozí pracovní plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Další pracovní plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Pracovní plocha 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Pracovní plocha 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Pracovní plocha 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Pracovní plocha 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Pracovní plocha 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Pracovní plocha 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Pracovní plocha 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Pracovní plocha 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Pracovní plocha 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Pracovní plocha 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Pracovní plocha 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Pracovní plocha 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Přidat pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Přidat sousední pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Smazat poslední pracovní plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Smazat aktivní pracovní plochu" @@ -575,186 +624,204 @@ msgstr "Xfce4 widgety" msgid "Version information" msgstr "Informace o verzi" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "Grafické procesory" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Správce oken" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Spravuje umístění oken na obrazovce." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Poskytuje místo pro tlačítka oken, spouštěče, nabídky aplikací a více." +msgstr "" +"Poskytuje místo pro tlačítka oken, spouštěče, nabídky aplikací a více." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Správce plochy" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Nastavuje pozadí pracovní plochy, spravuje ikony a více." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Správce souborů" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Spravuje vaše soubory moderním, snadným a rychlým způsobem." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Správce svazků" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Spravuje vyměnitelné jednotky a média pro Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Správce relace" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Ukládá a obnovuje vaši relace, spravuje spouštění, automatické spouštění a vypínání." +msgstr "" +"Ukládá a obnovuje vaši relace, spravuje spouštění, automatické spouštění a " +"vypínání." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Nastavení systému" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Správce nastavení" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Konfiguruje nastavení vzhledu, displeje, klávesnice a myši." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Vyhledávač aplikací" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Rychle vyhledá a spustí aplikace nainstalované na vašem systému." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Proces služby nastavení" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Ukládá vaše nastavení v systému konfigurace založeném na sběrnici D-Bus." +msgstr "" +"Ukládá vaše nastavení v systému konfigurace založeném na sběrnici D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Knihovna nabídky" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementuje nabídku splňující požadavky freedesktop.org založenou na knihovnách Glib a GIO." +msgstr "" +"Implementuje nabídku splňující požadavky freedesktop.org založenou na " +"knihovnách Glib a GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Služba náhledů" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementuje specifikaci sběrnice D-Bus pro správu náhledů." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Navštivte stránku " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Pokud víte o někom, kdo na tomto seznamu chybí, neváhejte a vyplňte hlášení o chybě na stránce ." +msgstr "" +"Pokud víte o někom, kdo na tomto seznamu chybí, neváhejte a vyplňte hlášení " +"o chybě na stránce ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Díky všem, kteří se podíleli na vytváření tohoto softwaru." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Vlastníkem autorských práv Xfce 4 je Olivier Fourdan (fourdan@xfce.org). Různé komponenty jsou chráněny autorskými právy příslušných autorů." +msgstr "" +"Vlastníkem autorských práv Xfce 4 je Olivier Fourdan (fourdan@xfce.org). " +"Různé komponenty jsou chráněny autorskými právy příslušných autorů." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Balíčky libxfce4ui, libxfce4util a exo jsou distribuovány pod podmínkami licence GNU Library General Public License publikované organizací Free Software Foundation; ve verzi 2 této licence, nebo (dle vašeho výběru) pozdější." +msgstr "" +"Balíčky libxfce4ui, libxfce4util a exo jsou distribuovány pod podmínkami " +"licence GNU Library General Public License publikované organizací Free " +"Software Foundation; ve verzi 2 této licence, nebo (dle vašeho výběru) " +"pozdější." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Balíčky thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop a xfwm4 jsou distribudovány pod podmínkami licence GNU General Public License publikované organizací Free Software Foundation; ve verzi 2 této licence, nebo (dle vašeho výběru) pozdější." +msgstr "" +"Balíčky thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings," +" xfconf, xfdesktop a xfwm4 jsou distribudovány pod podmínkami licence GNU " +"General Public License publikované organizací Free Software Foundation; ve " +"verzi 2 této licence, nebo (dle vašeho výběru) pozdější." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Informace o použití získáte příkazem „%s --help“" -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Nelze inicializovat GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Vývojářský tým prostředí Xfce. Všechna práva vyhrazena." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." -msgstr "Chyby prosíme hlaste na <%s>." +msgstr "Prosíme, abyste chyby nahlásili na adresu <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Načtení rozhraní se nezdařilo." #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Klíčoví vývojáři" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktivní přispěvatelé" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servery spravuje" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Vedoucí překladů" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Vedoucí dokumentace" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Překladatelé" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Dřívější přispěvatelé" @@ -775,52 +842,70 @@ msgid "About the Xfce Desktop Environment" msgstr "O pracovním prostředí Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "štítek" +msgid "_Help" +msgstr "_Nápověda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Název operačního systému" +msgid "_Close" +msgstr "_Zavřít" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Zařízení" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Paměť" +msgid "label" +msgstr "štítek" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Procesor" +msgid "OS Name" +msgstr "Název operačního systému" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Typ operačního systému" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Verze prostředí Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Verze prostředí Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Verze sady GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Verze jádra" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Procesor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Paměť" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "Grafický procesor" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Systém" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Prostředí Xfce je sbírkou programů, které dohromady poskytují plnohodnostné pracovní prostředí.\nSoučástí jádra prostředí Xfce jsou tyto programy:" +msgstr "" +"Prostředí Xfce je sbírkou programů, které dohromady poskytují plnohodnostné pracovní prostředí.\n" +"Součástí jádra prostředí Xfce jsou tyto programy:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -829,48 +914,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce je také platforma pro vývoj, poskytující mnoho knihoven, jež pomáhají programátorům vytvářet aplikace, které dobře zapadnou do pracovního prostředí.\n\nKomponenty prostředí Xfce jsou licencovány pod otevřenými nebo svobodnými licencemi; GPL nebo BSDL pro aplikace a LGPL nebo BSDL pro knihovny. Další informace získáte nahlédnutím do dokumentace, zdrojových kódů nebo webových stránek Xfce (https://www.xfce.org).\n\nDěkujeme vám za váš zájem o Xfce.\n\n\t- Tým vývojárů Xfce" +msgstr "" +"Xfce je také platforma pro vývoj, poskytující mnoho knihoven, jež pomáhají programátorům vytvářet aplikace, které dobře zapadnou do pracovního prostředí.\n" +"\n" +"Komponenty prostředí Xfce jsou licencovány pod otevřenými nebo svobodnými licencemi; GPL nebo BSDL pro aplikace a LGPL nebo BSDL pro knihovny. Další informace získáte nahlédnutím do dokumentace, zdrojových kódů nebo webových stránek Xfce (https://www.xfce.org).\n" +"\n" +"Děkujeme vám za váš zájem o Xfce.\n" +"\n" +"\t- Tým vývojárů Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "O pracovním prostředí" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Vytvořili" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Autorská práva" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Neznámý" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64bitový (32bitový uživatelský prostor)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64bitový" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32bitový" @@ -878,7 +970,7 @@ msgstr "32bitový" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID sestavení: %s" @@ -888,12 +980,12 @@ msgstr "%s; ID sestavení: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Soubor %s v této složce už existuje, proto nebyl přidán." +msgstr "Soubor %s v tomto adresáři již existuje, proto nebyl přidán." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" -msgstr "Přenesení původního nastavení panelu se nezdařilo" +msgstr "Migrace starého nastavení panelu se nezdařila" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Přizpůsobení nastavení uloženého službou Xfconf" diff --git a/po/cy.po b/po/cy.po index dd7400c..4c3533b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1,17 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Geraint Rowlands , 2018 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Welsh (http://www.transifex.com/xfce/libxfce4ui/language/cy/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Welsh (https://app.transifex.com/xfce/teams/16840/cy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -35,11 +38,13 @@ msgstr "Ydych eisiau darllen y llawlyfr ar-lein?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Cewch eich dargyfeirio at y wefan dogfenyddiaeth ble mae'r tudalennau cymorth yn cael eu cynnal a'u cyfieithu." +msgstr "" +"Cewch eich dargyfeirio at y wefan dogfenyddiaeth ble mae'r tudalennau " +"cymorth yn cael eu cynnal a'u cyfieithu." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Canslo" @@ -71,13 +76,15 @@ msgstr "Canslo" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "" +msgstr "Ai cau ffenestr gyda tabiau lluosog?" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." msgstr "" +"Mae gyda'r ffenestr yma tabiau lluosog. Bydd yn cau y ffenestr hwn hefyd yn " +"cau ei dabiau i gyd." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -85,6 +92,8 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"Mae gyda'r ffenestr yma %d tab lluosog. Bydd yn cau y ffenestr hwn hefyd yn " +"cau ei dabiau i gyd." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -92,15 +101,15 @@ msgstr "Rhybudd" #: ../libxfce4ui/xfce-dialogs.c:534 msgid "Close T_ab" -msgstr "" +msgstr "Cau T_ab" #: ../libxfce4ui/xfce-dialogs.c:535 msgid "Close _Window" -msgstr "" +msgstr "Cau _Ffenestr" #: ../libxfce4ui/xfce-dialogs.c:540 msgid "Do _not ask me again" -msgstr "" +msgstr "Peidiwch â'm _gofyn eto" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "Session management client ID" @@ -122,46 +131,45 @@ msgstr "Dewisiadau rheolaeth sesiwn" msgid "Show session management options" msgstr "Dangos dewisiadau rheolaeth sesiwn" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Methu cysylltu a'r rheolwr sesiwn: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Ni gafwyd rhif adnabod gwestai dilys gan y rheolwr sesiwn" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Nid yw'r ffolder \"%s\" yn bodoli. Ni gaiff ei ddefnyddio wrth silio \"%s\"." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "Mae ffeilenw yn rhy hir" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Gwahanwr Cyfeiriadur anghyfreithlon yn enw ffeil" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "Ni ddylent ffeilenwau dechreu neu orffen gyda gwagle." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Mae'r byrlwybr yma mewn defnydd ar gyfer y weithred '%s'. Pa weithred ydych am ei ddefnyddio?" +msgstr "" +"Mae'r byrlwybr yma mewn defnydd ar gyfer y weithred '%s'. Pa weithred ydych " +"am ei ddefnyddio?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -185,74 +193,108 @@ msgstr "Cadw '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Mae'r byrlwybr yma mewn defnydd ar gyfer y gorchymyn '%s'. Pa weithred ydych am ei ddefnyddio?" +msgstr "" +"Mae'r byrlwybr yma mewn defnydd ar gyfer y gorchymyn '%s'. Pa weithred ydych" +" am ei ddefnyddio?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Mae'r byrlwybr yma yn cael ei ddefnyddio gan y weithred '%s'. Pa weithred ydych am ei ddefnyddio?" +msgstr "" +"Mae'r byrlwybr yma yn cael ei ddefnyddio gan y weithred '%s'. Pa weithred " +"ydych am ei ddefnyddio?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Defnyddiwch gyfuniad arall o allweddi." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Mae %syn sbarduno'r weithred yma'n barod." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Gweithredau'n gwrthdaro ar gyfer %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Mae'r byrlwybr yn cael ei ddefnyddio ar gyfer rhywbeth arall." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Golygydd Byrlwybrau" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Y byrlwybr cyfredol. Cliciwch i olygu..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Clirio y byrlwybr" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Adfer y byrlwybr rhagosodedig" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" +"Mae'r byrlwybr bysellfwrdd yma yn ei ddefnyddio yn cyfredol gyda: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Byrlwybr bysellfwrdd yn eisoes ei ddefnyddiwyd" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Byrlwybr Gweithred Rheolwr Ffenestr" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "gweithred" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Byrlwybr Gorchymyn" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "gorchymyn" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Byrlwybr" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" -msgstr "" +msgstr "Clirio" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "Pwyswch y bysellau i sbarduno'r %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "Atolwg pwyswch bysell" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Methu ymafael a'r allweddfwrdd." @@ -361,198 +403,214 @@ msgid "Toggle fullscreen" msgstr "Toglo sgrin lawn" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Symud ffenestr i'r gweithle uwch" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Symud ffenestr i'r gweithle is" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Symud ffenestr i'r gweithle chwith" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Symud ffenestr i'r gweithle dde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Symud ffenestr i'r gweithle blaenorol" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Symud ffenestr i'r gweithle nesaf" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Symud ffenestr i weithle 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Symud ffenestr i weithle 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Symud ffenestr i weithle 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Symud ffenestr i weithle 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Symud ffenestr i weithle 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Symud ffenestr i weithle 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Symud ffenestr i weithle 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Symud ffenestr i weithle 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Symud ffenestr i weithle 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Symud ffenestr i weithle 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Symud ffenestr i weithle 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Symud ffenestr i weithle 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Teilio ffenestr i'r brig" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Teilio ffenestr i'r gwaelod" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Teilio ffenestr i'r chwith" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Teilio ffenestr i'r dde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Teilio ffenestr ar y brig-chwith" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Teilio ffenestr ar y brig-dde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Teilio ffenestr ar y gwaelod-chwith" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Teilio ffenestr ar y gwaelod-dde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Dangos y penfwrdd" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Gweithle uwch" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Gweithle is" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Gweithle chwith" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Gweithle dde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Gweithle blaenorol" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Gweithle nesaf" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Gweithle 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Gweithle 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Gweithle 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Gweithle 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Gweithle 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Gweithle 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Gweithle 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Gweithle 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Gweithle 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Gweithle 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Gweithle 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Gweithle 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Ychwanegu gweithle" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Ychwanegu gweithle cyfagos" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Dileu'r gweithle olaf" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Dileu'r gweithle bresennol" @@ -568,124 +626,144 @@ msgstr "Isdeitl" msgid "Xfce 4 Widgets" msgstr "Celfigion Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Gwybodaeth fersiwn" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPUau" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Rheolwr Ffenestr" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Yn rheoli gosod ffenestri ar y sgrin." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "" +msgstr "Cynnig cartref am botymau ffenestr, lansiwyr, dewislen âp a mwy." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Rheolwr Penfwrdd" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "Gosodi cefndiroedd penbwrdd, triniaethu eiconau a mwy." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" -msgstr "" +msgstr "Rheoliwr Ffeil" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "Rheoli eich ffeiliau yn fodd cyfoes, hawdd-i-ddefnyddio a chyflym." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Rheoliwr Cyfrol" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "Rheoli gyriannau a chyfryngau tynniadwy am Thunar" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Rheolwr Sesiwn" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"Achub ac adfer eich cyfeistedd, triniaethu uwchgychwyn, hunangychwyn a " +"llawrgau." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Gosodiadau System" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Rheoliwr Gosodiadau" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "Ffurfweddu dangosiad, ardangosfa, bysellfwrdd a gosodiadau llygoden." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Chwiliwr Rhaglenni" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" +"Canfod a lansio yn gyflym cymhwysiadau mewnsefydlwyd ar eich cyfundrefn." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Ellyll Gosodiadau" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "Achub eich gosodiadau yn gyfundrefn ffurfweddiad D-Bus-seiliedig." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Llyfgell Dewislen" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" +"Mewndrefnu dewislen freedesktop.org ufuddhiedig seiliedig ar GLib a GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Gwasanaeth Bawdewinnau" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "Mewndrefnu y manyliadaeth D-Bus rheoliad bawdewin." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Atolwg gweler " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Os y gwyddoch am rhywun sydd ar goll o'r rhestr yma, peidiwch ag oedi: " +"rhestrwch nam ar ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Diolch i bawb sydd wedi helpu darparu'r meddalwedd yma!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Mae Xfce 4 yn hawlfraint Olivier Fourdan (fourdan@xfce.org). Mae'r gwahanol cydrannau'n hawlfraint eu hawduron priodol." +msgstr "" +"Mae Xfce 4 yn hawlfraint Olivier Fourdan (fourdan@xfce.org). Mae'r gwahanol " +"cydrannau'n hawlfraint eu hawduron priodol." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." msgstr "" +"Dosbarthir y pecynnau libxfce4ui, libxfce4util ac exo o dan amodau'r GNU " +"Library General Public License fel y cyhoeddir gan y Free Software " +"Foundation; naill ai fersiwn 2 o'r Trwydded, neu (ar eich dewis chi) unrhyw " +"fersiwn diweddarach." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -693,66 +771,61 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" +"Dosbarthir y pecynnau thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop ac xfwm4 o dan amodau'r GNU General Public" +" License fel y cyfoeddir gan y Free Software Foundation; naill ai fersiwn 2 " +"o'r Trwydded, neu (ar eich dewis chi) unrhyw fersiwn diweddarach." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Teipiwch '%s --help' am wybodaeth defnydd." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Methu ymgychwyn GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Tim datblygu Xfce. Cedwir pob hawl." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Adroddwch namau at <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Methu llwytho'r rhyngwyneb" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Fersiwn %s, dosrannir gan %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Fersiwn %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Prif ddatblygwyr" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Cyfranwyr presennol" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Cynnal gweinyddion" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Cynorthwyo cyfieithu" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Goruwchwyliad dogfenniaeth" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Cyfieithwyr" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Cyfranwyr cynt" @@ -773,48 +846,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Ynghylch yr Amgylchedd Penfwrdd Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "" +msgid "_Help" +msgstr "_Cymhorth" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Cau" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" -msgstr "" +msgstr "Dyfais" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "llabed" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "Enw OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "Math OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "" +msgid "Distributor" +msgstr "Dosbarthwr" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" -msgstr "" +msgid "Xfce Version" +msgstr "Fersiwn Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Fersiwn GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Fersiwn Cnewyll" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Côf" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Mae Xfce yn gasgliad o raglenni sydd yn cyfuno i ddarparu amgylchedd penfwrdd cyflawn. \n" +"Mae'r rhaglenni canlynol yn ffurfio rhanbarth o'r craidd Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -824,55 +919,79 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Mae Xfce hefyd yn lwyfan datblygiad sydd yn darparu amryw llyfrgelleodd sydd yn cymhorthwyo rhaglennwyr i greu cymhwysiadau sydd yn ffitio i mewn yn dda gyda'r amgylchiad penfwrdd.\n" +"\n" +"Mae cydrannau Xfce yn eu thrwyddedwyd dan trwyddedau tarddiad agored rhydwd; GPL neu BDSL am gymhwysiadai ac LGPL neu BSDL am lyfrgelloedd. Edrychwch ar y dogfenniaeth, y côd tarddiad neu'r wefan Xfce (https://www.xfce.org) am fwy o wybodaeth.\n" +"\n" +"Diolch i chi an eich diddordeb yn Xfce.\n" +"\n" +" - Y Carfan Datblygiad Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Ynghylch" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Clodrestr" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Hawlfraint" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" -msgstr "" +msgstr "Anwybyddus" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-did (32-did defnyddiwrofod)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-did" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-did" #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "" +msgstr "%s; Hunaniaeth Adeiladu: %s" #: ../tests/test-ui.c:111 #, c-format msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Mae ffeil o'r enw \"%s\" eisoes yn bodoli yn y ffolder yma, ni ychwanegwyd y ffeil." +msgstr "" +"Mae ffeil o'r enw \"%s\" eisoes yn bodoli yn y ffolder yma, ni ychwanegwyd y" +" ffeil." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Methu mudo'r hen ffurfweddiad panel" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Addasu gosodiadau a storir gan Xfconf" diff --git a/po/da.po b/po/da.po index 4621430..df78aff 100644 --- a/po/da.po +++ b/po/da.po @@ -1,25 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Aputsiak Niels Janussen , 2013,2015 -# Aputsiak Niels Janussen , 2013,2015 -# Erik Schmidt , 2012 -# Linuxbruger , 2018 -# Morten Juhl-Johansen Zölde-Fejér , 2015-2016 -# olegb , 2008 -# olegb , 2008 -# Per Kongstad , 2009 -# scootergrisen, 2016-2021 +# Xfce Bot , 2023 +# scootergrisen, 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-12 05:41+0000\n" -"Last-Translator: scootergrisen\n" -"Language-Team: Danish (http://www.transifex.com/xfce/libxfce4ui/language/da/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: scootergrisen, 2023\n" +"Language-Team: Danish (https://app.transifex.com/xfce/teams/16840/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -43,11 +39,13 @@ msgstr "Vil du læse manualen online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Du viderestilles til dokumentationswebstedet, hvor hjælpesiderne vedligeholdes og oversættes." +msgstr "" +"Du viderestilles til dokumentationswebstedet, hvor hjælpesiderne " +"vedligeholdes og oversættes." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Annuller" @@ -85,14 +83,18 @@ msgstr "Luk vindue med flere faneblade?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Vinduet har flere åbne faneblade. Hvis vinduet lukkes, så lukkes alle dets faneblade også." +msgstr "" +"Vinduet har flere åbne faneblade. Hvis vinduet lukkes, så lukkes alle dets " +"faneblade også." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Vinduet har %d åbne faneblade. Hvis vinduet lukkes, så lukkes alle dets faneblade også." +msgstr "" +"Vinduet har %d åbne faneblade. Hvis vinduet lukkes, så lukkes alle dets " +"faneblade også." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -130,37 +132,36 @@ msgstr "Tilvalg for sessionshåndtering" msgid "Show session management options" msgstr "Vis tilvalg for sessionshåndtering" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Kunne ikke oprette forbindelse til sessionshåndteringen: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Sessionshåndteringen returnerede ikke et gyldigt klient-id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Arbejdsmappen \"%s\" findes ikke. Den vil ikke blive brugt ved start af \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Mappeseparator er ikke tilladt i filnavnet" +msgstr "" +"Arbejdsmappen \"%s\" findes ikke. Den vil ikke blive brugt ved start af " +"\"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Filnavnet er for langt" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Mappeseparator er ikke tilladt i filnavnet" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Filnavne må ikke begynde og slutte med et mellemrum" @@ -169,7 +170,9 @@ msgstr "Filnavne må ikke begynde og slutte med et mellemrum" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Genvejen bruges allerede af handlingen \"%s\". Hvilken handling vil du bruge?" +msgstr "" +"Genvejen bruges allerede af handlingen \"%s\". Hvilken handling vil du " +"bruge?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -193,74 +196,106 @@ msgstr "Behold '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Genvejen bruges allerede af kommandoen '%s'. Hvilken handling vil du bruge?" +msgstr "" +"Genvejen bruges allerede af kommandoen '%s'. Hvilken handling vil du bruge?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Genvejen bruges allerede af handlingen \"%s\". Hvilken handling vil du bruge?" +msgstr "" +"Genvejen bruges allerede af handlingen \"%s\". Hvilken handling vil du " +"bruge?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Brug venligst en anden tastekombination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s udløser allerede handlingen." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Handlinger til %s er i konflikt" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Genvejen bruges allerede til noget andet." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Genvejsredigering" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Nuværende genvej. Klik for at redigere ..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Ryd genvejen" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Gendan standardgenvejen" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Tastaturgenvejen bruges af: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Tastaturgenvejen er allerede i brug" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Handlingsgenvej for vindueshåndtering" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "handling" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Kommandogenvej" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "kommando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Genvej" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Ryd" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Tryk på tastaturtasterne for at udløse %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Tryk venligst på en tast" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Kunne ikke indfange tastaturet." @@ -369,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Fuldskærm til/fra" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Flyt vindue til skærm nedenfor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Flyt vindue til venstre skærm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Flyt vindue til højre skærm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Flyt vindue til skærm ovenfor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Flyt vindue til arbejdsområde ovenfor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Flyt vindue til arbejdsområde nedenfor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Flyt vindue til venstre arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Flyt vindue til højre arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Flyt vindue til forrige arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Flyt vindue til næste arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Flyt vindue til arbejdsområde 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Flyt vindue til arbejdsområde 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Flyt vindue til arbejdsområde 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Flyt vindue til arbejdsområde 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Flyt vindue til arbejdsområde 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Flyt vindue til arbejdsområde 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Flyt vindue til arbejdsområde 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Flyt vindue til arbejdsområde 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Flyt vindue til arbejdsområde 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Flyt vindue til arbejdsområde 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Flyt vindue til arbejdsområde 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Flyt vindue til arbejdsområde 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Flyt vindue øverst" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Flyt vindue nederst" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Flyt vindue til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Flyt vindue til højre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Flyt vindue øverst til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Flyt vindue øverst til højre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Flyt vindue nederst til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Flyt vindue nederst til højre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Vis skrivebord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Arbejdsområde ovenfor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Arbejdsområde nedenfor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Venstre arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Højre arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Forrige arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Næste arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Arbejdsområde 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Arbejdsområde 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Arbejdsområde 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Arbejdsområde 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Arbejdsområde 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Arbejdsområde 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Arbejdsområde 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Arbejdsområde 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Arbejdsområde 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Arbejdsområde 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Arbejdsområde 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Arbejdsområde 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Tilføj arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Tilføj tilstødende arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Slet sidste arbejdsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Slet aktive arbejdsområde" @@ -580,186 +631,201 @@ msgstr "Xfce 4-widgets" msgid "Version information" msgstr "Versionsinformation" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU'er" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Vindueshåndtering" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Håndterer placeringen af vinduer på skærmen." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "Giver et hjem til vinduesknapper, opstartere, programmenu mm." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Skrivebordshåndtering" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Indstiller skrivebordsbaggrunde, håndterer ikoner mm." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Filhåndtering" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Håndterer dine filer på en moderne, letanvendelig og hurtig måde." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Diskområdehåndtering" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Håndterer flytbare drev og medier for Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Sessionshåndtering" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Gemmer og gendanner din session, håndterer opstart, automatisk start og nedlukning." +msgstr "" +"Gemmer og gendanner din session, håndterer opstart, automatisk start og " +"nedlukning." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Systemindstilling" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Indstillingshåndtering" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Konfigurerer udseende-, skærm-, tastatur- og museindstillinger." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Programfinder" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "Finder og starter programmer som er installeret på dit system, hurtigt." +msgstr "" +"Finder og starter programmer som er installeret på dit system, hurtigt." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Indstillingsdæmon" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Gemmer dine indstillinger i et D-Bus-baseret konfigurationssystem." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Et menubibliotek" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementerer en freedesktop.org-overholdende menu baseret på GLib og GIO." +msgstr "" +"Implementerer en freedesktop.org-overholdende menu baseret på GLib og GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Miniaturetjeneste" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementerer D-Bus-specifikationen til miniaturehåndtering." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Se venligst " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Hvis der mangler nogen i listen, er du velkommen til at fejlrapportere det på ." +msgstr "" +"Hvis der mangler nogen i listen, er du velkommen til at fejlrapportere det " +"på ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Tak til alle som hjalp med at gøre softwaren tilgængelig!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Olivier Fourdan har ophavsret på Xfce 4 (fourdan@xfce.org). De enkelte forfattere har ophavsret på de forskellige komponenter." +msgstr "" +"Olivier Fourdan har ophavsret på Xfce 4 (fourdan@xfce.org). De enkelte " +"forfattere har ophavsret på de forskellige komponenter." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Pakkerne libxfce4ui, libxfce4util og exo distribueres under vilkårene i GNU Library General Public License som udgivet af Free Software Foundation; enten version 2 af licensen, eller (efter eget valg) enhver senere version." +msgstr "" +"Pakkerne libxfce4ui, libxfce4util og exo distribueres under vilkårene i GNU " +"Library General Public License som udgivet af Free Software Foundation; " +"enten version 2 af licensen, eller (efter eget valg) enhver senere version." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Pakkerne thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop og xfwm4 distribueres under vilkårene i GNU General Public License som udgivet af Free Software Foundation; enten version 2 af licensen, eller (efter eget valg) enhver senere version." +msgstr "" +"Pakkerne thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop og xfwm4 distribueres under vilkårene i " +"GNU General Public License som udgivet af Free Software Foundation; enten " +"version 2 af licensen, eller (efter eget valg) enhver senere version." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Skriv \"%s --help\" for anvendelsesinformation." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Kan ikke initiere GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce's udviklingshold. Alle rettigheder forbeholdes." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapportér venligst fejl til <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Kunne ikke indlæse grænseflade" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Primære udviklere" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktive bidragydere" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Vedligeholdelse af servere" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Tilsyn af oversættelser" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Tilsyn af dokumentation" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Oversættere" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Tidligere bidragydere" @@ -780,52 +846,71 @@ msgid "About the Xfce Desktop Environment" msgstr "Om Xfce-skrivebordsmiljøet" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiket" +msgid "_Help" +msgstr "_Hjælp" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Styresystemets navn" +msgid "_Close" +msgstr "_Luk" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Enhed" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Hukommelse" +msgid "label" +msgstr "etiket" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Styresystemets navn" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Styresystemets type" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce-version" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributør" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce-version" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK-version" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kernelversion" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Hukommelse" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce er en samling af programmer der tilsammen leverer et fuldt funktionsdygtigt skrivebordsmiljø. Følgende programmer er en del af kernen i Xfce:" +msgstr "" +"Xfce er en samling af programmer der tilsammen leverer et fuldt " +"funktionsdygtigt skrivebordsmiljø. Følgende programmer er en del af kernen i" +" Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -834,48 +919,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce er også en udviklingsplatform med adskillige biblioteker der hjælper programmører med at oprette programmer som passer godt ind i med skrivebordsmiljøet.\n\nKomponenterne i Xfce er licenseret under frie eller open source-licenser; GPL eller BSDL til programmer, og LGPL eller BSDL til biblioteker. Kig i dokumentationen, kildekoden eller på Xfce-webstedet (https://www.xfce.org) for mere information.\n\nTak for din interesse i Xfce.\n\n\t- Xfce's udviklingshold" +msgstr "" +"Xfce er også en udviklingsplatform med adskillige biblioteker der hjælper programmører med at oprette programmer som passer godt ind i med skrivebordsmiljøet.\n" +"\n" +"Komponenterne i Xfce er licenseret under frie eller open source-licenser; GPL eller BSDL til programmer, og LGPL eller BSDL til biblioteker. Kig i dokumentationen, kildekoden eller på Xfce-webstedet (https://www.xfce.org) for mere information.\n" +"\n" +"Tak for din interesse i Xfce.\n" +"\n" +"\t- Xfce's udviklingshold" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Om" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Anerkendelser" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Ophavsret" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Ukendt" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit brugerrum)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -883,7 +975,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Bygge-id: %s" @@ -893,12 +985,13 @@ msgstr "%s; Bygge-id: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "En fil ved navn \"%s\" findes allerede i mappen. Filen blev ikke tilføjet." +msgstr "" +"En fil ved navn \"%s\" findes allerede i mappen. Filen blev ikke tilføjet." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Den gamle panelopsætning kunne ikke overføres" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Tilpas indstillinger som er gemt af Xfconf" diff --git a/po/de.po b/po/de.po index 646ea8f..cddf230 100644 --- a/po/de.po +++ b/po/de.po @@ -1,21 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Andreas Eitel , 2019-2020 -# Georg Eckert , 2013,2015 -# Harald Judt , 2013 -# Tobias Bannert , 2014-2017 -# Vinzenz Vietzke , 2017,2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-14 00:45+0100\n" -"PO-Revision-Date: 2020-12-14 14:42+0000\n" -"Last-Translator: Andreas Eitel \n" -"Language-Team: German (http://www.transifex.com/xfce/libxfce4ui/language/de/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: German (https://app.transifex.com/xfce/teams/16840/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,7 +23,8 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Der Webbrowser zum Lesen des Internethandbuchs konnte nicht geöffnet werden" +msgstr "" +"Der Webbrowser zum Lesen des Internethandbuchs konnte nicht geöffnet werden" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -39,11 +39,13 @@ msgstr "Möchten Sie das Handbuch im Internet lesen?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Sie werden zur Internetseite mit den Handbüchern weitergeleitet. Dort finden Sie aktuelle und übersetzte Hilfeseiten vor." +msgstr "" +"Sie werden zur Internetseite mit den Handbüchern weitergeleitet. Dort finden" +" Sie aktuelle und übersetzte Hilfeseiten vor." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Abbrechen" @@ -81,14 +83,18 @@ msgstr "Fenster mit mehreren Tabs schließen?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Dieses Fenster hat mehrere Reiter geöffnet. Mit dem Schließen dieses Fensters werden auch alle seine Reiter geschlossen." +msgstr "" +"Dieses Fenster hat mehrere Reiter geöffnet. Mit dem Schließen dieses " +"Fensters werden auch alle seine Reiter geschlossen." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Dieses Fenster hat %d Reiter geöffnet. Das Schließen dieses Fensters wird auch alle seine Reiter schließen." +msgstr "" +"Dieses Fenster hat %d Reiter geöffnet. Das Schließen dieses Fensters wird " +"auch alle seine Reiter schließen." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -126,37 +132,36 @@ msgstr "Optionen der Sitzungsverwaltung" msgid "Show session management options" msgstr "Optionen der Sitzungsverwaltung anzeigen" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Verbindung zur Sitzungsverwaltung fehlgeschlagen: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Die Sitzungsverwaltung hat keine gültige Kennung geliefert" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Das Arbeitsverzeichnis »%s« ist nicht vorhanden: Es wird beim Starten von »%s« nicht verwendet." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Verzeichnis-Trennzeichen im Dateinamen sind unzulässig" +msgstr "" +"Das Arbeitsverzeichnis »%s« ist nicht vorhanden: Es wird beim Starten von " +"»%s« nicht verwendet." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Der Dateiname ist zu lang" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Verzeichnis-Trennzeichen im Dateinamen sind unzulässig" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Dateinamen sollten nicht mit einem Leerzeichen beginnen oder enden" @@ -165,7 +170,9 @@ msgstr "Dateinamen sollten nicht mit einem Leerzeichen beginnen oder enden" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Dieses Tastenkürzel wird bereits für die Aktion »%s« verwendet. Welche Aktion möchten Sie verwenden?" +msgstr "" +"Dieses Tastenkürzel wird bereits für die Aktion »%s« verwendet. Welche " +"Aktion möchten Sie verwenden?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -189,74 +196,109 @@ msgstr "»%s« beibehalten" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Dieses Tastenkürzel wird bereits für den Befehl »%s« verwendet. Welche Aktion möchten Sie verwenden?" +msgstr "" +"Dieses Tastenkürzel wird bereits für den Befehl »%s« verwendet. Welche " +"Aktion möchten Sie verwenden?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Dieses Tastenkürzel wird bereits von der Aktion »%s« verwendet. Welche Aktion möchten Sie verwenden?" +msgstr "" +"Dieses Tastenkürzel wird bereits von der Aktion »%s« verwendet. Welche " +"Aktion möchten Sie verwenden?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Bitte verwenden Sie eine andere Tastenkombination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Diese Aktion wird bereits durch %s aufgerufen." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt bei Aktionen für »%s«" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Dieses Tastenkürzel wird bereits für eine andere Aktion verwendet." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Tastenkürzeleditor" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Der aktuelle Kurzbefehl. Zum Bearbeiten anklicken..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Löschen des Tastenkürzels" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Standard Tastenkürzel wiederherstellen" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Dieses Kürzel wird derzeit verwendet von: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Tastenkürzel wird bereits verwendet" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Tastenkürzel für die Aktion der Fensterverwaltung" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "Aktion" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Tastenkürzel für Befehl" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "Befehl" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Tastenkürzel" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Leeren" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "Bitte die Tastenkombination drücken, die Sie benutzen möchten, um den %s '%s' auszulösen." +msgstr "" +"Bitte die Tastenkombination drücken, die Sie benutzen möchten, um den %s " +"'%s' auszulösen." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Bitte drücken Sie eine Taste" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Tastatur konnte nicht erfasst werden." @@ -365,198 +407,214 @@ msgid "Toggle fullscreen" msgstr "Vollbildmodus" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Fenster auf den unteren Monitor verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Fenster auf den linken Monitor verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Fenster auf den rechten Monitor verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Fenster auf den oberen Monitor verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Fenster auf die obere Arbeitsfläche verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Fenster auf die untere Arbeitsfläche verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Fenster auf die linke Arbeitsfläche verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Fenster auf die rechte Arbeitsfläche verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Fenster auf die vorige Arbeitsfläche verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Fenster auf die nächste Arbeitsfläche verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Fenster auf Arbeitsfläche 1 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Fenster auf Arbeitsfläche 2 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Fenster auf Arbeitsfläche 3 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Fenster auf Arbeitsfläche 4 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Fenster auf Arbeitsfläche 5 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Fenster auf Arbeitsfläche 6 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Fenster auf Arbeitsfläche 7 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Fenster auf Arbeitsfläche 8 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Fenster auf Arbeitsfläche 9 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Fenster auf Arbeitsfläche 10 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Fenster auf Arbeitsfläche 11 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Fenster auf Arbeitsfläche 12 verschieben" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Fenster nach oben kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Fenster nach unten kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Fenster nach links kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Fenster nach rechts kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Fenster nach links oben kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Fenster nach rechts oben kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Fenster nach links unten kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Fenster nach rechts unten kacheln" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Schreibtisch anzeigen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Obere Arbeitsfläche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Untere Arbeitsfläche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Linke Arbeitsfläche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Rechte Arbeitsfläche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Vorherige Arbeitsfläche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Nächste Arbeitsfläche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Arbeitsfläche 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Arbeitsfläche 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Arbeitsfläche 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Arbeitsfläche 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Arbeitsfläche 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Arbeitsfläche 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Arbeitsfläche 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Arbeitsfläche 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Arbeitsfläche 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Arbeitsfläche 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Arbeitsfläche 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Arbeitsfläche 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Arbeitsfläche hinzufügen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Anliegende Arbeitsfläche hinzufügen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Letzte Arbeitsfläche löschen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Aktive Arbeitsfläche löschen" @@ -576,182 +634,213 @@ msgstr "Xfce-4-Elemente" msgid "Version information" msgstr "Versionsinformation" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Fensterverwaltung" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Regelt die Platzierung der Fenster auf dem Bildschirm." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Leiste" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Bietet ein Zuhause für Fensterschaltflächen, Startprogramme, Anwendungsmenü und mehr." +msgstr "" +"Bietet ein Zuhause für Fensterschaltflächen, Startprogramme, Anwendungsmenü " +"und mehr." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Schreibtischverwaltung" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Legt Schreibtischhintergründe fest, verwaltet Symbole und mehr." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Dateiverwaltung" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "Verwaltet Ihre Dateien auf moderne, benutzerfreundliche und schnelle Weise" +msgstr "" +"Verwaltet Ihre Dateien auf moderne, benutzerfreundliche und schnelle Weise" -#: ../xfce4-about/main.c:155 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "Datenträgerverwaltung" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Verwaltet Wechsellaufwerke und -medien für Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Sitzungsverwaltung" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Speichert und stellt Ihre Sitzung wieder her, kümmert sich um Start, Autostart und Herunterfahren." +msgstr "" +"Speichert und stellt Ihre Sitzung wieder her, kümmert sich um Start, " +"Autostart und Herunterfahren." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Systemeinstellungen" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Einstellungen" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "Konfiguriert die Einstellungen für Aussehen, Anzeige, Tastatur und Maus." +msgstr "" +"Konfiguriert die Einstellungen für Aussehen, Anzeige, Tastatur und Maus." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Anwendungsfinder" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "Schnelles Auffinden und Starten von auf Ihrem System installierten Anwendungen." +msgstr "" +"Schnelles Auffinden und Starten von auf Ihrem System installierten " +"Anwendungen." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Einstellungsdienst" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Speichert Ihre Einstellungen in einem D-Bus-basierten Konfigurationssystem." +msgstr "" +"Speichert Ihre Einstellungen in einem D-Bus-basierten Konfigurationssystem." -#: ../xfce4-about/main.c:180 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "Eine Menübibliothek" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Erstellt ein freedesktop.org-kompatibles Menü, das auf GLib und GIO basiert." +msgstr "" +"Erstellt ein freedesktop.org-kompatibles Menü, das auf GLib und GIO basiert." -#: ../xfce4-about/main.c:185 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "Miniaturansichtendienst" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "Erstellt die D-Bus-Spezifikation zur Verwaltung von Miniaturansichten." +msgstr "" +"Erstellt die D-Bus-Spezifikation zur Verwaltung von Miniaturansichten." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Siehe " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Sollten Sie jemanden auf dieser Liste vermissen, zögern Sie nicht, unter einen Fehlerbericht zu erstellen." +msgstr "" +"Sollten Sie jemanden auf dieser Liste vermissen, zögern Sie nicht, unter " +" einen Fehlerbericht zu " +"erstellen." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Danke an alle, die geholfen haben, diese Anwendung verfügbar zu machen!" +msgstr "" +"Danke an alle, die geholfen haben, diese Anwendung verfügbar zu machen!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Das Urheberrecht von Xfce 4 liegt bei Olivier Fourdan (fourdan@xfce.org). Die verschiedenen Komponenten sind durch ihre jeweiligen Autoren urheberrechtlich geschützt." +msgstr "" +"Das Urheberrecht von Xfce 4 liegt bei Olivier Fourdan (fourdan@xfce.org). " +"Die verschiedenen Komponenten sind durch ihre jeweiligen Autoren " +"urheberrechtlich geschützt." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Die Pakete libxfce4ui, libxfce4util und exo werden verbreitet unter den Bestimmungen der GNU Library General Public License, wie sie von der Free Software Foundation veröffentlicht wurde; entweder in Version 2 der Lizenz oder einer späteren (Ihrer Wahl)." +msgstr "" +"Die Pakete libxfce4ui, libxfce4util und exo werden verbreitet unter den " +"Bestimmungen der GNU Library General Public License, wie sie von der Free " +"Software Foundation veröffentlicht wurde; entweder in Version 2 der Lizenz " +"oder einer späteren (Ihrer Wahl)." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Die Pakete thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop und xfwm4 werden verbreitet unter den Bestimmungen der GNU General Public License, wie sie von der Free Software Foundation veröffentlicht wurde; entweder in Version 2 der Lizenz oder einer späteren (Ihrer Wahl)." +msgstr "" +"Die Pakete thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop und xfwm4 werden verbreitet unter den " +"Bestimmungen der GNU General Public License, wie sie von der Free Software " +"Foundation veröffentlicht wurde; entweder in Version 2 der Lizenz oder einer" +" späteren (Ihrer Wahl)." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "»%s --help« eingeben, um weitere Informationen zu erhalten." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ konnte nicht initialisiert werden." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Die Xfce-Entwicklungsmannschaft. Alle Rechte vorbehalten." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Probleme bitte unter <%s> melden." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Schnittstelle konnte nicht geladen werden" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Kernentwickler" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktive Mitwirkende" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Server gewartet von" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Koordination der Übersetzungen" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Koordination der Dokumentation" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Übersetzer" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Frühere Mitwirkende" @@ -772,52 +861,71 @@ msgid "About the Xfce Desktop Environment" msgstr "Über die Xfce-Arbeitsumgebung" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "label" +msgid "_Help" +msgstr "_Hilfe" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "BS Name" +msgid "_Close" +msgstr "_Schließen" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Gerät" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Arbeitsspeicher" +msgid "label" +msgstr "label" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "BS Name" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "BS Typ" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce Version" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce Version" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK-Version" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kernel-Version" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Arbeitsspeicher" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce ist eine Sammlung von Programmen, die zusammen eine voll funktionsfähige Arbeitsumgebung zur Verfügung stellen. Die folgenden Programme sind Teil des Xfce-Kerns:" +msgstr "" +"Xfce ist eine Sammlung von Programmen, die zusammen eine voll " +"funktionsfähige Arbeitsumgebung zur Verfügung stellen. Die folgenden " +"Programme sind Teil des Xfce-Kerns:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,48 +934,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce ist auch eine Entwicklungsplattform, die mehrere Bibliotheken bereitstellt, die Programmierern helfen, Anwendungen zu erstellen, die sich gut in die Arbeitsumgebung einfügen.\n\nXfce-Komponenten sind unter freien oder Open-Source-Lizenzen lizenziert; GPL oder BSDL für Anwendungen und LGPL oder BSDL für Bibliotheken. Weitere Informationen finden Sie in der Dokumentation, im Quellcode oder auf der Xfce-Website (https://www.xfce.org).\n\nVielen Dank für Ihr Interesse an Xfce.\n\n\t- Das Xfce-Entwicklungsteam" +msgstr "" +"Xfce ist auch eine Entwicklungsplattform, die mehrere Bibliotheken bereitstellt, die Programmierern helfen, Anwendungen zu erstellen, die sich gut in die Arbeitsumgebung einfügen.\n" +"\n" +"Xfce-Komponenten sind unter freien oder Open-Source-Lizenzen lizenziert; GPL oder BSDL für Anwendungen und LGPL oder BSDL für Bibliotheken. Weitere Informationen finden Sie in der Dokumentation, im Quellcode oder auf der Xfce-Website (https://www.xfce.org).\n" +"\n" +"Vielen Dank für Ihr Interesse an Xfce.\n" +"\n" +"\t- Das Xfce-Entwicklungsteam" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Über" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Mitwirkende" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Urheberrecht" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "(unbekannt)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-Bit (32-Bit Userspace)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-Bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-Bit" @@ -875,7 +990,7 @@ msgstr "32-Bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Build Kennung: %s" @@ -885,12 +1000,14 @@ msgstr "%s; Build Kennung: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Eine Datei mit dem Namen »%s« ist bereits in diesem Verzeichnis vorhanden, die Datei wurde nicht hinzugefügt." +msgstr "" +"Eine Datei mit dem Namen »%s« ist bereits in diesem Verzeichnis vorhanden, " +"die Datei wurde nicht hinzugefügt." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Die alte Leistenkonfiguration konnte nicht migriert werden" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Von Xfconf gespeicherte Einstellungen bearbeiten" diff --git a/po/el.po b/po/el.po index 4d4ecde..db3f789 100644 --- a/po/el.po +++ b/po/el.po @@ -1,22 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Ápo. , 2016 -# Ápo. , 2017 -# Efstathios Iosifidis , 2014-2015 -# Efstathios Iosifidis , 2012 -# ebal , 2009 -# Πέτρος Σαμαράς , 2017 +# Xfce Bot , 2023 +# Ioannis LM, 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Greek (http://www.transifex.com/xfce/libxfce4ui/language/el/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Ioannis LM, 2023\n" +"Language-Team: Greek (https://app.transifex.com/xfce/teams/16840/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,7 +24,9 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Αποτυχία ανοίγματος περιηγητή για προβολή τεκμηρίωσης στο διαδίκτυο" +msgstr "" +"Απέτυχε το άνοιγμα του περιηγητή για τη προβολή της τεκμηρίωσης στο " +"διαδίκτυο" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -40,13 +41,15 @@ msgstr "Θέλετε να διαβάσετε το εγχειρίδιο στο δ msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Θα μετακινηθείτε στην ιστοσελίδα τεκμηρίωσης όπου οι σελίδες βοήθειας συντηρούνται και μεταφράζονται." +msgstr "" +"Θα μετακινηθείτε στην ιστοσελίδα τεκμηρίωσης όπου οι σελίδες βοήθειας " +"συντηρούνται και μεταφράζονται." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" -msgstr "Ά_κυρο" +msgstr "Άκ_υρο" #: ../libxfce4ui/xfce-dialogs.c:277 msgid "_Read Online" @@ -76,13 +79,15 @@ msgstr "Άκυρο" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "" +msgstr "Να κλείσει το παράθυρο με τις πολλές καρτέλες;" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." msgstr "" +"Το παράθυρο έχει πολλές ανοιχτές καρτέλες. Το κλείσιμο του παραθύρου θα " +"κλείσει και όλες τις καρτέλες." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -90,26 +95,28 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"Το παράθυρο έχει %d ανοιχτές καρτέλες. Το κλείσιμο του παραθύρου θα κλείσει " +"και όλες τις καρτέλες." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" -msgstr "Προειδοποίηση" +msgstr "Προσοχή" #: ../libxfce4ui/xfce-dialogs.c:534 msgid "Close T_ab" -msgstr "" +msgstr "Κλείσιμο κα_ρτέλας" #: ../libxfce4ui/xfce-dialogs.c:535 msgid "Close _Window" -msgstr "" +msgstr "Κλείσιμο _παραθύρου" #: ../libxfce4ui/xfce-dialogs.c:540 msgid "Do _not ask me again" -msgstr "Μη_ν με ξαναρωτήσεις" +msgstr "Να _μην ξαναγίνει η ερώτηση" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "Session management client ID" -msgstr "ID πελάτη του διαχειριστή συνεδρίας" +msgstr "ID υπηρεσίας του διαχειριστή συνεδρίας" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "ID" @@ -125,48 +132,51 @@ msgstr "Επιλογές του διαχειριστή συνεδρίας" #: ../libxfce4ui/xfce-sm-client.c:1439 msgid "Show session management options" -msgstr "Εμφάνιση των επιλογών του διαχειριστή συνεδρίας" +msgstr "Εμφάνιση επιλογών του διαχειριστή συνεδρίας" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Αποτυχία σύνδεσης με τον διαχειριστή συνεδρίας: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" -msgstr "Ο διαχειριστής συνεδρίας επέστρεψε μη έγκυρο id πελάτη" +msgstr "Ο διαχειριστής συνεδρίας επέστρεψε μη έγκυρο id υπηρεσίας" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Ο κατάλογος εργασίας \"%s\" δεν υπάρχει. Δε θα χρησιμοποιηθεί κατά τη δημιουργία του \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Ο κατάλογος εργασίας \"%s\" δεν υπάρχει. Δε θα χρησιμοποιηθεί κατά τη " +"δημιουργία του \"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "Το όνομα του αρχείου είναι υπερβολικά μεγάλο" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Μη έγκυρος χαρακτήρας στο όνομα του αρχείου" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" +"Τα ονόματα των αρχείων δεν πρέπει να αρχίζουν ή να τελειώνουν με κενό " +"χαρακτήρα" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για την ενέργεια '%s'. Ποια ενέργεια θέλετε να χρησιμοποιήσετε;" +msgstr "" +"Αυτή η συντόμευση χρησιμοποιείται ήδη για την ενέργεια '%s'. Ποια ενέργεια " +"θέλετε να χρησιμοποιήσετε;" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -174,7 +184,7 @@ msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη #: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "Χρήση '%s'" +msgstr "Χρήση του '%s'" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -190,74 +200,107 @@ msgstr "Διατήρηση του '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για την εντολή '%s'. Ποια δράση θέλετε να χρησιμοποιήσετε;" +msgstr "" +"Αυτή η συντόμευση χρησιμοποιείται ήδη για την εντολή '%s'. Ποια ενέργεια " +"θέλετε να χρησιμοποιήσετε;" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για την ενέργεια '%s'. Ποια ενέργεια θέλετε να χρησιμοποιήσετε;" +msgstr "" +"Αυτή η συντόμευση χρησιμοποιείται ήδη για την ενέργεια '%s'. Ποια ενέργεια " +"θέλετε να χρησιμοποιήσετε;" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Παρακαλώ χρησιμοποιήστε άλλο συνδυασμό πλήκτρων." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." -msgstr "%s ήδη πυροδοτεί αυτήν την ενέργεια." +msgstr "Το %s ενεργοποιεί ήδη αυτήν την ενέργεια." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" -msgstr "Συγκρουόμενες δράσεις για το %s" +msgstr "Συγκρουόμενες ενέργειες για το %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για κάτι άλλο." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Επεξεργαστής συντομεύσεων" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Η τρέχουσα συντόμευση. Πατήστε για επεξεργασία..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Αφαίρεση της συντόμευσης" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Επαναφορά της προεπιλεγμένης συντόμευσης" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Η συντόμευση πληκτρολογίου χρησιμοποιείται από το: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Η συντόμευση πληκτρολογίου χρησιμοποιείται ήδη" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" -msgstr "Συντόμευση Ενέργειας Διαχειριστή Παραθύρων" +msgstr "Συντόμευση ενέργειας του διαχειριστή παραθύρων" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "ενέργεια" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Συντόμευση εντολής" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "εντολή" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Συντόμευση" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Καθαρισμός" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "Πατήστε πλήκτρα στο πληκτρολόγιο για να ενεργοποιήσετε την %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "Παρακαλώ πατήστε ένα πλήκτρο" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Δεν είναι δυνατή η δέσμευση του πληκτρολογίου." @@ -267,7 +310,7 @@ msgstr "Λειτουργίες παραθύρων" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 msgid "Up" -msgstr "Πάνω" +msgstr "Επάνω" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 msgid "Down" @@ -287,7 +330,7 @@ msgstr "Εναλλαγή παραθύρων" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 msgid "Cycle windows (Reverse)" -msgstr "Εναλλαγή παραθύρων (Αντίστροφα)" +msgstr "Εναλλαγή παραθύρων (αντίστροφα)" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 msgid "Switch window for same application" @@ -327,11 +370,11 @@ msgstr "Αλλαγή μεγέθους παραθύρου" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 msgid "Shade window" -msgstr "Σκίαση παραθύρου" +msgstr "Αναδίπλωση παραθύρου" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 msgid "Stick window" -msgstr "Επικόλληση παραθύρου" +msgstr "Συγκόλληση παραθύρου" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 msgid "Raise window" @@ -359,211 +402,227 @@ msgstr "Κάθετη μεγιστοποίηση παραθύρου" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 msgid "Toggle above" -msgstr "Εναλλαγή με το παραπάνω" +msgstr "Εναλλαγή πάνω από" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 msgid "Toggle fullscreen" -msgstr "Σε πλήρη οθόνη" +msgstr "Εναλλαγή σε πλήρη οθόνη" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 -msgid "Move window to upper workspace" -msgstr "Μετακίνηση παραθύρου στον πάνω χώρο εργασίας" +msgid "Move window to lower monitor" +msgstr "Μετακίνηση παραθύρου στη κάτω οθόνη" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Μετακίνηση παραθύρου στην οθόνη αριστερά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Μετακίνηση παραθύρου στην οθόνη δεξιά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Μετακίνηση παραθύρου στην επάνω οθόνη" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to upper workspace" +msgstr "Μετακίνηση παραθύρου στον επάνω χώρο εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Μετακίνηση παραθύρου στον κάτω χώρο εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας αριστερά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας δεξιά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Μετακίνηση παραθύρου στον προηγούμενο χώρο εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Μετακίνηση παραθύρου στον επόμενο χώρο εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας στην κορυφή" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Μετακίνηση παραθύρου στον κάτω χώρο εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας αριστερά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας δεξιά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Μετακίνηση του παραθύρου πάνω-αριστερά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Μετακίνηση του παραθύρου πάνω-δεξιά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Μετακίνηση του παραθύρου κάτω-αριστερά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Μετακίνηση του παραθύρου κάτω-δεξιά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Εμφάνιση επιφάνειας εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" -msgstr "Πάνω χώρος εργασίας" +msgstr "Επάνω χώρος εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Κάτω χώρος εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Χώρος εργασίας αριστερά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Χώρος εργασίας δεξιά" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Προηγούμενος χώρος εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Επόμενος χώρος εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Χώρος εργασίας 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Χώρος εργασίας 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Χώρος εργασίας 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Χώρος εργασίας 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Χώρος εργασίας 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Χώρος εργασίας 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Χώρος εργασίας 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Χώρος εργασίας 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Χώρος εργασίας 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Χώρος εργασίας 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Χώρος εργασίας 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Χώρος εργασίας 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Προσθήκη χώρου εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Προσθήκη γειτονικού χώρου εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Διαγραφή του τελευταίου χώρου εργασίας" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Διαγραφή ενεργού χώρου εργασίας" #: ../glade/libxfce4ui-2.xml.in.h:1 msgid "Titled Dialog" -msgstr "Διάλογος με τίτλο" +msgstr "Παράθυρο με τίτλο" #: ../glade/libxfce4ui-2.xml.in.h:2 msgid "Subtitle" @@ -571,126 +630,157 @@ msgstr "Υπότιτλος" #: ../glade/libxfce4ui-2.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Xfce4 Widgets" +msgstr "Γραφικά στοιχεία Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Πληροφορίες έκδοσης" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPUs" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Διαχειριστής παραθύρων" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." -msgstr "Χειρισμός μετακίνησης παραθύρων στην οθόνη." +msgstr "Χειρίζεται την τοποθέτηση παραθύρων στην οθόνη." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" -msgstr "Πίνακας" +msgstr "Ταμπλό" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" +"Παρέχει χώρο για κουμπιά παραθύρων, εκκινητές, μενού εφαρμογών και πολλά " +"άλλα." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" -msgstr "Διαχειριστής Επιφάνειας Εεργασίας" +msgstr "Διαχειριστής επιφάνειας εργασίας" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" +"Ρυθμίζει το φόντο, τα εικονίδια και πολλά άλλα στις επιφάνειες εργασίας." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Διαχειριστής αρχείων" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" +"Διαχειρίζεται τα αρχεία σας με ένα μοντέρνο, γρήγορο και εύκολο στη χρήση " +"τρόπο." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Διαχειριστής δίσκων" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "Διαχειρίζεται αφαιρούμενους οδηγούς και μέσα για το Thunar." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" -msgstr "Διαχειριστής Συνεδρίας" +msgstr "Διαχειριστής συνεδρίας" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"Αποθηκεύει και επαναφέρει τη συνεδρία σας, χειρίζεται την εκκίνηση, την " +"αυτόματη εκκίνηση και τον τερματισμό." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Ρύθμιση Συστήματος" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Διαχειριστής ρυθμίσεων" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" +"Διαμορφώνει τις ρυθμίσεις εμφάνισης, οθόνης, πληκτρολογίου και ποντικιού." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" -msgstr "Εύρεση Εφαρμογών" +msgstr "Εύρεση εφαρμογών" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" +"Βρίσκει και εκκινεί γρήγορα τις εφαρμογές που είναι εγκατεστημένες στο " +"σύστημά σας." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" -msgstr "Υπηρεσία Ρυθμίσεων" +msgstr "Υπηρεσία ρυθμίσεων" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" +"Αποθηκεύει τις ρυθμίσεις σας σε ένα σύστημα διαμόρφωσης με βάση το D-Bus." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Βιβλιοθήκη μενού" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" +"Υλοποιεί ένα μενού συμβατό με το freedesktop.org βασισμένο στο GLib και το " +"GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Υπηρεσία μικρογραφιών" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "Υλοποιεί την προδιαγραφή D-Bus για τη διαχείριση των μικρογραφιών." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Παρακαλώ δείτε " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Αν γνωρίζετε να λείπει κάτι από αυτή τη λίστα, μη διστάσετε να το αναφέρετε " +"στο ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Ευχαριστούμε όλους όσους βοήθησαν ώστε να είναι διαθέσιμο το λογισμικό αυτό!" +msgstr "" +"Ευχαριστούμε όλους όσους βοήθησαν ώστε να είναι διαθέσιμο αυτό το λογισμικό!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Η πνευματική ιδιοκτησία του Xfce 4 ανήκει στον Olivier Fourdan (fourdan@xfce.org). Τα διάφορα συστατικά είναι πνευματική ιδιοκτησία των αντίστοιχων συγγραφέων τους." +msgstr "" +"Η πνευματική ιδιοκτησία του Xfce 4 ανήκει στον Olivier Fourdan " +"(fourdan@xfce.org). Τα διάφορα συστατικά είναι πνευματική ιδιοκτησία των " +"αντίστοιχων συγγραφέων τους." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." msgstr "" +"Τα πακέτα, libxfce4ui, libxfce4util και exo διανέμονται υπό τους όρους της " +"Γενικής Άδειας Δημόσιας Χρήσης GNU όπως αυτή έχει δημοσιευτεί από Free " +"Software Foundation, είτε την έκδοση 2 της άδειας, είτε (κατ' επιλογήν) σε " +"οποιαδήποτε μεταγενέστερη έκδοση." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -698,72 +788,68 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" +"Τα πακέτα, thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop και xfwm4 διανέμονται υπό τους όρους της " +"Γενικής Άδειας Δημόσιας Χρήσης GNU όπως αυτή έχει δημοσιευτεί από Free " +"Software Foundation, είτε την έκδοση 2 της άδειας, είτε (κατ' επιλογήν) σε " +"οποιαδήποτε μεταγενέστερη έκδοση." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Για πληροφορίες χρήσης πληκτρολογήστε '%s --help'." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." -msgstr "Αδυναμία αρχικοποίησης GTK+." +msgstr "Αδύνατη η προετοιμασία GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." -msgstr "Η ομάδα ανάπτυξης Xfce. Όλα τα δικαιώματα είναι κατοχυρωμένα." +msgstr "Η ομάδα ανάπτυξης Xfce. Με την επιφύλαξη παντός νόμιμου δικαιώματος." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Παρακαλώ αναφέρετε σφάλματα στο <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" -msgstr "Αποτυχία φόρτωσης διεπαφής" - -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Έκδοση %s, διανομή από %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Έκδοση %s" +msgstr "Απέτυχε η φόρτωση της διεπαφής" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" -msgstr "Βασικοί προγραμματιστές" +msgstr "Κύριοι προγραμματιστές" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" -msgstr "Ενεργοί συνεισφέροντες" +msgstr "Ενεργοί συντελεστές" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" -msgstr "Οι εξυπηρετητές συντηρούνται από" +msgstr "Οι διακομιστές συντηρούνται από" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Συντονισμός μεταφράσεων" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Εποπτεία τεκμηρίωσης" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Μεταφραστές" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" -msgstr "Προηγούμενοι συνεισφέροντες" +msgstr "Προηγούμενοι συντελεστές" #: ../xfce4-about/xfce4-about.desktop.in.h:1 msgid "About Xfce" -msgstr "Περί Xfce" +msgstr "Περί του Xfce" #: ../xfce4-about/xfce4-about.desktop.in.h:2 msgid "Information about the Xfce Desktop Environment" @@ -778,48 +864,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Περί του περιβάλλοντος εργασίας Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "ετικέτα" +msgid "_Help" +msgstr "_Βοήθεια" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Κλείσιμο" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Συσκευή" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "ετικέτα" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "Όνομα λειτουργικού" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "Τύπος λειτουργικού" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "" +msgid "Distributor" +msgstr "Διανομή" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" -msgstr "" +msgid "Xfce Version" +msgstr "Έκδοση Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Έκδοση GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Έκδοση kernel" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Μνήμη" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Σύστημα" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Το Xfce είναι μια συλλογή προγραμμάτων που προσφέρουν μαζί ένα πλήρες λειτουργικό περιβάλλον εργασίας. \n" +"Τα παρακάτω προγράμματα είναι μέρος του πυρήνα Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -829,55 +937,79 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Το Xfce είναι επίσης και μια πλατφόρμα ανάπτυξης παρέχοντας διάφορες βιβλιοθήκες που βοηθούν τους προγραμματιστές να δημιουργήσουν εφαρμογές που ταιριάζουν καλά με το περιβάλλον της επιφάνειας εργασίας.\n" +"\n" +"Τα συστατικά του Xfce αδειοδοτούνται με άδειες χρήσης ελεύθερου ή ανοικτού κώδικα: GPL ή BSDL για τις εφαρμογές και LGPL ή BSDL για τις βιβλιοθήκες. Δείτε την τεκμηρίωση, τον πηγαίο κώδικα ή τον ιστότοπο του Xfce για περισσότερες πληροφορίες (https://www.xfce.org).\n" +"\n" +"Σας ευχαριστούμε για το ενδιαφέρον σας για το Xfce.\n" +"\n" +"\t- Η ομάδα ανάπτυξης του Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Περί" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Συντελεστές" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Πνευματικά δικαιώματα" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Άγνωστο" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (σε περιβάλλον 32-bit)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "" +msgstr "%s; ID κατασκευής: %s" #: ../tests/test-ui.c:111 #, c-format msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Ένα αρχείο με όνομα \"%s\" υπάρχει ήδη σε αυτόν τον κατάλογο. Το αρχείο δεν προστέθηκε." +msgstr "" +"Ένα αρχείο με όνομα \"%s\" υπάρχει ήδη σε αυτόν τον κατάλογο. Το αρχείο δεν " +"προστέθηκε." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Απέτυχε η μεταφορά των παλαιών ρυθμίσεων του ταμπλό" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Παραμετροποίηση αποθηκευμένων ρυθμίσεων από το xfconf" diff --git a/po/en_AU.po b/po/en_AU.po index a6c5e99..121aa26 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# John Humphrys , 2019 -# John Humphrys , 2018 -# Michael Findlay , 2013-2015 -# Michael Findlay , 2016 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: English (Australia) (http://www.transifex.com/xfce/libxfce4ui/language/en_AU/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: English (Australia) (https://app.transifex.com/xfce/teams/16840/en_AU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,11 +38,13 @@ msgstr "Do you want to read the manual online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "You will be redirected to the documentation website where the help pages are maintained and translated." +msgstr "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Cancel" @@ -125,37 +127,36 @@ msgstr "Session management options" msgid "Show session management options" msgstr "Show session management options" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Failed to connect to the session manager: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Session manager did not return a valid client id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -164,7 +165,9 @@ msgstr "" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "This shortcut is already being used for the action '%s'. Which action do you want to use?" +msgstr "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -188,74 +191,107 @@ msgstr "Keep '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "This shortcut is already being used for the command '%s'. Which action do you want to use?" +msgstr "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "This shortcut is already being used by the action '%s'. Which action do you want to use?" +msgstr "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Please use another key combination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s already triggers this action." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Conflicting actions for %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "This shortcut is already being used for something else." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "This keyboard shortcut is currently used by: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Keyboard shortcut already in use" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Window Manager Action Shortcut" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "action" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Command Shortcut" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "command" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Shortcut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Clear" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Could not grab the keyboard." @@ -364,198 +400,214 @@ msgid "Toggle fullscreen" msgstr "Toggle fullscreen" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Move window to upper workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Move window to bottom workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Move window to left workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Move window to right workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Move window to previous workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Move window to next workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Move window to workspace 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Move window to workspace 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Move window to workspace 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Move window to workspace 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Move window to workspace 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Move window to workspace 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Move window to workspace 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Move window to workspace 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Move window to workspace 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Move window to workspace 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Move window to workspace 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Move window to workspace 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Tile window to the top" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Tile window to the bottom" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Tile window to the left" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Tile window to the right" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Tile window to the top-left" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Tile window to the top-right" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Tile window to the bottom-left" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Tile window to the bottom-right" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Show desktop" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Upper workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Bottom workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Left workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Right workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Previous workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Next workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Workspace 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Workspace 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Workspace 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Workspace 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Workspace 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Workspace 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Workspace 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Workspace 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Workspace 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Workspace 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Workspace 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Workspace 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Add workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Add adjacent workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Delete last workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Delete active workspace" @@ -571,191 +623,201 @@ msgstr "Subtitle" msgid "Xfce 4 Widgets" msgstr "Xfce 4 Widgets" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Version information" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Window Manager" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Handles the placement of windows on the screen." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Desktop Manager" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "File Manager" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Session Manager" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Setting System" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Settings Manager" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Application Finder" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Settings Daemon" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Thanks to all who helped making this software available!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different components are copyrighted by their respective authors." +msgstr "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "The libxfce4ui, libxfce4util and exo packages are distributed under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +msgstr "" +"The libxfce4ui, libxfce4util and exo packages are distributed under the " +"terms of the GNU Library General Public License as published by the Free " +"Software Foundation; either version 2 of the License, or (at your option) " +"any later version." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +msgstr "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " +"of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Type '%s --help' for usage information." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Unable to initialise GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Please report bugs to <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Failed to load interface" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Version %s, distributed by %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Version %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Core developers" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Active contributors" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servers maintained by" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Translations supervision" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Translators" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Previous contributors" @@ -776,23 +838,23 @@ msgid "About the Xfce Desktop Environment" msgstr "About the Xfce Desktop Environment" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "label" +msgid "_Help" +msgstr "_Help" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Close" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Device" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "label" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -800,24 +862,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,39 +910,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "About" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Credits" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Unknown" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -870,12 +967,14 @@ msgstr "" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "A file named \"%s\" already exists in this directory, the file hasn't been added." +msgstr "" +"A file named \"%s\" already exists in this directory, the file hasn't been " +"added." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Failed to migrate the old panel configuration" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Customise settings stored by Xfconf" diff --git a/po/en_GB.po b/po/en_GB.po index b37f348..b1515c9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,19 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Andi Chandler , 2017 -# Jackson Doak , 2013 -# Robert Readman , 2013 +# Andi Chandler , 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/xfce/libxfce4ui/language/en_GB/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: English (United Kingdom) (https://app.transifex.com/xfce/teams/16840/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,11 +39,13 @@ msgstr "Do you want to read the manual online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "You will be redirected to the documentation website where the help pages are maintained and translated." +msgstr "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Cancel" @@ -73,13 +77,15 @@ msgstr "Cancel" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "" +msgstr "Close window with multiple tabs?" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." msgstr "" +"This window has multiple tabs open. Closing this window will also close all " +"its tabs." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -87,6 +93,8 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"This window has %d tabs open. Closing this window will also close all its " +"tabs." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -124,46 +132,47 @@ msgstr "Session management options" msgid "Show session management options" msgstr "Show session management options" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Failed to connect to the session manager: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Session manager did not return a valid client id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "Filename is too long" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Directory separator illegal in file name" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "Filenames should not start or end with a space" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "This shortcut is already being used for the action '%s'. Which action do you want to use?" +msgstr "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +196,107 @@ msgstr "Keep '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "This shortcut is already being used for the command '%s'. Which action do you want to use?" +msgstr "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "This shortcut is already being used by the action '%s'. Which action do you want to use?" +msgstr "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Please use another key combination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s already triggers this action." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Conflicting actions for %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "This shortcut is already being used for something else." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Shortcuts Editor" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "The current shortcut. Click to edit..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Clear the shortcut" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restore the default shortcut" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "This keyboard shortcut is currently used by: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Keyboard shortcut already in use" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Window Manager Action Shortcut" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "action" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Command Shortcut" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "command" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Shortcut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Clear" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "Press keyboard keys to trigger the %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "Please press a key" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Could not grab the keyboard." @@ -363,198 +405,214 @@ msgid "Toggle fullscreen" msgstr "Toggle fullscreen" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Move window to lower monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Move window to left monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Move window to right monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Move window to upper monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Move window to upper workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Move window to bottom workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Move window to left workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Move window to right workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Move window to previous workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Move window to next workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Move window to workspace 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Move window to workspace 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Move window to workspace 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Move window to workspace 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Move window to workspace 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Move window to workspace 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Move window to workspace 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Move window to workspace 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Move window to workspace 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Move window to workspace 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Move window to workspace 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Move window to workspace 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Tile window to the top" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Tile window to the bottom" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Tile window to the left" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Tile window to the right" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Tile window to the top-left" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Tile window to the top-right" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Tile window to the bottom-left" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Tile window to the bottom-right" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Show desktop" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Upper workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Bottom workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Left workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Right workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Previous workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Next workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Workspace 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Workspace 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Workspace 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Workspace 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Workspace 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Workspace 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Workspace 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Workspace 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Workspace 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Workspace 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Workspace 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Workspace 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Add workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Add adjacent workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Delete last workspace" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Delete active workspace" @@ -570,124 +628,141 @@ msgstr "Subtitle" msgid "Xfce 4 Widgets" msgstr "Xfce 4 Widgets" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Version information" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPUs" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Window Manager" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Handles the placement of windows on the screen." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "" +msgstr "Provides a home for window buttons, launchers, app menu and more." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Desktop Manager" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "Sets desktop backgrounds, handles icons and more." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "File Manager" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "Manages your files in a modern, easy-to-use and fast way." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Volume Manager" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "Manages removable drives and media for Thunar." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Session Manager" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"Saves and restores your session, handles startup, autostart and shutdown." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Setting System" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Settings Manager" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "Configures appearance, display, keyboard and mouse settings." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Application Finder" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "" +msgstr "Quickly finds and launches applications installed on your system." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Settings Daemon" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "Stores your settings in a D-Bus-based configuration system." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "A Menu Library" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "" +msgstr "Implements a freedesktop.org compliant menu based on GLib and GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Thumbnails Service" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "Implements the thumbnail management D-Bus specification." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Please see " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Thanks to all who helped making this software available!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different components are copyrighted by their respective authors." +msgstr "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." msgstr "" +"The libxfce4ui, libxfce4util and exo packages are distributed under the " +"terms of the GNU Library General Public Licence as published by the Free " +"Software Foundation; either version 2 of the Licence, or (at your option) " +"any later version." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -695,66 +770,62 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " +"of the GNU General Public Licence as published by the Free Software " +"Foundation; either version 2 of the Licence, or (at your option) any later " +"version." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Type '%s --help' for usage information." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Unable to initialise GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Please report bugs to <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Failed to load interface" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Version %s, distributed by %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Version %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Core developers" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Active contributors" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servers maintained by" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Translations supervision" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Documentation supervision" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Translators" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Previous contributors" @@ -775,48 +846,70 @@ msgid "About the Xfce Desktop Environment" msgstr "About the Xfce Desktop Environment" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "label" +msgid "_Help" +msgstr "_Help" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Close" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Device" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "label" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "OS Name" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "OS Type" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "" +msgid "Distributor" +msgstr "Distributor" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" -msgstr "" +msgid "Xfce Version" +msgstr "Xfce Version" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK Version" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kernel Version" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memory" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce is a collection of programs that together provide a full-featured desktop environment.\n" +"The following programs are part of the Xfce core:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,55 +919,79 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" +"\n" +"Xfce components are licensed under free or open source licences; GPL or BSDL for applications and LGPL or BSDL for libraries. Look at the documentation, the source code or the Xfce website (https://www.xfce.org) for more information.\n" +"\n" +"Thank you for your interest in Xfce.\n" +"\n" +"\t- The Xfce Development Team" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "About" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Credits" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Unknown" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (32-bit userspace)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "" +msgstr "%s; Build ID: %s" #: ../tests/test-ui.c:111 #, c-format msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "A file named \"%s\" already exists in this directory, the file hasn't been added." +msgstr "" +"A file named \"%s\" already exists in this directory, the file hasn't been " +"added." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Failed to migrate the old panel configuration" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Customise settings stored by Xfconf" diff --git a/po/es.po b/po/es.po index e968ff2..a0dbfe9 100644 --- a/po/es.po +++ b/po/es.po @@ -1,36 +1,30 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Adolfo Jayme-Barrientos, 2014 -# Adolfo Jayme-Barrientos, 2015 -# Casper casper, 2019-2020 -# Fitoschido, 2014-2015 -# Ignacio Poggi , 2019-2020 -# 629cf3e396111bb8c5fb6664e2dbc91d, 2015 -# mc , 2013 -# prflr88 , 2017 -# prflr88 , 2013-2015 -# prflr88 , 2016-2017 -# Toni Estévez , 2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-23 08:40+0000\n" -"Last-Translator: Casper casper\n" -"Language-Team: Spanish (http://www.transifex.com/xfce/libxfce4ui/language/es/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Spanish (https://app.transifex.com/xfce/teams/16840/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "No se pudo abrir el navegador web para acceder a la documentación en línea" +msgstr "" +"Error al abrir el navegador web para acceder a la documentación en línea" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -45,11 +39,13 @@ msgstr "¿Quiere leer el manual en línea?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Le redirigiremos al sitio web de la documentación, en el que se mantienen y traducen las páginas de ayuda." +msgstr "" +"Le redirigiremos al sitio web de la documentación, en el que se mantienen y " +"traducen las páginas de ayuda." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Cancelar" @@ -81,28 +77,32 @@ msgstr "Cancelar" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "¿Cerrar ventana con múltiples pestañas?" +msgstr "¿Cerrar una ventana con múltiples pestañas?" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Esta ventana tiene múltiples pestañas abiertas. Cerrar esta ventana también cerrará todas sus pestañas. " +msgstr "" +"Esta ventana tiene múltiples pestañas abiertas. Cerrar esta ventana también " +"cerrará todas sus pestañas." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Esta ventana tiene %d pestañas abiertas. Cerrar esta ventana también cerrará todas sus pestañas. " +msgstr "" +"Esta ventana tiene %d pestañas abiertas. Cerrar esta ventana también cerrará" +" todas sus pestañas." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" -msgstr "Atención" +msgstr "Advertencia" #: ../libxfce4ui/xfce-dialogs.c:534 msgid "Close T_ab" -msgstr "Cerrar la _pestaña" +msgstr "Cerrar la pest_aña" #: ../libxfce4ui/xfce-dialogs.c:535 msgid "Close _Window" @@ -132,37 +132,35 @@ msgstr "Opciones de la gestión de sesiones" msgid "Show session management options" msgstr "Mostrar las opciones de la gestión de sesiones" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "No se pudo conectar con el gestor de sesiones: %s" +msgstr "No ha podido conectar con el gestor de sesiones: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" -msgstr "El gestor de sesiones no devolvió un identificador de cliente válido" +msgstr "" +"El gestor de sesiones no ha devuelto un identificador de cliente válido" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "La carpeta de trabajo «%s» no existe. No se utilizará para ejecutar «%s»." +msgstr "No existe la carpeta de trabajo «%s». No se usará para ejecutar «%s»." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Espacio de directorio ilegal en el nombre de archivo" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "El nombre del archivo es demasiado largo" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Separador de carpetas incorrecto en el nombre del archivo" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Los nombres de archivo no deben comenzar o terminar con un espacio" @@ -171,7 +169,8 @@ msgstr "Los nombres de archivo no deben comenzar o terminar con un espacio" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Ese atajo ya está asignado a la acción «%s». ¿Qué acción quiere usar?" +msgstr "" +"Este atajo ya está asignado a la acción «%s». ¿Qué acción quiere usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -202,69 +201,99 @@ msgstr "Este atajo ya está asignado a la orden «%s». ¿Qué acción quiere us msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Este atajo ya está asignado a la acción «%s». ¿Qué acción quiere usar?" +msgstr "" +"Este atajo ya está asignado a la acción «%s». ¿Qué acción quiere usar?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Use otra combinación de teclas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s ya ejecuta esta acción." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Acciones en conflicto para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." -msgstr "Este atajo ya está asignada a otra acción." +msgstr "Este atajo ya está asignado a otra acción." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor de atajos" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "El atajo actual. Haga clic para editarlo..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Borar el atajo" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restaurar el atajo predeterminado" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Este atajo de teclado es usado por: «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Atajo de teclado en uso" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Atajo del gestor de ventanas" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "acción" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" -msgstr "Atajo de la orden" +msgstr "Orden del atajo" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "orden" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Atajo" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" -msgstr "Limpiar" +msgstr "Borrar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "Presione las teclas del teclado para activar el %s ' %s'." +msgstr "Pulse las teclas para activar %s «%s»." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "Por favor presione una tecla" +msgstr "Pulse una tecla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." -msgstr "No se pudo capturar el teclado." +msgstr "No se ha podido capturar el teclado." #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 msgid "Window operations menu" @@ -340,15 +369,15 @@ msgstr "Fijar la ventana" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 msgid "Raise window" -msgstr "Elevar la ventana" +msgstr "Ventana delante" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 msgid "Lower window" -msgstr "Bajar la ventana" +msgstr "Ventana detrás" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 msgid "Raise or lower window" -msgstr "Elevar o bajar la ventana" +msgstr "Ventana delante o detrás" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 msgid "Fill window" @@ -368,201 +397,217 @@ msgstr "Activar o desactivar siempre encima" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 msgid "Toggle fullscreen" -msgstr "Activar o desactivar a pantalla completa" +msgstr "Activar o desactivar la pantalla completa" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Mover la ventana al monitor inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Mover la ventana al monitor de la izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Mover la ventana al monitor de la derecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Mover la ventana al monitor superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mover la ventana al área de trabajo superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mover la ventana al área de trabajo inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mover la ventana al área de trabajo de la izquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mover la ventana al área de trabajo de la derecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mover la ventana al área de trabajo anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mover la ventana al área de trabajo siguiente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mover la ventana al área de trabajo 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mover la ventana al área de trabajo 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mover la ventana al área de trabajo 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mover la ventana al área de trabajo 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mover la ventana al área de trabajo 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mover la ventana al área de trabajo 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mover la ventana al área de trabajo 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mover la ventana al área de trabajo 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mover la ventana al área de trabajo 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mover la ventana al área de trabajo 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mover la ventana al área de trabajo 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mover la ventana al área de trabajo 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Ajustar la ventana arriba" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Ajustar la ventana abajo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Ajustar la ventana a la izquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Ajustar la ventana a la derecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Ajustar la ventana arriba a la izquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Ajustar la ventana arriba a la derecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Ajustar la ventana abajo a la izquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Ajustar la ventana abajo a la derecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Mostrar el escritorio" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Área de trabajo superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Área de trabajo inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Área de trabajo de la izquierda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Área de trabajo de la derecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Área de trabajo anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Área de trabajo siguiente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Área de trabajo 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Área de trabajo 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Área de trabajo 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Área de trabajo 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Área de trabajo 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Área de trabajo 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Área de trabajo 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Área de trabajo 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Área de trabajo 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Área de trabajo 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Área de trabajo 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Área de trabajo 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Añadir un área de trabajo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Añadir un área de trabajo adyacente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Eliminar la última área de trabajo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Eliminar el área de trabajo activa" @@ -582,186 +627,207 @@ msgstr "Controles de Xfce 4" msgid "Version information" msgstr "Información de la versión" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" -msgstr "GPUs" +msgstr "Procesadores gráficos" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gestor de ventanas" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Gestiona la colocación de las ventanas en la pantalla." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Proporciona un Inicio para botones de ventana, lanzadores, menú de aplicaciones y más." +msgstr "" +"Proporciona un espacio para los botones de las ventanas, los lanzadores, el " +"menú de aplicaciones y mucho más." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gestor de escritorio" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "Establece fondos de escritorio, maneja iconos y más." +msgstr "Configura los fondos de escritorio y gestiona los iconos y mucho más." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gestor de archivos" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "Gestiona sus archivos de una forma moderna, fácil de usar y rápida." +msgstr "Gestiona los archivos de una forma moderna, sencilla y rápida." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" -msgstr "Gestor de Volumen" +msgstr "Gestor de volúmenes" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "Administra unidades y medios extraíbles para Thunar." +msgstr "Gestiona dispositivos y soportes extraíbles para Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gestor de sesiones" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Guarda y restaura su sesión, maneja el inicio, el inicio automático y el apagado." +msgstr "" +"Guarda y restaura la sesión y gestiona el inicio, el inicio automático y el " +"apagado." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Sistema de configuración" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gestor de configuración" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "Configura la apariencia, la pantalla, el teclado y el raton." +msgstr "Configura la apariencia, la pantalla, el teclado y el ratón." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Buscador de aplicaciones" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "Encuentra e inicia rápidamente aplicaciones instaladas en su sistema." +msgstr "" +"Encuentra e inicia rápidamente las aplicaciones instaladas en el sistema." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Servicio de configuración" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Almacene su configuración en un sistema de configuración basado en D-Bus." +msgstr "Almacena los ajustes en un sistema de configuración basado en D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" -msgstr "Una Biblioteca de Menús" +msgstr "Una biblioteca de menús" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementa un menú compatible con freedesktop.org basado en GLib y GIO." +msgstr "" +"Implementa un menú compatible con freedesktop.org basado en GLib y GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" -msgstr "Servicio de Miniaturas" +msgstr "Servicio de miniaturas" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementa la especificación D-Bus de gestión de miniaturas." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " -msgstr "Por favor visita " +msgstr "Visite " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Si conoce a alguien que falte en esta lista; no lo dude y presente un error en ." +msgstr "" +"Si conoce a alguien que falte en esta lista, no dude en enviar un mensaje de" +" error a ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Gracias a todos quienes ayudaron a que este software esté disponible." +msgstr "" +"Gracias a todos los que han ayudado a que este software esté disponible." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 está registrado a nombre de Olivier Fourdan (fourdan@xfce.org). Los diferentes componentes están registrados por sus respectivos autores." +msgstr "" +"Los derechos de autor de Xfce 4 pertenecen a Olivier Fourdan " +"(fourdan@xfce.org). Los derechos de autor de los diferentes componentes " +"pertenecen a sus respectivos autores." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Los paquetes libxfce4ui, libxfce4util y exo se distribuyen según los términos de la Licencia Pública General para Bibliotecas de GNU publicada por la Free Software Foundation; ya sea la versión 2 de la Licencia o (a su elección) cualquier versión posterior." +msgstr "" +"Los paquetes libxfce4ui, libxfce4util y exo se distribuyen según los " +"términos de la Licencia Pública General para Bibliotecas de GNU publicada " +"por la Free Software Foundation; ya sea la versión 2 de la Licencia o (a su " +"elección) cualquier versión posterior." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Los paquetes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop y xfwm4 se distribuyen según los términos de la Licencia Pública General de GNU publicada por la Free Software Foundation; ya sea la versión 2 de la Licencia o (a su elección) cualquier versión posterior." +msgstr "" +"Los paquetes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop y xfwm4 se distribuyen según los términos " +"de la Licencia Pública General de GNU publicada por la Free Software " +"Foundation; ya sea la versión 2 de la Licencia o (a su elección) cualquier " +"versión posterior." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." -msgstr "Escriba «%s --help» para obtener información del uso." +msgstr "Escriba «%s --help» para su uso." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." -msgstr "No se pudo inicializar GTK+." +msgstr "No ha podido inicializar GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "El equipo de desarrollo de Xfce. Todos los derechos reservados." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Informe de errores a <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" -msgstr "No se pudo cargar la interfaz" +msgstr "No ha podido cargar la interfaz" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Desarrolladores principales" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Colaboradores activos" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servidores mantenidos por" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" -msgstr "Supervisión de traducciones" +msgstr "Supervisión de las traducciones" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" -msgstr "Supervisión de documentación" +msgstr "Supervisión de la documentación" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Traductores" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Colaboradores anteriores" @@ -771,7 +837,7 @@ msgstr "Acerca de Xfce" #: ../xfce4-about/xfce4-about.desktop.in.h:2 msgid "Information about the Xfce Desktop Environment" -msgstr "Información sobre el entorno de escritorio Xfce" +msgstr "Información acerca del entorno de escritorio Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:1 msgid "License" @@ -782,52 +848,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Acerca del entorno de escritorio Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiqueta" +msgid "_Help" +msgstr "Ay_uda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nombre del sistema operativo" +msgid "_Close" +msgstr "_Cerrar" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Dispositivo" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memoria" +msgid "label" +msgstr "etiqueta" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Procesador" +msgid "OS Name" +msgstr "Nombre del sistema operativo" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tipo de sistema operativo" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versión de Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distribuidor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versión de Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 -msgid "GPU" -msgstr "GPU" +msgid "GTK Version" +msgstr "Versión de GTK" #: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Versión del núcleo" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Procesador" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memoria" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "Procesador gràfico" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce es una colección de programas que juntos proporcionan un entorno de escritorio con todas las funciones.\nLos siguientes programas forman parte del núcleo de Xfce:" +msgstr "" +"Xfce es una colección de programas que, en conjunto, proporcionan un entorno de escritorio completo.\n" +"Los programas siguientes forman parte del núcleo de Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -836,71 +920,80 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce también es una plataforma de desarrollo que proporciona varias bibliotecas que ayudan a los programadores a crear aplicaciones que se adaptan bien al entorno de escritorio.\n\nLos componentes de Xfce están sujetos a licencias gratuitas o de código abierto; GPL o BSDL para aplicaciones y LGPL o BSDL para bibliotecas. Consulte la documentación, el código fuente o el sitio web de Xfce (https://www.xfce.org) para obtener más información.\n\nGracias por su interés en Xfce.\n\n\t- El equipo de desarrollo de Xfce" +msgstr "" +"Xfce también es una plataforma de desarrollo que proporciona varias bibliotecas que ayudan a los programadores a crear aplicaciones que se adaptan bien al entorno de escritorio.\n" +"\n" +"Los componentes de Xfce están sujetos a licencias libres o de código abierto: GPL o BSDL para las aplicaciones y LGPL o BSDL para las bibliotecas. Consulte la documentación, el código fuente o el sitio web de Xfce (https://www.xfce.org) para obtener más información.\n" +"\n" +"Gracias por su interés en Xfce.\n" +"\n" +"\t- El equipo de desarrollo de Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Acerca de" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Créditos" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" -msgstr "Derechos de autor" +msgstr "Copyright" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Desconocido" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bits (espacio de usuario de 32 bits)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" -msgstr "64 bit" +msgstr "64 bits" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" -msgstr "32 bit" +msgstr "32 bits" #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "%s; Id. de compilación: %s" +msgstr "%s; id. de compilación: %s" #: ../tests/test-ui.c:111 #, c-format msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Ya existe un archivo llamado «%s» en esta carpeta, no se ha añadido el archivo." +msgstr "" +"Ya existe un archivo llamado «%s» en esta carpeta. No se ha añadido el " +"archivo." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" -msgstr "No se pudo migrar la configuración antigua del panel" +msgstr "No se ha podido migrar la configuración antigua del panel" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" -msgstr "Personalizar la configuración almacenada por Xfconf" +msgstr "Personalice la configuración almacenada por Xfconf" diff --git a/po/et.po b/po/et.po index 742d81e..b206019 100644 --- a/po/et.po +++ b/po/et.po @@ -1,17 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Priit Jõerüüt , 2020-2021 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-08 11:23+0000\n" -"Last-Translator: Priit Jõerüüt \n" -"Language-Team: Estonian (http://www.transifex.com/xfce/libxfce4ui/language/et/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Estonian (https://app.transifex.com/xfce/teams/16840/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,7 +23,8 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Veebibrauseri avamine veebis asuvate juhendite lugemiseks ei õnnestunud" +msgstr "" +"Veebibrauseri avamine veebis asuvate juhendite lugemiseks ei õnnestunud" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -35,11 +39,13 @@ msgstr "Kas sa soovid lugeda juhendit veebis?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Sind suunatakse edasi meie dokumentatsiooni veebisaiti, kus juhendeid ja abiteavet hallatakse ja tõlgitakse. Enamus materjale on inglise keeles." +msgstr "" +"Sind suunatakse edasi meie dokumentatsiooni veebisaiti, kus juhendeid ja " +"abiteavet hallatakse ja tõlgitakse. Enamus materjale on inglise keeles." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Loobu" @@ -77,14 +83,17 @@ msgstr "Kas sulgen mitme kaardiga akna?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Selles aknas on avatud mitu kaarti. Akna sulgemine sulgeb ka kõik kaardid." +msgstr "" +"Selles aknas on avatud mitu kaarti. Akna sulgemine sulgeb ka kõik kaardid." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Selles aknas on avatud %d kaart(i). Akna sulgemine sulgeb ka kõik selle kaardid." +msgstr "" +"Selles aknas on avatud %d kaart(i). Akna sulgemine sulgeb ka kõik selle " +"kaardid." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -122,37 +131,34 @@ msgstr "Sessioonihalduse valikud" msgid "Show session management options" msgstr "Näita sessioonihalduse valikuid" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Ei õnnestunud ühendust saada sessioonihalduriga: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Sessioonihaldur ei leidnud kehtivat klienditunnust" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Töökausta \"%s\" pole olemas. Seega teda ei kasutata \"%s\" käivitamisel." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Kaustade eraldaja ei tohi sisalduda faili nimes" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Faili nimi on liiga pikk" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Kaustade eraldaja ei tohi sisalduda faili nimes" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Faili nimi ei tohi alata ega lõppeda tühikuga" @@ -161,7 +167,9 @@ msgstr "Faili nimi ei tohi alata ega lõppeda tühikuga" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Seda kiirklahvi juba kasutatakse '%s' tegevuse jaoks. Mis tegevuse jaoks sa soovid seda kasutada?" +msgstr "" +"Seda kiirklahvi juba kasutatakse '%s' tegevuse jaoks. Mis tegevuse jaoks sa " +"soovid seda kasutada?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -185,74 +193,107 @@ msgstr "Hoia '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Seda kiirklahvi juba kasutatakse '%s' käsu jaoks. Mis tegevuse jaoks sa soovid seda kasutada?" +msgstr "" +"Seda kiirklahvi juba kasutatakse '%s' käsu jaoks. Mis tegevuse jaoks sa " +"soovid seda kasutada?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Seda kiirklahvi juba kasutatakse '%s' tegevuse poolt. Mis tegevuse jaoks sa soovid seda kasutada?" +msgstr "" +"Seda kiirklahvi juba kasutatakse '%s' tegevuse poolt. Mis tegevuse jaoks sa " +"soovid seda kasutada?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Palun kasuta teistsugust klahvikombiatsiooni." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s juba käivitab selle tegevuse." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Vastuolulised tegevused %s jaoks" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Seda kiirklahvi juba kasutatakse millegi muu jaoks." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Kiirklahvide muutja" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Hetkel kehtiv kiirklahv. Muutmiseks klõpsi..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Eemalda kiirklahvi seadistus" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Taasta vaikimisi kehtiv kiirklahvi seadistus" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "See klaviatuuri kiirklahv on hetkel kasutusel: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Hetkel kasutuses olevad klaviatuuri kiirklahvid" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Aknahalduri tegevuste kiirklahv" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "tegevus" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Käskude kiirklahv" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "käsk" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Kiirklahv" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Puhasta" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "%s '%s' käivitamiseks vajuta klahve klaviatuuril." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Vajuta üht klahvi" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Ei õnnestunud klahvivajutust fikseerida." @@ -361,198 +402,214 @@ msgid "Toggle fullscreen" msgstr "Lülita täisekraanivaadet" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Tõsta aken alumisele ekraanile" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Tõsta aken vasakpoolsele ekraanile" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Tõsta aken parempoolsele ekraanile" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Tõsta aken ülemisele ekraanile" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Saada aken ülemisse tööruumi" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Saada aken alumisse tööruumi" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Saada aken vasakpoolsesse tööruumi" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Saada aken parempoolsesse tööruumi" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Saada aken eelmisesse tööruumi" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Saada aken järgmisesse tööruumi" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Saada aken tööruumi 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Saada aken tööruumi 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Saada aken tööruumi 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Saada aken tööruumi 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Saada aken tööruumi 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Saada aken tööruumi 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Saada aken tööruumi 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Saada aken tööruumi 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Saada aken tööruumi 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Saada aken tööruumi 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Saada aken tööruumi 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Saada aken tööruumi 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Paani aken üles" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Paani aken alla" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Paani aken vasakule" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Paani aken paremale" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Paani aken üles vasakule" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Paani aken üles paremale" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Paani aken alla vasakule" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Paani aken alla paremale" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Näita töölauda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Ülemine töölaud" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Alumine töölaud" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Vasak töölaud" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Parem töölaud" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Eelmine töölaud" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Järgmine töölaud" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Tööruum 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Tööruum 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Tööruum 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Tööruum 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Tööruum 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Tööruum 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Tööruum 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Tööruum 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Tööruum 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Tööruum 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Tööruum 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Tööruum 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Lisa tööruum" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Lisa külgnev tööruum" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Kustuta viimane tööruum" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Kustuta aktiivne tööruum" @@ -572,186 +629,209 @@ msgstr "Xfce 4 vidinad" msgid "Version information" msgstr "Versiooniteave" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "Graafikaprotsessorid" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Aknahaldur" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Haldab akende paigutust ekraanil." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Riba" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Pakub kodu aknanuppudele, käivitajatele, rakenduste menüüle ning paljule muulegi." +msgstr "" +"Pakub kodu aknanuppudele, käivitajatele, rakenduste menüüle ning paljule " +"muulegi." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Töölaua haldur" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Seadistab töölaua tausta, haldab ikoone ja teeb palju muudki." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Failihaldur" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Haldab sinu faile tänapäevasel, lihtsaltkasutataval ning kiirel moel." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Andmekandjate haldur" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Haldab eemaldatavaid andmekandjaid ja meediat Thunari jaoks." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Sessioonihaldur" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Salvestab ja taastab sinu sessioone, haldab süsteemi käivitamist ja sulgemist." +msgstr "" +"Salvestab ja taastab sinu sessioone, haldab süsteemi käivitamist ja " +"sulgemist." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Seadete haldus" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Seadistuste haldur" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Seadistab välimust, monitori, klaviatuuri ning hiirt." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Rakenduste leidja" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Kiiresti leiab ja käivitab süsteemi paigaldatud rakendusi." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Seadete taustaprotsess" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Salvestab sinu seadistused D-Bus'il põhinevasse seadistuste süsteemi." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Teek menüü jaoks" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Võimaldab kasutada Freedesktop.org spetsifikatsioonidele vastavat ning GLib ja GIO teekidel põhinevat menüülahendust." +msgstr "" +"Võimaldab kasutada Freedesktop.org spetsifikatsioonidele vastavat ning GLib " +"ja GIO teekidel põhinevat menüülahendust." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Teenus pisipiltide loomiseks" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "Võimaldab kasutada pisipiltide haldusloogikat, mis põhineb D-Bus'i spetsifikatsioonile." +msgstr "" +"Võimaldab kasutada pisipiltide haldusloogikat, mis põhineb D-Bus'i " +"spetsifikatsioonile." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Lisateavet leiad " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Kui sa tead kedagi, kes on siit loendist puudu, siis ära kõhkle esitamast veateadet meie arendussaidis ." +msgstr "" +"Kui sa tead kedagi, kes on siit loendist puudu, siis ära kõhkle esitamast " +"veateadet meie arendussaidis " +" ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Suur tänu kõigile, kes on selle tarkvara loonud ning meile kasutatavaks teinud!" +msgstr "" +"Suur tänu kõigile, kes on selle tarkvara loonud ning meile kasutatavaks " +"teinud!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 autoriõigused kuuluvad Olivier Fourdan'ile (fourdan@xfce.org). Erinevate komponentide autoriõigused kuuluvad nende vastavatele autoritele." +msgstr "" +"Xfce 4 autoriõigused kuuluvad Olivier Fourdan'ile (fourdan@xfce.org). " +"Erinevate komponentide autoriõigused kuuluvad nende vastavatele autoritele." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Libxfce4ui, libxfce4util ja exo teegid on avaldatud Vaba Tarkvara Fondi GNU Vähem Üldise Avaliku Litsentsi alusel (Free Software Foundation GNU LGPL). Litsentsi versiooniks võib olla 2 või sinu soovil ka mõni hilisem versioon." +msgstr "" +"Libxfce4ui, libxfce4util ja exo teegid on avaldatud Vaba Tarkvara Fondi GNU " +"Vähem Üldise Avaliku Litsentsi alusel (Free Software Foundation GNU LGPL). " +"Litsentsi versiooniks võib olla 2 või sinu soovil ka mõni hilisem versioon." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Rakendused thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop ja xfwm4 on levitatud Vaba Tarkvara Fondi poolt avaldatud GNU Üldise Avaliku Litsentsi alusel (Free Software Foundation GNU GPL). Litsentsi versiooniks võib olla 2 või sinu soovil ka mõni hilisem versioon." +msgstr "" +"Rakendused thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop ja xfwm4 on levitatud Vaba Tarkvara Fondi " +"poolt avaldatud GNU Üldise Avaliku Litsentsi alusel (Free Software " +"Foundation GNU GPL). Litsentsi versiooniks võib olla 2 või sinu soovil ka " +"mõni hilisem versioon." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Trüki „%s --help” kasutusjuhise saamiseks." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ initsialiseerimine ei õnnestunud." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce arendusmeeskond. Kõik õigused kaitstud." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Palun teata vigadest aadressil <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Liidese laadimine ebaõnnestus" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Tuumikarendajad" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktiivsed kaastöötajad" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Serverite haldus" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Tõlgete järelvalve" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Dokumentatsiooni järelvalve" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Tõlkijad" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Varasemad kaastöötajad" @@ -772,52 +852,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Teave Xfce töölauakeskkonna kohta" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "silt" +msgid "_Help" +msgstr "A_bi" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Operatsioonisüsteem" +msgid "_Close" +msgstr "_Sulge" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Seade" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Mälu" +msgid "label" +msgstr "silt" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Protsessor" +msgid "OS Name" +msgstr "Operatsioonisüsteem" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Operatsioonisüsteemi tüüp" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce versioon" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributsioon" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce versioon" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK versioon" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kerneli versioon" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Protsessor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Mälu" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "Graafikaprotsessor" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Süsteem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce on tarkvarakogum, mis üheskoos tagab tervikliku töölauakeskkonna.\nXfce tuumikrakendused on:" +msgstr "" +"Xfce on tarkvarakogum, mis üheskoos tagab tervikliku töölauakeskkonna.\n" +"Xfce tuumikrakendused on:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,48 +924,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Lisaks on Xfce ka arenduskeskkond, mille pakutavad mitmed teegid aitavad programmeerijatel luua rakendusi, mis sobivad kogu töölauakeskkonnaga.\n\nXfce komponendid on litsenseeritud vaba tarkvara litsentside alusel - rakenduste jaoks GPL või BSDL ning teekide jaoks LGPL või BSDL. Lisateavet leiad dokumentatsioonist, lähtekoodist või Xfce veebisaidist (https://www.xfce.org).\n\nTäname, et sind huvitab Xfce.\n\n\t- Xfce arendusmeeskond" +msgstr "" +"Lisaks on Xfce ka arenduskeskkond, mille pakutavad mitmed teegid aitavad programmeerijatel luua rakendusi, mis sobivad kogu töölauakeskkonnaga.\n" +"\n" +"Xfce komponendid on litsenseeritud vaba tarkvara litsentside alusel - rakenduste jaoks GPL või BSDL ning teekide jaoks LGPL või BSDL. Lisateavet leiad dokumentatsioonist, lähtekoodist või Xfce veebisaidist (https://www.xfce.org).\n" +"\n" +"Täname, et sind huvitab Xfce.\n" +"\n" +"\t- Xfce arendusmeeskond" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Teave" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Autorid" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Autoriõigused" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Tundmatu" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bitine (32-bitise kasutajakeskkonnaga)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bitine" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bitine" @@ -875,7 +980,7 @@ msgstr "32-bitine" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Järgu tunnus: %s" @@ -891,6 +996,6 @@ msgstr "Fail nimega \"%s\" on juba olemas siin kaustas ja uut faili ei lisatud. msgid "Failed to migrate the old panel configuration" msgstr "Riba vanade sätete ülekandmine ebaõnnestus" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Kohanda Xfconf'i salvestatud seadistusi" diff --git a/po/eu.po b/po/eu.po index eace432..58325ea 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# beriain, 2020-2021 -# Dabid Martinez , 2020 -# Piarres Beobide , 2008-2009,2013,2015-2017 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-12 15:34+0000\n" -"Last-Translator: beriain\n" -"Language-Team: Basque (http://www.transifex.com/xfce/libxfce4ui/language/eu/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Basque (https://app.transifex.com/xfce/teams/16840/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,11 +38,13 @@ msgstr "Manuala saretik irakurri nahi duzu?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Laguntza orrialdeak itzultzen eta mantentzen diren dokumentazio webgunera birbidaliko zaizu." +msgstr "" +"Laguntza orrialdeak itzultzen eta mantentzen diren dokumentazio webgunera " +"birbidaliko zaizu." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Utzi" @@ -79,14 +82,18 @@ msgstr "Itxi leihoa hainbat fitxekin?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Leiho honek hainbat fitxa ditu irekita. Leiho hau ixteak bere fitxa guztiak itxiko ditu baita." +msgstr "" +"Leiho honek hainbat fitxa ditu irekita. Leiho hau ixteak bere fitxa guztiak " +"itxiko ditu baita." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Leiho honek %d fitxa ditu irekita. Leiho hau ixteak bere fitxa guztiak itxiko ditu baita." +msgstr "" +"Leiho honek %d fitxa ditu irekita. Leiho hau ixteak bere fitxa guztiak " +"itxiko ditu baita." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -124,37 +131,34 @@ msgstr "Saio kudeaketa aukerak " msgid "Show session management options" msgstr "Ikusi saio kudeaketa aukeraj" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Huts saio-kudeatzailearekin konektatzerakoan: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Saio kudeatzaileak ez du ID erabilgarri bat erantzun" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "\"%s\" lan direktorioa ez dago. Berau \"%s\" sortzean erabiliko da." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Direktorio bereizle ilegala fitxategiaren izenean" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Fitxategiaren izena luzeegia da" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Direktorio bereizle ilegala fitxategiaren izenean" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Fitxategi izenek ez lukete hutsune batekin hasi edo amaitu behar" @@ -163,7 +167,9 @@ msgstr "Fitxategi izenek ez lukete hutsune batekin hasi edo amaitu behar" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Lasterbide hau dagoeneko '%s' ekintzarentzat ezarririk dago. Zein ekintza erabiltzea nahi duzu?" +msgstr "" +"Lasterbide hau dagoeneko '%s' ekintzarentzat ezarririk dago. Zein ekintza " +"erabiltzea nahi duzu?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +193,107 @@ msgstr "Mantendu '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Lasterbide hau dagoeneko '%s' komandoarentzat ezarririk dago. Zein ekintza erabiltzea nahi duzu?" +msgstr "" +"Lasterbide hau dagoeneko '%s' komandoarentzat ezarririk dago. Zein ekintza " +"erabiltzea nahi duzu?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Lasterbide hau dagoeneko '%s' ekintzarentzat ezarririk dago. Zein ekintza erabiltzea nahi duzu?" +msgstr "" +"Lasterbide hau dagoeneko '%s' ekintzarentzat ezarririk dago. Zein ekintza " +"erabiltzea nahi duzu?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Mesedez erabili beste tekla konbinazio bat" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s-ek dagoeneko ekintza hau abiarazten du." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Gatazka sortzen duten ekintzak %s-rentzat" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Lasterbide hau dagoeneko beste zerbaitek erabiltzen du." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Lasterbideen editorea" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Oraingo lasterbidea. Klikatu editatzeko..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Lasterbidea ezabatu" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Lasterbide lehenetsia berrezarri" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Teklatu lasterbide hau honetarako erabilia izaten hari da: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Teklatu lasterbidea erabilia izaten ari da une honetan" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Leiho kudeatzaile ekintza laster-tekla" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "ekintza" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Komando laster-tekla" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "Komandoa" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Laster-tekla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Garbitu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Sakatu teklak %s '%s' abiarazteko." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Mesedez sakatu tekla bat" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Ezin da teklatua kapturatu." @@ -363,198 +402,214 @@ msgid "Toggle fullscreen" msgstr "Txandakatu pantaila-osoa" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mugitu leihoa goiko idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mugitu leihoa beheko idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mugitu leihoa ezkerreko idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mugitu leihoa eskuineko idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mugitu leihoa aurreko idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mugitu leihoa hurrengo idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mugitu leihoa 1 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mugitu leihoa 2 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mugitu leihoa 3 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mugitu leihoa 4 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mugitu leihoa 5 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mugitu leihoa 6 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mugitu leihoa 7 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mugitu leihoa 8 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mugitu leihoa 9 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mugitu leihoa 10 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mugitu leihoa 11 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mugitu leihoa 12 idazmahaiera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Mosaikoa leihoa goian" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Mosaikoa leihoa behean" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Mosaikoa leihoa ezkerrean" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Mosaikoa leihoa eskuinean" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Mosaiko goian eskubira" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Mosaiko goian ezkerrera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Mosaiko behean eskubira" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Mosaiko behean ezkerrera" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Ikusi idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Goiko idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Beheko idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ezkerreko idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Eskuineko idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Aurreko idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Hurrengo idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "1 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "2 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "3 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "4 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "5 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "6 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "7 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "8 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "9 Idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "10 Idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "11 idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "12 Idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Gehitu idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Gehitu ondoko idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Ezabatu azken idazmahaia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Ezabatu idazmahai aktiboa" @@ -574,186 +629,207 @@ msgstr "Xfce 4 Widgets" msgid "Version information" msgstr "Bertsio argibideak" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUak" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Leiho kudeatzailea" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Pantailan leihoen kokapena kudeatzen du." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panela" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Leihoen botoientzako, abiarazleentzako, aplikazio menuetarako eta gehiagorako lekua hornitzen du." +msgstr "" +"Leihoen botoientzako, abiarazleentzako, aplikazio menuetarako eta " +"gehiagorako lekua hornitzen du." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Mahaigain kudeatzailea" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Ezarri mahaigaineko atzeko planoa, ikonoen kudeaketa eta gehiago." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Fitxategi kudeatzailea" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Kudeatu zure fitxategiak modu moderno, erabilerraz eta azkarrean." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Bolumen kudeatzailea" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Kudeatu gailu eta euskarri aldagarriak Thunar-rentzat." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Saio kudeatzailea" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Zure saioa gordetzen eta berrezartzen du, abiaraztea, hasiera automatikoa eta itzaltzea kudeatzen ditu." +msgstr "" +"Zure saioa gordetzen eta berrezartzen du, abiaraztea, hasiera automatikoa " +"eta itzaltzea kudeatzen ditu." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Ezarpen sistema" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Ezarpen kudeatzailea" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "Itxura, bistaratzea, teklatua eta saguaren ezarpenak kofiguratzen ditu." +msgstr "" +"Itxura, bistaratzea, teklatua eta saguaren ezarpenak kofiguratzen ditu." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Aplikazio bilatzailea" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Azkar bilatu eta abiarazi zure sisteman instalatutako aplikazioak" -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Ezarpena deabrua" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Zure ezarpenak D-Bus-en oinarritutako konfigurazio sistema baten gordetzen ditu." +msgstr "" +"Zure ezarpenak D-Bus-en oinarritutako konfigurazio sistema baten gordetzen " +"ditu." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Liburutegi menu bat" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "freedesktop.org-ekin konplitzen duen menu inplementazio bat inplementatzen du, GLib eta GIOn oinarritutakoa." +msgstr "" +"freedesktop.org-ekin konplitzen duen menu inplementazio bat inplementatzen " +"du, GLib eta GIOn oinarritutakoa." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Argazkitxoen zerbitzua" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "D-Bus argazkitxoen kudeaketa espezifikazioa inplementatzen du." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Mesedez ikusi " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Zerrenda honetan faltan den norbaiten berri baduzu, mesedez esaguzu programa errore baten bidez -en." +msgstr "" +"Zerrenda honetan faltan den norbaiten berri baduzu, mesedez esaguzu programa" +" errore baten bidez -en." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Milesker software hau eskuragarri egiten lagundu duten guztiei." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 Olivier Fourdan (fourdan@xfce.org)-en copyright du. Osagai ezberdinek bere egileen copyrighta dute." +msgstr "" +"Xfce 4 Olivier Fourdan (fourdan@xfce.org)-en copyright du. Osagai ezberdinek" +" bere egileen copyrighta dute." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfce4util eta exo paketeak Free Software Foundation-ek kaleratutako GNU liburutegi lizentzia publiko orokorraren terminoetan banatzen dira; edo lizentziaren 2. bertsioan edo (zure aukeran) edozein beranduagokoan." +msgstr "" +"libxfce4ui, libxfce4util eta exo paketeak Free Software Foundation-ek " +"kaleratutako GNU liburutegi lizentzia publiko orokorraren terminoetan " +"banatzen dira; edo lizentziaren 2. bertsioan edo (zure aukeran) edozein " +"beranduagokoan." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop eta xfwm4 paketeak Free Software Foundation-ek kaleratutako GNU lizentzia publiko orokorraren terminoetan banatzen dira; edo lizentziaren 2. bertsioan edo (zure aukeran) edozein beranduagokoan." +msgstr "" +"Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf," +" xfdesktop eta xfwm4 paketeak Free Software Foundation-ek kaleratutako GNU " +"lizentzia publiko orokorraren terminoetan banatzen dira; edo lizentziaren 2." +" bertsioan edo (zure aukeran) edozein beranduagokoan." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Idatzi \"%s --help\" erabilerarako." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Ezinda GTK+ abiarazi." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce garapen taldea. Eskubide guztiak erreserbatuta" -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Mesedez eman programa-erroreen berri <%s>-n." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Huts interfazea kargatzean." #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Muin garatzaileak" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Laguntzaile aktiboak" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Zerbitzari mantenua: " -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Itzulpen gainbegiratzea" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Dokumentazio gainbegiratzea" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Piarres Beobide " -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Aurreko idazmahaia" @@ -774,52 +850,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce mahaigain inguruneari buruz" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiketa" +msgid "_Help" +msgstr "_Laguntza" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "SE izena" +msgid "_Close" +msgstr "I_txi" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Gailua" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memoria" +msgid "label" +msgstr "etiketa" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "PUZ" +msgid "OS Name" +msgstr "SE izena" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "SE mota" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce bertsioa" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Banatzailea" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce bertsioa" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK bertsioa" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kernel bertsioa" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "PUZ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memoria" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce mahaigain ingurune osoa eskaintzen duten programen bilduma da.\nHurrengo programak dira Xfce muinaren zati:" +msgstr "" +"Xfce mahaigain ingurune osoa eskaintzen duten programen bilduma da.\n" +"Hurrengo programak dira Xfce muinaren zati:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,48 +922,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce garapen plataforma bat da ere, hainbat liburutegi ematen dituena garatzaileei laguntzeko mahaigain ingurunearekin bat datozen aplikazioak sortzen.\n\nXfceren osagaiak iturburu libre edo irekiko lizentziapekoak dira; GPL edo BSDL aplikazioetarako eta LGPL edo BSDL liburutegietarako. Ikusi dokumentazioa, iturburu kodea edo Xfceren webgunea (https://www.xfce.org) informazio gehiago lortzeko.\n\nEskerrik asko zure Xfcerekiko interesagatik.\n\n\t- Xfceren garapen taldea" +msgstr "" +"Xfce garapen plataforma bat da ere, hainbat liburutegi ematen dituena garatzaileei laguntzeko mahaigain ingurunearekin bat datozen aplikazioak sortzen.\n" +"\n" +"Xfceren osagaiak iturburu libre edo irekiko lizentziapekoak dira; GPL edo BSDL aplikazioetarako eta LGPL edo BSDL liburutegietarako. Ikusi dokumentazioa, iturburu kodea edo Xfceren webgunea (https://www.xfce.org) informazio gehiago lortzeko.\n" +"\n" +"Eskerrik asko zure Xfcerekiko interesagatik.\n" +"\n" +"\t- Xfceren garapen taldea" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Honi buruz" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Kredituak" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "(ezezaguna)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit erabiltzaile espazioa)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -877,7 +978,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Eraikitze IDa: %s" @@ -887,12 +988,14 @@ msgstr "%s; Eraikitze IDa: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Dagoeneko badago \"%s\" izeneko fitxategi bat karpeta honetan, fitxategia ez da gehitu." +msgstr "" +"Dagoeneko badago \"%s\" izeneko fitxategi bat karpeta honetan, fitxategia ez" +" da gehitu." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Huts panel zaharrek konfigurazioa migratzean" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Xfconf-ek gordetako ezarpenak pertsonlizatu" diff --git a/po/fa_IR.po b/po/fa_IR.po new file mode 100644 index 0000000..4e3f953 --- /dev/null +++ b/po/fa_IR.po @@ -0,0 +1,972 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# Xfce Bot , 2023 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Persian (Iran) (https://app.transifex.com/xfce/teams/16840/fa_IR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fa_IR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:110 +msgid "Failed to open web browser for online documentation" +msgstr "باز کردن مرورگر وب برای مستندات آنلاین با شکست مواجه شد" + +#: ../libxfce4ui/xfce-dialogs.c:265 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "آیا می‌خواهید راهنمای آنلاین %s را بخوانید؟" + +#: ../libxfce4ui/xfce-dialogs.c:267 +msgid "Do you want to read the manual online?" +msgstr "آیا می‌خواهید راهنمای آنلاین را بخوانید؟" + +#: ../libxfce4ui/xfce-dialogs.c:273 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "" +"شما به وب سایت مستندات که صفحات راهنما در آن نگهداری و ترجمه می شوند ، هدایت" +" خواهید شد." + +#. Create cancel button +#: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 +msgid "_Cancel" +msgstr "انصراف" + +#: ../libxfce4ui/xfce-dialogs.c:277 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:286 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:335 ../libxfce4ui/xfce-dialogs.c:370 +#: ../libxfce4ui/xfce-dialogs.c:406 +msgid "Close" +msgstr "بستن" + +#: ../libxfce4ui/xfce-dialogs.c:453 +msgid "No" +msgstr "خیر" + +#: ../libxfce4ui/xfce-dialogs.c:455 +msgid "Yes" +msgstr "بله" + +#: ../libxfce4ui/xfce-dialogs.c:459 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "لغو" + +#: ../libxfce4ui/xfce-dialogs.c:518 +msgid "Close window with multiple tabs?" +msgstr "بستن پنجره با چندین زبانه؟" + +#: ../libxfce4ui/xfce-dialogs.c:520 +msgid "" +"This window has multiple tabs open. Closing this window will also close all " +"its tabs." +msgstr "" +"این پنجره دارای چندین زبانه باز است، بستن این پنجره باعث بسته شدن تمام این " +"زبانه‌ها خواهد شد." + +#: ../libxfce4ui/xfce-dialogs.c:523 +#, c-format +msgid "" +"This window has %d tabs open. Closing this window will also close all its " +"tabs." +msgstr "" +"این پنجره دارای %d زبانه باز است، بستن این پنجره باعث بسته شدن تمام این " +"زبانه‌ها خواهد شد." + +#: ../libxfce4ui/xfce-dialogs.c:529 +msgid "Warning" +msgstr "هشدار" + +#: ../libxfce4ui/xfce-dialogs.c:534 +msgid "Close T_ab" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:535 +msgid "Close _Window" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:540 +msgid "Do _not ask me again" +msgstr "دوباره از من نپرس" + +#: ../libxfce4ui/xfce-sm-client.c:1427 +msgid "Session management client ID" +msgstr "شناسه کارخواه مدیریت نشست" + +#: ../libxfce4ui/xfce-sm-client.c:1427 +msgid "ID" +msgstr "شناسه" + +#: ../libxfce4ui/xfce-sm-client.c:1428 +msgid "Disable session management" +msgstr "غیرفعال کردن مدیریت نشست‌ها" + +#: ../libxfce4ui/xfce-sm-client.c:1438 +msgid "Session management options" +msgstr "تنظیمات مدیریت نشست‌ها" + +#: ../libxfce4ui/xfce-sm-client.c:1439 +msgid "Show session management options" +msgstr "نمایش تنظیمات مدیریت نشست‌ها" + +#: ../libxfce4ui/xfce-sm-client.c:1609 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "شکست در اتصال به مدیر نشست‌ها %s" + +#: ../libxfce4ui/xfce-sm-client.c:1615 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "مدیر نشست، شناسه کاربری معتبری ارائه نکرد" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:397 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "" + +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 +msgid "Filename is too long" +msgstr "نام فایل خیلی طولانی است" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 +msgid "Filenames should not start or end with a space" +msgstr "نام فایل نباید با فاصله آغاز یا به پایان رسد" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "" +"این میانبر در حال حاضر برای عملکرد '%s' استفاده می‌شود. شما می‌خواهید برای " +"کدام عملکرد استفاده کنید؟" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "استفاده '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "حفظ '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "" +"این میانبر در حال حاضر برای فرمان '%s' استفاده می‌شود. شما می‌خواهید برای " +"کدام عملکرد استفاده کنید؟" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" +"این میانبر در حال حاضر توسط عملکرد '%s' استفاده می‌شود. شما می‌خواهید برای " +"کدام عملکرد استفاده کنید؟" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 +msgid "Please use another key combination." +msgstr "لطفا از کلید ترکیبی دیگری استفاده کنید." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 +#, c-format +msgid "Conflicting actions for %s" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 +msgid "This shortcut is already being used for something else." +msgstr "این میانبر در حال حاضر برای چیز دیگری استفاده می‌شود." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "ویرایشگر میان‌برها" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "این میانبر صفحه‌کلید در حال استفاده توسط این موارد است: «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "میانبر صفحه‌کلید در حال استفاده است" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +msgid "Window Manager Action Shortcut" +msgstr "" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 +msgid "action" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +msgid "Command Shortcut" +msgstr "میانبر فرمان" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 +msgid "command" +msgstr "فرمان" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +msgid "Shortcut" +msgstr "میانبر" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 +msgid "Clear" +msgstr "تمیز کردن" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 +#, c-format +msgid "Press keyboard keys to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 +msgid "Please press a key" +msgstr "لطفا یک کلید را فشار دهید" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 +msgid "Could not grab the keyboard." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "بالا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "پایین" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "چپ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "راست" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "پنجره را بیشینه کن" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "پنجره را پنهان کن" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "سایه کردن پنجره" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "انباشتن پنجره" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to upper workspace" +msgstr "انتقال پنجره به ورک‌اسپیس بالا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to bottom workspace" +msgstr "انتقال پنجره به ورک‌اسپیس پایین" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to left workspace" +msgstr "انتقال پنجره به ورک‌اسپیس چپ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to right workspace" +msgstr "انتقال پنجره به ورک‌اسپیس راست" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to previous workspace" +msgstr "انتقال پنجره به ورک‌اسپیس قبلی" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to next workspace" +msgstr "انتقال پنجره به ورک‌اسپیس بعدی" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 1" +msgstr "انتقال پنجره به ورک‌اسپیس 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 2" +msgstr "انتقال پنجره به ورک‌اسپیس 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 3" +msgstr "انتقال پنجره به ورک‌اسپیس 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 4" +msgstr "انتقال پنجره به ورک‌اسپیس 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 5" +msgstr "انتقال پنجره به ورک‌اسپیس 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 6" +msgstr "انتقال پنجره به ورک‌اسپیس 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 7" +msgstr "انتقال پنجره به ورک‌اسپیس 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 8" +msgstr "انتقال پنجره به ورک‌اسپیس 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Move window to workspace 9" +msgstr "انتقال پنجره به ورک‌اسپیس 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Move window to workspace 10" +msgstr "انتقال پنجره به ورک‌اسپیس 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Move window to workspace 11" +msgstr "انتقال پنجره به ورک‌اسپیس 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Move window to workspace 12" +msgstr "انتقال پنجره به ورک‌اسپیس 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the bottom" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the left" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the right" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Tile window to the top-left" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Tile window to the top-right" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Tile window to the bottom-left" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Tile window to the bottom-right" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Show desktop" +msgstr "نمایش دسکتاپ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Upper workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Bottom workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Left workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Right workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Previous workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Next workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 1" +msgstr "فضای کاری ۱" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 2" +msgstr "فضای کاری ۲" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 3" +msgstr "فضای کاری ۳" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 4" +msgstr "فضای کاری ۴" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 5" +msgstr "فضای کاری ۵" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 6" +msgstr "فضای کاری ۶" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 7" +msgstr "فضای کاری ۷" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 8" +msgstr "فضای کاری ۸" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Workspace 9" +msgstr "فضای کاری ۹" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Workspace 10" +msgstr "فضای کاری ۱۰" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Workspace 11" +msgstr "فضای کاری ۱۱" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Workspace 12" +msgstr "فضای کاری ۱۲" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 +msgid "Add workspace" +msgstr "افزودن فضای کاری" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 +msgid "Add adjacent workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 +msgid "Delete last workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 +msgid "Delete active workspace" +msgstr "" + +#: ../glade/libxfce4ui-2.xml.in.h:1 +msgid "Titled Dialog" +msgstr "" + +#: ../glade/libxfce4ui-2.xml.in.h:2 +msgid "Subtitle" +msgstr "زیرنویس" + +#: ../glade/libxfce4ui-2.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "" + +#: ../xfce4-about/main.c:58 +msgid "Version information" +msgstr "اطلاعات نسخه" + +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 +msgid "Window Manager" +msgstr "مدیریت پنجره" + +#: ../xfce4-about/main.c:147 +msgid "Handles the placement of windows on the screen." +msgstr "" + +#: ../xfce4-about/main.c:151 +msgid "Panel" +msgstr "پنل" + +#: ../xfce4-about/main.c:152 +msgid "Provides a home for window buttons, launchers, app menu and more." +msgstr "" + +#: ../xfce4-about/main.c:156 +msgid "Desktop Manager" +msgstr "مدیر میزکار" + +#: ../xfce4-about/main.c:157 +msgid "Sets desktop backgrounds, handles icons and more." +msgstr "تنظیمات پس‌ضمینه دسکتاپ، اداره کردن آیکن‌ها و بیشتر." + +#: ../xfce4-about/main.c:161 +msgid "File Manager" +msgstr "مدیر پرونده" + +#: ../xfce4-about/main.c:162 +msgid "Manages your files in a modern, easy-to-use and fast way." +msgstr "مدیریت فایل‌های شما به روشی پیش‌رفته، آسان برای استفاده و سریع." + +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" + +#: ../xfce4-about/main.c:167 +msgid "Manages removable drives and media for Thunar." +msgstr "" + +#: ../xfce4-about/main.c:171 +msgid "Session Manager" +msgstr "مدیر نشست" + +#: ../xfce4-about/main.c:172 +msgid "" +"Saves and restores your session, handles startup, autostart and shutdown." +msgstr "" + +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "مدیر تنظیمات" + +#: ../xfce4-about/main.c:177 +msgid "Configures appearance, display, keyboard and mouse settings." +msgstr "پیکربندی کردن تنظیمات ظاهر، نمایشگر، کیبورد و موس." + +#: ../xfce4-about/main.c:181 +msgid "Application Finder" +msgstr "یابنده برنامه‌" + +#: ../xfce4-about/main.c:182 +msgid "Quickly finds and launches applications installed on your system." +msgstr "یافتن سریع و اجرای برنامه‌های نصب شده در سیستم شما." + +#: ../xfce4-about/main.c:186 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:187 +msgid "Stores your settings in a D-Bus-based configuration system." +msgstr "" + +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" + +#: ../xfce4-about/main.c:192 +msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." +msgstr "" + +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" + +#: ../xfce4-about/main.c:197 +msgid "Implements the thumbnail management D-Bus specification." +msgstr "" + +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "لطفا ببینید " + +#: ../xfce4-about/main.c:312 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:316 +msgid "Thanks to all who helped making this software available!" +msgstr "سپاس از تمام کسانی که به در دسترس قرار گرفتن این نرم‌افزار کمک کردند!" + +#: ../xfce4-about/main.c:333 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:338 +msgid "" +"The libxfce4ui, libxfce4util and exo packages are distributed under the " +"terms of the GNU Library General Public License as published by the Free " +"Software Foundation; either version 2 of the License, or (at your option) " +"any later version." +msgstr "" + +#: ../xfce4-about/main.c:345 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " +"of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" + +#: ../xfce4-about/main.c:491 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:497 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:506 +msgid "The Xfce development team. All rights reserved." +msgstr "تیم توسعه Xfce. تمامی حقوق محفوظ است" + +#: ../xfce4-about/main.c:507 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "لطفا خطاها را در <%s> گزارش کنید." + +#: ../xfce4-about/main.c:517 +msgid "Failed to load interface" +msgstr "" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:144 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:147 +msgid "Active contributors" +msgstr "مشارکت کننده‌‌گان فعال" + +#: ../xfce4-about/contributors.h:150 +msgid "Servers maintained by" +msgstr "نگهداری سرورها توسط" + +#: ../xfce4-about/contributors.h:153 +msgid "Translations supervision" +msgstr "نظارت بر ترجمه‌ها" + +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "نظارت بر اسناد" + +#: ../xfce4-about/contributors.h:159 +msgid "Translators" +msgstr "مترجمین" + +#: ../xfce4-about/contributors.h:162 +msgid "Previous contributors" +msgstr "مشارکت کننده‌گان قبلی" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "درباره Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "اطلاعات درباره محیط دسکتاپ Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "License" +msgstr "مجوز" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About the Xfce Desktop Environment" +msgstr "درباره محیط دسکتاپ Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "_Help" +msgstr "راهنما" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "_Close" +msgstr "بستن" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "Device" +msgstr "دستگاه" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "label" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "OS Name" +msgstr "نام سیستم عامل" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "OS Type" +msgstr "نوع سیستم عامل" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:9 +msgid "Distributor" +msgstr "توزیع کننده" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "نسخه Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "نگارش جی‌تی‌کِی" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "نگارش کِرنِل" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "حافظه" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 +msgid "System" +msgstr "سیستم" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 +msgid "" +"Xfce is a collection of programs that together provide a full-featured desktop environment.\n" +"The following programs are part of the Xfce core:" +msgstr "" +"Xfce مجموعه‌ای از برنامه‌ها هست که در کنار هم یک محیط دسکتاپ با امکانات کامل را فراهم می‌کنند.\n" +"برنامه‌هایی که در ادامه قید شده‌اند بخشی از هسته Xfce هستند:" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 +msgid "" +"Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" +"\n" +"Xfce components are licensed under free or open source licences; GPL or BSDL for applications and LGPL or BSDL for libraries. Look at the documentation, the source code or the Xfce website (https://www.xfce.org) for more information.\n" +"\n" +"Thank you for your interest in Xfce.\n" +"\n" +"\t- The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +msgid "About" +msgstr "درباره" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +msgid "Credits" +msgstr "دست‌اندکاران" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 +msgid "GPL" +msgstr "جی‌پی‌اِل" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 +msgid "LGPL" +msgstr "اِل‌جی‌پی‌اِل" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 +msgid "BSD" +msgstr "بی‌اِس‌دی" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 +msgid "Copyright" +msgstr "حق رونوشت" + +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 +msgid "Unknown" +msgstr "ناشناخته" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "۶۴-بیت (فضای کاربری ۳۲-بیت)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "۶۴-بیت" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "۳۲-بیت" + +#. translators: This is the name of the OS, followed by the build ID, for +#. * example: +#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or +#. * "Ubuntu 16.04 LTS; Build ID: jki" +#: ../xfce4-about/system-info.c:729 +#, c-format +msgid "%s; Build ID: %s" +msgstr "" + +#: ../tests/test-ui.c:111 +#, c-format +msgid "" +"A file named \"%s\" already exists in this directory, the file hasn't been " +"added." +msgstr "" +"پرونده‌ای به نام «%s» در حال حاضر در این شاخه موجود است، پرونده افزوده نشد." + +#: ../tests/test-ui.c:122 +msgid "Failed to migrate the old panel configuration" +msgstr "" + +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 +msgid "Customize settings stored by Xfconf" +msgstr "" diff --git a/po/fi.po b/po/fi.po index 4cfa89c..9365294 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,21 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Ammuu5, 2017,2019 -# Jiri Grönroos , 2013,2019-2021 -# Juhani Numminen , 2019 -# Lasse Liehu , 2015 -# Pasi Lallinaho , 2014-2015,2017 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-01 10:50+0000\n" -"Last-Translator: Jiri Grönroos \n" -"Language-Team: Finnish (http://www.transifex.com/xfce/libxfce4ui/language/fi/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Finnish (https://app.transifex.com/xfce/teams/16840/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,11 +38,13 @@ msgstr "Haluatko lukea käyttöohjetta verkossa?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Sinut ohjataan verkkosivuille, joilla ylläpidetään käyttöohjeita ja niiden käännöksiä." +msgstr "" +"Sinut ohjataan verkkosivuille, joilla ylläpidetään käyttöohjeita ja niiden " +"käännöksiä." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Peru" @@ -81,14 +82,18 @@ msgstr "Suljetaanko ikkuna, jossa on useita välilehtiä?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Tässä ikkunassa on useita avoinna olevia välilehtiä. Ikkunan sulkeminen sulkee kaikki ikkunassa olevat välilehdet." +msgstr "" +"Tässä ikkunassa on useita avoinna olevia välilehtiä. Ikkunan sulkeminen " +"sulkee kaikki ikkunassa olevat välilehdet." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Tässä ikkunassa on %d avoinna olevaa välilehteä. Ikkunan sulkeminen sulkee kaikki ikkunassa olevat välilehdet." +msgstr "" +"Tässä ikkunassa on %d avoinna olevaa välilehteä. Ikkunan sulkeminen sulkee " +"kaikki ikkunassa olevat välilehdet." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -126,37 +131,36 @@ msgstr "Istunnonhallinnan asetukset" msgid "Show session management options" msgstr "Näytä istunnonhallinnan asetukset" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Istunnonhallintaan yhdistäminen epäonnistui: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Istunnonhallinta ei palauttanut kelvollista asiakastunnistetta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Työkansiota \"%s\" ei ole olemassa. Sitä ei käytetä, kun prosessi \"%s\" luodaan." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Työkansiota \"%s\" ei ole olemassa. Sitä ei käytetä, kun prosessi \"%s\" " +"luodaan." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Tiedostonimi on liian pitkä" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Tiedostonimien ei tule alkaa tai päättyä välilyöntiin" @@ -165,7 +169,9 @@ msgstr "Tiedostonimien ei tule alkaa tai päättyä välilyöntiin" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Tätä pikanäppäintä käytetään jo toiminnolle '%s'. Kumpaa toimintoa haluat käyttää?" +msgstr "" +"Tätä pikanäppäintä käytetään jo toiminnolle '%s'. Kumpaa toimintoa haluat " +"käyttää?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -196,67 +202,98 @@ msgstr "Pikanäppäin on jo liitetty komentoon \"%s\". Kumpaa toimintoa käytet msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Toiminto '%s' käyttää jo tätä pikanäppäintä. Kumpaa toimintoa haluat käyttää?" +msgstr "" +"Toiminto '%s' käyttää jo tätä pikanäppäintä. Kumpaa toimintoa haluat " +"käyttää?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Käytä toista näppäinyhdistelmää." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Pikänäppäin %s käynnistää jo tämän toiminnon." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Ristiriita pikanäppäimellä %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Pikanäppäin on jo liitetty toiseen toimintoon." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Pikanäppäinten muokkain" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Nykyinen pikanäppäin. Napsauta muokataksesi..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Tyhjennä pikanäppäin" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Palauta oletusarvoinen pikanäppäin" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Tämä pikanäppäin on jo käytössä: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Pikanäppäin on jo käytössä" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Ikkunointiohjelman toimintopikanäppäin" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "toiminto" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Komennon pikanäppäin" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "komento" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Pikanäppäin" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Tyhjennä" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Paina näppäintä" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Näppäimistöä ei voitu kaapata." @@ -365,198 +402,214 @@ msgid "Toggle fullscreen" msgstr "Koko näytön tila" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Siirrä ikkuna alempana olevaan näyttöön" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Siirrä ikkuna vasemmalla olevaan näyttöön" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Siirrä ikkuna oikealla olevaan näyttöön" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Siirrä ikkuna yläpuolella olevaan näyttöön" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Siirrä ikkuna ylempään työtilaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Siirrä ikkuna alempaan työtilaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Siirrä ikkuna vasempaan työtilaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Siirrä ikkuna oikeaan työtilaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Siirrä ikkuna edelliseen työtilaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Siirrä ikkuna seuraavaan työtilaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Siirrä ikkuna työtilaan 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Siirrä ikkuna työtilaan 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Siirrä ikkuna työtilaan 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Siirrä ikkuna työtilaan 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Siirrä ikkuna työtilaan 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Siirrä ikkuna työtilaan 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Siirrä ikkuna työtilaan 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Siirrä ikkuna työtilaan 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Siirrä ikkuna työtilaan 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Siirrä ikkuna työtilaan 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Siirrä ikkuna työtilaan 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Siirrä ikkuna työtilaan 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Järjestä yläreunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Järjestä alareunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Järjestä vasempaan reunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Järjestä oikeaan reunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Järjestä vasempaan yläreunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Järjestä oikeaan yläreunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Järjestä vasempaan alareunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Järjestä oikeaan alareunaan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Näytä työpöytä" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Ylempi työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Alempi työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Vasen työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Oikea työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Edellinen työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Seuraava työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Työtila 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Työtila 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Työtila 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Työtila 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Työtila 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Työtila 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Työtila 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Työtila 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Työtila 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Työtila 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Työtila 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Työtila 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Lisää työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Lisää työtila vierelle" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Poista viimeinen työtila" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Poista nykyinen työtila" @@ -576,186 +629,205 @@ msgstr "Xfce 4:n elementit" msgid "Version information" msgstr "Versiotiedot" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" -msgstr "" +msgstr "Näytönohjaimet" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Ikkunointiohjelma" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Hallitsee ikkunoiden sijoittelua näytöllä." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Paneeli" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" +"Tarjoaa sijainnin ikkunapainikkeille, käynnistyimille, sovellusvalikolle ja " +"muulle." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Työpöydän hallinta" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "Asettaa taustakuvan, käsittelee kuvakkeet ja muuta." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Tiedostonhallinta" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" +"Hallitse tiedostojasi nykyaikaisella, helppokäyttöisellä ja nopealla " +"tavalla." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Taltionhallinta" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "Hallitsee irrotettavia tallennuslaitteita Thunaria varten." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Istunnonhallinta" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"Tallentaa ja palauttaa istunnon, vastaa käynnistämisestä, automaattisesta " +"käynnistymisestä ja sammuttamisesta." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Asetusjärjestelmä" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Asetustenhallinta" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "Määrittää ulkoasun, näytön, näppäimistön ja hiiren asetukset." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Sovellusten hakutyökalu" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "" +msgstr "Löytää ja käynnistää järjestelmään asennettuja sovelluksia." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Asetusdemoni" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "Tallettaa asetukset D-Bus-pohjaiseen asetusjärjestelmään." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Valikkokirjasto" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" +"Toteuttaa GLib- ja GIO-kirjastoihin pohjautuvan valikon, joka on " +"freedesktop.org-yhteensopiva." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" -msgstr "" +msgstr "Esikatselupalvelu" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Lue " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Jos tiedät jonkun puuttuvan listalta, älä epäröi tehdä vikaraporttia " +"osoitteessa ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Kiitos kaikille, jotka auttoivat näiden ohjelmistojen kehitystyössä." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4:n tekijänoikeuden omistaa Olivier Fourdan (fourdan@xfce.org). Sen osien tekijänoikeudet kuuluvat niiden kehittäjille." +msgstr "" +"Xfce 4:n tekijänoikeuden omistaa Olivier Fourdan (fourdan@xfce.org). Sen " +"osien tekijänoikeudet kuuluvat niiden kehittäjille." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Ohjelmistot libxfce4ui, libxfce4util ja exo on julkaistu Free Software Foundationin julkaiseman GNU LGPL -lisenssin version 2 tai halutessasi uudemman ehdoilla." +msgstr "" +"Ohjelmistot libxfce4ui, libxfce4util ja exo on julkaistu Free Software " +"Foundationin julkaiseman GNU LGPL -lisenssin version 2 tai halutessasi " +"uudemman ehdoilla." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Ohjelmistot thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop ja xfwm4 on julkaistu Free Software Foundationin julkaiseman GNU GPL -lisenssin version 2 tai halutessasi uudemman ehdoilla." +msgstr "" +"Ohjelmistot thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop ja xfwm4 on julkaistu Free Software " +"Foundationin julkaiseman GNU GPL -lisenssin version 2 tai halutessasi " +"uudemman ehdoilla." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Kirjoita '%s --help' nähdäksesi käyttöohjeen." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+:n alustus epäonnistui." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce:n kehitystiimi. Kaikki oikeudet pidätetään." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Ilmoita vioista osoitteessa %s." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Käyttöliittymän lataus epäonnistui." #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Ydinkehittäjät" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktiiviset kehittäjät" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Palvelinten ylläpito" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Käännösten ohjaus" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" -msgstr "" +msgstr "Dokumentaation ohjaus" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Kääntäjät" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Aiemmat kehittäjät" @@ -776,52 +848,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Tietoja Xfce-työpöytäympäristöstä" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "nimike" +msgid "_Help" +msgstr "_Ohje" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Käyttöjärjestelmän nimi" +msgid "_Close" +msgstr "_Sulje" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Laite" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Muisti" +msgid "label" +msgstr "nimike" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Suoritin" +msgid "OS Name" +msgstr "Käyttöjärjestelmän nimi" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Käyttöjärjestelmän tyyppi" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce:n versio" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Jakelija" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce:n versio" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 -msgid "GPU" -msgstr "" +msgid "GTK Version" +msgstr "GTK:n versio" #: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Ytimen versio" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Suoritin" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Muisti" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "Näytönohjain" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Järjestelmä" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce on sovelluskokoelma, joka yhdessä muodostaa monipuolisen työpöytäjärjestelmän.\n" +"Xfce:n ydin koostuu seuraavista ohjelmistoista:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -832,46 +922,46 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Tietoja" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Tekijät" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Tekijänoikeus" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Tuntematon" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" -msgstr "" +msgstr "64-bit (32-bit käyttäjäavaruus)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -879,7 +969,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Koostustunniste: %s" @@ -889,12 +979,14 @@ msgstr "%s; Koostustunniste: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Tiedosto nimeltä \"%s\" on jo olemassa tässä hakemistossa, tiedostoa ei lisätty." +msgstr "" +"Tiedosto nimeltä \"%s\" on jo olemassa tässä hakemistossa, tiedostoa ei " +"lisätty." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Paneelin asetusten tuominen epäonnistui" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Mukauta Xfconfiin tallennettuja asetuksia" diff --git a/po/fr.po b/po/fr.po index 24a2fbe..6c0a8d5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,30 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Charles Monzat , 2018 -# jc1 , 2013 -# jc1 , 2013,2020 -# Luclu7 , 2020 -# math Matmutant , 2016 -# math Matmutant , 2016 -# Maximilian Schleiss , 2008 -# Urien Desterres , 2014-2015 -# Yannick Le Guen , 2014-2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-23 18:42+0000\n" -"Last-Translator: Yannick Le Guen \n" -"Language-Team: French (http://www.transifex.com/xfce/libxfce4ui/language/fr/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: French (https://app.transifex.com/xfce/teams/16840/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" @@ -43,11 +38,13 @@ msgstr "Souhaitez-vous consulter le manuel en ligne ?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Vous allez être redirigé vers le site de documentation en ligne où les pages d’aide sont maintenues et traduites." +msgstr "" +"Vous allez être redirigé vers le site de documentation en ligne où les pages" +" d’aide sont maintenues et traduites." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Annuler" @@ -85,14 +82,18 @@ msgstr "Fermer la fenêtre avec plusieurs onglets ?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Cette fenêtre a plusieurs onglets ouverts. Fermer cette fenêtre fermera également tous ses onglets." +msgstr "" +"Cette fenêtre a plusieurs onglets ouverts. Fermer cette fenêtre fermera " +"également tous ses onglets." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Cette fenêtre a %d onglets ouverts. Fermer cette fenêtre fermera aussi tous ses onglets." +msgstr "" +"Cette fenêtre a %d onglets ouverts. Fermer cette fenêtre fermera aussi tous " +"ses onglets." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -130,46 +131,48 @@ msgstr "Options du gestionnaire de session" msgid "Show session management options" msgstr "Afficher les options du gestionnaire de session" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Impossible de se connecter au gestionnaire de session : %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Le gestionnaire de session n’a pas retourné un ID client valide" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Le répertoire de travail « %s » n’existe pas. Il ne sera pas utilisé à la réouverture de « %s »." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Séparateur de répertoire interdit dans le nom de fichier" +msgstr "" +"Le répertoire de travail « %s » n’existe pas. Il ne sera pas utilisé à la " +"réouverture de « %s »." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Le nom de fichier est trop long" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Séparateur de répertoire interdit dans le nom de fichier" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "Les noms de fichiers ne devraient pas commencer ni se terminer par un espace" +msgstr "" +"Les noms de fichiers ne devraient pas commencer ni se terminer par un espace" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Ce raccourci est déjà utilisé pour l’action « %s ». Quelle action voulez-vous garder ?" +msgstr "" +"Ce raccourci est déjà utilisé pour l’action « %s ». Quelle action voulez-" +"vous garder ?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -193,74 +196,107 @@ msgstr "Garder « %s »" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Ce raccourci est déjà utilisé pour la commande « %s ». Quelle action voulez-vous garder ?" +msgstr "" +"Ce raccourci est déjà utilisé pour la commande « %s ». Quelle action voulez-" +"vous garder ?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Ce raccourci est déjà utilisé pour l’action « %s ». Quelle action voulez-vous garder ?" +msgstr "" +"Ce raccourci est déjà utilisé pour l’action « %s ». Quelle action voulez-" +"vous garder ?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Veuillez utiliser une autre combinaison de touches." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s déclenche déjà cette action." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Actions en conflit pour %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Ce raccourci est déjà utilisé pour autre chose." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Éditeur des raccourcis" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Le raccourci actuel. Cliquez pour éditer..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Effacer le raccourci" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restaurer le raccourci par défaut" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Ce raccourci clavier est actuellement utilisé par : « %s »" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Raccourci clavier déjà utilisé" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Raccourci d’une action du gestionnaire de fenêtres" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "l’action" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Raccourci commande" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "la commande" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Raccourci" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Effacer" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Appuyer sur les touches du clavier pour déclencher %s « %s »." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Veuillez appuyer sur une touche" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Impossible d’accéder au clavier." @@ -369,198 +405,214 @@ msgid "Toggle fullscreen" msgstr "Basculer en plein écran" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Déplacer la fenêtre vers le bas du moniteur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Déplacer la fenêtre vers la gauche du moniteur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Déplacer la fenêtre vers la droite du moniteur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Déplacer la fenêtre vers le haut du moniteur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Déplacer la fenêtre vers l’espace de travail supérieur" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Déplacer la fenêtre vers l’espace de travail inférieur" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Déplacer la fenêtre vers l’espace de travail à gauche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Déplacer la fenêtre vers l’espace de travail à droite" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Déplacer la fenêtre vers l’espace de travail précédent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Déplacer la fenêtre vers l’espace de travail suivant" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Déplacer la fenêtre vers l’espace de travail 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Déplacer la fenêtre vers l’espace de travail 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Déplacer la fenêtre vers l’espace de travail 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Déplacer la fenêtre vers l’espace de travail 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Déplacer la fenêtre vers l’espace de travail 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Déplacer la fenêtre vers l’espace de travail 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Déplacer la fenêtre vers l’espace de travail 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Déplacer la fenêtre vers l’espace de travail 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Déplacer la fenêtre vers l’espace de travail 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Déplacer la fenêtre vers l’espace de travail 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Déplacer la fenêtre vers l’espace de travail 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Déplacer la fenêtre vers l’espace de travail 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Agencer la fenêtre en mosaïque vers le haut" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Agencer la fenêtre en mosaïque vers le bas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Agencer la fenêtre en mosaïque vers la gauche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Agencer la fenêtre en mosaïque vers la droite" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Agencer la fenêtre en mosaïque en haut à gauche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Agencer la fenêtre en mosaïque en haut à droite" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Agencer la fenêtre en mosaïque en bas à gauche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Agencer la fenêtre en mosaïque en bas à droite" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Afficher le bureau" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Espace de travail supérieur" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Espace de travail inférieur" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Espace de travail à gauche" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Espace de travail à droite" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Espace de travail précédent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Espace de travail suivant" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Espace de travail 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Espace de travail 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Espace de travail 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Espace de travail 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Espace de travail 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Espace de travail 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Espace de travail 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Espace de travail 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Espace de travail 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Espace de travail 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Espace de travail 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Espace de travail 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Ajouter un espace de travail" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Ajouter un espace de travail adjacent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Supprimer le dernier espace de travail" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Supprimer l’espace de travail actif" @@ -580,186 +632,206 @@ msgstr "Widgets Xfce 4" msgid "Version information" msgstr "Informations sur la version" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "Processeurs graphiques" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gestionnaire de fenêtres" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Gère le placement des fenêtres sur l’écran." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Tableau de bord" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Fournit une zone pour les boutons de fenêtres, les lanceurs, le menu des applications et plus encore." +msgstr "" +"Fournit une zone pour les boutons de fenêtres, les lanceurs, le menu des " +"applications et plus encore." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gestionnaire du bureau" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Définit les fonds d’écran du bureau, gère les icônes et plus encore." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gestionnaire de fichiers" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Gère vos fichiers de façon moderne, rapide et simple d’utilisation." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Gestionnaire de volumes" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Gère les disques et médias amovibles pour Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gestionnaire de sessions" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Enregistre et restaure votre session, gère le lancement de session, le démarrage automatique et l’arrêt." +msgstr "" +"Enregistre et restaure votre session, gère le lancement de session, le " +"démarrage automatique et l’arrêt." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Paramètres système" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gestionnaire de paramètres" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Configure l’apparence, l’affichage, le clavier et la souris." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Liste des applications" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "Retrouve et lance rapidement les applications installées sur votre système." +msgstr "" +"Retrouve et lance rapidement les applications installées sur votre système." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Service des paramètres" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Stocke vos paramètres dans un système de configuration basé sur D-Bus." +msgstr "" +"Stocke vos paramètres dans un système de configuration basé sur D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Une bibliothèque de menus" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Implémente un menu conforme freedesktop.org basé sur GLib et GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Service de miniatures" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implémente la spécification D-Bus de gestion des miniatures." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Veuillez consulter " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Si vous connaissez quelqu’un d’absent dans cette liste, n’hésitez pas et signalez un bug sur ." +msgstr "" +"Si vous connaissez quelqu’un d’absent dans cette liste, n’hésitez pas et " +"signalez un bug sur ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Merci à tous ceux qui ont aidé à rendre ce logiciel disponible !" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Les droits d’auteur de Xfce 4 appartiennent à Olivier Fourdan (fourdan@xfce.org). Les différents composants sont protégés par copyright par leurs auteurs respectifs." +msgstr "" +"Les droits d’auteur de Xfce 4 appartiennent à Olivier Fourdan " +"(fourdan@xfce.org). Les différents composants sont protégés par copyright " +"par leurs auteurs respectifs." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Les paquets libxfce4ui, libxfce4util et exo sont distribués sous les termes de la GNU Library General Public License telle que publiée par la Free Software Foundation ; que ce soit en version 2, ou (à votre guise) toute version ultérieure." +msgstr "" +"Les paquets libxfce4ui, libxfce4util et exo sont distribués sous les termes " +"de la GNU Library General Public License telle que publiée par la Free " +"Software Foundation ; que ce soit en version 2, ou (à votre guise) toute " +"version ultérieure." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Les paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop et xfwm4 sont distribués sous les termes de la GNU General Public License telle que publiée par la Free Software Foundation ; que ce soit en version 2, ou (à votre guise) toute version ultérieure." +msgstr "" +"Les paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop et xfwm4 sont distribués sous les termes " +"de la GNU General Public License telle que publiée par la Free Software " +"Foundation ; que ce soit en version 2, ou (à votre guise) toute version " +"ultérieure." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Taper « %s --help » pour plus d’aide." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Impossible d’initialiser GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "L’équipe de développement Xfce. Tous droits réservés." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Veuillez signaler les bogues à <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Impossible de charger l’interface" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Développeurs principaux" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Contributeurs actifs" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Serveurs maintenus par" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervision des traductions" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Supervision de la documentation" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Traducteurs" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Contributeurs précédents" @@ -780,52 +852,70 @@ msgid "About the Xfce Desktop Environment" msgstr "À propos de l’environnement de bureau Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "étiquette" +msgid "_Help" +msgstr "_Aide" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nom du système d’exploitation" +msgid "_Close" +msgstr "_Fermer" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Appareil" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Mémoire" +msgid "label" +msgstr "étiquette" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Processeur" +msgid "OS Name" +msgstr "Nom du système d’exploitation" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Type du système d’exploitation" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Version de Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributeur" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Version de Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Version de GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Version du noyau" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Processeur" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Mémoire" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "Processeur graphique" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Système" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce est un ensemble de programmes qui, ensemble, fournissent un environnement de bureau complet.\nLes programmes suivants font partie du cœur de Xfce :" +msgstr "" +"Xfce est un ensemble de programmes qui, ensemble, fournissent un environnement de bureau complet.\n" +"Les programmes suivants font partie du cœur de Xfce :" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -834,48 +924,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce est aussi une plateforme de développement fournissant plusieurs bibliothèques qui aident les programmeurs à créer des applications qui s’intègrent bien à l’environnement de bureau.\n\nLes composants Xfce sont placés sous des licences libres ou open source ; GPL ou BSDL pour les applications et LGPL ou BSDL pour les bibliothèques. Consultez la documentation, le code source ou le site web de Xfce (https://www.xfce.org) pour plus d’informations.\n\nMerci de votre intérêt pour Xfce.\n\n\t- L’équipe de développement Xfce" +msgstr "" +"Xfce est aussi une plateforme de développement fournissant plusieurs bibliothèques qui aident les programmeurs à créer des applications qui s’intègrent bien à l’environnement de bureau.\n" +"\n" +"Les composants Xfce sont placés sous des licences libres ou open source ; GPL ou BSDL pour les applications et LGPL ou BSDL pour les bibliothèques. Consultez la documentation, le code source ou le site web de Xfce (https://www.xfce.org) pour plus d’informations.\n" +"\n" +"Merci de votre intérêt pour Xfce.\n" +"\n" +"\t- L’équipe de développement Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "À propos" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Crédits" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Inconnu" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bits (espace utilisateur 32 bits)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 bits" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 bits" @@ -883,7 +980,7 @@ msgstr "32 bits" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s ; ID de compilation : %s" @@ -893,12 +990,14 @@ msgstr "%s ; ID de compilation : %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Un fichier nommé « %s » existe déjà dans ce répertoire, le fichier n’a pas été ajouté." +msgstr "" +"Un fichier nommé « %s » existe déjà dans ce répertoire, le fichier n’a pas " +"été ajouté." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Impossible de migrer l’ancienne configuration du tableau de bord" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Modifier les paramètres stockés par Xfconf" diff --git a/po/gl.po b/po/gl.po index 60c0281..c4fdb5a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Daniel Muñiz Fontoira , 2017,2019-2020 -# Leandro Regueiro , 2008-2010,2013 -# Xosé, 2015,2017 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-20 00:45+0100\n" -"PO-Revision-Date: 2020-12-21 04:56+0000\n" -"Last-Translator: Daniel Muñiz Fontoira \n" -"Language-Team: Galician (http://www.transifex.com/xfce/libxfce4ui/language/gl/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Galician (https://app.transifex.com/xfce/teams/16840/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,7 +23,9 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Produciuse un fallo ao abrir o navegador web para consultar a documentación en liña" +msgstr "" +"Produciuse un fallo ao abrir o navegador web para consultar a documentación " +"en liña" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -37,11 +40,13 @@ msgstr "Desexa ler o manual en liña?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Redirixiráselle ao sitio web de documentación no que se manteñen e traducen as páxinas de axuda." +msgstr "" +"Redirixiráselle ao sitio web de documentación no que se manteñen e traducen " +"as páxinas de axuda." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Cancelar" @@ -79,14 +84,18 @@ msgstr "Pechar a xanela con varias lapelas?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Esta xanela ten varias lapelas abertas. Pechando esta xanela tamén pechará todas estas lapelas." +msgstr "" +"Esta xanela ten varias lapelas abertas. Pechando esta xanela tamén pechará " +"todas estas lapelas." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Esta xanela ten %d lapelas abertas. Pechando esta xanela tamén pechará todas estas lapelas." +msgstr "" +"Esta xanela ten %d lapelas abertas. Pechando esta xanela tamén pechará todas" +" estas lapelas." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -124,37 +133,37 @@ msgstr "Opcións de xestión de sesións" msgid "Show session management options" msgstr "Amosar as opcións de xestión de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Produciuse un fallo ao conectar co xestor de sesións: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" -msgstr "O xestor de sesións non devolveu ningún identificador de cliente correcto" +msgstr "" +"O xestor de sesións non devolveu ningún identificador de cliente correcto" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "O directorio de traballo «%s» non existe. Non se usará ao iniciar «%s»." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "O separador de directorios empregado no nome do ficheiro non se permite" +msgstr "" +"O directorio de traballo «%s» non existe. Non se usará ao iniciar «%s»." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "O nome do ficheiro é longo de máis" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" +"O separador de directorios empregado no nome do ficheiro non se permite" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Os nomes de ficheiros non deberían non comezar nin rematar cos espazo" @@ -163,7 +172,8 @@ msgstr "Os nomes de ficheiros non deberían non comezar nin rematar cos espazo" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Este atallo xa está sendo usado para a acción «%s». Que acción desexa usar?" +msgstr "" +"Este atallo xa está sendo usado para a acción «%s». Que acción desexa usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +197,105 @@ msgstr "Manter «%s»" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Este atallo xa está sendo usado para a orde «%s». Que acción desexa usar?" +msgstr "" +"Este atallo xa está sendo usado para a orde «%s». Que acción desexa usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Este atallo xa está sendo usado pola acción «%s». Que acción desexa usar?" +msgstr "" +"Este atallo xa está sendo usado pola acción «%s». Que acción desexa usar?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Empregue outra combinación de teclas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s xa activa esta acción." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Accións en conflito para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Este atallo xa está sendo usado por algo." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "O atallo de teclado está sendo usado por: «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "O atallo de teclado xa está en uso" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Atallo de acción do xestor de xanelas" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "acción" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Atallo de orde" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "orde" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Atallo" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Limpar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Prema as teclas do teclado para activar o %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Prema a tecla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Non se puido obter o teclado." @@ -363,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Activar a pantalla completa" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mover a xanela ao espazo de traballo superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mover a xanela ao espazo de traballo inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mover a xanela ao espazo de traballo da esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mover a xanela ao espazo de traballo da dereita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mover a xanela ao espazo de traballo anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mover a xanela ao seguinte espazo de traballo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mover a xanela ao espazo de traballo 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mover a xanela ao espazo de traballo 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mover a xanela ao espazo de traballo 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mover a xanela ao espazo de traballo 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mover a xanela ao espazo de traballo 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mover a xanela ao espazo de traballo 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mover a xanela ao espazo de traballo 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mover a xanela ao espazo de traballo 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mover a xanela ao espazo de traballo 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mover a xanela ao espazo de traballo 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mover a xanela ao espazo de traballo 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mover a xanela ao espazo de traballo 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Xear mosaico da xanela na cima" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Xerar mosaico da xanela cara abaixo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Xerar mosaico da xanela cara á esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Xerar mosaico da xanela cara á dereita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Xear mosaico da xanela arriba á esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Xerar mosaico da xanela arriba á dereita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Xerar mosaico da xanela abaixo á esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Xerar mosaico da xanela abaixo á dereita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Amosar o escritorio" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Espazo de traballo superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Espazo de traballo inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Espazo de traballo da esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Espazo de traballo da dereita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Espazo de traballo anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Espazo de traballo seguinte" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Espazo de traballo 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Espazo de traballo 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Espazo de traballo 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Espazo de traballo 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Espazo de traballo 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Espazo de traballo 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Espazo de traballo 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Espazo de traballo 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Espazo de traballo 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Espazo de traballo 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Espazo de traballo 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Espazo de traballo 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Engadir un espazo de traballo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Engadir un espazo de traballo adxacente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Eliminar o último espazo de traballo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Eliminar o espazo de traballo activo" @@ -574,186 +631,209 @@ msgstr "Trebellos do Xfce 4" msgid "Version information" msgstr "Información da versión" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Xestor de xanelas" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Xestiona a colocación das xanelas na pantalla." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Fornece un lugar para botóns de xanelas, lanzadores, menú de aplicacións e moito máis." +msgstr "" +"Fornece un lugar para botóns de xanelas, lanzadores, menú de aplicacións e " +"moito máis." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Xestor de xanelas" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Define os fondos de escritorio, manexa iconas e moito mais." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Xestor de ficheiros" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Manexa os seus ficheiros de xeito moderno, doado de usar e rápido." -#: ../xfce4-about/main.c:155 -msgid "Volume manager" -msgstr "Xestor de volume" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Xestor do volume" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Manexa unidades e soportes extraíbeis no Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Xestor de sesións" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Garda e restaura a súa sesión, manexa o inicio, inicio automático de aplicacións e o apagado." +msgstr "" +"Garda e restaura a súa sesión, manexa o inicio, inicio automático de " +"aplicacións e o apagado." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Configuración do sistema" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Xestor de configuración" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Configura as opcións de aparencia, pantalla, teclado e rato. " -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Buscador de aplicacións" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Atopa rapidamente e inicia aplicacións instaladas no seu sistema." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Daemon de configuración" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Almacena as súas opcións nun sistema de configuración baseado en D-Bus." +msgstr "" +"Almacena as súas opcións nun sistema de configuración baseado en D-Bus." -#: ../xfce4-about/main.c:180 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "Unha biblioteca de menús" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Incorpora un menú compatíbel coa especificación freedesktop.org baseado en GLib e GIO." +msgstr "" +"Incorpora un menú compatíbel coa especificación freedesktop.org baseado en " +"GLib e GIO." -#: ../xfce4-about/main.c:185 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "Servizo de miniaturas" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "Incorpora un servizo de xestión de miniaturas coa especificación D-Bus." +msgstr "" +"Incorpora un servizo de xestión de miniaturas coa especificación D-Bus." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Visite " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Se considera que falta algo nesta lista; non dubide e redacte un informe de fallos a través de ." +msgstr "" +"Se considera que falta algo nesta lista; non dubide e redacte un informe de " +"fallos a través de ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Grazas a todas as persoas que axudaron a facer que este software estea dispoñíbel!" +msgstr "" +"Grazas a todas as persoas que axudaron a facer que este software estea " +"dispoñíbel!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 ten copyright de Olivier Fourdan (fourdan@xfce.org). Os diferentes compoñentes de teñen copyright dos seus respectivos autores." +msgstr "" +"Xfce 4 ten copyright de Olivier Fourdan (fourdan@xfce.org). Os diferentes " +"compoñentes de teñen copyright dos seus respectivos autores." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Os paquetes libxfce4ui, libxfce4util e exo distribúense baixo os termos da Licenza pública xeral da biblioteca GNU tal e como a publica a Free Software Foundation; xa sexa a versión 2 da licenza, ou (segundo a súa elección) calquera versión posterior." +msgstr "" +"Os paquetes libxfce4ui, libxfce4util e exo distribúense baixo os termos da " +"Licenza pública xeral da biblioteca GNU tal e como a publica a Free Software" +" Foundation; xa sexa a versión 2 da licenza, ou (segundo a súa elección) " +"calquera versión posterior." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Os paquetes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop e xfwm4 distribúense baixo os termos da licenza pública xeral GNU tal como foi publicada pola Free Software Foundation; xa sexa a versión 2 da licenza, ou (segundo a súa elección) calquera versión posterior." +msgstr "" +"Os paquetes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop e xfwm4 distribúense baixo os termos da " +"licenza pública xeral GNU tal como foi publicada pola Free Software " +"Foundation; xa sexa a versión 2 da licenza, ou (segundo a súa elección) " +"calquera versión posterior." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Escriba «%s --help» para obter información sobre o modo de uso." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Non se puido inicializar GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "O equipo de desenvolvemento de Xfce. Todos os dereitos reservados." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, comunique os fallos a <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Produciuse un fallo ao cargar a interface" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Desenvolvedores principais" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Colaboradores activos" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servidores mantidos por" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervisión da tradución" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Supervisión da documentación" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Tradutores" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Anteriores colaboradores" @@ -774,52 +854,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Sobre o contorno de escritorio Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiqueta" +msgid "_Help" +msgstr "A_xuda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nome do SO" +msgid "_Close" +msgstr "_Pechar" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Dispositivo" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memoria" +msgid "label" +msgstr "etiqueta" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Procesador" +msgid "OS Name" +msgstr "Nome do SO" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tipo de SO" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versión do Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distribuidor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versión do Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Procesador" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memoria" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "O Xfce é unha colección de programas que xuntos fornecen un contorno de escritorio con moitas características.\nOs seguintes programas forman parte do núcleo de Xfce:" +msgstr "" +"O Xfce é unha colección de programas que xuntos fornecen un contorno de escritorio con moitas características.\n" +"Os seguintes programas forman parte do núcleo de Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,48 +926,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "O Xfce é tamén unha plataforma de desenvolvemento que fornece varias bibliotecas que axudan aos programadores a crear aplicacións que se axusten ben ao contorno de escritorio.\n\nOs compoñentes de Xfce están baixo licenzas libres ou de código aberto; GPL ou BSDL para as aplicacións e LGPL ou BSDL para as bibliotecas. Consulte a documentación, o código fonte ou o sitio web do Xfce (https://www.xfce.org) para máis información.\n\nGrazas polo seu interese no Xfce.\n\n- O equipo de desenvolvemento do Xfce." +msgstr "" +"O Xfce é tamén unha plataforma de desenvolvemento que fornece varias bibliotecas que axudan aos programadores a crear aplicacións que se axusten ben ao contorno de escritorio.\n" +"\n" +"Os compoñentes de Xfce están baixo licenzas libres ou de código aberto; GPL ou BSDL para as aplicacións e LGPL ou BSDL para as bibliotecas. Consulte a documentación, o código fonte ou o sitio web do Xfce (https://www.xfce.org) para máis información.\n" +"\n" +"Grazas polo seu interese no Xfce.\n" +"\n" +"- O equipo de desenvolvemento do Xfce." -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Sobre" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Créditos" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Descoñecido" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bits (espazo de usuario de 32 bits)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -877,7 +982,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID da compilación: %s" @@ -887,12 +992,14 @@ msgstr "%s; ID da compilación: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Xa existe un ficheiro chamado «%s» neste directorio; non se engadiu o ficheiro." +msgstr "" +"Xa existe un ficheiro chamado «%s» neste directorio; non se engadiu o " +"ficheiro." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Non se puido migrar a configuración antiga do panel" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalizar a configuración almacenada por Xfconf" diff --git a/po/he.po b/po/he.po index 70a8dac..45d3b93 100644 --- a/po/he.po +++ b/po/he.po @@ -1,23 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Elishai Eliyahu , 2016-2017,2019-2020 -# Elishai Eliyahu , 2020 -# GenghisKhan , 2014 -# GenghisKhan , 2014-2016 -# Hezy Amiel , 2010 -# Omer I.S. , 2020 -# Yaron Shahrabani , 2014 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-26 11:58+0000\n" -"Last-Translator: Elishai Eliyahu \n" -"Language-Team: Hebrew (http://www.transifex.com/xfce/libxfce4ui/language/he/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Hebrew (https://app.transifex.com/xfce/teams/16840/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,11 +38,12 @@ msgstr "האם ברצונך לקרוא את המדריך אונליין?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "המערכת תפנה אותך אל אתר רשת תיעוד היכן שעמודי עזרה הינם מתוחזקים ומתורגמים." +msgstr "" +"המערכת תפנה אותך אל אתר רשת תיעוד היכן שעמודי עזרה הינם מתוחזקים ומתורגמים." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_ביטול" @@ -83,14 +81,16 @@ msgstr "לסגור חלון עם לשוניות?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "לחלון זה מספר לשוניות פתוחות. סגירת חלון זה תסגור גם את כל הלשוניות שלו." +msgstr "" +"לחלון זה מספר לשוניות פתוחות. סגירת חלון זה תסגור גם את כל הלשוניות שלו." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "לחלון זה %d לשוניות פתוחות. סגירת חלון זה תסגור גם את כל הלשוניות שלו." +msgstr "" +"לחלון זה %d לשוניות פתוחות. סגירת חלון זה תסגור גם את כל הלשוניות שלו." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -128,37 +128,34 @@ msgstr "אפשרויות ניהול סשן" msgid "Show session management options" msgstr "הצג אפשרויות ניהול סשן" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "נכשלה התחברות למנהל הסשן: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "מנהל הסשן לא השיב זהות לקוח תקפה" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "תיקיית עבודה \"%s\" לא קיימת. היא לא תהיה בשימוש כאשר תובא \"%s\"." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "מפריד ספריה לא חוקי בשם קובץ" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "שם קובץ יותר מדי ארוך" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "מפריד ספריה לא חוקי בשם קובץ" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "שמות קבצים לא אמורים להתחיל או להסתיים עם רווח" @@ -167,7 +164,8 @@ msgstr "שמות קבצים לא אמורים להתחיל או להסתיים msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "קיצור דרך זה כבר מצוי בשימוש עבור הפעולה '%s'. באיזו פעולה ברצונך להשתמש?" +msgstr "" +"קיצור דרך זה כבר מצוי בשימוש עבור הפעולה '%s'. באיזו פעולה ברצונך להשתמש?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -191,74 +189,105 @@ msgstr "שמור על '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "קיצור דרך זה כבר מצוי בשימוש עבור הפקודה '%s'. באיזו פעולה ברצונך להשתמש?" +msgstr "" +"קיצור דרך זה כבר מצוי בשימוש עבור הפקודה '%s'. באיזו פעולה ברצונך להשתמש?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "קיצור דרך זה כבר מצוי בשימוש על ידי הפעולה '%s'. באיזו פעולה ברצונך להשתמש?" +msgstr "" +"קיצור דרך זה כבר מצוי בשימוש על ידי הפעולה '%s'. באיזו פעולה ברצונך להשתמש?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "אנא השתמש בשילוב מקשים אחר." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "‏%s כבר מעוררת את פעולה זו." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "פעולות סותרות עבור %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "קיצור דרך זה כבר מצוי בשימוש עבור משהו אחר." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "עורך הקיצורים" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "קיצור הדרך הנוכחי. הקלק לעריכה..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "נקה את הקיצור" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "שחזר לקיצור ברירת המחדל" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "קיצור דרך זה במקלדת כרגע בשימוש עם: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "קיצור דרך במקלדת כבר בשימוש" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "קיצור דרך פעולת מנהל חלונות" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "פעולה" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "קיצור דרך פקודה" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "פקודה" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "קיצור דרך" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "נקה" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "לחץ על מקשי המקלדת כדי להפעיל את %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "אנא לחץ על מקש" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "לא יכול לתפוס את המקלדת." @@ -367,198 +396,214 @@ msgid "Toggle fullscreen" msgstr "החלף מסך מלא" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "העבר חלון למסך תחתון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "העבר חלון למסך שמאלי" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "העבר חלון למסך ימני" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "העבר חלון למסך עליון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "העבר חלון למשטח עבודה עליון" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "העבר חלון למשטח עבודה תחתון" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "העבר חלון למשטח עבודה שמאלי" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "העבר חלון למרחב עבודה ימני" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "העבר חלון למשטח עבודה קודם" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "העבר חלון למשטח עבודה הבא" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "העבר חלון למשטח עבודה 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "העבר חלון למשטח עבודה 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "העבר חלון למשטח עבודה 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "העבר חלון למשטח עבודה 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "העבר חלון למשטח עבודה 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "העבר חלון למשטח עבודה 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "העבר חלון למשטח עבודה 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "העבר חלון למשטח עבודה 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "העבר חלון למשטח עבודה 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "העבר חלון למשטח עבודה 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "העבר חלון למשטח עבודה 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "העבר חלון למשטח עבודה 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "הפוך חלון לאריח עליון" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "הפוך חלון לאריח תחתון" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "הפוך חלון לאריח שמאלי" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "הפוך חלון לאריח ימני" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "הפוך חלון לאריח עליון-שמאלי" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "הפוך חלון לאריח עליון-ימני" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "הפוך חלון לאריח תחתון-שמאלי" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "הפוך חלון לאריח תחתון-ימני" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "הצג שולחן עבודה" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "משטח עבודה עליון" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "משטח עבודה תחתון" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "משטח עבודה שמאלי" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "משטח עבודה ימני" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "משטח עבודה קודם" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "משטח עבודה הבא" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "משטח עבודה 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "משטח עבודה 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "משטח עבודה 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "משטח עבודה 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "משטח עבודה 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "משטח עבודה 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "משטח עבודה 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "משטח עבודה 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "משטח עבודה 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "משטח עבודה 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "משטח עבודה 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "משטח עבודה 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "הוסף משטח עבודה" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "הוסף משטח עבודה סמוך" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "מחק משטח עבודה אחרון" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "מחק משטח עבודה פעיל" @@ -578,186 +623,197 @@ msgstr "יישומונים Xfce 4" msgid "Version information" msgstr "מידע גרסה" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" -msgstr "GPUs" +msgstr "מאיצים גרפיים" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "מנהל חלונות" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "מטפל במיקום של חלונות על המרקע." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "לוח" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "מספק בית לכפתורי חלונות, מפעילים, תפריט ישומים ועוד." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "מנהל שולחן עבודה" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "קובע רקעים של שולחן עבודה, מטפל באיקונים ועוד." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "מנהל קבצים" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "מנהל את הקבצים שלך בדרך מודרנית, קלה לשימוש ומהירה. " -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "מנהל עוצמת קול" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "מנהל כוננים נשלפים ומדיה עבור Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "מנהל הפעלה" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "שומר ומשחזר את הסשן שלך, מטפל באתחול, הפעלה אוטומטית וכיבוי." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "מערכת הגדרות" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "מנהל הגדרות" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "קובע הגדרות הופעה, תצוגה, מקלדת ועכבר." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "מחפש אפליקציות" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "מוצא ומפעיל במהירות ישומים המותקנים במערכת שלך." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "שדון הגדרות" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "מאחסן את ההגדרות שלך במערכת הגדרות מבוססת D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "ספריית תפריט" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "מיישם תפריט תואם freedesktop.org המבוסס על GLib ו-GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "שירות תמונות מוקטנות" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "מיישם את מפרט D-Bus לניהול תמונות מוקטנות." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "אנא ראה " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "אם אתה מכיר מישהו שחסר ברשימה זו, אל תהסס לפתוח באג ב-." +msgstr "" +"אם אתה מכיר מישהו שחסר ברשימה זו, אל תהסס לפתוח באג " +"ב-." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "תודה לכל מי אשר סייע להפוך את תכנה זו לזמינה!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "‏Xfce 4 הינו מוגן בזכויות יוצרים לטובת Olivier Fourdan ‏(fourdan@xfce.org). הרכיבים השונים מוגנים בזכויות יוצרים לטובת המחברים שלהם בהתאמה." +msgstr "" +"‏Xfce 4 הינו מוגן בזכויות יוצרים לטובת Olivier Fourdan ‏(fourdan@xfce.org). " +"הרכיבים השונים מוגנים בזכויות יוצרים לטובת המחברים שלהם בהתאמה." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "החבילות libxfce4ui, libxfce4util וגם exo מופצות תחת התנאים של ספריית GNU רישיון ציבורי כללי כפי שפורסם על ידי קרן תוכנה חופשית: מהדורה 2 של הרישיון, או (לבחירתך) כל מהדורה מאוחרת יותר." +msgstr "" +"החבילות libxfce4ui, libxfce4util וגם exo מופצות תחת התנאים של ספריית GNU " +"רישיון ציבורי כללי כפי שפורסם על ידי קרן תוכנה חופשית: מהדורה 2 של הרישיון, " +"או (לבחירתך) כל מהדורה מאוחרת יותר." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "החבילות thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop וגם xfwm4 מופצות תחת התנאים של GNU רישיון ציבורי כללי כפי שפורסם על ידי קרן תוכנה חופשית: מהדורה 2 של הרישיון, או (לבחירתך) כל מהדורה מאוחרת יותר." +msgstr "" +"החבילות thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings," +" xfconf, xfdesktop וגם xfwm4 מופצות תחת התנאים של GNU רישיון ציבורי כללי כפי" +" שפורסם על ידי קרן תוכנה חופשית: מהדורה 2 של הרישיון, או (לבחירתך) כל מהדורה" +" מאוחרת יותר." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "הקלד \"%s --help\" למידע שימוש." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "לא מסוגל לאתחל את GTK+ " -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." -msgstr "אנא דווח על באגים ל־ <%s>." +msgstr "נא לדווח על באגים ל־<%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "נכשלה טעינת הממשק" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "‎מפתחי ליבה" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "‎תורמים פעילים" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "‎שרתים מתוחזקים ע״י" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "‎פיקוח תרגומים" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "פיקוח תיעוד" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "‎מתרגמים" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "‎תורמים קודמים" @@ -778,52 +834,70 @@ msgid "About the Xfce Desktop Environment" msgstr "אודות סביבת שולחן עבודה Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "תווית" +msgid "_Help" +msgstr "_עזרה" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "שם מערכת הפעלה" +msgid "_Close" +msgstr "_סגור" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "התקן" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "זיכרון" +msgid "label" +msgstr "תווית" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "מעבד" +msgid "OS Name" +msgstr "שם מערכת הפעלה" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "סוג מערכת הפעלה" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "גרסת Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "מפיץ" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "גרסת Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 -msgid "GPU" -msgstr "GPU" +msgid "GTK Version" +msgstr "גרסת GTK" #: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "גרסת קרנל" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "מעבד" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "זיכרון" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "מאיצים גרפיים" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "מערכת" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce הוא אוסף של תוכנות שביחד מספקות סביבת שולחן עבודה מלאה בתכונות.\nהתוכנות הבאות הן חלק מליבת Xfce:" +msgstr "" +"Xfce הוא אוסף של תוכנות שביחד מספקות סביבת שולחן עבודה מלאה בתכונות.\n" +"התוכנות הבאות הן חלק מליבת Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -832,56 +906,63 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce היא בנוסף פלטפורמת פיתוח המספקת מספר ספריות העוזרות למתכנתים ליצור ישומים שמשתלבים היטב עם סביבת שולחן עבודה.\n\nרכיבי Xfce מורשים תחת רשיונות חופשיים או פתוחים, GPL או BSDL לישומים ו-LGPL או BSDL לספריות. הסתכל בתיעוד, קוד המקור או באתר Xfce (https://www.xfce.org) למידע נוסף.\n\nתודה על התעניינותך ב-Xfce.\n\n\t-צוות פיתוח Xfce" +msgstr "" +"Xfce היא בנוסף פלטפורמת פיתוח המספקת מספר ספריות העוזרות למתכנתים ליצור ישומים שמשתלבים היטב עם סביבת שולחן עבודה.\n" +"\n" +"רכיבי Xfce מורשים תחת רשיונות חופשיים או פתוחים, GPL או BSDL לישומים ו-LGPL או BSDL לספריות. הסתכל בתיעוד, קוד המקור או באתר Xfce (https://www.xfce.org) למידע נוסף.\n" +"\n" +"תודה על התעניינותך ב-Xfce.\n" +"\n" +"\t-צוות פיתוח Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "אודות" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "תודות" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "זכויות יוצרים" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "לא ידוע" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit userspace)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" -msgstr "64-bit" +msgstr "64 סיביות" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" -msgstr "32-bit" +msgstr "32 סיביות" #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; זהות Build: %s" @@ -897,6 +978,6 @@ msgstr "קובץ בשם \"%s\" כבר קיים בספרייה זו, הקובץ msgid "Failed to migrate the old panel configuration" msgstr "נכשל ייבוא תצורת לוח ישנה" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "התאם הגדרות מאוחסנות על ידי Xfconf" diff --git a/po/hr.po b/po/hr.po index 4032910..8053420 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Edin Veskovic , 2019-2020 -# Edin Veskovic , 2015,2017 -# Edin Veskovic , 2014 -# Ivica Kolić , 2013-2016,2019-2020 +# Xfce Bot , 2023 +# Ivica Kolić , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-09 09:49+0000\n" -"Last-Translator: Ivica Kolić \n" -"Language-Team: Croatian (http://www.transifex.com/xfce/libxfce4ui/language/hr/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Ivica Kolić , 2023\n" +"Language-Team: Croatian (https://app.transifex.com/xfce/teams/16840/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,11 +39,13 @@ msgstr "Želite li čitati priručnik na mreži?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Biti ćete preusmjereni na web stranicu dokumentacije gdje se stranice pomoći održavaju i prevode." +msgstr "" +"Biti ćete preusmjereni na web stranicu dokumentacije gdje se stranice pomoći" +" održavaju i prevode." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Otkaži" @@ -80,14 +83,18 @@ msgstr "Zatvori prozor s više kartica?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Ovaj prozor ima više otvorenih kartica. Zatvaranjem prozora zatvorit će se i sve njegove kartice." +msgstr "" +"Ovaj prozor ima više otvorenih kartica. Zatvaranjem prozora zatvorit će se i" +" sve njegove kartice." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Ovaj prozor ima %d otvorenih kartica. Zatvaranjem prozora zatvorit će se i sve njegove kartice." +msgstr "" +"Ovaj prozor ima %d otvorenih kartica. Zatvaranjem prozora zatvorit će se i " +"sve njegove kartice." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -125,37 +132,36 @@ msgstr "Opcije upravljanja sesijom" msgid "Show session management options" msgstr "Pokaži opcije upravljanja sesijam" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Nije uspjelo spajanje na upravitelja sesijom: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Upravitelj sesijom nije vratio valjan id klijenta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Radna mapa \"%s\" ne postoji. Neće se koristiti prilikom pokretanja nove instance \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Radna mapa \"%s\" ne postoji. Neće se koristiti prilikom pokretanja nove " +"instance \"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Datotečno ime je predugo" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Datotečna imena ne bi trebala započinjati ili završavati razmakom" @@ -188,74 +194,105 @@ msgstr "Zadrži '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" +msgstr "" +"Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" +msgstr "" +"Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Molim koristite drugu kombinaciju tipki." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s već pokreće ovu radnju." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Sukobljene radnje za %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Ovaj prečac je već u upotrebi za nešto drugo." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Uređivač prečaca" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Trenutni prečac. Klikni za uređivanje..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Očisti prečac" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Obnovi zadani prečac" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Ovaj prečac tipkovnice trenutno koristi: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Ovaj se prečac tipkovnice već koristi" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Prečac radnje upravitelja prozora" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "radnja" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Prečac naredbe" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "naredba" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Prečac" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Očisti" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Molim pritisnite tipku" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Ne mogu se spojiti na tipkovnicu." @@ -364,198 +401,214 @@ msgid "Toggle fullscreen" msgstr "Postavi puni prozor" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Premjesti prozor na donji monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Premjesti prozor na lijevi monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Premjesti prozor na desni monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Premjesti prozor na gornji monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Pomakni prozor u gornji radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Pomakni prozor u donji radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Pomakni prozor u lijevi radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Pomakni prozor u desni radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Pomakni prozor u prethodni radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Pomakni prozor u slijedeći radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Pomakni prozor u radni prostor 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Pomakni prozor u radni prostor 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Pomakni prozor u radni prostor 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Pomakni prozor u radni prostor 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Pomakni prozor u radni prostor 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Pomakni prozor u radni prostor 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Pomakni prozor u radni prostor 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Pomakni prozor u radni prostor 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Pomakni prozor u radni prostor 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Pomakni prozor u radni prostor 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Pomakni prozor u radni prostor 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Pomakni prozor u radni prostor 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Pomakni prozor gore" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Pomakni prozor dolje" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Pomakni prozor lijevo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Pomakni prozor desno" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Pomakni prozor gore-lijevo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Pomakni prozor gore-desno" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Pomakni prozor dolje-lijevo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Pomakni prozor dolje-desno" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Pokaži radnu površinu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Gornji radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Donji radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Lijevi radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Desni radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Prethodni radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Slijedeći radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Radni prostor 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Radni prostor 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Radni prostor 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Radni prostor 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Radni prostor 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Radni prostor 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Radni prostor 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Radni prostor 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Radni prostor 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Radni prostor 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Radni prostor 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Radni prostor 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Dodaj radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Dodaj susjedni radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Obriši zadnji radni prostor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Obriši aktivni radni prostor" @@ -571,191 +624,202 @@ msgstr "Podnapis" msgid "Xfce 4 Widgets" msgstr "Xfce 4 Widgeti" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Informacija o verziji" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Upravitelj prozora" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Upravlja postavljanjem prozora na zaslonu." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Ploča" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Upravitelj radne površine" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Upravitelj datotekama" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "Upravlja vašim datotekama na moderan, lagan i brz način." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Upravitelj particijama" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Upravitelj sesijom" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Postavljanje sustava" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Upravitelj postavki" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "Konfigurira izgled, prikaz, postavke tipkovnice i miša." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Nalaznik programa" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Nadzornik postavka" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Knjižnica izbornika" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Servis sličica" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Molim pogledajte " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Ako znate tko nedostaje sa ovoga popisa, ne oklijevajte i prijavite bug na " +" ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Hvala svima koji su pomogli učiniti ovaj software dostupnim!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Nositelj autorskog prava za Xfce 4 je Olivier Fourdan (fourdan@xfce.org). Različite komponente su pod autorskim pravima dotičnih autora." +msgstr "" +"Nositelj autorskog prava za Xfce 4 je Olivier Fourdan (fourdan@xfce.org). " +"Različite komponente su pod autorskim pravima dotičnih autora." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Libxfce4ui, libxfce4util i exo paketi distribuiraju se pod uvjetima GNU Library General Public licence objavljene od strane Free Software Foundation; verzija 2 licence ili (po vašem izboru) neka od kasnijih verzija." +msgstr "" +"Libxfce4ui, libxfce4util i exo paketi distribuiraju se pod uvjetima GNU " +"Library General Public licence objavljene od strane Free Software " +"Foundation; verzija 2 licence ili (po vašem izboru) neka od kasnijih " +"verzija." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop i xfwm4 paketi distribuiraju se pod uvjetima GNU Library General Public licence objavljene od strane Free Software Foundation; verzija 2 licence ili (po vašem izboru) neka od kasnijih verzija." +msgstr "" +"Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf," +" xfdesktop i xfwm4 paketi distribuiraju se pod uvjetima GNU Library General " +"Public licence objavljene od strane Free Software Foundation; verzija 2 " +"licence ili (po vašem izboru) neka od kasnijih verzija." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Upiši '%s --help za informaciju o uporabi." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Nije moguće pokrenuti GTK +." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce razvojni tim. Sva prava pridržana." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Molimo prijavite bugove na <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Nije uspjelo učitavanje sučelja" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Verzija %s, distribuira %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Verzija %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Glavni razvijatelji" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktivni doprinositelji" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Poslužitelje održava" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Nadzor prijevoda" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Nadzor dokumentacije" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Prevoditelji" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Prethodni doprinositelji" @@ -776,48 +840,70 @@ msgid "About the Xfce Desktop Environment" msgstr "O Xfce radnom okruženju" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "naziv" +msgid "_Help" +msgstr "_Pomoć" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Ime operativnog sustava" +msgid "_Close" +msgstr "_Zatvori" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Uređaj" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memorija" +msgid "label" +msgstr "naziv" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Ime operativnog sustava" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tip operativnog sustava" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce verzija" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce verzija" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK inačica" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kernel inačica" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memorija" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sustav" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce je skup programa koji zajedno pružaju potpuno opremljeno radno " +"okruženje. Sljedeći programi su dio Xfce jezgre:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,39 +914,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "O programu" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Zahvale" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Autorska prava" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Nepoznato" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Build ID: %s" @@ -870,12 +971,13 @@ msgstr "%s; Build ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Datoteka imena \"%s\" već postoji u ovom direktoriju, datoteka nije dodana." +msgstr "" +"Datoteka imena \"%s\" već postoji u ovom direktoriju, datoteka nije dodana." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Neuspjelo premještanje stare konfiguracije ploče" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Prilagodi postavke koje je pohranio Xfconf" diff --git a/po/hu.po b/po/hu.po index 576bf08..591d822 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,21 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Balázs Meskó , 2018 -# Gabor Kelemen , 2009,2011-2012 -# Gábor P., 2017,2019-2020 -# gyeben , 2016 -# Sándor Zelenák , 2011 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Hungarian (http://www.transifex.com/xfce/libxfce4ui/language/hu/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Hungarian (https://app.transifex.com/xfce/teams/16840/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,11 +38,13 @@ msgstr "Szeretné elolvasni a kézikönyvet online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Átirányításra kerül a dokumentációs weboldalra, ahol a súgóoldalak karbantartása és fordítása történik." +msgstr "" +"Átirányításra kerül a dokumentációs weboldalra, ahol a súgóoldalak " +"karbantartása és fordítása történik." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "Mé_gse" @@ -81,14 +82,18 @@ msgstr "Több lapot tartalmazó ablak bezárása?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Ez az ablak több nyitott lapot tartalmaz. Az ablak bezárásával a nyitott lapok is bezárásra kerülnek." +msgstr "" +"Ez az ablak több nyitott lapot tartalmaz. Az ablak bezárásával a nyitott " +"lapok is bezárásra kerülnek." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Ez az ablak %d nyitott lapot tartalmaz. Az ablak bezárásával a nyitott lapok is bezárásra kerülnek." +msgstr "" +"Ez az ablak %d nyitott lapot tartalmaz. Az ablak bezárásával a nyitott " +"lapok is bezárásra kerülnek." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -126,46 +131,47 @@ msgstr "Munkamenet-kezelés beállítások" msgid "Show session management options" msgstr "Munkamenet-kezelés beállításainak megjelenítése" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "A munkamenet-kezelőhöz való csatlakozás meghiúsult: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "A munkamenet-kezelő nem adott vissza érvényes kliensazonosítót" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "A munkakönyvtár („%s”) nem létezik. Nem kerül felhasználásra „%s” indításakor." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"A munkakönyvtár („%s”) nem létezik. Nem kerül felhasználásra „%s” " +"indításakor." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "Túl hosszú fájlnév" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Mappaelválasztó nem lehet fájlnévben" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "A fájlnevek szélén nem lehet szóköz" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik műveletet akarja használni?" +msgstr "" +"Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik " +"műveletet akarja használni?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -189,74 +195,107 @@ msgstr "„%s” megtartása" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik műveletet akarja használni?" +msgstr "" +"Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik " +"műveletet akarja használni?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik műveletet akarja használni?" +msgstr "" +"Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik " +"műveletet akarja használni?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Kérem használjon más billentyűkombinációt!" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s már előidézi ezt a műveletet." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Ütköző műveletek ehhez: %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Ez a gyorsbillentyű már használatban van valami másra." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Gyorsbillentyű szerkesztő" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "A jelenlegi gyorsbillentyű. Kattints a szerkesztéshez..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Gyorsbillentyű törlése" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Az alapértelmezett gyorsbillentyű visszaállítása" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Ezt a gyorsbillentyűt már ez használja: „%s”" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "A gyorsbillentyű már használatban van" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Ablakkezelő-művelet gyorsbillentyű" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "műveletet" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Parancs gyorsbillentyű" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "parancsot" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Gyorsbillentyű" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Töröl" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "Kérlek, üss le egy billentyűt" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "A billentyűzet használata sikertelen." @@ -365,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Teljes képernyő átváltása" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Ablak mozgatása az alsó monitorra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Ablak mozgatása a bal monitorra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Ablak mozgatása a jobb monitorra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Ablak mozgatása a felső monitorra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Ablak áthelyezése a felső munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Ablak áthelyezése az alsó munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Ablak áthelyezése a bal munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Ablak áthelyezése a jobb munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Ablak áthelyezése az előző munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Ablak áthelyezése a következő munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Ablak áthelyezése az 1. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Ablak áthelyezése a 2. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Ablak áthelyezése a 3. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Ablak áthelyezése a 4. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Ablak áthelyezése az 5. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Ablak áthelyezése a 6. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Ablak áthelyezése a 7. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Ablak áthelyezése a 8. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Ablak áthelyezése a 9. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Ablak áthelyezése a 10. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Ablak áthelyezése a 11. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Ablak áthelyezése a 12. munkaterületre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Ablak igazítása felülre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Ablak igazítása alulra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Ablak igazítása balra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Ablak igazítása jobbra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Ablak igazítása bal felülre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Ablak igazítása jobb felülre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Ablak igazítása bal alulra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Ablak igazítása jobb alulra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Asztal megjelenítése" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Felső munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Alsó munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Bal munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Jobb munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Előző munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Következő munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "1. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "2. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "3. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "4. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "5. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "6. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "7. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "8. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "9. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "10. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "11. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "12. munkaterület" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Munkaterület hozzáadása" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Szomszédos munkaterület hozzáadása" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Utolsó munkaterület törlése" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Aktív munkaterület törlése" @@ -572,191 +627,205 @@ msgstr "Felirat" msgid "Xfce 4 Widgets" msgstr "Xfce 4 felületi elemek" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Verzióinformációk" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPU-k" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Ablakkezelő" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Az ablakok elhelyezésének kezelése a képernyőn." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Asztalkezelő" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "Beállítja az asztal hátterét, kezeli az ikonokat és hasonlókat." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Fájlkezelő" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "Kezeli a fájljaidat modern, könnyen használható módon és gyorsan." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "Kötetkezelő" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "Az eltávolítható meghajtókat és médiát kezeli a Thunar számára." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Munkamenet-kezelő" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"Menti és visszaállítja a munkafolyamatodat, kezeli indulását, az automatikus" +" indításokat és a leállítást." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Rendszer beállítása" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Beállításkezelő" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "Kezeli a megjelenés, kijelző, billentyűzet és egér beállításait." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Alkalmazáskereső" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "" +msgstr "Gyorsan megtalálja, elindítja a rendszerre telepített alkalmazásokat." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Beállításkezelő" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "Eltárolja a beállításaidat egy D-Bus-alapú beállító rendszeren." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Egy menürendszer" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Egy Menü könyvtár" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" +"Egy freedesktop.org-kompatibilis menü-implementáció GLib és GIO-alapokon." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Bélyegkép-készítő szolgáltatás" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Bélyegkép szolgáltatás" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "Megvalósítja a bélyegkép szolgáltatás D-Bus specifikációját." + +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Lásd itt: " -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Ha tudsz valaki, aki hiányzik erről a listáról; ne várj, hanem jelezd itt: " +" ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Köszönet mindazoknak, akik segítségével ez az alkalmazás elérhetővé vált." +msgstr "" +"Köszönet mindazoknak, akik segítségével ez az alkalmazás elérhetővé vált." -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Az Xfce szerzői joga Olivier Fourdant (fourdan@xfce.org) illeti. A további összetevők szerzői joga azok szerzőit illeti." +msgstr "" +"Az Xfce szerzői joga Olivier Fourdant (fourdan@xfce.org) illeti. A további " +"összetevők szerzői joga azok szerzőit illeti." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "A libxfce4ui, libxfce4util és exo csomagok a Free Software Foundation által kiadott GNU Library General Public License második (vagy bármely későbbi) változatában foglaltak alapján kerülnek terjesztésre." +msgstr "" +"A libxfce4ui, libxfce4util és exo csomagok a Free Software Foundation által " +"kiadott GNU Library General Public License második (vagy bármely későbbi) " +"változatában foglaltak alapján kerülnek terjesztésre." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "A thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop és xfwm4 csomagok a Free Software Foundation által kiadott GNU General Public License második (vagy bármely későbbi) változatában foglaltak alapján kerülnek terjesztésre." +msgstr "" +"A thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop és xfwm4 csomagok a Free Software Foundation által kiadott" +" GNU General Public License második (vagy bármely későbbi) változatában " +"foglaltak alapján kerülnek terjesztésre." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Segítségért adja ki a „%s --help” parancsot." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "A GTK+ előkészítése sikertelen." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Az Xfce fejlesztői csapata. Minden jog fenntartva." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "A programhibák itt jelenthetők be: %s" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "A felület betöltése sikertelen" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "%s verzió, terjesztő: %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Verzió %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Fő fejlesztők" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktív közreműködők" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "A kiszolgálóinkat karbantartják:" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Fordítások felügyelet" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Dokumentáció felügyelet" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Fordítók" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Előző munkatársak" @@ -777,48 +846,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Az Xfce asztali környezet névjegye" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "címke" +msgid "_Help" +msgstr "_Súgó" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Operációs rendszer neve" +msgid "_Close" +msgstr "_Bezárás" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Eszköz" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memória" +msgid "label" +msgstr "címke" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Operációs rendszer neve" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Operációs rendszer típusa" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce változat" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Forgalmazó" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce változat" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK verzió" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kernel verzió" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memória" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Rendszer" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Az Xfce egy programgyűjtemény, mely együtt egy teljes-képességű asztali környezet biztosít.\n" +"A következő programok részei az Xfce magjának:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,40 +919,62 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Az Xfce egy fejlesztő platform is, mely a programozók számára a munkakörnyezethez illő alkalmazások létrehozására nyújt különböző függvénykönyvtárakat..\n" +"\n" +"Az Xfce összetevők szabad vagy nyílt forrású licencűek; GPL vagy BSDL az alkalmazásokhoz, LGPL vagy BSDL a függvénykönyvtárakhoz. Lásd a dokumentációt, a forráskódot vagy az Xfce honlapot (https://www.xfce.org) további információkért.\n" +"\n" +"Thank you for your interest in Xfce.\n" +"\n" +"\t- Az Xfce csapat" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Névjegy" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Köszönet" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Ismeretlen" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Összeállítás azonosítója: %s" @@ -871,12 +984,13 @@ msgstr "%s; Összeállítás azonosítója: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "A(z) „%s” fájl már létezik a könyvtárban, a fájl nem került hozzáadásra." +msgstr "" +"A(z) „%s” fájl már létezik a könyvtárban, a fájl nem került hozzáadásra." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "A panel régi beállításainak átköltöztetése meghiúsult" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Az Xfconf által tárolt beállítások személyre szabása" diff --git a/po/hy.po b/po/hy.po index f3263bd..8e4fc52 100644 --- a/po/hy.po +++ b/po/hy.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Aram Palyan , 2014 -# E-Hayq LLC , 2018 -# Hayk Andreasyan , 2019 -# Real School , 2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Armenian (http://www.transifex.com/xfce/libxfce4ui/language/hy/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Armenian (https://app.transifex.com/xfce/teams/16840/hy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,11 +38,12 @@ msgstr "Ընթերցե՞լ ձեռնարկը առցանց։" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Կբացվի նկարագրման կայքը, որտեղ աջակցման նյութերը թարգմանվում և պահվում են։" +msgstr "" +"Կբացվի նկարագրման կայքը, որտեղ աջակցման նյութերը թարգմանվում և պահվում են։" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Չեղարկել" @@ -125,37 +126,35 @@ msgstr "Նիստի կառավարման ընտրանքներ" msgid "Show session management options" msgstr "Ցույց տալ նիստի կառավարման ընտրաքները" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Չհաջողվեց կապակցվել նիստի կառավարչին․ %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Նիստի կառավարիչը չի վերադարձրել սպասառուի վավեր ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "«%s» նշարանը գոյություն չունի։ Այն չի օգտագործվի «%s»֊ի միացման ժամանակ։" - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"«%s» նշարանը գոյություն չունի։ Այն չի օգտագործվի «%s»֊ի միացման ժամանակ։" -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -164,7 +163,9 @@ msgstr "" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Այս դյուրանցումն արդեն գործածվում է «%s» գործողության համար։ Ո՞ր գործողությունը գործածել։" +msgstr "" +"Այս դյուրանցումն արդեն գործածվում է «%s» գործողության համար։ Ո՞ր " +"գործողությունը գործածել։" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -188,74 +189,107 @@ msgstr "Թողնել «%s»֊ը" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Այս դյուրանցումն արդեն գործածվում է «%s» հրամանի համար։ Ո՞ր գործողությունը գործածել։" +msgstr "" +"Այս դյուրանցումն արդեն գործածվում է «%s» հրամանի համար։ Ո՞ր գործողությունը " +"գործածել։" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Այս դյուրանցումն արդեն գործածվում է «%s» գործողության կողմից։ Ո՞ր գործողությունն օգտագործել։" +msgstr "" +"Այս դյուրանցումն արդեն գործածվում է «%s» գործողության կողմից։ Ո՞ր " +"գործողությունն օգտագործել։" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Օգտագործել ստեղնների այլ զուգակցություն։" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s֊ն արդեն օգտագործում է այս գործողությունը։" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Բախվող գործողություններ %s֊ի համար" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Այս դյուրանցումն արդեն գործածվում է այլ բանի համար։" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Դյուրանցումն արդեն %s֊ի կողմից" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Դյուարնցումն արդեն գործածվում է" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Պատուհանների կառավարչի գործողությունների դյուրանցում" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "գործողություն" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Հրամանի դյուրանցում" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "հրաման" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Դյուրանցում" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Մաքրել" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Չհաջողվեց կպցնել ստեղնաշարը" @@ -364,198 +398,214 @@ msgid "Toggle fullscreen" msgstr "Անցնել ամբողջական ցուցադրիչի աշխատակերպ" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Տեղափոխել պատուհանը վերին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Տեղափոխել պատուհանը ստորին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Տեղափոխել պատուհանը ձախ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Տեղափոխել պատուհանը աջ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Տեղափոխել պատուհանը նախորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Տեղափոխել պատուհանը հաջորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Տեղափոխել պատուհանն առաջին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Տեղափոխել պատուհանն երկրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Տեղափոխել պատուհանն երրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Տեղափոխել պատուհանը չորրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Տեղափոխել պատուհանը հինգերորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Տեղափոխել պատուհանը վեցերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Տեղափոխել պատուհանը յոթերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Տեղափոխել պատուհանն ութներրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Տեղափոխել պատուհանն իններորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Տեղափոխել պատուհանը տասերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Տեղափոխել պատուհանը տասնմեկերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Տեղափոխել պատուհանը տասներկուերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Տեղադրել պատուհանը վերևում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Տեղադրել պատուհանը ներքևում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Տեղադրել պատուհանը ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Տեղադրել պատուհանը աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Տեղադրել պատուհանը վերևի ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Տեղադրել պատուհանը վերևի աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Տեղադրել պատուհանը ներքևի ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Տեղադրել պատուհանը ներքևի աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Ցուցադրել աշխատասեղանը" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Վերին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Ստորին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ձախ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Աջ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Նախորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Յաջորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Աշխատատարածք 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Աշխատատարածք 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Աշխատատարածք 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Աշխատատարածք 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Աշխատատարածք 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Աշխատատարածք 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Աշխատատարածք 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Աշխատատարածք 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Աշխատատարածք 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Աշխատատարածք 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Աշխատատարածք 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Աշխատատարածք 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Ավելացնել աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Ավելացնել հարակից աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Ջնջել վերջին աշխատատարածքը" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Ջնջել գործուն աշխատատարածքը" @@ -571,191 +621,200 @@ msgstr "Ենթանուն" msgid "Xfce 4 Widgets" msgstr "Xfce 4֊ի հարմարանքներ " -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Տարբերակի վերաբերեալ տեղեկույթ" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Պատուհանների կառավարիչ" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Կարգավորում է պատուհանների դիրքերը՝ ցուցադրիչի վրա։" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Վահանակ" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Աշխատասեղանի կառավարիչ" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Նիշք" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Ծավալի կառավարիչ" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Նիստի կառավարիչ" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Կարգավորման համակարգ" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Հավելվածների որոնում" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Կարգավորումների օժանդակ ծրագիր" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Ցանկի գրադարան" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Փոքրապատկերների ծառայություն" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Շնորհակալություն բոլոր նրանց, ովքեր օգնեցին այս միջավայրը դարձնել հասանելի:" +msgstr "" +"Շնորհակալություն բոլոր նրանց, ովքեր օգնեցին այս միջավայրը դարձնել հասանելի:" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce4-ի հեղինակային իրավունքը պատկանում է Օլիվեր Ֆաունդանին (fourdan@xfce.org)։ Տարբեր բաղադրիչների հեղինակային իրավունքները պաշտպանվում են դրանք ստեղծող հեղինակների կողմից։" +msgstr "" +"Xfce4-ի հեղինակային իրավունքը պատկանում է Օլիվեր Ֆաունդանին " +"(fourdan@xfce.org)։ Տարբեր բաղադրիչների հեղինակային իրավունքները պաշտպանվում" +" են դրանք ստեղծող հեղինակների կողմից։" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs եւ exo փաթեթները մշակվում են ըստ Free Software Foundation֊ի թողարկած, GNU գրադարանների հանրային արտոնագրի երկրորդ կամ (կամընտրական) ավելի նոր տարբերակի կաննոների համաձայն։" +msgstr "" +"libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs եւ exo փաթեթները մշակվում " +"են ըստ Free Software Foundation֊ի թողարկած, GNU գրադարանների հանրային " +"արտոնագրի երկրորդ կամ (կամընտրական) ավելի նոր տարբերակի կաննոների համաձայն։" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr " Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop եւ xfwm4 փաթեթները մշակված են ըստ GNU հանրային արտոնագրի երկրորդ կամ (կամընտրական) ավելի նոր տարբերակի կանոնների համաձայն։" +msgstr "" +" Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop եւ xfwm4 փաթեթները մշակված են ըստ GNU հանրային արտոնագրի " +"երկրորդ կամ (կամընտրական) ավելի նոր տարբերակի կանոնների համաձայն։" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Մուտքագրեք «%s --help» աջակցության համար։" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Անհնար է գործարկել GTK+֊ը։" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce֊ի մշակման խումբ։ Բոլոր իրավունքները պաշտպանված են։" -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Սխալների մասին <%s> հասցեով։" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Չհաջողվեց բեռնել միջերեսը" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Տարբերակ %s, մշակված %s֊ի կողմից" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Տարբերակ %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Հիմնական մշակողներ" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Գործունյա աջակիցներ" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Սպասարկիչների կարգավորում" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Թարգմանությունների վերահսկում" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Թարգմանիչներ" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Նախկին աջակիցներ" @@ -776,23 +835,23 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce աշխատասեղանի միջավայրի մասին" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "" +msgid "_Help" +msgstr "_Աջակցություն" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Փակել" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" +msgid "label" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -800,24 +859,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Համակարգ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,39 +907,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Ծրագրի մասին" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Շնորհակալություն" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Հեղինակային իրավունք" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Անհայտ" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -876,6 +970,6 @@ msgstr "%s նիշն արդեն գոյություն ունի տվյալ նշար msgid "Failed to migrate the old panel configuration" msgstr "Չհաջողվեց առբերել վահանակի նախկին կարգավորումները" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Կազմաձևել Xfconf֊ի կողմից պահված կարգավորումները" diff --git a/po/hy_AM.po b/po/hy_AM.po index 098bc2d..f126aae 100644 --- a/po/hy_AM.po +++ b/po/hy_AM.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# E-Hayq LLC , 2018 -# Hayk Andreasyan , 2019 -# Real School , 2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Armenian (Armenia) (http://www.transifex.com/xfce/libxfce4ui/language/hy_AM/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Armenian (Armenia) (https://app.transifex.com/xfce/teams/16840/hy_AM/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,11 +38,13 @@ msgstr "Ընթերցե՞լ ձեռնարկը առցանց։" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Կը բացուի նկարագրման կայքը, որտեղ աջակցման նիւթերը թարգմանուում եւ պահուում են։" +msgstr "" +"Կը բացուի նկարագրման կայքը, որտեղ աջակցման նիւթերը թարգմանուում եւ պահուում " +"են։" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Չեղարկել" @@ -124,37 +127,35 @@ msgstr "Նիստի կառավարման ընտրանքներ" msgid "Show session management options" msgstr "Ցոյց տալ նիստի կառավարման ընտրաքները" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Չյաջողուեց կապակցուել նիստի կառավարչին․ %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Նիստի կառավարիչը չի վերադարձրել սպասառուի վավեր ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "«%s» նշարանը գոյութիւն չունի։ Այն չի աւգտագործուի «%s»֊ի միացման ժամանակ։" - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"«%s» նշարանը գոյութիւն չունի։ Այն չի աւգտագործուի «%s»֊ի միացման ժամանակ։" -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -163,7 +164,9 @@ msgstr "" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան համար։ Ո՞ր գործողութիւնը գործածել։" +msgstr "" +"Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան համար։ Ո՞ր " +"գործողութիւնը գործածել։" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +190,107 @@ msgstr "Թողնել «%s»֊ը" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Այս դիւրանցումն արդէն գործածուում է «%s» հրամանի համար։ Ո՞ր գործողութիւնը գործածել։" +msgstr "" +"Այս դիւրանցումն արդէն գործածուում է «%s» հրամանի համար։ Ո՞ր գործողութիւնը " +"գործածել։" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան կողմից։ Ո՞ր գործողութիւնն աւգտագործել։" +msgstr "" +"Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան կողմից։ Ո՞ր " +"գործողութիւնն աւգտագործել։" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Օգտագործել ստեղնների այլ զուգակցութիւն։" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s֊ն արդէն աւգտագործում է այս գործողութիւնը։" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Բախուող գործողութիւններ %s֊ի համար" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Այս դիւրանցումն արդէն գործածուում է այլ բանի համար։" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Դիւրանցումն արդէն %s֊ի կողմից" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Դիւարնցումն արդէն գործածուում է" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Պատուհանների կառավարչի գործողութիւնների դիւրանցում" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "գործողութիւն" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Հրամանի դիւրանցում" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "հրաման" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Դիւրանցում" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Մաքրել" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Չյաջողուեց կպցնել ստեղնաշարը" @@ -363,198 +399,214 @@ msgid "Toggle fullscreen" msgstr "Անցնել ամբողջական ցուցադրիչի աշխատակերպ" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Տեղափոխել պատուհանը վերին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Տեղափոխել պատուհանը ստորին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Տեղափոխել պատուհանը ձախ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Տեղափոխել պատուհանը աջ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Տեղափոխել պատուհանը նախորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Տեղափոխել պատուհանը յաջորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Տեղափոխել պատուհանն առաջին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Տեղափոխել պատուհանն երկրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Տեղափոխել պատուհանն երրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Տեղափոխել պատուհանը չորրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Տեղափոխել պատուհանը հինգերորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Տեղափոխել պատուհանը վեցերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Տեղափոխել պատուհանը եաւթերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Տեղափոխել պատուհանն ութներրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Տեղափոխել պատուհանն իններորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Տեղափոխել պատուհանը տասերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Տեղափոխել պատուհանը տասնմեկերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Տեղափոխել պատուհանը տասներկուերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Տեղադրել պատուհանը վերեւում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Տեղադրել պատուհանը ներքեւում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Տեղադրել պատուհանը ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Տեղադրել պատուհանը աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Տեղադրել պատուհանը վերեւի ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Տեղադրել պատուհանը վերեւի աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Տեղադրել պատուհանը ներքեւի ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Տեղադրել պատուհանը ներքեւի աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Ցուցադրել աշխատասեղանը" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Վերին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Ստորին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ձախ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Աջ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Նախորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Յաջորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Աշխատատարածք 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Աշխատատարածք 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Աշխատատարածք 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Աշխատատարածք 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Աշխատատարածք 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Աշխատատարածք 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Աշխատատարածք 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Աշխատատարածք 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Աշխատատարածք 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Աշխատատարածք 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Աշխատատարածք 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Աշխատատարածք 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Աւելացնել աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Աւելացնել յարակից աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Ջնջել վերջին աշխատատարածքը" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Ջնջել գործուն աշխատատարածքը" @@ -570,191 +622,200 @@ msgstr "Ենթանուն" msgid "Xfce 4 Widgets" msgstr "Xfce 4֊ի հարմարանքներ " -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Տարբերակի վերաբերեալ տեղեկոյթ" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Պատուհանների կառավարիչ" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Կարգաւորում է պատուհանների դիրքերը՝ ցուցադրիչի վրայ։" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Վահանակ" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Աշխատասեղանի կառավարիչ" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Նիշք" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Ծաւալի կառավարիչ" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Նիստի կառավարիչ" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Կարգաւորման համակարգ" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Կարգաւորումների կառավարիչ" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Յաւելուածների որոնում" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Կարգաւորումների աւժանդակ ծրագիր" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Ցանկի գրադարան" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Փոքրապատկերների ծառայութիւն" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Շնորհակալութիւն բոլոր նրանց, ովքեր աւգնեցին այս միջավայրը դարձնել հասանելի:" +msgstr "" +"Շնորհակալութիւն բոլոր նրանց, ովքեր աւգնեցին այս միջավայրը դարձնել հասանելի:" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce4-ի հեղինակային իրաւունքը պատկանում է Օլիվեր Ֆաունդանին (fourdan@xfce.org)։ Տարբեր բաղադրիչների հեղինակային իրաւունքները պաշտպանուում են դրանք ստեղծող հեղինակների կողմից։" +msgstr "" +"Xfce4-ի հեղինակային իրաւունքը պատկանում է Օլիվեր Ֆաունդանին " +"(fourdan@xfce.org)։ Տարբեր բաղադրիչների հեղինակային իրաւունքները " +"պաշտպանուում են դրանք ստեղծող հեղինակների կողմից։" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs եւ exo փաթեթները մշակուում են ըստ Free Software Foundation֊ի թողարկած, GNU գրադարանների հանրային արտաւնագրի երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կաննոների համաձայն։" +msgstr "" +"libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs եւ exo փաթեթները մշակուում" +" են ըստ Free Software Foundation֊ի թողարկած, GNU գրադարանների հանրային " +"արտաւնագրի երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կաննոների համաձայն։" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr " Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop եւ xfwm4 փաթեթները մշակուած են ըստ GNU հանրային արտաւնագրի երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կանոնների համաձայն։" +msgstr "" +" Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop եւ xfwm4 փաթեթները մշակուած են ըստ GNU հանրային արտաւնագրի" +" երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կանոնների համաձայն։" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Մուտքագրէք «%s --help» աջակցութեան համար։" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Անհնար է գործարկել GTK+֊ը։" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce֊ի մշակման խումբ։ Բոլոր իրաւունքները պաշտպանուած են։" -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Սխալների մասին <%s> հասցէով։" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Չյաջողուեց բեռնել միջերեսը" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Տարբերակ %s, մշակուած %s֊ի կողմից" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Տարբերակ %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Հիմնական մշակողներ" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Գործունեայ աջակիցներ" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Սպասարկիչների կարգաւորում" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Թարգմանութիւնների վերահսկում" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Թարգմանիչներ" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Նախկին աջակիցներ" @@ -775,23 +836,23 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce աշխատասեղանի միջավայրի մասին" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "" +msgid "_Help" +msgstr "Աւգնութիւն" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Փակել" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Սարք" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" +msgid "label" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -799,24 +860,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Համակարգ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,39 +908,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Ծրագրի մասին" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Շնորհակալութիւն" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Հեղինակային իրաւունք" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Անյայտ" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -875,6 +971,6 @@ msgstr "%s նիշն արդէն գոյութիւն ունի տուեալ նշար msgid "Failed to migrate the old panel configuration" msgstr "Չյաջողուեց առբերել վահանակի նախկին կարգաւորումները" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Կազմաձեւել Xfconf֊ի կողմից պահուած կարգաւորումները " diff --git a/po/hye.po b/po/hye.po index 8d67ff8..7a2bad5 100644 --- a/po/hye.po +++ b/po/hye.po @@ -1,21 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Arman Harutyunyan , 2020 -# E-Hayq LLC , 2018 -# Hayk Andreasyan , 2019 -# Real School , 2019 -# Վահրամ Չալաբեան , 2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Eastern Armenian (http://www.transifex.com/xfce/libxfce4ui/language/hye/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Eastern Armenian (https://app.transifex.com/xfce/teams/16840/hye/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,11 +38,13 @@ msgstr "Ընթերցե՞լ ձեռնարկը առցանց։" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Կը բացուի նկարագրման կայքը, որտեղ աջակցման նիւթերը թարգմանուում եւ պահուում են։" +msgstr "" +"Կը բացուի նկարագրման կայքը, որտեղ աջակցման նիւթերը թարգմանուում եւ պահուում " +"են։" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Չեղարկել" @@ -81,14 +82,18 @@ msgstr "Փակե՞լ պատուհանի բոլոր ներդիրները" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Այս պատուհանը ունի բացուած բազմակի ներդիրներ։ Փակելով այս պատուհանը դուք կը փակեք նաեւ բոլոր ներդիրները։" +msgstr "" +"Այս պատուհանը ունի բացուած բազմակի ներդիրներ։ Փակելով այս պատուհանը դուք կը " +"փակեք նաեւ բոլոր ներդիրները։" #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Այս պատուհանը ունի %d բացուած ներդիրներ։ Փակելով այս պատուհանը դուք կը փակեք նաեւ բոլոր ներդիրները։" +msgstr "" +"Այս պատուհանը ունի %d բացուած ներդիրներ։ Փակելով այս պատուհանը դուք կը փակեք" +" նաեւ բոլոր ներդիրները։" #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -126,37 +131,35 @@ msgstr "Նիստի կառավարման ընտրանքներ" msgid "Show session management options" msgstr "Ցոյց տալ նիստի կառավարման ընտրաքները" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Չյաջողուեց կապակցուել նիստի կառավարչին․ %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Նիստի կառավարիչը չի վերադարձրել սպասառուի վավեր ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "«%s» նշարանը գոյութիւն չունի։ Այն չի աւգտագործուի «%s»֊ի միացման ժամանակ։" - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Նշարանի բաժանիչը անաւրինական է նիշքի անուան մեջ " +msgstr "" +"«%s» նշարանը գոյութիւն չունի։ Այն չի աւգտագործուի «%s»֊ի միացման ժամանակ։" -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Նշանունը չափազանց երկար է" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Նշարանի բաժանիչը անաւրինական է նիշքի անուան մեջ " + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Նշանուները չեն կարող սկսուել կամ վերջանալ բացատով։" @@ -165,7 +168,9 @@ msgstr "Նշանուները չեն կարող սկսուել կամ վերջա msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան համար։ Ո՞ր գործողութիւնը գործածել։" +msgstr "" +"Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան համար։ Ո՞ր " +"գործողութիւնը գործածել։" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -189,74 +194,107 @@ msgstr "Թողնել «%s»֊ը" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Այս դիւրանցումն արդէն գործածուում է «%s» հրամանի համար։ Ո՞ր գործողութիւնը գործածել։" +msgstr "" +"Այս դիւրանցումն արդէն գործածուում է «%s» հրամանի համար։ Ո՞ր գործողութիւնը " +"գործածել։" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան կողմից։ Ո՞ր գործողութիւնն աւգտագործել։" +msgstr "" +"Այս դիւրանցումն արդէն գործածուում է «%s» գործողութեան կողմից։ Ո՞ր " +"գործողութիւնն աւգտագործել։" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Օգտագործել ստեղնների այլ զուգակցութիւն։" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s֊ն արդէն աւգտագործում է այս գործողութիւնը։" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Բախուող գործողութիւններ %s֊ի համար" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Այս դիւրանցումն արդէն գործածուում է այլ բանի համար։" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Դիւրանցումն արդէն %s֊ի կողմից" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Դիւարնցումն արդէն գործածուում է" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Պատուհանների կառավարչի գործողութիւնների դիւրանցում" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "գործողութիւն" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Հրամանի դիւրանցում" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "հրաման" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Դիւրանցում" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Մաքրել" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Չյաջողուեց կպցնել ստեղնաշարը" @@ -365,198 +403,214 @@ msgid "Toggle fullscreen" msgstr "Անցնել ամբողջական ցուցադրիչի աշխատակերպ" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Տեղափոխել պատուհանը վերին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Տեղափոխել պատուհանը ստորին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Տեղափոխել պատուհանը ձախ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Տեղափոխել պատուհանը աջ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Տեղափոխել պատուհանը նախորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Տեղափոխել պատուհանը յաջորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Տեղափոխել պատուհանն առաջին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Տեղափոխել պատուհանն երկրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Տեղափոխել պատուհանն երրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Տեղափոխել պատուհանը չորրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Տեղափոխել պատուհանը հինգերորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Տեղափոխել պատուհանը վեցերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Տեղափոխել պատուհանը եաւթերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Տեղափոխել պատուհանն ութներրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Տեղափոխել պատուհանն իններորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Տեղափոխել պատուհանը տասերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Տեղափոխել պատուհանը տասնմեկերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Տեղափոխել պատուհանը տասներկուերրորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Տեղադրել պատուհանը վերեւում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Տեղադրել պատուհանը ներքեւում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Տեղադրել պատուհանը ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Տեղադրել պատուհանը աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Տեղադրել պատուհանը վերեւի ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Տեղադրել պատուհանը վերեւի աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Տեղադրել պատուհանը ներքեւի ձախ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Տեղադրել պատուհանը ներքեւի աջ կողմում" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Ցուցադրել աշխատասեղանը" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Վերին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Ստորին աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ձախ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Աջ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Նախորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Յաջորդ աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Աշխատատարածք 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Աշխատատարածք 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Աշխատատարածք 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Աշխատատարածք 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Աշխատատարածք 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Աշխատատարածք 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Աշխատատարածք 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Աշխատատարածք 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Աշխատատարածք 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Աշխատատարածք 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Աշխատատարածք 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Աշխատատարածք 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Աւելացնել աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Աւելացնել յարակից աշխատատարածք" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Ջնջել վերջին աշխատատարածքը" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Ջնջել գործուն աշխատատարածքը" @@ -572,191 +626,200 @@ msgstr "Ենթանուն" msgid "Xfce 4 Widgets" msgstr "Xfce 4֊ի հարմարանքներ " -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Տարբերակի վերաբերեալ տեղեկոյթ" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Պատուհանների կառավարիչ" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Կարգաւորում է պատուհանների դիրքերը՝ ցուցադրիչի վրայ։" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Վահանակ" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Աշխատասեղանի կառավարիչ" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Նիշք" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Ծաւալի կառավարիչ" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Նիստի կառավարիչ" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Կարգաւորման համակարգ" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Կարգաւորումների կառավարիչ" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Յաւելուածների որոնում" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Կարգաւորումների աւժանդակ ծրագիր" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Ցանկի գրադարան" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Փոքրապատկերների ծառայութիւն" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Շնորհակալութիւն բոլոր նրանց, ովքեր աւգնեցին այս միջավայրը դարձնել հասանելի:" +msgstr "" +"Շնորհակալութիւն բոլոր նրանց, ովքեր աւգնեցին այս միջավայրը դարձնել հասանելի:" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce4-ի հեղինակային իրաւունքը պատկանում է Ոլիւեր Ֆաունդանին (fourdan@xfce.org)։ Տարբեր բաղադրիչների հեղինակային իրաւունքները պաշտպանուում են դրանք ստեղծող հեղինակների կողմից։" +msgstr "" +"Xfce4-ի հեղինակային իրաւունքը պատկանում է Ոլիւեր Ֆաունդանին " +"(fourdan@xfce.org)։ Տարբեր բաղադրիչների հեղինակային իրաւունքները " +"պաշտպանուում են դրանք ստեղծող հեղինակների կողմից։" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs եւ exo փաթեթները մշակուում են ըստ Free Software Foundation֊ի թողարկած, GNU գրադարանների հանրային արտաւնագրի երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կաննոների համաձայն։" +msgstr "" +"libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs եւ exo փաթեթները մշակուում" +" են ըստ Free Software Foundation֊ի թողարկած, GNU գրադարանների հանրային " +"արտաւնագրի երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կաննոների համաձայն։" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr " Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop եւ xfwm4 փաթեթները մշակուած են ըստ GNU հանրային արտաւնագրի երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կանոնների համաձայն։" +msgstr "" +" Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop եւ xfwm4 փաթեթները մշակուած են ըստ GNU հանրային արտաւնագրի" +" երկրորդ կամ (կամընտրական) աւելի նոր տարբերակի կանոնների համաձայն։" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Մուտքագրէք «%s --help» աջակցութեան համար։" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Անհնար է գործարկել GTK+֊ը։" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce֊ի մշակման խումբ։ Բոլոր իրաւունքները պաշտպանուած են։" -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Սխալների մասին <%s> հասցէով։" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Չյաջողուեց բեռնել միջերեսը" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Տարբերակ %s, մշակուած %s֊ի կողմից" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Տարբերակ %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Հիմնական մշակողներ" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Գործունեայ աջակիցներ" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Սպասարկիչների կարգաւորում" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Թարգմանութիւնների վերահսկում" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Թարգմանիչներ" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Նախկին աջակիցներ" @@ -777,48 +840,68 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce աշխատասեղանի միջավայրի մասին" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "Պիտակ" +msgid "_Help" +msgstr "Աւգնութիւն" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "ԱւՀ-ի անունը ՝" +msgid "_Close" +msgstr "_Փակել" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Սարք" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Յիշողութիւն" +msgid "label" +msgstr "Պիտակ" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "ԿՄՍ" +msgid "OS Name" +msgstr "ԱւՀ-ի անունը ՝" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "ԱւՀ-ի Տիպար" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce-ի տարբերակ" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Մշակող ՝" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce-ի տարբերակ" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "ԿՄՍ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Յիշողութիւն" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Համակարգ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -829,39 +912,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Ծրագրի մասին" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Շնորհակալութիւն" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Հեղինակային իրաւունք" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Անյայտ" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s;Ստեղծման ID.%s" @@ -877,6 +975,6 @@ msgstr "%s նիշն արդէն գոյութիւն ունի տուեալ նշար msgid "Failed to migrate the old panel configuration" msgstr "Չյաջողուեց առբերել վահանակի նախկին կարգաւորումները" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Կազմաձեւել Xfconf֊ի կողմից պահուած կարգաւորումները " diff --git a/po/id.po b/po/id.po index 80b702f..70a1583 100644 --- a/po/id.po +++ b/po/id.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Andhika Padmawan , 2009 -# Ardjuna , 2015,2017,2021 -# Triyan W. Nugroho , 2020 -# William Thomas , 2017 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-01 10:26+0000\n" -"Last-Translator: Ardjuna \n" -"Language-Team: Indonesian (http://www.transifex.com/xfce/libxfce4ui/language/id/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Indonesian (https://app.transifex.com/xfce/teams/16840/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,11 +38,12 @@ msgstr "Anda ingin membaca dokumentasi secara daring?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Anda akan diarahkan ke situs web dokumentasi yang memuat halaman bantuan." +msgstr "" +"Anda akan diarahkan ke situs web dokumentasi yang memuat halaman bantuan." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Batal" @@ -80,14 +81,18 @@ msgstr "Tutup jendela dengan banyak tab?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Jendela ini memiliki banyak tab terbuka. Menutup jendela ini juga akan menutup semua tab." +msgstr "" +"Jendela ini memiliki banyak tab terbuka. Menutup jendela ini juga akan " +"menutup semua tab." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Jendela ini memiliki %d tab yang terbuka. Menutup jendela ini juga akan menutup semua tab." +msgstr "" +"Jendela ini memiliki %d tab yang terbuka. Menutup jendela ini juga akan " +"menutup semua tab." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -125,37 +130,36 @@ msgstr "Opsi manajemen sesi" msgid "Show session management options" msgstr "Tampilkan opsi manajemen sesi" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Gagal mengoneksi ke manajer sesi: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Manajer sesi tidak mengembalikan identitas klien yang sah" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Direktori kerja \"%s\" tidak ada. Direktori tidak akan digunakan ketika memijahkan \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Nama berkas tidak boleh menggunakan pemisah direktori" +msgstr "" +"Direktori kerja \"%s\" tidak ada. Direktori tidak akan digunakan ketika " +"memijahkan \"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Nama berkas terlalu panjang" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Nama berkas tidak boleh menggunakan pemisah direktori" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Nama berkas tidak boleh dimulai atau diakhiri dengan spasi" @@ -164,7 +168,8 @@ msgstr "Nama berkas tidak boleh dimulai atau diakhiri dengan spasi" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Pintasan ini telah digunakan untuk '%s'. Aksi mana yang ingin anda gunakan?" +msgstr "" +"Pintasan ini telah digunakan untuk '%s'. Aksi mana yang ingin anda gunakan?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -188,74 +193,105 @@ msgstr "Simpan '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Pintasan ini telah digunakan oleh'%s'. Aksi mana yang ingin anda gunakan?" +msgstr "" +"Pintasan ini telah digunakan oleh'%s'. Aksi mana yang ingin anda gunakan?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Pintasan ini telah digunakan oleh '%s'. Aksi mana yang ingin anda gunakan?" +msgstr "" +"Pintasan ini telah digunakan oleh '%s'. Aksi mana yang ingin anda gunakan?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Mohon gunakan kombinasi tombol lain." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s telah digunakan untuk menjalankan aksi ini." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Terdapat konflik pintasan untuk aksi %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Pintasan ini telah digunakan untuk aksi yang lain." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Penyunting Pintasan" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Pintasan saat ini. Klik untuk menyunting..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Bersihkan pintasan" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Kembalikan pintasan bawaan" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Pintasan ini sedang digunakan oleh: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Pintasan telah digunakan" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Tombol Pintasan Manajer Jendela" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "aksi" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Perintah Tombol Pintasan" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "perintah" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Pintasan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Bersihkan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Tekan tombol papan tik untuk memicu %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Tekan sebuah tombol" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Tidak mendapat masukan dari papan ketik." @@ -364,198 +400,214 @@ msgid "Toggle fullscreen" msgstr "Ubah ke layar penuh" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Pindah jendela ke ruang kerja sebelah atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Pindah jendela ke ruang kerja sebelah bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Pindah jendela ke ruang kerja sebelah kiri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Pindah jendela ke ruang kerja sebelah kanan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Pindah jendela ke ruang kerja sebelumnya" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Pindah jendela ke ruang kerja selanjutnya" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Pindah jendela ke ruang kerja 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Pindah jendela ke ruang kerja 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Pindah jendela ke ruang kerja 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Pindah jendela ke ruang kerja 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Pindah jendela ke ruang kerja 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Pindah jendela ke ruang kerja 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Pindah jendela ke ruang kerja 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Pindah jendela ke ruang kerja 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Pindah jendela ke ruang kerja 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Pindah jendela ke ruang kerja 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Pindah jendela ke ruang kerja 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Pindah jendela ke ruang kerja 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Tempatkan jendela di atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Tempatkan jendela ke bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Tempatkan jendela di kiri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Tempatkan jendela ke kanan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Tempatkan jendela ke kiri atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Tempatkan jendela ke kanan atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Tempatkan jendela ke kiri bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Tempatkan jendela ke kanan bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Tampilkan destop" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Bagian atas ruang kerja" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Bagian bawah ruang kerja" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Bagian kiri ruang kerja" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Bagian kanan ruang kerja" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Ruang kerja sebelumnya" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Ruang kerja selanjutnya" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Ruang kerja 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Ruang kerja 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Ruang kerja 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Ruang kerja 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Ruang kerja 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Ruang kerja 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Ruang kerja 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Ruang kerja 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Ruang kerja 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Ruang kerja 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Ruang kerja 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Ruang kerja 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Tambah ruang kerja" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Tambah ruang kerja berdampingan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Hapus ruang kerja terakhir" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Hapus ruang kerja aktif" @@ -575,186 +627,210 @@ msgstr "Peralatan Xfce 4" msgid "Version information" msgstr "Informasi versi" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Manajer Jendela" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Menangani penempatan jendela di layar." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Menyediakan tempat untuk tombol jendela, peluncur, menu aplikasi dan lebih banyak lagi." +msgstr "" +"Menyediakan tempat untuk tombol jendela, peluncur, menu aplikasi dan lebih " +"banyak lagi." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Manajer Destop" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "Menyetel gambar latar belakang desktop, menangani ikon dan lebih banyak lagi." +msgstr "" +"Menyetel gambar latar belakang desktop, menangani ikon dan lebih banyak " +"lagi." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Manajer Berkas" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "Mengelola berkas Anda dengan cara yang modern, mudah digunakan dan cepat." +msgstr "" +"Mengelola berkas Anda dengan cara yang modern, mudah digunakan dan cepat." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Manajemen Volume" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Mengelola penggerak dan media yang dapat dilepas untuk Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Manajer Sesi" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Menyimpan dan mengembalikan sesi Anda, menangani saat hidupkan, mulai otomatis, dan matikan." +msgstr "" +"Menyimpan dan mengembalikan sesi Anda, menangani saat hidupkan, mulai " +"otomatis, dan matikan." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Sistem Pengaturan" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Manajer Pengaturan" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Konfigurasi penampilan, tampilan layar, papan tik dan tetikus." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Pencari Aplikasi" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "Mencari dan meluncurkan aplikasi yang terpasang pada komputer Anda dengan cepat." +msgstr "" +"Mencari dan meluncurkan aplikasi yang terpasang pada komputer Anda dengan " +"cepat." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Daemon Pengaturan" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Menyimpan pengaturan pada sistem konfigurasi berbasis D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Pustaka Menu" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Mengimplementasikan menu freedesktop.org berbasis GLib dan GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Layanan Citra Miniatur" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "Mengimplementasikan spesifikasi D-Bus untuk manajemen gambar miniatur." +msgstr "" +"Mengimplementasikan spesifikasi D-Bus untuk manajemen gambar miniatur." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Silahkan kunjungi " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Jika Anda merasa ada yang terlewat pada daftar ini, jangan ragu untuk mengirimkan laporan kutu ke ." +msgstr "" +"Jika Anda merasa ada yang terlewat pada daftar ini, jangan ragu untuk " +"mengirimkan laporan kutu ke " +" ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Terima kasih pada semua pihak yang terlibat sehingga peranti lunak ini tersedia." +msgstr "" +"Terima kasih pada semua pihak yang terlibat sehingga peranti lunak ini " +"tersedia." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 adalah hak cipta Olivier Fourdan (fourdan@xfce.org). Komponen berbeda merupakan hak cipta masing-masing pembuatnya." +msgstr "" +"Xfce 4 adalah hak cipta Olivier Fourdan (fourdan@xfce.org). Komponen berbeda" +" merupakan hak cipta masing-masing pembuatnya." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Paket libxfce4ui, libxfce4util dan exo didistribusikan di bawah ketentuan GNU Library General Public License yang dipublikasikan oleh Free Software Foundation; baik versi 2 maupun (sesuai pilihan Anda) versi berikutnya." +msgstr "" +"Paket libxfce4ui, libxfce4util dan exo didistribusikan di bawah ketentuan " +"GNU Library General Public License yang dipublikasikan oleh Free Software " +"Foundation; baik versi 2 maupun (sesuai pilihan Anda) versi berikutnya." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Paket thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop dan xfwm4 didistribusikan di bawah ketentuan GNU General Public License yang dipublikasikan oleh Free Software Foundation; baik versi 2 maupun (sesuai pilihan Anda) versi berikutnya." +msgstr "" +"Paket thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop dan xfwm4 didistribusikan di bawah ketentuan GNU General " +"Public License yang dipublikasikan oleh Free Software Foundation; baik versi" +" 2 maupun (sesuai pilihan Anda) versi berikutnya." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Ketik '%s --help' untuk informasi penggunaan." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Tak dapat menginisialisasi GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Tim pengembang Xfce. Hak cipta dilindungi undang-undang." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Silakan laporkan awakutu ke <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Gagal memuat antar muka" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Pengembang inti" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Kontributor aktif" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Server dikelola oleh" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Pengawas terjemahan" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Pengawasan dokumentasi" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Penerjemah" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Kontributor terdahulu" @@ -775,52 +851,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Tentang Lingkungan Destop Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "label" +msgid "_Help" +msgstr "_Bantuan" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nama Sistem Operasi" +msgid "_Close" +msgstr "_Tutup" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Perangkat" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memori" +msgid "label" +msgstr "label" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Nama Sistem Operasi" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tipe Sistem Operasi" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versi Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versi Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Versi GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Versi Kernel" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memori" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce adalah sekumpulan program yang secara bersama-sama menyediakan sebuah lingkungan desktop dengan fitur yang lengkap.\nProgram-program berikut adalah bagian dari inti Xfce:" +msgstr "" +"Xfce adalah sekumpulan program yang secara bersama-sama menyediakan sebuah lingkungan desktop dengan fitur yang lengkap.\n" +"Program-program berikut adalah bagian dari inti Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -829,48 +923,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce juga menjadi sebuah platform pengembangan yang menyediakan beberapa pustaka yang membantu pemrogram membuat aplikasi yang pas dengan lingkungan desktop.\n\nKomponen-komponen Xfce dilisensikan di bawah lisensi bebas atau sumber-terbuka; GPL atau BSDL untuk aplikasi dan LGPL atau BSDL untuk pustaka. Lihat pada dokumentasi, kode sumber atau situs web Xfce (https://www.xfce.org) untuk informasi lebih lanjut.\n\nTerimakasih atas ketertarikan Anda pada Xfce.\n\n\t- Tim Pengembang Xfce" +msgstr "" +"Xfce juga menjadi sebuah platform pengembangan yang menyediakan beberapa pustaka yang membantu pemrogram membuat aplikasi yang pas dengan lingkungan desktop.\n" +"\n" +"Komponen-komponen Xfce dilisensikan di bawah lisensi bebas atau sumber-terbuka; GPL atau BSDL untuk aplikasi dan LGPL atau BSDL untuk pustaka. Lihat pada dokumentasi, kode sumber atau situs web Xfce (https://www.xfce.org) untuk informasi lebih lanjut.\n" +"\n" +"Terimakasih atas ketertarikan Anda pada Xfce.\n" +"\n" +"\t- Tim Pengembang Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Info Aplikasi" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Kredit" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Hak Cipta" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Tak diketahui" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit ruang pengguna)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -878,7 +979,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Build ID: %s" @@ -888,12 +989,14 @@ msgstr "%s; Build ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Sebuah berkas bernama \"%s\" sudah ada di direktori ini, berkas tersebut belum ditambahkan." +msgstr "" +"Sebuah berkas bernama \"%s\" sudah ada di direktori ini, berkas tersebut " +"belum ditambahkan." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Gagal untuk migrasi konfigurasi panel lama" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Merubah konfigurasi yang disimpan di Xfconf" diff --git a/po/ie.po b/po/ie.po index 3b8f0c4..629759b 100644 --- a/po/ie.po +++ b/po/ie.po @@ -1,17 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Caarmi, 2020 +# Xfce Bot , 2023 +# Caarmi, 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-24 03:31+0000\n" -"Last-Translator: Caarmi\n" -"Language-Team: Interlingue (http://www.transifex.com/xfce/libxfce4ui/language/ie/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Caarmi, 2023\n" +"Language-Team: Interlingue (https://app.transifex.com/xfce/teams/16840/ie/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,7 +43,7 @@ msgstr "" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Annular" @@ -77,14 +81,18 @@ msgstr "Cluder un fenestre con multiplic cartes?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Ti-ci fenestre have multiplic apertet cartes. Si on clude ti\nfenestre, omni cartes anc va esser cludet." +msgstr "" +"Ti-ci fenestre have multiplic apertet cartes. Si on clude ti\n" +"fenestre, omni cartes anc va esser cludet." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Ti-ci fenestre have %d apertet cartes. Si on clude ti\nfenestre, omni cartes anc va esser cludet." +msgstr "" +"Ti-ci fenestre have %d apertet cartes. Si on clude ti\n" +"fenestre, omni cartes anc va esser cludet." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -122,37 +130,36 @@ msgstr "Optiones de gerentie de session" msgid "Show session management options" msgstr "Monstrar optiones de gerentie de session" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Ne successat conexer al gerente de session: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Li gerente de session ne retrodat un valid id de client" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Li directoria de labor «%s» ne existe. It ne va esser usat quande on lansa «%s»." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Un separator de directorias es ínvalid in un nómine de file" +msgstr "" +"Li directoria de labor «%s» ne existe. It ne va esser usat quande on lansa " +"«%s»." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Li nómine de file es tro long" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Un separator de directorias es ínvalid in un nómine de file" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Nómines de file deve ne comensar o finir per un spacie" @@ -161,7 +168,8 @@ msgstr "Nómines de file deve ne comensar o finir per un spacie" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Ti-ci rapid-taste es ja usat por li action «%s». Quel action vu vole usar?" +msgstr "" +"Ti-ci rapid-taste es ja usat por li action «%s». Quel action vu vole usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -185,74 +193,105 @@ msgstr "Retener «%s»" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Ti-ci rapid-taste es ja usat por li comande «%s». Quel action vu vole usar?" +msgstr "" +"Ti-ci rapid-taste es ja usat por li comande «%s». Quel action vu vole usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Ti-ci rapid-taste es ja usat per li action «%s». Quel action vu vole usar?" +msgstr "" +"Ti-ci rapid-taste es ja usat per li action «%s». Quel action vu vole usar?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Ples usar un altri combination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s ja producte ti-ci action." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Conflictent actiones por %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Ti-ci rapid-taste es ja usat por alquo altri." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Redactor de rapid-tastes" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Vacuar li rapid-taste" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restituer li predefinit rapid-taste" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Ti-ci rapid-taste es ja usat de: «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Li rapid-taste es ja usat" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Rapid-taste de un action de gerente de fenestres" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "action" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Rapid-taste" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "comande" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Rapid-taste" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Vacuar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Ples tippa un taste" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Ne successar capter li tastatura" @@ -361,198 +400,214 @@ msgid "Toggle fullscreen" msgstr "(Des)activar mode plen-ecran" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Mover un fenestre al monitor a bass" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Mover un fenestre al monitor a levul" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Mover un fenestre al monitor a dextri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Mover un fenestre al monitor a supra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mover un fenestre al labor-spacie ad supra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mover li fenestre al labor-spacie ad infra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mover un fenestre al labor-spacie a levul" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mover li fenestre al labor-spacie a dextri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mover un fenestre al precedent labor-spacie" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mover li fenestre al sequent labor-spacie" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mover un fenestre al labor-spacie 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mover un fenestre al labor-spacie 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mover un fenestre al labor-spacie 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mover un fenestre al labor-spacie 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mover un fenestre al labor-spacie 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mover un fenestre al labor-spacie 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mover un fenestre al labor-spacie 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mover un fenestre al labor-spacie 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mover un fenestre al labor-spacie 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mover un fenestre al labor-spacie 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mover un fenestre al labor-spacie 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mover un fenestre al labor-spacie 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Tegular li fenestre ad supra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Tegular un fenestre ad infra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Tegular un fenestre ad levul" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Tegular li fenestre a dextri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Tegular un fenestre ad supra-levul" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Tegular un fenestre ad supra-dextri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Tegular un fenestre ad infra-levul" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Tegular un fenestre ad infra-dextri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Monstrar li Pupitre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Labor-spacie ad supra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Labor-spacie ad infra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Labor-spacie a levul" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Labor-spacie a dextri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Precedent labor-spacie" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Sequent labor-spacie" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Labor-spacie 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Labor-spacie 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Labor-spacie 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Labor-spacie 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Labor-spacie 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Labor-spacie 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Labor-spacie 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Labor-spacie 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Labor-spacie 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Labor-spacie 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Labor-spacie 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Labor-spacie 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Adjunter un labor-spacie" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Adjunter un adjacent labor-spacie" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Deleter li ultim labor-spacie" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Remover li activ labor-spacie" @@ -572,120 +627,122 @@ msgstr "Widgets de Xfce4" msgid "Version information" msgstr "Information del version" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gerente de fenestres" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Plazza fenestres sur li ecran." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gerente del Pupitre" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gerentiator de files" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Gerente de volumes" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gerente de session" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Sistema de parameters" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gerente de parametres" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Trovator de applicationes" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Dæmon de parametres" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Un biblioteca de menús" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Servicie de miniaturas" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Ples vider " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Mersí a omnes que assistet far ti-ci programmas obtenibil!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Jure editorial del Xfce 4: Olivier Fourdan (fourdan@xfce.org). Li jures editorial del altri componentes apartene al su propri autores." +msgstr "" +"Jure editorial del Xfce 4: Olivier Fourdan (fourdan@xfce.org). Li jures " +"editorial del altri componentes apartene al su propri autores." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -693,7 +750,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -702,56 +759,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Tippa '%s --help' por li usage." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Ne posset intitialisar GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Ples raportar errores a <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Ne posset cargar li interfacie" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Chef developatores" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Contributores activ" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servitores es mantenet de" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Control de traductiones" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Control de documentation" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Traductores" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Contributores anteyan" @@ -772,52 +829,68 @@ msgid "About the Xfce Desktop Environment" msgstr "Pri li Xfce Desktop Environment" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "" +msgid "_Help" +msgstr "Au_xilie" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nómine del OS" +msgid "_Close" +msgstr "_Clúder" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Aparate" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memorie" +msgid "label" +msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Nómine del OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tip del OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Version de Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Version de Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Version de GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Version del nucleo" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memorie" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,46 +901,46 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Pri" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Credites" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Jure editorial" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Ínconosset" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (usator-spacie 32-bit)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -875,7 +948,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID del construction: %s" @@ -885,12 +958,13 @@ msgstr "%s; ID del construction: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Un file «%s» ja existet in ti-ci fólder, li file ne ha esset adjuntet." +msgstr "" +"Un file «%s» ja existet in ti-ci fólder, li file ne ha esset adjuntet." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Ne successat transferter li ancian configuration de panel" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalisar parametres mantenet per Xfconf" diff --git a/po/is.po b/po/is.po index cd7b57c..cddf1be 100644 --- a/po/is.po +++ b/po/is.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Sveinn í Felli , 2010,2013-2015,2017,2019 -# Sveinn í Felli , 2010-2013 -# Sveinn í Felli , 2013 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Icelandic (http://www.transifex.com/xfce/libxfce4ui/language/is/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Icelandic (https://app.transifex.com/xfce/teams/16840/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,11 +38,13 @@ msgstr "Viltu lesa handbókina á netinu?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Þér verður beint á skjölunarvefinn þar sem hjálparsíðum er viðhaldið og þær þýddar." +msgstr "" +"Þér verður beint á skjölunarvefinn þar sem hjálparsíðum er viðhaldið og þær " +"þýddar." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Hætta við" @@ -124,37 +127,34 @@ msgstr "Valkostir setustýringar" msgid "Show session management options" msgstr "Sýna valkosti setustýringar" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Mistókst að tengjast setustýringu: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Setustýringin gaf ekki gilt biðlaraauðkenni" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Vinnumappan \"%s\" er ekki til. Hún verður ekki notuð við gerð \"%s\"." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 +msgid "Filename is too long" msgstr "" -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 -msgid "Filename is too long" +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -163,7 +163,9 @@ msgstr "" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Þessi flýtileið er þegar í notkun fyrir '%s' aðgerðina. Hvaða aðgerð viltu nota?" +msgstr "" +"Þessi flýtileið er þegar í notkun fyrir '%s' aðgerðina. Hvaða aðgerð viltu " +"nota?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +189,107 @@ msgstr "Halda '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Þessi flýtileið er þegar í notkun fyrir '%s' skipunina. Hvaða aðgerð viltu nota?" +msgstr "" +"Þessi flýtileið er þegar í notkun fyrir '%s' skipunina. Hvaða aðgerð viltu " +"nota?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Þessi flýtileið er þegar í notkun af '%s' aðgerðinni. Hvaða aðgerð viltu nota?" +msgstr "" +"Þessi flýtileið er þegar í notkun af '%s' aðgerðinni. Hvaða aðgerð viltu " +"nota?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Notaðu einhverja aðra lyklasamsetningu." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s gangsetur nú þegar þessa aðgerð." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Árekstrar milli aðgerða fyrir %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Þessi flýtileið er nú þegar í notkun fyrir eitthvað annað." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Þessi flýtilyklasamsetning er þegar notuð af: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Flýtilykillinn er þegar í notkun" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Flýtilykill fyrir gluggastjóraaðgerð" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "aðgerð" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Flýtilykill skipunar" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "skipun" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Flýtileið" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Hreinsa" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Ekki var hægt að ná í lyklaborðið." @@ -363,198 +398,214 @@ msgid "Toggle fullscreen" msgstr "Víxla heilskjá" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Flytja glugga yfir á vinnusvæði fyrir ofan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Flytja glugga yfir á vinnusvæði fyrir neðan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Flytja glugga yfir á vinnusvæði til vinstri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Flytja glugga yfir á vinnusvæði til hægri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Flytja glugga yfir á fyrra vinnusvæði" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Flytja glugga yfir á næsta vinnusvæði" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Flytja glugga yfir á vinnusvæði 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Flytja glugga yfir á vinnusvæði 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Flytja glugga yfir á vinnusvæði 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Flytja glugga yfir á vinnusvæði 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Flytja glugga yfir á vinnusvæði 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Flytja glugga yfir á vinnusvæði 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Flytja glugga yfir á vinnusvæði 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Flytja glugga yfir á vinnusvæði 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Flytja glugga yfir á vinnusvæði 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Flytja glugga yfir á vinnusvæði 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Flytja glugga yfir á vinnusvæði 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Flytja glugga yfir á vinnusvæði 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Stafla glugga efst" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Stafla glugga neðst" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Stafla glugga til vinstri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Stafla glugga til hægri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Stafla glugga efst til vinstri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Stafla glugga efst til hægri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Stafla glugga neðst til vinstri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Stafla glugga neðst til hægri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Sýna skjáborðið" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Vinnusvæði fyrir ofan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Vinnusvæði fyrir neðan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Vinnusvæði til vinstri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Vinnusvæði til hægri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Fyrra vinnusvæði" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Næsta vinnusvæði" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Vinnusvæði 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Vinnusvæði 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Vinnusvæði 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Vinnusvæði 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Vinnusvæði 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Vinnusvæði 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Vinnusvæði 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Vinnusvæði 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Vinnusvæði 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Vinnusvæði 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Vinnusvæði 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Vinnusvæði 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Bæta við vinnusvæði" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Bæta við aðliggjandi vinnusvæði" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Eyða síðasta vinnusvæði" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Eyða virku vinnusvæði" @@ -570,191 +621,202 @@ msgstr "Undirtexti" msgid "Xfce 4 Widgets" msgstr "XFCE 4 græjur" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Útgáfuupplýsingar" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gluggastjóri" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Sér um staðsetningu glugga á skjánum." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Skjástika" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Skjáborðsstjórnun" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Skráastjóri" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Diskastýring" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Setustjórnun" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Stilling kerfis" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Stillingastjórnun" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Forritaleit" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Stillingamiðlari" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Aðgerðasafn fyrir valmyndir" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Smámyndaþjónusta" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Þakkir til allra sem hjálpuðu með að gera þennan hugbúnað aðgengilegan!" +msgstr "" +"Þakkir til allra sem hjálpuðu með að gera þennan hugbúnað aðgengilegan!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Höfundarrétt að Xfce 4 á Olivier Fourdan (fourdan@xfce.org). Aðrir hlutar eru með höfundarrétt viðkomandi höfundar." +msgstr "" +"Höfundarrétt að Xfce 4 á Olivier Fourdan (fourdan@xfce.org). Aðrir hlutar " +"eru með höfundarrétt viðkomandi höfundar." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfceui, libxfce4util og exo pökkunum er dreift samkvæmt skilmálum í almenna GNU GPL notkunarleyfisins eins og það er gefið út af Frjálsu hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða (ef þér sýnist svo) einhverja nýrri útgáfu leyfisins." +msgstr "" +"libxfceui, libxfce4util og exo pökkunum er dreift samkvæmt skilmálum í " +"almenna GNU GPL notkunarleyfisins eins og það er gefið út af Frjálsu " +"hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða (ef þér " +"sýnist svo) einhverja nýrri útgáfu leyfisins." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Hugbúnaðarpökkunum thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop og xfwm4 er dreift samkvæmt skilmálum í almenna GNU GPL notkunarleyfisins eins og það er gefið út af Frjálsu hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða (ef þér sýnist svo) einhverja nýrri útgáfu leyfisins." +msgstr "" +"Hugbúnaðarpökkunum thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop og xfwm4 er dreift samkvæmt skilmálum í " +"almenna GNU GPL notkunarleyfisins eins og það er gefið út af Frjálsu " +"hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða (ef þér " +"sýnist svo) einhverja nýrri útgáfu leyfisins." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Skrifaðu '%s --help' til að fá upplýsingar um notkun." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Tókst ekki að frumstilla GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce þróunarteymið. Allur réttur áskilinn." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Tilkynntu villur til <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Tókst ekki að hlaða inn viðmóti" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Útgáfa %s, dreift af %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Útgáfa %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Aðalhönnuðir" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Virkir þáttakendur" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Umsjón með kerfum" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Umsjón með þýðingum" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Þýðendur" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Eldri framlög" @@ -775,23 +837,23 @@ msgid "About the Xfce Desktop Environment" msgstr "Um Xfce skjáborðsumhverfið" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "skýring" +msgid "_Help" +msgstr "_Hjálp" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Loka" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Tæki" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "skýring" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -799,24 +861,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Kerfis" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,39 +909,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Um hugbúnað" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Framlög" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Höfundarréttur" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Óþekkt" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -869,12 +966,14 @@ msgstr "" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Skrá með heitinu \"%s\" er þegar til í þessari möppu, skránni var því ekki bætt við." +msgstr "" +"Skrá með heitinu \"%s\" er þegar til í þessari möppu, skránni var því ekki " +"bætt við." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Mistókst að millifæra eldri skjástikustillingar" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Sérsníða stillingar fyrir Xfconf" diff --git a/po/it.po b/po/it.po index 63a31e3..da36e50 100644 --- a/po/it.po +++ b/po/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Cristian Marchi , 2009,2013,2015-2016 -# Emanuele Petriglia , 2018 -# Emanuele Petriglia , 2019-2020 -# Vincenzo Reale , 2020 +# Dmytro Tokayev, 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-14 00:45+0100\n" -"PO-Revision-Date: 2020-12-14 16:31+0000\n" -"Last-Translator: Emanuele Petriglia \n" -"Language-Team: Italian (http://www.transifex.com/xfce/libxfce4ui/language/it/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Italian (https://app.transifex.com/xfce/teams/16840/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" @@ -38,11 +39,13 @@ msgstr "Leggere il manuale online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Si verrà reindirizzati al sito web della documentazione dove le pagine d'aiuto sono mantenute e tradotte." +msgstr "" +"Si verrà reindirizzati al sito web della documentazione dove le pagine " +"d'aiuto sono mantenute e tradotte." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "A_nnulla" @@ -80,14 +83,18 @@ msgstr "Chiudere la finestra con più schede?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Questa finestre ha più schede aperte. Chiudendo questa finestra verranno chiuse tutte le schede." +msgstr "" +"Questa finestre ha più schede aperte. Chiudendo questa finestra verranno " +"chiuse tutte le schede." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Questa finestra ha %d schede aperte. Chiudendo questa finestra verranno chiuse tutte le schede." +msgstr "" +"Questa finestra ha %d schede aperte. Chiudendo questa finestra verranno " +"chiuse tutte le schede." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -125,37 +132,36 @@ msgstr "Opzioni di gestione della sessione" msgid "Show session management options" msgstr "Mostra le opzioni di gestione della sessione" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Impossibile connettersi al gestore della sessione: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Il gestore della sessione non ha restituito un client ID valido" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "La cartella di lavoro \"%s\" non esiste. Non verrà utilizzata per deporre \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Il separatore di cartelle è vietato nel nome del file" +msgstr "" +"La cartella di lavoro \"%s\" non esiste. Non verrà utilizzata per deporre " +"\"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Il nome del file è troppo lungo" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Il separatore di cartelle è vietato nel nome del file" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Il nome del file non dovrebbe iniziare o finire con uno spazio" @@ -164,7 +170,8 @@ msgstr "Il nome del file non dovrebbe iniziare o finire con uno spazio" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Questa scorciatoia è già assegnata al comando '%s'. Quale azione utilizzare?" +msgstr "" +"Questa scorciatoia è già assegnata all'azione '%s'. Quale azione utilizzare?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -172,7 +179,7 @@ msgstr "Questa scorciatoia è già assegnata al comando '%s'. Quale azione utili #: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "Usare '%s'" +msgstr "Usa '%s'" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -180,7 +187,7 @@ msgstr "Usare '%s'" #: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Keep '%s'" -msgstr "Mantenere '%s'" +msgstr "Mantieni '%s'" #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 @@ -188,74 +195,105 @@ msgstr "Mantenere '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Questa scorciatoia è già assegnata al comando '%s'. Quale azione utilizzare?" +msgstr "" +"Questa scorciatoia è già assegnata al comando '%s'. Quale azione utilizzare?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Questa scorciatoia è già assegnata all'azione '%s'. Quale azione utilizzare?" +msgstr "" +"Questa scorciatoia è già assegnata all'azione '%s'. Quale azione utilizzare?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Usare un'altra combinazione di tasti." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s attiva già questa azione." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Azioni in conflitto per %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Questa scorciatoia è già utilizzata per altro." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor delle scorciatoie" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "La scorciatoia attuale. Premere per modificare…" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Rimuovi la scorciatoia" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Ripristina la scorciatoia predefinita" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Questa scorciatoia da tastiera è attualmente usata da: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Scorciatoia da tastiera già in uso" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Scorciatoia dell'azione del gestore della finestra" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "azione" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Scorciatoia del comando" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Scorciatoia" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Pulisci" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Premere i tasti sulla testiera per abilitare il %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Premere un tasto" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Impossibile prendere il controllo della tastiera" @@ -364,198 +402,214 @@ msgid "Toggle fullscreen" msgstr "Abilita a schermo intero" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Sposta finestra nello schermo inferiore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Sposta finestra nello schermo di sinistra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Sposta finestra nello schermo di destra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Sposta finestra nello schermo superiore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Sposta la finestra nello spazio di lavoro superiore" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Sposta la finestra nello spazio di lavoro inferiore" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Sposta la finestra nello spazio di lavoro di sinistra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Sposta la finestra nello spazio di lavoro di destra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Sposta la finestra nello spazio di lavoro precedente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Sposta la finestra nello spazio di lavoro successivo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Sposta la finestra nello spazio di lavoro 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Sposta la finestra nello spazio di lavoro 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Sposta la finestra nello spazio di lavoro 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Sposta la finestra nello spazio di lavoro 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Sposta la finestra nello spazio di lavoro 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Sposta la finestra nello spazio di lavoro 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Sposta la finestra nello spazio di lavoro 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Sposta la finestra nello spazio di lavoro 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Sposta la finestra nello spazio di lavoro 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Sposta la finestra nello spazio di lavoro 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Sposta la finestra nello spazio di lavoro 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Sposta la finestra nello spazio di lavoro 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Riquadra la finestra in alto" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Riquadra la finestra in basso" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Riquadra la finestra a sinistra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Riquadra la finestra a destra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Riquadra la finestra in alto a sinistra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Riquadra la finestra in alto a destra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Riquadra la finestra in basso a sinistra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Riquadra la finestra in basso a destra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Mostra la scrivania" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Spazio di lavoro superiore" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Spazio di lavoro inferiore" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Spazio di lavoro di sinistra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Spazio di lavoro di destra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Spazio di lavoro precedente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Spazio di lavoro successivo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Spazio di lavoro 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Spazio di lavoro 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Spazio di lavoro 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Spazio di lavoro 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Spazio di lavoro 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Spazio di lavoro 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Spazio di lavoro 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Spazio di lavoro 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Spazio di lavoro 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Spazio di lavoro 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Spazio di lavoro 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Spazio di lavoro 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Aggiungi spazio di lavoro" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Aggiungi uno spazio di lavoro adiacente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Elimina l'ultimo spazio di lavoro" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Elimina lo spazio di lavoro attivo" @@ -575,182 +629,207 @@ msgstr "Xfce 4 Widget" msgid "Version information" msgstr "Informazioni di versione" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gestore delle finestre" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Gestisce il posizionamento delle finestre sullo schermo." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Pannello" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Fornisce un posto per lanciatori, menu delle applicazioni, pulsanti per le finestre e altro." +msgstr "" +"Fornisce un posto per lanciatori, menu delle applicazioni, pulsanti per le " +"finestre e altro." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gestore della scrivania" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Imposta lo sfondo della scrivania, gestisce le icone e altro." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gestore dei file" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "Gestisce i file con un'interfaccia moderna, rapida e facile da utilizzare." +msgstr "" +"Gestisce i file con un'interfaccia moderna, rapida e facile da utilizzare." -#: ../xfce4-about/main.c:155 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "Gestore dei volumi" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Gestisce i dispositivi rimovibili e dischi per Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gestore della sessione" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Salva e ripristina le sessioni, gestisce l'avvio, l'avvio automatico di applicazioni e lo spegnimento." +msgstr "" +"Salva e ripristina le sessioni, gestisce l'avvio, l'avvio automatico di " +"applicazioni e lo spegnimento." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Impostazioni del sistema" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gestore delle impostazioni" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Configura l'aspetto e le impostazioni di schermo, tastiera e mouse." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Trova applicazioni" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Trova e avvia velocemente applicazioni installate sul sistema." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Demone delle impostazioni" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Salva le impostazioni in un sistema di configurazione basato su D-Bus." +msgstr "" +"Salva le impostazioni in un sistema di configurazione basato su D-Bus." -#: ../xfce4-about/main.c:180 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "Un menu a libreria" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Implementa un menu basato su GLib e GIO conforme a freedesktop.org." -#: ../xfce4-about/main.c:185 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "Servizio delle miniature" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementa la specifica di gestione delle miniature basato su D-Bus." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Consultare " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Se manca qualcuno su questa lista, si può seganalare su ." +msgstr "" +"Se manca qualcuno su questa lista, si può seganalare su " +"." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Si ringraziano tutti quelli che hanno contribuito a rendere questo programma disponibile!" +msgstr "" +"Si ringraziano tutti quelli che hanno contribuito a rendere questo programma" +" disponibile!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce4 è copyright di Olivier Fourdan (fourdan@xfce.org). I vari componenti sono copyright dei rispettivi autori." +msgstr "" +"Xfce4 è copyright di Olivier Fourdan (fourdan@xfce.org). I vari componenti " +"sono copyright dei rispettivi autori." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "I pacchetti libxfce4ui, libxfce4util e exo sono distribuiti sotto i termini della GNU Library General Public License pubblicata dalla Free Software Foundation; nella versione 2 della Licenza o (a propria scelta) una delle versioni successive." +msgstr "" +"I pacchetti libxfce4ui, libxfce4util e exo sono distribuiti sotto i termini " +"della GNU Library General Public License pubblicata dalla Free Software " +"Foundation; nella versione 2 della Licenza o (a propria scelta) una delle " +"versioni successive." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "I pacchetti thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop e xfwm4 sono distribuiti sotto i termini della GNU General Public License pubblicata dalla Free Software Foundation; nella versione 2 della Licenza o (a propria scelta) una delle versioni successive." +msgstr "" +"I pacchetti thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop e xfwm4 sono distribuiti sotto i termini " +"della GNU General Public License pubblicata dalla Free Software Foundation; " +"nella versione 2 della Licenza o (a propria scelta) una delle versioni " +"successive." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Digitare '%s --help' per le informazioni di utilizzo." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Impossibile inizializzare GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Il team di sviluppo di Xfce. Tutti i diritti riservati." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Segnalare i problemi a <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Impossibile caricare l'interfaccia" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Sviluppatori principali" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Collaboratori attivi" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Server mantenuto da" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervisione dei traduttori" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Supervisione della documentazione" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Traduttori" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Contributori precedenti" @@ -771,52 +850,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Informazioni sull'ambiente grafico Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etichetta" +msgid "_Help" +msgstr "_Aiuto" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Sistema operativo" +msgid "_Close" +msgstr "_Chiudi" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Dispositivo" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memoria" +msgid "label" +msgstr "etichetta" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Sistema operativo" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tipo di sistema operativo" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versione di Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributore" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versione di Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Versione GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Versione del kernel" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memoria" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce è una collezione di programmi che insieme forniscono un ambiente desktop completo.\nI programmi principali di Xfce sono i seguenti:" +msgstr "" +"Xfce è una collezione di programmi che insieme forniscono un ambiente desktop completo.\n" +"I programmi principali di Xfce sono i seguenti:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -825,48 +922,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce è inoltre una piattaforma di sviluppo che fornisce diverse libreria che aiutano programmatori nella creazione di applicazioni che si integrano bene nell'ambiente desktop.\n\nI componenti di Xfce sono sotto licenze libere o open source; GPL o BSDL per le applicazioni, LGPL o BSDL per le librerie. Per maggiori informazioni si consiglia la visione della documentazione, del codice sorgente o del sito Web di Xfce (https://www.xfce.org).\n\nGrazie per il tuo interesse a Xfce.\n\n\t- Il team di sviluppo di Xfce" +msgstr "" +"Xfce è inoltre una piattaforma di sviluppo che fornisce diverse librerie che aiutano programmatori nella creazione di applicazioni che si integrano bene nell'ambiente desktop.\n" +"\n" +"I componenti di Xfce sono sotto licenze libere o open source; GPL o BSDL per le applicazioni, LGPL o BSDL per le librerie. Per maggiori informazioni si consiglia la visione della documentazione, del codice sorgente o del sito Web di Xfce (https://www.xfce.org).\n" +"\n" +"Grazie per il tuo interesse a Xfce.\n" +"\n" +"\t- Il team di sviluppo di Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Informazioni" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Riconoscimenti" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Sconosciuto" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit userspace)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -874,7 +978,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Build ID: %s" @@ -884,12 +988,14 @@ msgstr "%s; Build ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Un file di nome \"%s\" esiste già in questa cartella e quindi non è stato aggiunto" +msgstr "" +"Un file di nome \"%s\" esiste già in questa cartella e quindi non è stato " +"aggiunto" #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Impossibile migrare la configurazione del vecchio pannello" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalizzazione delle impostazioni immagazzinate da Xfconf" diff --git a/po/ja.po b/po/ja.po index b109d6f..b3277cb 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Nobuhiro Iwamatsu , 2008,2016-2017,2019-2020 -# UTUMI Hirosi , 2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-23 00:18+0000\n" -"Last-Translator: Nobuhiro Iwamatsu \n" -"Language-Team: Japanese (http://www.transifex.com/xfce/libxfce4ui/language/ja/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Japanese (https://app.transifex.com/xfce/teams/16840/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,7 +42,7 @@ msgstr "ドキュメントウェブサイトでヘルプページがメンテナ #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "キャンセル(_C)" @@ -123,37 +125,34 @@ msgstr "セッション管理オプション" msgid "Show session management options" msgstr "セッション管理オプションを表示します" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "セッションマネージャーへの接続に失敗しました: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "セッションマネージャーは正常なクライアント ID を返しませんでした" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "作業ディレクトリ \"%s\" が存在しません。\"%s\" 起動時にこれは使用されません。" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "ファイル名のディレクトリ区切り文字が無効です" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "ファイル名が長すぎます" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "ファイル名のディレクトリ区切り文字が無効です" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "ファイル名の先頭または末尾にスペースを使用しないでください" @@ -197,63 +196,92 @@ msgstr "このショートカットはすでにアクション '%s' で使用さ #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "他のキーの組み合わせを使用してください。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s はすでにこのアクションで使用されています。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s のアクションの衝突" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "このショートカットはすでに他で使用されています。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "ショートカットエディター" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "現在のショートカット。クリックで編集..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "ショートカットをクリア" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "デフォルトのショートカットに戻す" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "このキーボードショートカットは現在、次によって使用されています: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "キーボードショートカットは既に使用中です。" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "ウィンドウマネージャーアクションショートカット" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "アクション" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "コマンドショートカット" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "コマンド" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "ショートカットキー" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "クリア" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "%s '%s' のトリガーにするキーを押してください。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "キーを押してください" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "キーボードを取得できませんでした。" @@ -362,198 +390,214 @@ msgid "Toggle fullscreen" msgstr "全画面化/解除の切り替え" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "ウィンドウを下のモニターに移動" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "ウィンドウを左のモニターに移動" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "ウィンドウを右のモニターに移動" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "ウィンドウを上のモニターに移動" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "ウィンドウを上のワークスペースに移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "ウィンドウを下のワークスペースに移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "ウィンドウを左のワークスペースに移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "ウィンドウを右のワークスペースに移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "ウィンドウを前のワークスペースに移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "ウィンドウを次のワークスペースに移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "ウィンドウをワークスペース 1 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "ウィンドウをワークスペース 2 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "ウィンドウをワークスペース 3 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "ウィンドウをワークスペース 4 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "ウィンドウをワークスペース 5 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "ウィンドウをワークスペース 6 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "ウィンドウをワークスペース 7 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "ウィンドウをワークスペース 8 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "ウィンドウをワークスペース 9 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "ウィンドウをワークスペース 10 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "ウィンドウをワークスペース 11 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "ウィンドウをワークスペース 12 へ移す" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "ウィンドウを画面上にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "ウィンドウを画面下にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "ウィンドウを画面左にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "ウィンドウを画面右にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "ウィンドウを画面左上にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "ウィンドウを画面右上にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "ウィンドウを画面左下にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "ウィンドウを画面右下にタイル表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "デスクトップを表示" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "上のワークスペースへ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "下のワークスペースへ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "左のワークスペースへ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "右のワークスペースへ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "前のワークスペースへ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "次のワークスペースへ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "ワークスペース 1 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "ワークスペース 2 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "ワークスペース 3 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "ワークスペース 4 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "ワークスペース 5 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "ワークスペース 6 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "ワークスペース 7 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "ワークスペース 8 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "ワークスペース 9 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "ワークスペース 10 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "ワークスペース 11 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "ワークスペース 12 へ移る" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "ワークスペースの追加" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "隣にワークスペースを追加" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "最後のワークスペースを削除" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "現在のワークスペースを削除" @@ -573,186 +617,195 @@ msgstr "Xfce 4 ウィジェット" msgid "Version information" msgstr "バージョン情報" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "ウィンドウマネージャー" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "画面上のウィンドウの配置を管理します。" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "パネル" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "ウィンドウボタン、ランチャー、アプリメニューなどのホームを提供します。" -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "デスクトップマネージャー" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "デスクトップの背景を設定し、アイコンなどを処理します。" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "ファイルマネージャー" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "モダンで使いやすく高速な方法でファイルを管理します。" -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "ボリュームマネージャー" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Thunarのリムーバブルドライブとメディアを管理します。" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "セッションマネージャー" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "セッションを保存および復元し、起動、自動起動、シャットダウンを処理します。" -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "システム設定" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "設定マネージャー" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "外観、ディスプレイ、キーボード、マウスを設定します。" -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "アプリケーションファインダー" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "システムにインストールされているアプリケーションをすばやく見つけて起動します。" -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "設定デーモン" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "D-Busベースの設定システムに設定を保存します。" -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "メニューライブラリ" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "GLibとGIOに基づくfreedesktop.org準拠のメニューを実装します。" -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "サムネイルサービス" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "サムネイルを管理するD-Bus仕様を実装します。" -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr " をご覧ください" -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "このリストに記載ミスがある場合は、 までバグとしてお知らせください。" +msgstr "" +"このリストに記載ミスがある場合は、 " +"までバグとしてお知らせください。" -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "このソフトウェアを利用できるよう協力して下さったすべての方々に感謝します。" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce の著作権は Olivier Fourdan (fourdan@xfce.org) が保有しています。各コンポーネントの著作権はそれぞれの製作者が保有しています。" +msgstr "" +"Xfce の著作権は Olivier Fourdan (fourdan@xfce.org) " +"が保有しています。各コンポーネントの著作権はそれぞれの製作者が保有しています。" -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui、libxfce4util、および exo の各パッケージは、フリーソフトウェア財団によって発行された GNU ライブラリ一般公衆使用許諾契約書 (バージョン2か、希望によってはそれ以降のバージョンのうちどれか) の定める条件下で配布されています。" +msgstr "" +"libxfce4ui、libxfce4util、および exo の各パッケージは、フリーソフトウェア財団によって発行された GNU " +"ライブラリ一般公衆使用許諾契約書 (バージョン2か、希望によってはそれ以降のバージョンのうちどれか) の定める条件下で配布されています。" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "thunar、xfce4-appfinder、xfce4-panel、xfce4-session、xfce4-settings、xfconf、xfdesktop および xfwm4 の各パッケージは、フリーソフトウェア財団によって発行された GNU ライブラリ一般公衆使用許諾契約書 (バージョン2か、希望によってはそれ以降のバージョンのうちどれか) の定める条件下で配布されています。" +msgstr "" +"thunar、xfce4-appfinder、xfce4-panel、xfce4-session、xfce4-settings、xfconf、xfdesktop" +" および xfwm4 の各パッケージは、フリーソフトウェア財団によって発行された GNU ライブラリ一般公衆使用許諾契約書 " +"(バージョン2か、希望によってはそれ以降のバージョンのうちどれか) の定める条件下で配布されています。" -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "'%s --help' と入力すると使用法が表示されます。" -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ を初期化できません。" -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "バグの報告は <%s> までお願いします。" -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "インターフェイスの読込みに失敗しました" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "中心開発者" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "現在の協力者" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "サーバーの管理" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "翻訳の監修" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "ドキュメントの監修" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "翻訳者" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "以前の協力者" @@ -773,52 +826,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce デスクトップ環境について" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "ラベル" +msgid "_Help" +msgstr "ヘルプ(_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "OS 名" +msgid "_Close" +msgstr "閉じる(_C)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "デバイス" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "メモリー" +msgid "label" +msgstr "ラベル" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "OS 名" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "OS タイプ" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce バージョン" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "ディストリビューター" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce バージョン" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK バージョン" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "カーネルバージョン" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "メモリー" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "システム" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfceは、すべての機能を備えたデスクトップ環境を提供するプログラムのコレクションです。\n以下のプログラムはXfceコアの一部です:" +msgstr "" +"Xfceは、すべての機能を備えたデスクトップ環境を提供するプログラムのコレクションです。\n" +"以下のプログラムはXfceコアの一部です:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,48 +898,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfceは、プログラマーがデスクトップ環境にうまく適合するアプリケーションを作成するのに役立ついくつかのライブラリーを提供する開発プラットフォームでもあります。\n\nXfceコンポーネントは、フリーまたはオープンソースのライセンスに基づいてライセンスされます。アプリケーションの場合はGPLまたはBSDL、ライブラリの場合はLGPLまたはBSDLです。詳細についてはドキュメント、ソースコード、またはXfce Webサイト (https://www.xfce.org) をご覧ください。\n\nXfceに関心をお寄せいただきありがとうございます。\n\n\t- Xfce開発チーム" +msgstr "" +"Xfceは、プログラマーがデスクトップ環境にうまく適合するアプリケーションを作成するのに役立ついくつかのライブラリーを提供する開発プラットフォームでもあります。\n" +"\n" +"Xfceコンポーネントは、フリーまたはオープンソースのライセンスに基づいてライセンスされます。アプリケーションの場合はGPLまたはBSDL、ライブラリの場合はLGPLまたはBSDLです。詳細についてはドキュメント、ソースコード、またはXfce Webサイト (https://www.xfce.org) をご覧ください。\n" +"\n" +"Xfceに関心をお寄せいただきありがとうございます。\n" +"\n" +"\t- Xfce開発チーム" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Xfce について" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "クレジット" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "著作権" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "不明" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit ユーザースペース)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -876,7 +954,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ビルド ID: %s" @@ -892,6 +970,6 @@ msgstr "\"%s\" の名前のファイルが既にこのディレクトリに存 msgid "Failed to migrate the old panel configuration" msgstr "古いパネル設定の移行に失敗しました" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "保存された設定を Xfconf によってカスタマイズします" diff --git a/po/ka.po b/po/ka.po index 5553e6e..cd7b76d 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,17 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# zura davitashvili , 2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Georgian (http://www.transifex.com/xfce/libxfce4ui/language/ka/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Georgian (https://app.transifex.com/xfce/teams/16840/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,13 +42,13 @@ msgstr "" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "გაუქმება" #: ../libxfce4ui/xfce-dialogs.c:277 msgid "_Read Online" -msgstr "" +msgstr "ონლაინ _ნახვა" #: ../libxfce4ui/xfce-dialogs.c:286 msgid "_Always go directly to the online documentation" @@ -77,14 +80,18 @@ msgstr "" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "ამ ფანჯარას გახსნილი აქვს რამდენიმე ჩანართი. ამ ფანჯრის დახურვით ასევე დაიხურება ყველა მისი ჩანართი." +msgstr "" +"ამ ფანჯარას გახსნილი აქვს რამდენიმე ჩანართი. ამ ფანჯრის დახურვით ასევე " +"დაიხურება ყველა მისი ჩანართი." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "ამ ფანჯარას გახსნილი აქვს %d ჩანართი. ამ ფანჯრის დახურვით ასევე დაიხურება ყველა მისი ჩანართი." +msgstr "" +"ამ ფანჯარას გახსნილი აქვს %d ჩანართი. ამ ფანჯრის დახურვით ასევე დაიხურება " +"ყველა მისი ჩანართი." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -104,7 +111,7 @@ msgstr "აღარ მკითხო" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "Session management client ID" -msgstr "" +msgstr "სესიის მართვის კლიენტის " #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "ID" @@ -112,49 +119,46 @@ msgstr "აიდი" #: ../libxfce4ui/xfce-sm-client.c:1428 msgid "Disable session management" -msgstr "" +msgstr "სესიების მართვის გამორთვა" #: ../libxfce4ui/xfce-sm-client.c:1438 msgid "Session management options" -msgstr "" +msgstr "სესიის მმართველის პარამეტრები" #: ../libxfce4ui/xfce-sm-client.c:1439 msgid "Show session management options" -msgstr "" +msgstr "სესიის მმართველის პარამეტრები ჩვენება" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" +msgstr "ფაილის სახელი ძალიან გრძელია" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "ფაილის სახელი არ შეიძლება, ჰარეთი მთავრდებოდეს" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format @@ -169,7 +173,7 @@ msgstr "" #: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "" +msgstr "%s-ის გამოყენება" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -177,7 +181,7 @@ msgstr "" #: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Keep '%s'" -msgstr "" +msgstr "%s-ის შენარჩუნება" #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 @@ -196,63 +200,92 @@ msgstr "" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "ფანჯრის მმართველის მოქმედების მალსახმობი" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "მოქმედება" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "ბრძამების მალსახმობი" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "ბრძანება" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "მალსახმობი" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "გაწმენდა" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "" @@ -314,11 +347,11 @@ msgstr "ფანჯრის დამალვა" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 msgid "Move window" -msgstr "" +msgstr "ფანჯრის გადაადგილება" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 msgid "Resize window" -msgstr "" +msgstr "ფანჯრის ზომის შეცვლა" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 msgid "Shade window" @@ -342,7 +375,7 @@ msgstr "" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 msgid "Fill window" -msgstr "" +msgstr "შეავსე ფანჯარა" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 msgid "Fill window horizontally" @@ -358,201 +391,217 @@ msgstr "" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 msgid "Toggle fullscreen" -msgstr "" +msgstr "მთელ ეკრანზე გატანის ჩართ/გამორთ" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "ფანჯრის გადატანა ზედა სამუშაო სივრცეზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "ფანჯრის გადატანა ქვედა სამუშაო სივრცეზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "ფანჯრის გადატანა მარცხენა სამუშაო სივრცეზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "ფანჯრის გადატანა მარჯვენა სამუშაო სივრცეზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "ფანჯრის გადატანა წინა სამუშაო სივრცეზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "ფანჯრის გადატანა მომდევნო სამუშაო სივრცეზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 1-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 2-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 3-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 4-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 5-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 6-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 7-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 8-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 9-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 10-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 11-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "ფანჯრის გადატანა სამუშაო სივრცე 12-ზე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "სამუშაო მაგიდის ჩვენება" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "ზედა სამუშაო ადგილი" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "ქვედა სამუშაო სივრცე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "მარცხენა სამუშაო სივრცე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "მარჯვენა სამუშაო სივრცე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "წინა სამუშაო სივრცე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "მომდევნო სამუშაო სივრცე" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "სამუშაო სივრცე 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "სამუშაო სივრცე 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "სამუშაო სივრცე 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "სამუშაო სივრცე 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "სამუშაო სივრცე 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "სამუშაო სივრცე 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "სამუშაო სივრცე 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "სამუშაო სივრცე 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "სამუშაო სივრცე 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "სამუშაო სივრცე 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "სამუშაო სივრცე 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "სამუშაო სივრცე 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "სამუშაო სივრცის დამატება" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "ბოლო სამუშაო სივრცის წაშლა" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "აქტიური სამუშაო სივრცის წაშლა" @@ -562,122 +611,130 @@ msgstr "" #: ../glade/libxfce4ui-2.xml.in.h:2 msgid "Subtitle" -msgstr "" +msgstr "სუბტიტრები" #: ../glade/libxfce4ui-2.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "" +msgstr "Xfce 4 -ის ვიჯეტები" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "ვერსიის შესახებ ინფორმაცია" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPU-ები" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "ფანჯრის მმართველი" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "პანელი" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "სამუშაო მაგიდის მმართველი" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "ფაილების მმართველი" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "სესსის მმართველი" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "პარამეტრების მმართველი" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "პროგრამის მპოვნელი" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "მენიუს ბიბლიოთეკა" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "მადლობას ვუხდით ყველას, ვინც დაგვეხმარა ამ პროგრამის განვითარებაში!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." msgstr "" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -685,7 +742,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -694,65 +751,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." -msgstr "" +msgstr "GTK+-ის ინიციალიზაციის შეცდომა" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce-ის განვითარების ჯგუფი. ყველა უფლება დაცულია." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "გთხოვთ, შეცდომების შესახებ გვაცნობეთ აქ <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" -msgstr "" - -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "ვერსია %s" +msgstr "ინტერფეისის ჩატვირთვის შეცდომა" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" -msgstr "" +msgstr "ძირითადი პროგრამისტები" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" -msgstr "" +msgstr "აქტიური მოხალისეები" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" -msgstr "" +msgstr "თარგმანების მართვა" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "დოკუმენტაციის მართვა" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "მთარგმნელები" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "" @@ -773,48 +821,68 @@ msgid "About the Xfce Desktop Environment" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "" +msgid "_Help" +msgstr "_დახმარება" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "დახურვა" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "მოწყობილობა" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "მეხსიერება" +msgid "label" +msgstr "ჭდე" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "ოს-ის სახელი" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "ოს-ის ტიპი" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce-ის ვერსია" +msgid "Distributor" +msgstr "დისტრიბუტორი" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" -msgstr "" +msgid "Xfce Version" +msgstr "Xfce-ის ვერსია" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK-ის ვერსია" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "ბირთვის ვერსია" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "მეხსიერება" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "სისტემა" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -825,39 +893,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "შესახებ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" -msgstr "" +msgstr "კრედიტები" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" -msgstr "" +msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" -msgstr "" +msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" -msgstr "" +msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "საავტორო უფლებები" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "უცნობი" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-ბიტიანი" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-ბიტიანი" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; აგების აიდი: %s" @@ -867,12 +950,13 @@ msgstr "%s; აგების აიდი: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "ფაილი სახელად \"%s\" უკვე არსებობს ამ კატალოგში, ფაილი არ იქნა დამატებული." +msgstr "" +"ფაილი სახელად \"%s\" უკვე არსებობს ამ კატალოგში, ფაილი არ იქნა დამატებული." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "" diff --git a/po/kk.po b/po/kk.po index 2a9496b..d538156 100644 --- a/po/kk.po +++ b/po/kk.po @@ -1,17 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Baurzhan Muftakhidinov , 2009,2015-2017,2019-2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-09 06:26+0000\n" -"Last-Translator: Baurzhan Muftakhidinov \n" -"Language-Team: Kazakh (http://www.transifex.com/xfce/libxfce4ui/language/kk/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Kazakh (https://app.transifex.com/xfce/teams/16840/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,7 +42,7 @@ msgstr "Сіз құжаттама парақтары әзірленіп, ауд #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "Ба_с тарту" @@ -58,7 +61,7 @@ msgstr "Жабу" #: ../libxfce4ui/xfce-dialogs.c:453 msgid "No" -msgstr "Жабу" +msgstr "Жоқ" #: ../libxfce4ui/xfce-dialogs.c:455 msgid "Yes" @@ -77,14 +80,18 @@ msgstr "Бірнеше беті бар терезені жабу керек пе msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Бұл терезеде бірнеше ашық бет бар. Бұл бетті жабу нәтижесінде ол беттердің барлығы да жабылады." +msgstr "" +"Бұл терезеде бірнеше ашық бет бар. Бұл бетті жабу нәтижесінде ол беттердің " +"барлығы да жабылады." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Бұл терезеде %d ашық бет бар. Бұл бетті жабу нәтижесінде ол беттердің барлығы да жабылады." +msgstr "" +"Бұл терезеде %d ашық бет бар. Бұл бетті жабу нәтижесінде ол беттердің " +"барлығы да жабылады." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -122,37 +129,34 @@ msgstr "Сессияларды басқару опциялары" msgid "Show session management options" msgstr "Сессияларды басқарудың опцияларын көрсету" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Сессияларды басқарушыға байланысты орнату сәтсіз аяқталды: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Сессияны басқарушысы дұрыс клиент ID-ін қайтармады" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "\"%s\" жұмыс бумасы жоқ болып тұр. Ол \"%s\" жасалғанда қолданылмайды." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Файл атында бумалар ажыратқышы жарамсыз" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Файл аты тым ұзын" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Файл атында бумалар ажыратқышы жарамсыз" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Файл аттару бос аралықпен басталмауы және аяқталмауы тиіс" @@ -161,7 +165,9 @@ msgstr "Файл аттару бос аралықпен басталмауы ж msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды қалайсыз?" +msgstr "" +"Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды " +"қалайсыз?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -185,74 +191,107 @@ msgstr "'%s' қалдыру" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды қалайсыз?" +msgstr "" +"Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды " +"қалайсыз?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды қалайсыз?" +msgstr "" +"Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды " +"қалайсыз?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Басқа пернелер комбинациясын қолданыңыз." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Бұл әрекетті %s іске қосуға бапталған." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s үшін ерегісетін әрекеттер" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Жарлық қазір басқа бір әрекет үшін орнатылып тұр." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Жарлықтар түзеткіші" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Ағымдағы жарлық. Түзету үшін шертіңіз..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Жарлықты тазарту" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Бастапқы жарлықты қалпына келтіру" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Бұл пернетақта жарлығы келесі үшін қолданылуда: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Пернетақта қолданылуда болып тұр" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Терезелер басқарушысы әрекетінің жарлығы" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "әрекет" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Команда жарлығы" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "команда" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Жарлық" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Тазарту" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "%s '%s' жөнелту үшін пернетақта пернелерін басыңыз." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Пернені басыңыз" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Пернетақта басқаруын алу мүмкін емес." @@ -338,7 +377,7 @@ msgstr "Терезені артқа апару" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 msgid "Raise or lower window" -msgstr "Терезені көтеру не төмендету" +msgstr "Терезені көтеру немесе төмендету" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 msgid "Fill window" @@ -361,198 +400,214 @@ msgid "Toggle fullscreen" msgstr "Толық экранға болуды қосу/сөндіру" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Терезені астыңғы мониторға жылжыту" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Терезені сол жақ мониторға жылжыту" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Терезені оң жақ мониторға жылжыту" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Терезені жоғарғы мониторға жылжыту" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Терезені жоғарғы жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Терезені төмендегі жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Терезені сол жақтағы жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Терезені оң жақтағы жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Терезені алдыңғы жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Терезені келесі жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Терезені 1-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Терезені 2-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Терезені 3-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Терезені 4-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Терезені 5-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Терезені 6-шы жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Терезені 7-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Терезені 8-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Терезені 9-шы жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Терезені 10-шы жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Терезені 11-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Терезені 12-ші жұмыс орнына апару" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Терезені үстіге толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Терезені астыға толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Терезені сол жаққа толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Терезені оң жаққа толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Терезені сол жақ жоғарыға толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Терезені оң жақ жоғарыға толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Терезені сол жақ төменге толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Терезені оң жақ төменге толтыру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Жұмыс үстелін көрсету" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Жоғарғы жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Төменгі жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Сол жақтағы жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Оң жақтағы жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Алдыңғы жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Келесі жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "1-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "2-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "3-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "4-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "5-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "6-шы жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "7-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "8-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "9-шы жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "10-шы жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "11-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "12-ші жұмыс орны" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Жұмыс орнын қосу" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Сыбайлас жұмыс орнын қосу" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Соңғы жұмыс орнын өшіру" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Белсенді тұрған жұмыс орнын жою" @@ -568,191 +623,209 @@ msgstr "Қосымша атауы" msgid "Xfce 4 Widgets" msgstr "Xfce 4 виджеттері" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Нұсқа ақпараты" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "Видеокарталар" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Терезелер басқарушысы" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Экрандағы терезелердің орналасуын басқарады." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Панель" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Терезе батырмалары, жөнелткіштер, қолданбалар мәзірі және басқаларды сақтайды." +msgstr "" +"Терезе батырмалары, жөнелткіштер, қолданбалар мәзірі және басқаларды " +"сақтайды." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Жұмыс үстел басқарушысы" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Жұмыс үстел тұсқағазын орнатады, таңбашаларды басқарады және т.б." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Файлдар басқарушысы" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "Файлдарыңызды заманауи, қолдануға жеңіл және жылдам тәсілмен басқарады." +msgstr "" +"Файлдарыңызды заманауи, қолдануға жеңіл және жылдам тәсілмен басқарады." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "Бөлімдерді басқарушысы" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Thunar үшін ауыстырмалы тасушылар мен дисктерді басқарады." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Сессиялар басқарушысы" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Сессияңызды сақтайды және қалпына келтіреді, іске қосылу, автожөнелту және сөндіруді басқарады." +msgstr "" +"Сессияңызды сақтайды және қалпына келтіреді, іске қосылу, автожөнелту және " +"сөндіруді басқарады." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Баптаулар жүйесі" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Баптаулар басқарушысы" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Сыртқы түрі, дисплей, пернетақта және тышқанды баптайды." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Қолданбаларды табушы" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Жүйеңізде орнатылған қолданбаларды жылдам табады және орындайды." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Баптаулар басқарушысының қызметі" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Баптауларыңызды D-Bus негізіндегі баптаулар жүйесінде сақтайды." -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "Мәзір библиотекасы" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "GLib және GIO негізіндегі freedesktop.org-үйлесімді мәзірді іске асырады." +msgstr "" +"GLib және GIO негізіндегі freedesktop.org-үйлесімді мәзірді іске асырады." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "Кіші көріністер қызметі" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Кіші көріністерді басқару D-Bus спецификациясын іске асырады." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr " қараңыз" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Бұл тізімнен қалып қойған біреуді білсеңіз, ақаулық хабарламасын жеріне жазыңыз." +msgstr "" +"Бұл тізімнен қалып қойған біреуді білсеңіз, ақаулық хабарламасын " +" жеріне жазыңыз." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Осы бағдарламалық қамтаманы қолжетерлік қылуға көмектескен барлық адамдарға рахмет!" +msgstr "" +"Осы бағдарламалық қамтаманы қолжетерлік қылуға көмектескен барлық адамдарға " +"рахмет!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 құқықтарына Olivier Fourdan (fourdan@xfce.org) ие. Әр түрлі құрауыштар өз авторларының меншігі болып табылады." +msgstr "" +"Xfce 4 құқықтарына Olivier Fourdan (fourdan@xfce.org) ие. Әр түрлі " +"құрауыштар өз авторларының меншігі болып табылады." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfce4util және exo дестелері Free Software Foundation жариялаған GNU Library General Public License аясында таратылады; нұсқасы 2 немесе (таңдауыңызша) одан кейін шыққан кез-келгені." +msgstr "" +"libxfce4ui, libxfce4util және exo дестелері Free Software Foundation " +"жариялаған GNU Library General Public License аясында таратылады; нұсқасы 2 " +"немесе (таңдауыңызша) одан кейін шыққан кез-келгені." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop және xfwm4 дестелері Free Software Foundation жариялаған GNU General Public License аясында таратылады; нұсқасы 2 немесе (таңдауыңызша) одан кейін шыққан кез-келгені." +msgstr "" +"thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf," +" xfdesktop және xfwm4 дестелері Free Software Foundation жариялаған GNU " +"General Public License аясында таратылады; нұсқасы 2 немесе (таңдауыңызша) " +"одан кейін шыққан кез-келгені." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Қолдану ақпаратын қарау үшін '%s --help' енгізіңіз." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ іске қосу мүмкін емес." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Қателер жөнінде осында хабарлаңыз: <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Интерфейсті жүктеу сәтсіз" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Нұсқасы %s, таратушы %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Нұсқасы %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Негізгі жасаушылар" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Белсенді қатысушылар" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Сервер үшін жауап беретін" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Аудармалар үшін жауап беретін" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Құжаттама үшін жауап беретін" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Аудармашылар" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Алдыңғы үлес қосушылар" @@ -773,48 +846,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce жұмыс үстел ортасы туралы" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "белгі" +msgid "_Help" +msgstr "Кө_мек" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "ОЖ атауы" +msgid "_Close" +msgstr "Жаб_у" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Құрылғы" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Жады" +msgid "label" +msgstr "белгі" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Процессор" +msgid "OS Name" +msgstr "ОЖ атауы" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "ОЖ түрі" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce нұсқасы" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Таратушы" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce нұсқасы" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK нұсқасы" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Ядро нұсқасы" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Процессор" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Жады" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "Видеокарта" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Жүйелік" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce - бұл мүмкіндіктері көп жұмыс үстел ортасын құрайтын бірнеше бағдарламалардың жинағы.\nКелесі бағдарламалар Xfce өзегін құрайды:" +msgstr "" +"Xfce - бұл мүмкіндіктері көп жұмыс үстел ортасын құрайтын бірнеше бағдарламалардың жинағы.\n" +"Келесі бағдарламалар Xfce өзегін құрайды:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -823,41 +918,63 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Сонымен қатар, Xfce бағдарламашыларға жұмыс үстеліне сәйкес келетін қолданбаларды жасауға көмектесетін бірнеше библиотекаларды ұсынатын әзірлеу платформасы болып табылады.\n\nXfce құрауыштары еркін не ашық лицензиялар аясында таратылады; қолданбалар үшін GPL не BSDL, жинақтар үшін LGPL не BSDL. Көбірек білу үшін құжаттаманы, бастапқы кодты мен Xfce веб сайтын (https://www.xfce.org) қараңыз.\n\nXfce жобасына көрсеткен қызығыңыз үшін рахмет.\n\n\t- Xfce әзірлеушілер тобы" +msgstr "" +"Сонымен қатар, Xfce бағдарламашыларға жұмыс үстеліне сәйкес келетін қолданбаларды жасауға көмектесетін бірнеше библиотекаларды ұсынатын әзірлеу платформасы болып табылады.\n" +"\n" +"Xfce құрауыштары еркін не ашық лицензиялар аясында таратылады; қолданбалар үшін GPL не BSDL, жинақтар үшін LGPL не BSDL. Көбірек білу үшін құжаттаманы, бастапқы кодты мен Xfce веб сайтын (https://www.xfce.org) қараңыз.\n" +"\n" +"Xfce жобасына көрсеткен қызығыңыз үшін рахмет.\n" +"\n" +"\t- Xfce әзірлеушілер тобы" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Осы туралы" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Жасағандар" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Белгісіз" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (32-биттік пайдаланушы ортасы)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-биттік" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-биттік" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Жинақ ID: %s" @@ -867,12 +984,13 @@ msgstr "%s; Жинақ ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Бұл бумада \"%s\" деп аталатын файл бар болып тұр, сондықтан файл қосылмады." +msgstr "" +"Бұл бумада \"%s\" деп аталатын файл бар болып тұр, сондықтан файл қосылмады." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Ескі панель баптауларын көшіру сәтсіз аяқталды" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Xfconf сақтап тұрған баптауларды түзету" diff --git a/po/ko.po b/po/ko.po index fb76388..31494e4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# 박정규(Jung-Kyu Park) , 2017 -# Seong-ho Cho , 2013-2017,2019-2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-12 12:30+0000\n" -"Last-Translator: Seong-ho Cho \n" -"Language-Team: Korean (http://www.transifex.com/xfce/libxfce4ui/language/ko/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Korean (https://app.transifex.com/xfce/teams/16840/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,7 +42,7 @@ msgstr "관리, 번역된 도움말 페이지가 있는 문서 웹사이트로 #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "취소(_C)" @@ -78,14 +80,18 @@ msgstr "여러 탭이 열린 창을 닫으시렵니까?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "이 창에 여러 탭이 열려있습니다. 이 창을 닫으면\n모든 탭이 닫힙니다." +msgstr "" +"이 창에 여러 탭이 열려있습니다. 이 창을 닫으면\n" +"모든 탭이 닫힙니다." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "이 창에 탭 %d개가 열려있습니다. 이 창을 닫으면\n모든 탭이 닫힙니다." +msgstr "" +"이 창에 탭 %d개가 열려있습니다. 이 창을 닫으면\n" +"모든 탭이 닫힙니다." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -123,37 +129,34 @@ msgstr "세션 관리자 옵션" msgid "Show session management options" msgstr "세션 관리자 옵션 보기" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "세션 관리자로 연결하는데 실패했습니다: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "세션 관리자에서 올바른 클라이언트 ID를 반환하지 않았습니다" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "작업 디렉터리 \"%s\"이(가) 존재하지 않습니다. \"%s\"이(가) 퍼지면 이를 사용하지 않습니다." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "파일 이름의 디렉터리 구분 문자가 잘못되었습니다" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "파일 이름이 너무 깁니다" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "파일 이름의 디렉터리 구분 문자가 잘못되었습니다" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "파일 이름은 공백으로 시작하거나 끝나면 안됩니다" @@ -197,63 +200,92 @@ msgstr "이 바로 가기는 이미 '%s' 동작에서 사용하고 있습니다. #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "다른 키 조합을 사용하십시오." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "이미 이 동작에 대해 %s 키 조합을 사용합니다." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s을(를) 위한 동작이 충돌합니다" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "이 바로 가기는 이미 다른 용도로 사용하고 있습니다." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "바로 가기 편집기" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "현재 바로 가기입니다. 편집하려면 누르십시오..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "바로 가기 지우기" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "기본 바로 가기 복원" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "이 키보드 바로 가기 키를 사용 중인 대상: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "이미 사용 중인 바로가기 키입니다" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "창 관리자 동작 바로 가기" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "동작" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "명령 바로 가기" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "명령" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "바로 가기" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "지우기" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "이제 %s '%s'을(를) 실행할 키보드 키를 누르십시오." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "키를 누르십시오" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "키보드 입력을 잡을 수 없습니다." @@ -362,198 +394,214 @@ msgid "Toggle fullscreen" msgstr "전체 화면 전환" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "하단 모니터로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "좌측 모니터로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "우측 모니터로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "상단 모니터로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "위쪽 작업 공간으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "아래쪽 작업 공간으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "왼쪽 작업 공간으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "오른쪽 작업 공간으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "이전 작업 공간으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "다음 작업 공간으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "작업 공간 1로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "작업 공간 2로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "작업 공간 3으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "작업 공간 4로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "작업 공간 5로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "작업 공간 6으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "작업 공간 7로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "작업 공간 8로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "작업 공간 9로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "작업 공간 10으로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "작업 공간 11로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "작업 공간 12로 창 이동" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "상단에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "하단에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "왼쪽에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "오른쪽에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "좌측 상단에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "우측 상단에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "좌측 하단에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "우측 하단에 창 바둑판 정렬" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "데스크톱 보이기" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "상단 작업 공간" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "하단 작업 공간" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "왼쪽 작업 공간" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "오른쪽 작업 공간" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "이전 작업 공간" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "다음 작업 공간" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "작업 공간 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "작업 공간 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "작업 공간 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "작업 공간 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "작업 공간 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "작업 공간 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "작업 공간 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "작업 공간 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "작업 공간 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "작업 공간 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "작업 공간 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "작업 공간 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "작업 공간 추가" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "인접 작업 공간 추가" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "마지막 작업 공간 삭제" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "활성 작업 공간 삭제" @@ -569,191 +617,199 @@ msgstr "부제" msgid "Xfce 4 Widgets" msgstr "Xfce 4 위젯" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "버전 정보" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPU" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "창 관리자" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "화면 상 창의 위치를 다룹니다." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "패널" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "창 단추, 실행 아이콘, 프로그램 메뉴 등의 홈을 제공합니다" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "데스크톱 관리자" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "데스크톱 배경, 메뉴, 아이콘 등을 설정합니다." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "파일 관리자" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "최신의, 간단하고 빠른 방식으로 파일을 관리합니다." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "볼륨 관리자" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "투나에서 이동식 드라이브, 미디어를 관리합니다." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "세션 관리자 옵션" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "세션을 시작, 자동 시작, 종료 동작을 저장하고 복원합니다." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "설정 시스템" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "설정 관리자" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "모양새, 화면, 키보드 마우스를 설정합니다." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "프로그램 찾기" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "시스템에 설치한 프로그램을 빠르게 찾고 실행합니다." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "설정 데몬" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "D-Bus 기반 설정 시스템에 설정 내용을 저장합니다." -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "메뉴 라이브러리" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Glib, GIO 기반 freedesktop.org 규정 준수 메뉴를 구현합니다." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "미리보기 그림 서비스" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "섬네일 서비스" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "D-Bus 미리 보기 그림 관리 명세를 구현합니다." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "다음을 참고하십시오:" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "이 목록의 빠진 내용을 아시는 분은 망설이지 마시고 에 버그를 알려주십시오." +msgstr "" +"이 목록의 빠진 내용을 아시는 분은 망설이지 마시고 " +"에 버그를 알려주십시오." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "이 소프트웨어를 사용할 수 있게 도와준 모든 분께 감사드립니다!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4는 Oliver Foundan(fourdan@xfce.org)의 지적 소유물입니다. 다른 구성요소는 제각각의 저작권자가 저작권을 소유하고 있습니다." +msgstr "" +"Xfce 4는 Oliver Foundan(fourdan@xfce.org)의 지적 소유물입니다. 다른 구성요소는 제각각의 저작권자가 " +"저작권을 소유하고 있습니다." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfce4util, exo 꾸러미는 자유 소프트웨어 재단에서 발표한 GNU 라이브러리 일반 공중 사용 허가서 버전 2 (또는 취향에 따라) 이상의 조항에 따라 배포합니다." +msgstr "" +"libxfce4ui, libxfce4util, exo 꾸러미는 자유 소프트웨어 재단에서 발표한 GNU 라이브러리 일반 공중 사용 허가서 " +"버전 2 (또는 취향에 따라) 이상의 조항에 따라 배포합니다." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "투나, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop xfwm4 는 자유 소프트웨어 재단에서 발표한 GNU 일반 공중 사용 허가서 버전 2 (또는 취향에 따라) 이상의 라이선스 조항에 따라 배포합니다." +msgstr "" +"투나, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, " +"xfdesktop xfwm4 는 자유 소프트웨어 재단에서 발표한 GNU 일반 공중 사용 허가서 버전 2 (또는 취향에 따라) 이상의 " +"라이선스 조항에 따라 배포합니다." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "사용법을 보려면 '%s --help'를 입력합니다." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+를 초기화할 수 없습니다." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 개발 팀. All rights reserved." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "<%s>(으)로 버그를 알려주십시오." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "인터페이스를 불러오는데 실패했습니다" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "버전 %s, %s이(가) 배포함" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "버전 %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "코어 개발자" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "활동 개발자" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "서버 관리자" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "번역 감독자" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "문서 제작 감독" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "번역자" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "이전 공헌자" @@ -774,48 +830,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce 데스크톱 환경 정보" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "레이블" +msgid "_Help" +msgstr "도움말(_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "운영체제명" +msgid "_Close" +msgstr "닫기(_O)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "장치" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "메모리" +msgid "label" +msgstr "레이블" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "운영체제명" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "운영체제 형식" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce 버전" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "제공자" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce 버전" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK 버전" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "커널 버전" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "메모리" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "시스템" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce는 완전한 기능을 갖춘 데스크톱 환경을 함께 제공하는 프로그램 모음입니다.\n다음 프로그램은 Xfce 코어의 일부입니다." +msgstr "" +"Xfce는 완전한 기능을 갖춘 데스크톱 환경을 함께 제공하는 프로그램 모음입니다.\n" +"다음 프로그램은 Xfce 코어의 일부입니다." -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -824,41 +902,63 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce는 데스크톱 환경과 더불어 프로그래머의 프로그램 제작을 돕는 여러 라이브러리를 제공하는 개발 플랫폼이기도 합니다.\n\nXfce 구성 요소는 자유/오픈소스 라이선스에 따라 사용을 허가합니다. 프로그램에 대해 GPL 또는 BSDL, 라이브러리에 대해 LGPL 또는 BSDL을 적용합니다. 더 많은 내용은 문서, 소스 코드, Xfce 웹사이트(https://www.xfce.org)를 참고하십시오.\n\nXfce에 관심을 주셔서 감사합니다.\n\n\t- Xfce 개발 팀" +msgstr "" +"Xfce는 데스크톱 환경과 더불어 프로그래머의 프로그램 제작을 돕는 여러 라이브러리를 제공하는 개발 플랫폼이기도 합니다.\n" +"\n" +"Xfce 구성 요소는 자유/오픈소스 라이선스에 따라 사용을 허가합니다. 프로그램에 대해 GPL 또는 BSDL, 라이브러리에 대해 LGPL 또는 BSDL을 적용합니다. 더 많은 내용은 문서, 소스 코드, Xfce 웹사이트(https://www.xfce.org)를 참고하십시오.\n" +"\n" +"Xfce에 관심을 주셔서 감사합니다.\n" +"\n" +"\t- Xfce 개발 팀" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "정보" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "참여자" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "알 수 없음" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64비트(32비트 사용자영역)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64비트" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32비트" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; 빌드 ID: %s" @@ -874,6 +974,6 @@ msgstr "\"%s\" 파일이 디렉터리에 이미 있습니다. 파일을 추가 msgid "Failed to migrate the old panel configuration" msgstr "이전 패널 설정 가져오기에 실패했습니다" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Xfconf에서 저장한 설정 개별 설정" diff --git a/po/lt.po b/po/lt.po index 4c7745c..f29f41f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Algimantas Margevičius , 2012 -# Moo, 2015-2017,2019-2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-22 13:08+0000\n" -"Last-Translator: Moo\n" -"Language-Team: Lithuanian (http://www.transifex.com/xfce/libxfce4ui/language/lt/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Lithuanian (https://app.transifex.com/xfce/teams/16840/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,11 +38,13 @@ msgstr "Ar norite skaityti naudotojo vadovą internete?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Jūs būsite nukreipti į dokumentacijos svetainę, kurioje yra verčiami ir prižiūrimi žinyno puslapiai." +msgstr "" +"Jūs būsite nukreipti į dokumentacijos svetainę, kurioje yra verčiami ir " +"prižiūrimi žinyno puslapiai." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Atsisakyti" @@ -78,14 +82,18 @@ msgstr "Užverti langą su keliomis kortelėmis?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Šiame lange yra kelios atvertos kortelės. Užvėrus šį langą, tuo pačiu bus užvertos ir visos jame esančios kortelės." +msgstr "" +"Šiame lange yra kelios atvertos kortelės. Užvėrus šį langą, tuo pačiu bus " +"užvertos ir visos jame esančios kortelės." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Šiame lange yra %d atvertos kortelės. Užvėrus šį langą, tuo pačiu bus užvertos ir visos jame esančios kortelės." +msgstr "" +"Šiame lange yra %d atvertos kortelės. Užvėrus šį langą, tuo pačiu bus " +"užvertos ir visos jame esančios kortelės." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -123,37 +131,34 @@ msgstr "Seanso tvarkymo parametrai" msgid "Show session management options" msgstr "Rodyti seanso tvarkymo parametrus" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Nepavyko prisijungti prie seansų tvarkytuvės: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Seansų tvarkytuvė negrąžino tinkamo kliento id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Darbinio katalogo „%s“ nėra. Jis nebus naudojamas atvaizduojant „%s“." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Katalogų skirtukas failo pavadinime yra neleistinas" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Failo pavadinimas yra per ilgas" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Katalogų skirtukas failo pavadinime yra neleistinas" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Failo pavadinimai neturėtų prasidėti ar baigtis tarpu" @@ -162,7 +167,9 @@ msgstr "Failo pavadinimai neturėtų prasidėti ar baigtis tarpu" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Šis susiejimas jau yra naudojamas veiksmui '%s'. Kurį veiksmą norėsite naudoti?" +msgstr "" +"Šis susiejimas jau yra naudojamas veiksmui '%s'. Kurį veiksmą norėsite " +"naudoti?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -186,74 +193,106 @@ msgstr "Palikti „%s“" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Šis susiejimas jau naudojamas komandai „%s“. Kurį veiksmą norėsite naudoti?" +msgstr "" +"Šis susiejimas jau naudojamas komandai „%s“. Kurį veiksmą norėsite naudoti?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Šis susiejimas jau yra naudojamas veiksmo '%s'. Kurį veiksmą norėsite naudoti?" +msgstr "" +"Šis susiejimas jau yra naudojamas veiksmo '%s'. Kurį veiksmą norėsite " +"naudoti?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Prašome naudoti kitokią klavišų kombinaciją." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s jau yra nustatyta, kad paleistų šį veiksmą." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Nesuderinami veiksmai, skirti %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Šis susiejimas jau naudojamas kažkam kitam." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Susiejimų redaktorius" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Dabartinis trumpinys. Spustelėkite norėdami taisyti..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Išvalyti susiejimą" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Atkurti numatytąjį susiejimą" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Šį klaviatūros susiejimą šiuo metu naudoja: „%s“" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Klaviatūros susiejimas jau yra naudojamas" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Langų tvarkytuvės veiksmų susiejimas" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "veiksmas" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Komandos susiejimas" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "komandą" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Susiejimas" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Išvalyti" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Paspauskite klaviatūros klavišus, kurie paleis %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Paspauskite klavišą" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Nepavyko sučiupti klaviatūros." @@ -362,198 +401,214 @@ msgid "Toggle fullscreen" msgstr "Perjungti viso ekrano veikseną" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Perkelti langą į apatinį monitorių" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Perkelti langą į kairįjį monitorių" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Perkelti langą į dešinįjį monitorių" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Perkelti langą į viršutinį monitorių" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Perkelti langą į aukštesniąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Perkelti langą į žemesniąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Perkelti langą į kairiąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Perkelti langą į dešiniąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Perkelti langą į buvusią darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Perkelti langą į kitą darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Perkelti langą į darbo sritį 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Perkelti langą į darbo sritį 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Perkelti langą į darbo sritį 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Perkelti langą į darbo sritį 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Perkelti langą į darbo sritį 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Perkelti langą į darbo sritį 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Perkelti langą į darbo sritį 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Perkelti langą į darbo sritį 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Perkelti langą į darbo sritį 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Perkelti langą į darbo sritį 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Perkelti langą į darbo sritį 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Perkelti langą į darbo sritį 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Perkelti langą į aukštesniąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Perkelti langą į žemesniąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Perkelti langą į kairiąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Perkelti langą į dešinąją darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Iškloti langą viršuje kairėje" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Iškloti langą viršuje dešinėje" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Iškloti langą apačioje kairėje" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Iškloti langą apačioje dešinėje" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Rodyti darbalaukį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Viršutinė darbo sritis" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Žemutinė darbo sritis" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Kairioji darbo sritis" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Dešinioji darbo sritis" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Ankstesnė darbo sritis" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Kita darbo sritis" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Darbo sritis 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Darbo sritis 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Darbo sritis 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Darbo sritis 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Darbo sritis 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Darbo sritis 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Darbo sritis 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Darbo sritis 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Darbo sritis 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Darbo sritis 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Darbo sritis 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Darbo sritis 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Pridėti darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Pridėti darbo sritį šalia" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Pašalinti paskutinę darbo sritį" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Pašalinti aktyvią darbo sritį" @@ -573,186 +628,201 @@ msgstr "Xfce 4 valdikliai" msgid "Version information" msgstr "Versija" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU plokštės" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Langų tvarkytuvė" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Apdoroja langų vietą ekrane." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Skydelis" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "Pateikia vietą lango mygtukams, leistukams, programos meniu ir kt." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Darbalaukio tvarkytuvė" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Nustato darbalaukio fonus, apdoroja piktogramas ir kt." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Failų tvarkytuvė" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Šiuolaikišku, lengvu ir greitu būdu tvarko jūsų failus." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Tomų tvarkytuvė" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Tvarko keičiamuosius diskus ir laikmenas už Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Seansų tvarkytuvė" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Įrašo ir atkuria jūsų seansą, apdoroja paleistį, automatinį paleidimą ir išjungimą." +msgstr "" +"Įrašo ir atkuria jūsų seansą, apdoroja paleistį, automatinį paleidimą ir " +"išjungimą." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Sistemos nustatymai" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Nustatymų tvarkytuvė" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Konfigūruoja išvaizdos, ekrano, klaviatūros bei pelės nustatymus." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Programų paieška" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Greitai randa ir paleidžia jūsų sistemoje įdiegtas programas." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Nustatymų tarnyba" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Saugo jūsų nustatymus D-Bus paremtoje konfigūracijos sistemoje." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Meniu biblioteka" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Įgyvendina su freedesktop.org suderinamą meniu, pagrįstą GLib ir GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Miniatiūrų tarnyba" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Įgyvendina miniatiūrų tvarkymo D-Bus specifikaciją." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Žiūrėkite " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Jei ko nors šiame sąraše trūksta, nesivaržykite ir užpildykite pranešimą apie klaidą, adresu ." +msgstr "" +"Jei ko nors šiame sąraše trūksta, nesivaržykite ir užpildykite pranešimą " +"apie klaidą, adresu ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Dėkojame visiems, kurie prisidėjo tam, kad ši programinė įranga būtų prieinama!" +msgstr "" +"Dėkojame visiems, kurie prisidėjo tam, kad ši programinė įranga būtų " +"prieinama!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 autorinės teisės priklauso Olivier Fourdan (fourdan@xfce.org). Kiti komponentai priklauso atitinkamiems autoriams." +msgstr "" +"Xfce 4 autorinės teisės priklauso Olivier Fourdan (fourdan@xfce.org). Kiti " +"komponentai priklauso atitinkamiems autoriams." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Libxfce4ui, libxfce4util ir exo paketai yra platinami pagal Free Software Foundation paskelbtą GNU Bendrąją Viešąją Licenciją; arba pagal licencijos versiją 2, arba (jūsų nuožiūra) bet kurią vėlesnę versiją." +msgstr "" +"Libxfce4ui, libxfce4util ir exo paketai yra platinami pagal Free Software " +"Foundation paskelbtą GNU Bendrąją Viešąją Licenciją; arba pagal licencijos " +"versiją 2, arba (jūsų nuožiūra) bet kurią vėlesnę versiją." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Paketai thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop ir xfwm4 yra platinami pagal Free Software Foundation paskelbtą GNU Bendrąją Viešąją Licenciją; arba pagal licencijos versiją 2, arba (jūsų nuožiūra) bet kurią vėlesnę versiją. " +msgstr "" +"Paketai thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings," +" xfconf, xfdesktop ir xfwm4 yra platinami pagal Free Software Foundation " +"paskelbtą GNU Bendrąją Viešąją Licenciją; arba pagal licencijos versiją 2, " +"arba (jūsų nuožiūra) bet kurią vėlesnę versiją. " -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Įveskite '%s --help', jei norite gauti daugiau informacijos." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Nepavyko inicijuoti GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce kūrėjų komanda. Visos teisės saugomos." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Apie klaidas praneškite <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Nepavyko įkelti sąsajos" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Autoriai" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Dabartiniai pagalbininkai" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Serverius prižiūri" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Vertimų priežiūra" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Dokumentacijos priežiūra" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Vertėjai" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Ankstesni talkininkai" @@ -773,52 +843,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Apie Xfce darbalaukio aplinką" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiketė" +msgid "_Help" +msgstr "Ž_inynas" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "OS pavadinimas" +msgid "_Close" +msgstr "_Užverti" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Įrenginys" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Atmintis" +msgid "label" +msgstr "etiketė" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Procesorius" +msgid "OS Name" +msgstr "OS pavadinimas" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "OS tipas" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce versija" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Platintojas" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce versija" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK versija" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Branduolio versija" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Procesorius" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Atmintis" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce - tai programų rinkinys, kartu sudarantis pilną darbalaukio aplinką.\nĮ Xfce branduolį įeina šios programos:" +msgstr "" +"Xfce - tai programų rinkinys, kartu sudarantis pilną darbalaukio aplinką.\n" +"Į Xfce branduolį įeina šios programos:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,48 +915,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce tap pat yra plėtojimo platforma, teikianti kelias bibliotekas, padedančias programuotojams kurti programas, kurios prisiderina prie darbalaukio aplinkos.\n\nXfce komponentai yra licencijuoti pagal laisvas ar atvirojo kodo licencijas; programos pagal GPL ar BSDL licencijas, o bibliotekos pagal LGPL ar BSDL licencijas. Išsamesnei informacijai, žiūrėkite dokumentaciją, pradinį kodą ar Xfce internetinę svetainę (https://www.xfce.org).\n\nDėkojame už jūsų susidomėjimą Xfce.\n\n\t- Xfce plėtojimo komanda" +msgstr "" +"Xfce tap pat yra plėtojimo platforma, teikianti kelias bibliotekas, padedančias programuotojams kurti programas, kurios prisiderina prie darbalaukio aplinkos.\n" +"\n" +"Xfce komponentai yra licencijuoti pagal laisvas ar atvirojo kodo licencijas; programos pagal GPL ar BSDL licencijas, o bibliotekos pagal LGPL ar BSDL licencijas. Išsamesnei informacijai, žiūrėkite dokumentaciją, pradinį kodą ar Xfce internetinę svetainę (https://www.xfce.org).\n" +"\n" +"Dėkojame už jūsų susidomėjimą Xfce.\n" +"\n" +"\t- Xfce plėtojimo komanda" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Apie" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Padėkos" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Autorių teisės" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Nežinoma" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bitų (32 bitų naudotojų erdvė)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 bitų" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 bitų" @@ -876,7 +971,7 @@ msgstr "32 bitų" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Darinio ID: %s" @@ -886,12 +981,13 @@ msgstr "%s; Darinio ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Failas, pavadinimu „%s“ šiame kataloge jau yra, failas nebuvo pridėtas." +msgstr "" +"Failas, pavadinimu „%s“ šiame kataloge jau yra, failas nebuvo pridėtas." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Nepavyko atkelti senos skydelio konfigūracijos" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Derinkite Xfconf saugomus nustatymus" diff --git a/po/lv.po b/po/lv.po index 5311137..8eb5e38 100644 --- a/po/lv.po +++ b/po/lv.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" +"POT-Creation-Date: 2021-11-15 00:45+0100\n" +"PO-Revision-Date: 2021-11-14 23:45+0000\n" "Last-Translator: Xfce Bot \n" "Language-Team: Latvian (http://www.transifex.com/xfce/libxfce4ui/language/lv/)\n" "MIME-Version: 1.0\n" @@ -133,26 +133,23 @@ msgid "Session manager did not return a valid client id" msgstr "Sesijas pārvaldnieks neatgrieza derīgu clienta id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:400 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:228 +msgid "Filename is too long" msgstr "" -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 -msgid "Filename is too long" +#: ../libxfce4ui/xfce-filename-input.c:229 +msgid "Directory separator illegal in file name" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:230 msgid "Filenames should not start or end with a space" msgstr "" @@ -214,6 +211,34 @@ msgstr "Konfliktējošas darbības priekš %s" msgid "This shortcut is already being used for something else." msgstr "Šo īsceļu jau izmanto kaut kam citam." +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:90 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:330 +msgid "The current shortcut. Press to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:341 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:351 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:426 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:517 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:429 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:520 +msgid "Keyboard shortcut already in use" +msgstr "" + #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 msgid "Window Manager Action Shortcut" msgstr "Logu pārvaldnieku darbību īsceļi" @@ -568,116 +593,124 @@ msgstr "Apakšvirsraksts" msgid "Xfce 4 Widgets" msgstr "Xfce 4 sīkrīki" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Versijas informācija" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:117 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:135 msgid "Window Manager" msgstr "Logu pārvaldnieks" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:136 msgid "Handles the placement of windows on the screen." msgstr "" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:140 msgid "Panel" msgstr "Panelis" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:141 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:145 msgid "Desktop Manager" msgstr "" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:146 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:150 msgid "File Manager" msgstr "Failu pārvaldnieks" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:151 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:155 +msgid "Volume Manager" msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:156 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:160 msgid "Session Manager" msgstr "" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:161 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "" +#: ../xfce4-about/main.c:165 +msgid "Settings Manager" +msgstr "Iestatījumu pārvaldnieks" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:166 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:170 msgid "Application Finder" msgstr "Lietotņu meklētājs" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:171 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:175 msgid "Settings Daemon" msgstr "" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:176 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:180 +msgid "A Menu Library" msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:181 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:185 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:186 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:240 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:300 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:304 msgid "Thanks to all who helped making this software available!" msgstr "" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:321 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." msgstr "" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:326 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -685,7 +718,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:333 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -694,65 +727,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:479 #, c-format msgid "Type '%s --help' for usage information." msgstr "" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:485 msgid "Unable to initialize GTK+." msgstr "Nevarēja inicializēt GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:494 msgid "The Xfce development team. All rights reserved." msgstr "Xfce izstrādes komanda. Visas tiesības paturētas." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:495 #, c-format msgid "Please report bugs to <%s>." msgstr "Lūdzu, ziņot par kļūdām uz <%s>" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:505 msgid "Failed to load interface" msgstr "" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:136 msgid "Core developers" msgstr "" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:139 msgid "Active contributors" msgstr "" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:142 msgid "Servers maintained by" msgstr "" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:145 msgid "Translations supervision" msgstr "" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:148 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:151 msgid "Translators" msgstr "" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:154 msgid "Previous contributors" msgstr "" @@ -773,48 +797,60 @@ msgid "About the Xfce Desktop Environment" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "_Help" +msgstr "_Palīdzība" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "_Close" +msgstr "_Aizvērt" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "label" msgstr "etiķete" -#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 msgid "OS Name" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 msgid "Device" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "Memory" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +#: ../xfce4-about/xfce4-about-dialog.glade.h:9 msgid "CPU" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "OS Type" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:9 +#: ../xfce4-about/xfce4-about-dialog.glade.h:11 msgid "Xfce Version" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 msgid "Distributor" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 msgid "System" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -825,39 +861,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:24 msgid "About" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:25 msgid "Credits" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "GPL" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "LGPL" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "BSD" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "Copyright" msgstr "" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:531 ../xfce4-about/system-info.c:553 +#: ../xfce4-about/system-info.c:654 ../xfce4-about/system-info.c:699 msgid "Unknown" msgstr "Nezināms" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:639 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:642 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:642 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:707 #, c-format msgid "%s; Build ID: %s" msgstr "" diff --git a/po/ms.po b/po/ms.po index b17b790..79cae54 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# abuyop , 2015-2017,2019-2020 -# Puretech , 2013 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Malay (http://www.transifex.com/xfce/libxfce4ui/language/ms/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Malay (https://app.transifex.com/xfce/teams/16840/ms/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,11 +38,13 @@ msgstr "Anda mahu membaca panduan dalam talian?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Anda akan dihalakan ke laman web dokumentasi dimana laman bantuan diselenggara dan diterjemahkan." +msgstr "" +"Anda akan dihalakan ke laman web dokumentasi dimana laman bantuan " +"diselenggara dan diterjemahkan." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Batal" @@ -78,14 +82,18 @@ msgstr "Tutup tetingkap dengan tab berbilang?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Tetingkap ini mempunyai tab berbilang terbuka. Penutupan tetingkap ini juga akan menutup semua tab di dalamnya." +msgstr "" +"Tetingkap ini mempunyai tab berbilang terbuka. Penutupan tetingkap ini juga " +"akan menutup semua tab di dalamnya." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Tetingkap ini masih mempunyai %d tab terbuka. Penutupan tetingkap ini juga akan menutup semua tab-tab di dalamnya." +msgstr "" +"Tetingkap ini masih mempunyai %d tab terbuka. Penutupan tetingkap ini juga " +"akan menutup semua tab-tab di dalamnya." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -123,37 +131,36 @@ msgstr "Pilihan pengurusan sesi" msgid "Show session management options" msgstr "Paparkan pilihan pengurus sesi" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Gagal menyambung ke pengurus sesi: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Pengurus sesi tidak mengembalikan id klien yang sah" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Direktori kerja \"%s\" tidak wujud. Ia tidak akan digunakan apabila menjana \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Direktori kerja \"%s\" tidak wujud. Ia tidak akan digunakan apabila menjana " +"\"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -162,7 +169,9 @@ msgstr "" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Pintasan ini telah digunakan untuk tindakan '%s'. Tindakan mana anda mahu gunakan?" +msgstr "" +"Pintasan ini telah digunakan untuk tindakan '%s'. Tindakan mana anda mahu " +"gunakan?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -186,74 +195,107 @@ msgstr "Simpan '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Pintasan ini telah digunakan untuk arahan '%s'. Tindakan mana anda mahu gunakan?" +msgstr "" +"Pintasan ini telah digunakan untuk arahan '%s'. Tindakan mana anda mahu " +"gunakan?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Pintasan ini telah digunakan untuk tindakan '%s'. Tindakan mana anda mahu gunakan?" +msgstr "" +"Pintasan ini telah digunakan untuk tindakan '%s'. Tindakan mana anda mahu " +"gunakan?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Sila gunakan kombinasi kekunci yang lain." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s telah pun mencetuskan tindakan ini." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Konflik tindakan untuk %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Pintasan ini telah digunakan untuk perkara lain." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Pintasan papan kekunci ini kini digunakan oleh: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Pintasan papan kekunci ini sudah digunakan" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Pintasan Tindakan Pengurus Tetingkap" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "tindakan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Pintaan Arahan" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "arahan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Pintasan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Kosongkan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Tidak dapat menangkap papan kekunci." @@ -362,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Togol skrinpenuh" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Pindah tetingkap ke ruangkerja atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Pindah tetingkap ke ruangkerja bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Pindah tetingkap ke ruangkerja kiri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Pindah tetingkap ke ruangkerja kanan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Pindah tetingkap ke ruangkerja tadi" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Pindah tetingkap ke ruangkerja seterusnya" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Pindah tetingkap ke ruangkerja 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Pindah tetingkap ke ruangkerja 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Pindah tetingkap ke ruangkerja 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Pindah tetingkap ke ruangkerja 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Pindah tetingkap ke ruangkerja 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Pindah tetingkap ke ruangkerja 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Pindah tetingkap ke ruangkerja 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Pindah tetingkap ke ruangkerja 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Pindah tetingkap ke ruangkerja 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Pindah tetingkap ke ruangkerja 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Pindah tetingkap ke ruangkerja 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Pindah tetingkap ke ruangkerja 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Susun tetingkap ke atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Susun tetingkap ke bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Susun tetingkap ke kiri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Susun tetingkap ke kanan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Jubinkan tetingkap ke kiri-atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Jubinkan tetingkap ke kanan-atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Jubinkan tetingkap ke kiri-bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Jubinkan tetingkap ke kanan-bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Papar desktop" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Ruangkerja atas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Ruangkerja bawah" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ruangkerja kiri" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Ruangkerja kanan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Ruangkerja terdahulu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Ruangkerja seterusnya" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Ruangkerja 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Ruangkerja 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Ruangkerja 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Ruangkerja 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Ruangkerja 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Ruangkerja 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Ruangkerja 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Ruangkerja 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Ruangkerja 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Ruangkerja 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Ruangkerja 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Ruangkerja 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Tambah ruangkerja" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Tambah ruangkerja bersebelahan" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Padam ruangkerja terakhir" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Padam ruangkerja aktif" @@ -569,191 +627,200 @@ msgstr "Sarikata" msgid "Xfce 4 Widgets" msgstr "Widget Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Maklumat versi" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Pengurus Tetingkap" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Mengendalikan penempatan tetingkap pada skrin." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Pengurus Desktop" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Pengurus Fail" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Pengurus Volum" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Pengurusan Sesi" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Tetapan Sistem" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Pengurus Tetapan" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Pencari Aplikasi" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Tetapan Daemon" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Pustaka menu" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Perkhidmatan lakaran kenit" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Terima kasih kepada semua yang membantu menjayakan perisian ini!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 adlah hakcipta Oliver Fourdan (fourdan@xfce.org). Komponen lain adalah hakcipta penulis yang berkenaan." +msgstr "" +"Xfce 4 adlah hakcipta Oliver Fourdan (fourdan@xfce.org). Komponen lain " +"adalah hakcipta penulis yang berkenaan." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Pakej libxfce4ui, libxfcegui4 dan exo diedarkan di bawah syarat-syarat GNU General Public License seperti yang diterbitkan oleh Free Software Foundation; sama ada Lesen versi 2, atau (atas pilihan anda) mana-mana versi selepas ini." +msgstr "" +"Pakej libxfce4ui, libxfcegui4 dan exo diedarkan di bawah syarat-syarat GNU " +"General Public License seperti yang diterbitkan oleh Free Software " +"Foundation; sama ada Lesen versi 2, atau (atas pilihan anda) mana-mana versi" +" selepas ini." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Pakej thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop dan xfwm4 diedarkan di bawah syarat-syarat GNU General Public License seperti yang diterbitkan oleh Free Software Foundation; sama ada Lesen versi 2, atau (atas pilihan anda) mana-mana versi selepas ini." +msgstr "" +"Pakej thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop dan xfwm4 diedarkan di bawah syarat-syarat GNU General " +"Public License seperti yang diterbitkan oleh Free Software Foundation; sama " +"ada Lesen versi 2, atau (atas pilihan anda) mana-mana versi selepas ini." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Taip '%s --help' untuk maklumat penggunaan." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Tidak dapat memulakan GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Pasukan pembangunan Xfce. Semua hak cipta terpelihara." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Sila laporkan pepijat ke <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Gagal untuk memuatkan antaramuka" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Versi %s, edaran oleh %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Versi %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Pembangun utama" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Penyumbang aktif" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Pelayan diselenggara oleh" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Penyelia terjemahan" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Penterjemah" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Penyumbang sebelum ini" @@ -774,48 +841,68 @@ msgid "About the Xfce Desktop Environment" msgstr "Perihal Persekitaran Desktop Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "label" +msgid "_Help" +msgstr "_Bantuan" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nama OS" +msgid "_Close" +msgstr "_Tutup" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Peranti" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Ingatan" +msgid "label" +msgstr "label" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Nama OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Jenis OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versi Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distribusi" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versi Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Ingatan" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,39 +913,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Perihal" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Kredit" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Hakcipta" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Tidak diketahui" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID Binaan: %s" @@ -868,12 +970,14 @@ msgstr "%s; ID Binaan: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Satu fail bernama \"%s\" sudah wujud dalam direktori ini, fail belum lagi ditambahkan." +msgstr "" +"Satu fail bernama \"%s\" sudah wujud dalam direktori ini, fail belum lagi " +"ditambahkan." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Gagal memindahkan konfigurasi panel lama" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Suaikan tetapan yang disimpan oleh Xfconf" diff --git a/po/nb.po b/po/nb.po index 84cb9d3..805a4b7 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,21 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Allan Nordhøy , 2014-2015 -# Allan Nordhøy , 2015-2016 -# Harald H. , 2014 -# Kjell Cato Heskjestad , 2019-2020 -# Terje Uriansrud , 2010 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-23 11:36+0000\n" -"Last-Translator: Kjell Cato Heskjestad \n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/xfce/libxfce4ui/language/nb/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Norwegian Bokmål (https://app.transifex.com/xfce/teams/16840/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,11 +38,13 @@ msgstr "Ønsker du å lese bruksanvisningen på nettet?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Du vil bli omdirigert til dokumentasjonsnettstedet der hjelpesidene blir vedlikeholdt og oversatt." +msgstr "" +"Du vil bli videresendt til dokumentasjonsnettstedet der hjelpesidene blir " +"vedlikeholdt og oversatt." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Avbryt" @@ -81,14 +82,18 @@ msgstr "Lukk vindu med flere faner?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Dette vinduet har flere faner åpne. Lukker du dette vinduet så lukker du også alle fanene." +msgstr "" +"Dette vinduet har flere faner åpne. Lukker du dette vinduet så lukker du " +"også alle fanene." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Dette vinduet har %d faner åpne. Lukker du dette vinduet så lukker du også alle fanene." +msgstr "" +"Dette vinduet har %d faner åpne. Lukker du dette vinduet så lukker du også " +"alle fanene." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -126,37 +131,35 @@ msgstr "Alternativer for øktbehandling" msgid "Show session management options" msgstr "Vis alternativer for øktbehandling" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Klarte ikke koble til øktbehandleren: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Øktbehandler returnerte ikke en gyldig klient-ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Arbeidsmappen «%s» finnes ikke. Den vil ikke brukes ved klargjøring av «%s»." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Filnavnet kan ikke inneholde skilletegn for mapper" +msgstr "" +"Arbeidsmappen «%s» finnes ikke. Den vil ikke brukes ved klargjøring av «%s»." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Filnavnet er for langt" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Filnavnet kan ikke inneholde skilletegn for mapper" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Filnavnet bør ikke starte eller slutte med mellomrom" @@ -165,7 +168,9 @@ msgstr "Filnavnet bør ikke starte eller slutte med mellomrom" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Denne snarveien benyttes allerede for handlingen «%s». Hvilken handling ønsker du å bruke?" +msgstr "" +"Denne snarveien benyttes allerede for handlingen «%s». Hvilken handling " +"ønsker du å bruke?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -189,80 +194,113 @@ msgstr "Behold «%s»" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Denne snarveien benyttes allerede for kommandoen «%s». Hvilken handling ønsker du å bruke?" +msgstr "" +"Denne snarveien benyttes allerede for kommandoen «%s». Hvilken handling " +"ønsker du å bruke?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Denne snarveien benyttes allerede for handlingen «%s». Hvilken handling ønsker du å bruke?" +msgstr "" +"Denne snarveien benyttes allerede for handlingen «%s». Hvilken handling " +"ønsker du å bruke?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Vennligst bruk en annen tastekombinasjon." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s utløser allerede denne handlingen." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Motstridende handlinger for %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Denne snarveien benyttes allerede for noe annet." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Redigering av hurtigtaster" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Gjeldende hurtigtast. Trykk for å redigere …" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Slett hurtigtasten" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Gjenopprett standard hurtigtast" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Denne hurtigtasten brukes av: «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Hurtigtasten er allerede i bruk" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Snarvei til vindusbehandlers handling" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "handling" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Kommandosnarvei" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "kommando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Snarvei" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Tøm" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Trykk tastaturtastene for å utløse %s «%s»." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Trykk en tast" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Klarte ikke å ta tak i tastaturet." #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 msgid "Window operations menu" -msgstr "Vindu handlingsmeny" +msgstr "Handlingsmeny til vindu" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 msgid "Up" @@ -282,19 +320,19 @@ msgstr "Høyre" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 msgid "Cycle windows" -msgstr "Roter vinduer" +msgstr "Bla gjennom vinduer" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 msgid "Cycle windows (Reverse)" -msgstr "Roter vinduer (baklengs)" +msgstr "Bla gjennom vinduer (baklengs)" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 msgid "Switch window for same application" -msgstr "Bytt vindu for samme applikasjon" +msgstr "Bytt vindu for samme program" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 msgid "Switch application" -msgstr "Bytt applikasjon" +msgstr "Bytt program" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 msgid "Close window" @@ -365,198 +403,214 @@ msgid "Toggle fullscreen" msgstr "Slå fullskjerm på/av" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Flytt vindu til nedre skjerm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Flytt vindu til venstre skjerm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Flytt vindu til høyre skjerm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Flytt vindu til øvre skjerm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Flytt vindu til øvre skrivebord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Flytt vindu til nedre skrivebord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Flytt vindu til venstre skrivebord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Flytt vindu til høyre skrivebrord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Flytt vindu til forrige skrivebord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Flytt vindu til neste skrivebord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Flytt vindu til arbeidsområde 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Flytt vindu til arbeidsområde 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Flytt vindu til arbeidsområde 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Flytt vindu til arbeidsområde 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Flytt vindu til arbeidsområde 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Flytt vindu til arbeidsområde 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Flytt vindu til arbeidsområde 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Flytt vindu til arbeidsområde 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Flytt vindu til arbeidsområde 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Flytt vindu til arbeidsområde 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Flytt vindu til arbeidsområde 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Flytt vindu til arbeidsområde 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Flislegg vinduet til toppen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Flislegg vinduet til bunnen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Flislegg vinduet til venstresiden" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Flislegg vinduet til høyresiden" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Still inn vindu øverst til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Still inn vindu øverst til høyre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Still inn vindu nederst til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Still inn vindu nederst til høyre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Vis skrivebord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Øvre arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Nedre arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Venstre arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Høyre arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Forrige arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Neste arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Arbeidsområde 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Arbeidsområde 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Arbeidsområde 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Arbeidsområde 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Arbeidsområde 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Arbeidsområde 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Arbeidsområde 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Arbeidsområde 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Arbeidsområde 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Arbeidsområde 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Arbeidsområde 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Arbeidsområde 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Legg til arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Legg til et skrivebord ved siden av" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Slett siste arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Slett gjeldende arbeidsområde" @@ -576,186 +630,202 @@ msgstr "Xfce4 Skjermelementer" msgid "Version information" msgstr "Versjonsinformasjon" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU-er" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Vindusbehandler" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." -msgstr "Håndterer plassering av vinduer på skjermen." +msgstr "Behandle plassering av vinduer på skjermen." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "Gir et hjem til vindusknapper, startere, programmeny og mer." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Skrivebordsbehandler" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Velger skrivebordsbakgrunn, håndterer ikoner med mer." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Filbehandler" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Behandler filer raskt og enkelt på en moderne måte." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Behandle flyttbare media" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Behandler flyttbare enheter og media for Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Øktbehandler" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Lagrer og gjenoppretter økter, håndterer oppstart, autostart og avslutning." +msgstr "" +"Lagrer og gjenoppretter økter, håndterer oppstart, autostart og avslutning." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Systeminnstillinger" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Innstillingsbehandler" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Stiller inn utseende, skjerm, tastatur og mus." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Programsøk" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Leter raskt opp installerte programmer på maskinen. " -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Innstillinger for bakgrunnsprosesser" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Lagrer innstillinger i et D-Bus-basert oppsettssystem." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Et menybibliotek" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementerer en freedesktop.org-kompatibel meny basert på GLib og GIO." +msgstr "" +"Implementerer en freedesktop.org-kompatibel meny basert på GLib og GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Tjeneste for miniatyrbilder" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementerer D-Bus-spesifikasjonen for miniatyrbildehåndtering." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Se " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Hvis du ser at det mangler noen fra denne listen så ikke nøl, lag en feilrapport på . " +msgstr "" +"Hvis du ser at det mangler noen fra denne listen så ikke nøl, lag en " +"feilrapport på . " -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Takk til alle som har hjulpet til med å gjøre denne programvaren mulig!" +msgstr "" +"Takk til alle som har hjulpet til med å gjøre denne programvaren mulig!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 er kopirettsbeskyttet Olivier Fourdan (fourdan@xfce.org) De forskjellige komponentene er kopirettsbeskyttet av sine respektive forfattere." +msgstr "" +"Olivier Fourdan (fourdan@xfce.org) har opphavsretten til Xfce 4. De " +"respektive opphavspersonene har opphavsrett til de forskjellige " +"komponentene." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Pakkene libxfce4ui, libxfce4util og exo distribueres under betingelsene til GNU Library General Public License som publisert av Free Software Foundation; enten lisensens versjon 2, eller (ditt valg) enhver senere versjon. " +msgstr "" +"Pakkene libxfce4ui, libxfce4util og exo distribueres under betingelsene til " +"GNU Library General Public License som publisert av Free Software " +"Foundation; enten lisensens versjon 2, eller (ditt valg) enhver senere " +"versjon. " -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Pakkene thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop og xfwm4 distribueres under betingelsene til GNU General Public License som publisert av Free Software Foundation; enten lisensens versjon 2, eller (ditt valg) enhver senere versjon." +msgstr "" +"Pakkene thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings," +" xfconf, xfdesktop og xfwm4 distribueres under betingelsene til GNU General " +"Public License som publisert av Free Software Foundation; enten lisensens " +"versjon 2, eller (ditt valg) enhver senere versjon." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Skriv '%s --help' for bruksinformasjon." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." -msgstr "Kunne ikke klargjøre GTK+." +msgstr "Klarte ikke klargjøre GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce utviklingslaget. Alle rettigheter reservert." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapporter feil til <%s>" -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" -msgstr "Kunne ikke laste inn grensesnitt" +msgstr "Klarte ikke laste inn grensesnitt" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Utviklere av sentrale komponenter" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktive bidragsytere" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Tjenere vedlikeholdt av" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Oversettelsesveiledning" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Hjelpetekstveiledning" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Oversettere" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Tidligere bidragsytere" @@ -776,52 +846,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Om Xfce skrivebordsmiljø" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "Etikett" +msgid "_Help" +msgstr "_Hjelp" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "OS-navn" +msgid "_Close" +msgstr "_Lukk" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Enhet" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Minne" +msgid "label" +msgstr "Etikett" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "OS-navn" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "OS-type" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce-versjon" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributør" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce-versjon" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK-versjon" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kjerneversjon" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Minne" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce er en samling programmer som tilsammen utgjør et fullt skrivebordsmiljø. \nFølgende programmer er sentrale i Xfce:" +msgstr "" +"Xfce er en samling programmer som tilsammen utgjør et fullt skrivebordsmiljø. \n" +"Følgende programmer er sentrale i Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -830,48 +918,58 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce er også en utviklingsplattform som gir tilgang til biblioteker som lar utviklere lage programmer som passer inn i skrivebordsmiljøet.\n\nXfce-komponentene er lisensierte under frie eller åpne kildekode-lisenser; programmene under GPL eller BSD, og bibliotekene under LGPL eller BSDL. For mer informasjon se hjelpedokumentasjonen, kildekoden eller nettsiden til Xfce (https://www.xfce.org).\n\nTakk for din interesse.\n\n\t– Utviklingslaget til Xfce" +msgstr "" +"Xfce er også en utviklingsplattform som gir tilgang til biblioteker som lar utviklere lage programmer som passer inn i skrivebordsmiljøet.\n" +"\n" +"Xfce-komponentene er lisensierte under frie eller åpne kildekode-lisenser; programmene under GPL eller BSD, og bibliotekene under LGPL eller BSDL. For mer informasjon se hjelpedokumentasjonen, kildekoden eller nettsiden til Xfce (https://www.xfce.org).\n" +"\n" +"Takk for din interesse.\n" +"\n" +"\t– Utviklingslaget til Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Om" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" -msgstr "haarek - Harald \nkingu - Allan Nordhøy \npapparonny - Ronny K. M. Olufsen " +msgstr "" +"haarek - Harald \n" +"kingu - Allan Nordhøy \n" +"papparonny - Ronny K. M. Olufsen " -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Kopirett" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Ukjent" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-biters (32-biters brukermiljø)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-biters" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-biters" @@ -879,7 +977,7 @@ msgstr "32-biters" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Bygg-ID: %s" @@ -889,12 +987,14 @@ msgstr "%s; Bygg-ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "En fil ved navn \"%s\" finnes allerede i denne mappen, filen har ikke blitt lagt til." +msgstr "" +"En fil ved navn «%s» finnes allerede i denne mappen. Filen har ikke blitt " +"lagt til." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Klarte ikke flytte det gamle paneloppsettet" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Tilpass innstillinger lagret av Xfconf" diff --git a/po/nl.po b/po/nl.po index 91678cc..fa95d4d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Pjotr , 2015-2017,2019-2020 -# Pjotr pjotrvertaalt@gmail.com , 2011,2013 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-20 00:45+0100\n" -"PO-Revision-Date: 2020-12-20 17:49+0000\n" -"Last-Translator: Pjotr \n" -"Language-Team: Dutch (http://www.transifex.com/xfce/libxfce4ui/language/nl/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Dutch (https://app.transifex.com/xfce/teams/16840/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,11 +38,13 @@ msgstr "Wilt u de handleiding op het internet lezen?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "U zult worden omgeleid naar de documentatiewebstek, waar de hulppagina's worden onderhouden en vertaald." +msgstr "" +"U zult worden omgeleid naar de documentatiewebstek, waar de hulppagina's " +"worden onderhouden en vertaald." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Afbreken" @@ -78,14 +82,18 @@ msgstr "Venster met meerdere tabbladen sluiten?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Dit venster heeft meerdere tabbladen open staan. Het sluiten van dit venster zal ook al zijn tabbladen sluiten." +msgstr "" +"Dit venster heeft meerdere tabbladen open staan. Het sluiten van dit venster" +" zal ook al zijn tabbladen sluiten." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Dit venster heeft %d tabbladen open staan. Het sluiten van dit venster zal ook al zijn tabbladen sluiten." +msgstr "" +"Dit venster heeft %d tabbladen open staan. Het sluiten van dit venster zal " +"ook al zijn tabbladen sluiten." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -123,37 +131,36 @@ msgstr "Opties voor sessiebeheer" msgid "Show session management options" msgstr "Toon opties voor sessiebeheer" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Kon geen verbinding maken met de sessiebeheerder: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Geen geldige client-ID van de sessiebeheerder ontvangen" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Werkmap '%s' bestaat niet. Hij zal niet worden gebruikt wanneer '%s' wordt uitgezaaid." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "In bestandnaam mag geen mapscheidingsteken voorkomen" +msgstr "" +"Werkmap '%s' bestaat niet. Hij zal niet worden gebruikt wanneer '%s' wordt " +"uitgezaaid." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Bestandnaam is te lang" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "In bestandnaam mag geen mapscheidingsteken voorkomen" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Bestandnamen mogen niet beginnen of eindigen met een spatie" @@ -162,7 +169,9 @@ msgstr "Bestandnamen mogen niet beginnen of eindigen met een spatie" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Deze sneltoets wordt reeds gebruikt voor de actie '%s'. Welke actie wilt u gebruiken?" +msgstr "" +"Deze sneltoets wordt reeds gebruikt voor de actie '%s'. Welke actie wilt u " +"gebruiken?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -186,74 +195,107 @@ msgstr "'%s' behouden" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Deze sneltoets wordt reeds gebruikt voor de opdracht '%s'. Welke actie wilt u gebruiken?" +msgstr "" +"Deze sneltoets wordt reeds gebruikt voor de opdracht '%s'. Welke actie wilt " +"u gebruiken?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Deze sneltoets wordt reeds gebruikt door de actie '%s'. Welke actie wilt u gebruiken?" +msgstr "" +"Deze sneltoets wordt reeds gebruikt door de actie '%s'. Welke actie wilt u " +"gebruiken?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Gebruik a.u.b. een andere toetscombinatie." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Deze actie wordt al opgeroepen door %s." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Tegenstrijdige acties voor %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "De sneltoets wordt al gebruikt voor iets anders." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Bewerker van sneltoetsen" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "De huidige sneltoets. Klik om te bewerken..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Sneltoets wissen" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Standaardsneltoets herstellen" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Deze sneltoets wordt thans gebruikt door: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Sneltoets is reeds in gebruik" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Sneltoets voor actie van vensterbeheerder" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "actie" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Sneltoets voor opdracht" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "opdracht" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Sneltoets" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Wissen" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Druk toetsen in voor het oproepen van de %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Druk a.u.b. een toets in" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Kon het toetsenbord niet bemachtigen." @@ -362,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Schakel schermvullend om" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Venster verplaatsen naar onderste beeldscherm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Venster verplaatsen naar linkerbeeldscherm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Venster verplaatsen naar rechterbeeldscherm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Venster verplaatsen naar bovenste beeldscherm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Verplaats venster naar bovenliggend werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Verplaats venster naar onderliggend werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Verplaats venster naar linkerwerkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Verplaats venster naar rechterwerkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Verplaats venster naar vorig werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Verplaats venster naar volgend werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Verplaats venster naar werkblad 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Verplaats venster naar werkblad 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Verplaats venster naar werkblad 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Verplaats venster naar werkblad 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Verplaats venster naar werkblad 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Verplaats venster naar werkblad 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Verplaats venster naar werkblad 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Verplaats venster naar werkblad 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Verplaats venster naar werkblad 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Verplaats venster naar werkblad 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Verplaats venster naar werkblad 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Verplaats venster naar werkblad 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Plaats venstertegel naar boven" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Plaats venstertegel naar beneden" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Plaats venstertegel naar links" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Plaats venstertegel naar rechts" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Venster naar linksboven tegelen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Venster naar rechtsboven tegelen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Venster naar linksonder tegelen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Venster naar rechtsonder tegelen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Toon bureaublad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Bovenste werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Onderste werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Linkerwerkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Rechterwerkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Vorig werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Volgend werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Werkblad 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Werkblad 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Werkblad 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Werkblad 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Werkblad 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Werkblad 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Werkblad 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Werkblad 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Werkblad 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Werkblad 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Werkblad 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Werkblad 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Voeg werkblad toe" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Voeg aangrenzend werkblad toe" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Verwijder laatste werkblad" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Verwijder actief werkblad" @@ -573,186 +631,209 @@ msgstr "Xfce 4-programmaatjes" msgid "Version information" msgstr "Versie-informatie" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU's" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Vensterbeheerder" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Bedient de plaatsing van vensters op het scherm." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Werkbalk" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Biedt onderdak aan vensterknoppen, starters, toepassingenmenu en meer." +msgstr "" +"Biedt onderdak aan vensterknoppen, starters, toepassingenmenu en meer." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Bureaubladbeheerder" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Stelt bureaubladachtergronden in, behandelt pictogrammen en meer." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Bestandbeheerder" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Beheert uw bestanden op een moderne, makkelijke en snelle manier." -#: ../xfce4-about/main.c:155 -msgid "Volume manager" -msgstr "Schijfstationsbeheerder" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Volumebeheer" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Beheert verwijderbare stations en media voor Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Sessiebeheerder" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Slaat uw sessie op en herstelt die, behandelt opstarten, automatisch starten en afsluiten." +msgstr "" +"Slaat uw sessie op en herstelt die, behandelt opstarten, automatisch starten" +" en afsluiten." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Instellingensysteem" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Instellingen- en systeembeheerder" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Stelt uiterlijk, beeldscherm, toetsenbord en muis in." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Toepassingenzoeker" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Vindt en start snel toepassingen die geïnstalleerd zijn." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Achtergronddienst voor instellingen" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Slaat uw instellingen op in een instellingensysteem dat is gebaseerd op D-Bus." +msgstr "" +"Slaat uw instellingen op in een instellingensysteem dat is gebaseerd op " +"D-Bus." -#: ../xfce4-about/main.c:180 -msgid "A menu library" -msgstr "Een menubibliotheekbestand" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Een menubibliotheek" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Past een menu toe dat is gebaseerd op GLib en GIO, dat voldoet aan de eisen van freedesktop.org." +msgstr "" +"Past een menu toe dat is gebaseerd op GLib en GIO, dat voldoet aan de eisen " +"van freedesktop.org." -#: ../xfce4-about/main.c:185 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "Miniaturendienst" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Past de D-Bus-specificatie toe voor miniatuurbeheer." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Zie a.u.b. " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Als u vindt dat er iemand op deze lijst ontbreekt, aarzel dan niet en dien een foutmelding in op ." +msgstr "" +"Als u vindt dat er iemand op deze lijst ontbreekt, aarzel dan niet en dien " +"een foutmelding in op ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Dank aan allen die geholpen hebben om deze programmatuur beschikbaar te stellen!" +msgstr "" +"Dank aan allen die geholpen hebben om deze programmatuur beschikbaar te " +"stellen!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 behoort auteursrechtelijk aan Olivier Fourdan (fourdan@xfce.org). De verschillende onderdelen behoren auteursrechtelijk aan hun respectievelijke makers." +msgstr "" +"Xfce 4 behoort auteursrechtelijk aan Olivier Fourdan (fourdan@xfce.org). De " +"verschillende onderdelen behoren auteursrechtelijk aan hun respectievelijke " +"makers." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "De pakketten libxfce4ui, libxfce4util en exo worden gedistribueerd onder de voorwaarden van de GNU Library General Public License zoals gepubliceerd door de Free Software Foundation; hetzij versie 2 van de Licentie, hetzij (naar uw keuze) enige nieuwere versie." +msgstr "" +"De pakketten libxfce4ui, libxfce4util en exo worden gedistribueerd onder de " +"voorwaarden van de GNU Library General Public License zoals gepubliceerd " +"door de Free Software Foundation; hetzij versie 2 van de Licentie, hetzij " +"(naar uw keuze) enige nieuwere versie." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "De pakketten thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop en xfwm4 worden gedistribueerd onder de voorwaarden van de GNU General Public License zoals gepubliceerd door de Free Software Foundation; hetzij versie 2 van die licentie, hetzij (naar uw keuze) enige nieuwere versie." +msgstr "" +"De pakketten thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop en xfwm4 worden gedistribueerd onder de " +"voorwaarden van de GNU General Public License zoals gepubliceerd door de " +"Free Software Foundation; hetzij versie 2 van die licentie, hetzij (naar uw " +"keuze) enige nieuwere versie." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Tik '%s --help' voor een gebruiksaanwijzing." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Kon GTK+ niet initialiseren." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "De Xfce-ontwikkelploeg. Alle rechten voorbehouden." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Meld fouten a.u.b. aan <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Kon gebruikersschil niet laden" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Kernontwikkelaars" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Actieve bijdragers" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servers onderhouden door" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Leiding van de vertalingen" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Leiding van de documentatie" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Vertalers" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Vroegere bijdragers" @@ -773,52 +854,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Over de Xfce-werkomgeving" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiket" +msgid "_Help" +msgstr "_Hulp" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Naam van besturingssysteem" +msgid "_Close" +msgstr "_Sluiten" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Apparaat" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Geheugen" +msgid "label" +msgstr "etiket" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Naam van besturingssysteem" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Soort besturingssysteem" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versie van Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Verdeler" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versie van Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK-versie" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Systeemkernversie" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Geheugen" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Systeem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce is een verzameling programma's die gezamenlijk een volledige functierijke werkomgeving bieden.\nDe volgende programma's maken deel uit van de kern van Xfce:" +msgstr "" +"Xfce is een verzameling programma's die gezamenlijk een volledige functierijke werkomgeving bieden.\n" +"De volgende programma's maken deel uit van de kern van Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,48 +926,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce is ook een ontwikkelplatform dat verschillende bibliotheekbestanden beschikbaar stelt die programmeurs helpen om toepassingen te maken die goed passen in de werkomgeving.\n\nDe Xfce-bestanddelen worden ter beschikking gesteld onder vrije of open-bron licenties; GPL of BSDL voor toepassingen en LGPL of BSDL voor bibliotheekbestanden. Kijk naar de documentatie, de broncode of de webstek van Xfce (https://www.xfce.org) voor meer informatie.\n\nBedankt voor uw belangstelling voor Xfce.\n\n\t- De ontwikkelaarsploeg van Xfce" +msgstr "" +"Xfce is ook een ontwikkelplatform dat verschillende bibliotheekbestanden beschikbaar stelt die programmeurs helpen om toepassingen te maken die goed passen in de werkomgeving.\n" +"\n" +"De Xfce-bestanddelen worden ter beschikking gesteld onder vrije of open-bron licenties; GPL of BSDL voor toepassingen en LGPL of BSDL voor bibliotheekbestanden. Kijk naar de documentatie, de broncode of de webstek van Xfce (https://www.xfce.org) voor meer informatie.\n" +"\n" +"Bedankt voor uw belangstelling voor Xfce.\n" +"\n" +"\t- De ontwikkelaarsploeg van Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Over" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Dankbetuigingen" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Auteursrecht" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Onbekend" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bits (32-bits gebruikersomgeving)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bits" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bits" @@ -876,7 +982,7 @@ msgstr "32-bits" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Bouwsel-ID: %s" @@ -886,12 +992,14 @@ msgstr "%s; Bouwsel-ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Een bestand genaamd '%s' bestaat reeds in deze map: het bestand is niet toegevoegd." +msgstr "" +"Een bestand genaamd '%s' bestaat reeds in deze map: het bestand is niet " +"toegevoegd." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Kon de oude werkbalkinstellingen niet overzetten" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Instellingen aanpassen die opgeslagen zijn door Xfconf" diff --git a/po/nn.po b/po/nn.po index 6b8fafb..308c206 100644 --- a/po/nn.po +++ b/po/nn.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Eivind Ødegård , 2012 -# Kevin Brubeck Unhammer , 2017-2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Norwegian Nynorsk (http://www.transifex.com/xfce/libxfce4ui/language/nn/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Norwegian Nynorsk (https://app.transifex.com/xfce/teams/16840/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,7 +23,8 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Greidde ikkje opna nettlesaren for å lesa dokumentasjonen som ligg på nettet" +msgstr "" +"Greidde ikkje opna nettlesaren for å lesa dokumentasjonen som ligg på nettet" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -36,11 +39,13 @@ msgstr "Vil du lesa bruksrettleiinga på nettet?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Du blir sendt vidare til dokumentasjonssida, der hjelpefilene blir oppdaterte og omsette." +msgstr "" +"Du blir sendt vidare til dokumentasjonssida, der hjelpefilene blir " +"oppdaterte og omsette." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "Av_bryt" @@ -123,37 +128,36 @@ msgstr "Val for økthandsaming" msgid "Show session management options" msgstr "Vis val for økthandsaming" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Greidde ikkje kopla til økthandsamaren: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Økthandsamaren gav ikkje ein gyldig klient-ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Arbeidsmappa «%s» finst ikkje. Me kjem ikkje til å bruka henne når me startar «%s»." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Arbeidsmappa «%s» finst ikkje. Me kjem ikkje til å bruka henne når me " +"startar «%s»." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -162,7 +166,8 @@ msgstr "" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Denne snarvegen er alt brukt av handlinga «%s». Kva handling vil du bruka?" +msgstr "" +"Denne snarvegen er alt brukt av handlinga «%s». Kva handling vil du bruka?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -186,74 +191,106 @@ msgstr "Behald «%s»" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Denne snarvegen er alt oppteken av kommandoen «%s». Kva kommando vil du bruka?" +msgstr "" +"Denne snarvegen er alt oppteken av kommandoen «%s». Kva kommando vil du " +"bruka?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Denne snarvegen er alt brukt av handlinga «%s». Kva handling vil du bruka?" +msgstr "" +"Denne snarvegen er alt brukt av handlinga «%s». Kva handling vil du bruka?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Vel ein annan tastekombinasjon." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s køyrer allereie denne handlinga." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt i handlingane for %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Denne snarvegen er alt oppteken til noko anna." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Denne tastatursnarvegen er for tida i bruk av: «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Tastatursnarveg allereie i bruk" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Snarveg til vindaugshandterar-handling" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "handling" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Kommandosnarveg" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "kommando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Snarveg" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Tøm" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Greidde ikkje fanga opp tastaturet." @@ -362,198 +399,214 @@ msgid "Toggle fullscreen" msgstr "Fullskjerm av/på" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Flytt dette vindauga til øvste arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Flytt dette vindauga til nedste arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Flytt dette vindauga til venstre arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Flytt dette vindauga til høgre arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Flytt dette vindauga til førre arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Flytt dette vindauga til neste arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Flytt vindauga til arbeidsområde 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Flytt vindauga til arbeidsområde 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Flytt vindauga til arbeidsområde 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Flytt vindauga til arbeidsområde 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Flytt vindauga til arbeidsområde 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Flytt vindauga til arbeidsområde 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Flytt vindauga til arbeidsområde 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Flytt vindauga til arbeidsområde 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Flytt vindauga til arbeidsområde 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Flytt vindauga til arbeidsområde 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Flytt vindauga til arbeidsområde 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Flytt vindauga til arbeidsområde 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Flislegg vindauga til toppen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Flislegg vindauga til botnen" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Flislegg vindauga til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Flislegg vindauga til høgre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Flislegg vindauga øvst til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Flislegg vindauga øvst til høgre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Flislegg vindauga nedst til venstre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Flislegg vindauga nedst til høgre" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Vis skrivebordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Øvste arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Nedste arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Venstre arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Høgre arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Førre arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Neste arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Arbeidsområde 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Arbeidsområde 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Arbeidsområde 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Arbeidsområde 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Arbeidsområde 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Arbeidsområde 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Arbeidsområde 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Arbeidsområde 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Arbeidsområde 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Arbeidsområde 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Arbeidsområde 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Arbeidsområde 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Legg til eit arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Legg til nabo-arbeidsområde" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Slett siste arbeidsområdet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Slett dette arbeidsområdet" @@ -569,116 +622,126 @@ msgstr "Undertittel" msgid "Xfce 4 Widgets" msgstr "Småprogram i Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Informasjon om denne utgåva" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Vindaugshandsamar" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Handterer korleis vindaugo blir plasserte på skjermen." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Skrivebordshandsamar" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Filhandsamar" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Behandlar for lagringseiningar" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Økthandsamar" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Innstillingssystem" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Innstillingshandterar" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Programfinnar" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Innstillingsnisse" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Eit menybibliotek" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Teneste for miniatyrbilete" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Takk til alle som har hjelpt til å laga denne programvara!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 er copyright Olivier Fourdan (fourdan@xfce.org). Dei ulike programskaparane har kopieringsretten til sine eigne program." +msgstr "" +"Xfce 4 er copyright Olivier Fourdan (fourdan@xfce.org). Dei ulike " +"programskaparane har kopieringsretten til sine eigne program." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -686,7 +749,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -695,65 +758,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Skriv «%s --help» for brukarrettleiing." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Klarte ikkje starta GTK+" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Utviklingslaget for Xfce. Alle rettar er reserverte." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapporter feil til <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Klarte ikkje å lasta grensesnittet" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Versjon %s, gjeven ut av %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Utgåve: %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Hovudutviklarar" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktive bidragsytarar" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Tenarane blir vedlikehaldne av " -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Styring over omsetjingane" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Omsetjarar" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Tidlegare bidragsytarar" @@ -774,23 +828,23 @@ msgid "About the Xfce Desktop Environment" msgstr "Om skrivebordsmiljøet Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "merkelapp" +msgid "_Help" +msgstr "_Hjelp" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Lat att" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Eining" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "merkelapp" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -798,24 +852,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,39 +900,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Om" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Heider og ære" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Opphavsrett" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Ukjend" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -868,12 +957,14 @@ msgstr "" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Det finst alt ei fil med namnet «%s» i denne mappa; fila vart ikkje lagt til." +msgstr "" +"Det finst alt ei fil med namnet «%s» i denne mappa; fila vart ikkje lagt " +"til." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Greidde ikkje overføra det gamle paneloppsettet" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Set opp innstillingane som Xfconf lagrar" diff --git a/po/oc.po b/po/oc.po index a7d3601..8774b5c 100644 --- a/po/oc.po +++ b/po/oc.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Cédric Valmary , 2015-2016 -# Cédric Valmary , 2013 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Occitan (post 1500) (http://www.transifex.com/xfce/libxfce4ui/language/oc/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Occitan (post 1500) (https://app.transifex.com/xfce/teams/16840/oc/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,11 +38,13 @@ msgstr "Volètz consultar lo manual en linha ?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Seretz redirigit cap al site de documentacion en linha ont las paginas d'ajuda son mantengudas e tradusidas." +msgstr "" +"Seretz redirigit cap al site de documentacion en linha ont las paginas " +"d'ajuda son mantengudas e tradusidas." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Anullar" @@ -72,13 +76,15 @@ msgstr "Anullar" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "" +msgstr "Tampar la fenèstra amb mantun onglet ?" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." msgstr "" +"Aquesta fenèstra a mantun onglet dobèrt. La tampadura d’aquesta fenèstra " +"tamparà totes sos onglets." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -86,6 +92,8 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"Aquesta fenèstra a %d onglets dobèrts. La tampadura d’aquesta fenèstra " +"tamparà totes sos onglets." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -93,11 +101,11 @@ msgstr "Avertiment" #: ../libxfce4ui/xfce-dialogs.c:534 msgid "Close T_ab" -msgstr "" +msgstr "Tampar _onglet" #: ../libxfce4ui/xfce-dialogs.c:535 msgid "Close _Window" -msgstr "" +msgstr "Tampar _fenèstra" #: ../libxfce4ui/xfce-dialogs.c:540 msgid "Do _not ask me again" @@ -123,46 +131,47 @@ msgstr "Opcions del gestionari de sesilha" msgid "Show session management options" msgstr "Afichar las opcions del gestionari de sesilha" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Impossible de se connectar al gestionari de sesilha : %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Lo gestionari de sesilha a pas tornat un id client valable" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Lo dorsièr de trabalh « %s » existís pas. Serà pas utilizat a la reobertura de « %s »." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Lo dorsièr de trabalh « %s » existís pas. Serà pas utilizat a la reobertura " +"de « %s »." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "Lo nom de fichièr es tròp long" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Separador de repertòri illegal dins lo nom de fichièr" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "Los noms de fichièrs devon pas començar o acabar amb un espaci" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Aqueste acorchi es ja utilizat per l'accion '%s'. Quina accion volètz gardar ?" +msgstr "" +"Aqueste acorchi es ja utilizat per l'accion '%s'. Quina accion volètz gardar" +" ?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -186,74 +195,107 @@ msgstr "Gardar '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Aqueste acorchi es ja utilizat per la comanda '%s'. Quina accion volètz gardar ?" +msgstr "" +"Aqueste acorchi es ja utilizat per la comanda '%s'. Quina accion volètz " +"gardar ?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Aqueste acorchi es ja atribuit per l'accion '%s'. Quina accion volètz gardar ?" +msgstr "" +"Aqueste acorchi es ja atribuit per l'accion '%s'. Quina accion volètz gardar" +" ?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Se vos plai utilizatz una autra combinason de tòcas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s desenclava ja aquesta accion." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Accions en conflicte per %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Aqueste acorchi es ja utilizat per quicòm mai." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor d’acorchis" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "L’acorchi actual. Clicatz per modificar..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Escafar l’acorchi" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restaurar l’acorchi per defaut" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "L'acorchi de clavièr es ja utilizat per : « %s »" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Acorchis de clavièr ja utilizat" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Acorchi d'una accion del gestionari de fenèstras" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "accion" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Acorchi comanda" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "comanda" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Acorchi" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Escafar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "Quichatz las tòcas per desenclavar %s « %s »." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "Volgatz quichar una tòca" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Impossible d'accedir al clavièr." @@ -362,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Bascuolar en ecran complet" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Desplaçar la fenèstra cap a l’ecran inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Desplaçar la fenèstra cap a l’ecran d’equèrra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Desplaçar la fenèstra cap a l’ecran de drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Desplaçar la fenèstra cap a l’ecran superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh a esquèrra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh a drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh precedent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh seguent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Agençar la fenèstra en mosaïca cap amont" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Agençar la fenèstra en mosaïca cap amont" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Agençar la fenèstra en mosaïca cap a esquèrra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Agençar la fenèstra en mosaïca cap a drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Agençar la fenèstra en mosaïca cap amont a esquèrra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Agençar la fenèstra en mosaïca cap amont a drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Agençar la fenèstra en mosaïca cap aval a esquèrra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Agençar la fenèstra en mosaïca cap aval a drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Afichar lo burèu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Espaci de trabalh superior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Espaci de trabalh inferior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Espaci de trabalh a esquèrra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Espaci de trabalh a drecha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Espaci de trabalh precedent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Espaci de trabalh seguent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Espaci de trabalh 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Espaci de trabalh 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Espaci de trabalh 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Espaci de trabalh 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Espaci de trabalh 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Espaci de trabalh 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Espaci de trabalh 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Espaci de trabalh 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Espaci de trabalh 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Espaci de trabalh 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Espaci de trabalh 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Espaci de trabalh 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Apondre un espaci de trabalh" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Apondre un espaci de trabalh adjacent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Suprimir lo darrièr espaci de trabalh" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Suprimir l'espaci de trabalh actiu" @@ -569,124 +627,148 @@ msgstr "Sostítol" msgid "Xfce 4 Widgets" msgstr "Widgets Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Informacions sus la version" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "Processors grafics" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gestionari de fenèstras" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Gerís lo plaçament de las fenèstras sus l'ecran." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panèl" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" +"Provesís una zòna pels botons de fenèstras, aviadors, menús d’aplicacions e " +"encara mai." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gestionari del burèu" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "Definís los rèireplans, gerís las icònas e mai." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gestionari de fichièrs" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "Gerís los fichièrs d’un biais modèrn, de bon utilizar e rapid." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Gestionari de son" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "Gerís los lectors amovibles e los mèdias per Thunar." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gestionari de sesilhas" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"Enregistra e restaura la session, gerís las aviadas, los lançaments " +"automatics e l’extincion." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Paramètres sistèma" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gestionari de paramètres" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" +"Configura las aparéncias, los paramètres d’afichatge, del clavièr e de la " +"mirga." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Lista de las aplicacions" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "" +msgstr "Tròba e lança rapidament las aplicacions installadas sul sistèma." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Paramètres demòni" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" +"Garda vòstres paramètres dins un sistèma de configuracion de tipe D-Bus." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Una bibliotèca de menú" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "" +msgstr "Implementa un menú compatible freedesktop.org basat sus GLib e GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Servici de vinhetas" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "Implementa la gestion de las vinhetas segon las especificacion D-Bus." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Vejatz " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Se vesètz que manca quicòm a la lista ; esitetz pas e garnissètz un rapòrt " +"sus ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Mercé a totes los qu'an ajuda a rendre aqueste logicial disponible !" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Los dreches d'autor de Xfce 4 apartenon a Olivier Fourdan (fourdan@xfce.org). Los diferents components son protegits per copyright per lors autors respectius." +msgstr "" +"Los dreches d'autor de Xfce 4 apartenon a Olivier Fourdan " +"(fourdan@xfce.org). Los diferents components son protegits per copyright per" +" lors autors respectius." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." msgstr "" +"Los paquets libxfce4ui, libxfce4util, e exo son distribuits jols tèrmes de " +"la GNU Library General Public License tala coma publicada per la Free " +"Software Foundation; que siá en version 2, o (coma volètz) tota version " +"ulteriora." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -694,66 +776,62 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" +"Los paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop e xfwm4 son distribuïts segon los tèrmes " +"de la licéncia publica generala GNU Licéncia publica generala publicada per " +"la Free Software Foundation ; siá dins la version 2 de la licéncia, o (coma " +"volètz) o dins una superiora." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Picatz '%s --help' per las informacions d'utilizacion." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Incapable d'inicializar GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "L'equipa de desvolopament Xfce. Totes los dreches reservats." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Se vos plai senhalatz los bugs a <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Impossible de cargar l'interfàcia" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Version %s, distribuida per %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Version %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Desvolopaires del còr" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Contributors actius" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servidors mantenguts per" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervision de las traduccions" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Supervision de la documentacion" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Traductors" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Precedents contributors" @@ -774,48 +852,70 @@ msgid "About the Xfce Desktop Environment" msgstr "A prepaus de l'environament de burèu Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiqueta" +msgid "_Help" +msgstr "_Ajuda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "_Tampar" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Periferic" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "etiqueta" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "Nom d’OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "Tipe d’OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "" +msgid "Distributor" +msgstr "Distributor" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" -msgstr "" +msgid "Xfce Version" +msgstr "Version Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Version GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Version Kernel" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Processor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memòria" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "Processor grafic" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistèma" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce es un ensemble de programas que, ensemble, provesisson un environament de burèu complet.\n" +"Los programas seguents fan partida del còr de Xfce :" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -825,55 +925,79 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Xfce es tanben una platafòrma de desvolopament que fornís mantuna bibliotèca qu’ajudan los desvolopaires a crear d’aplicacions que van ben amb l’environament de burèu.\n" +"\n" +"Los compausants Xfce son jos licéncia liura o open source ; GPL o BSDL per las aplicacions e LGPL o BSDL per las bibliotèca. Vejatz la documentacion, lo còdi font o lo site web de Xfce (https://www.xfce.org) per mai d’informacions.\n" +"\n" +"Mercés de vòstre interès per Xfce.\n" +"\n" +"\t- L’equipa de desvolopament de Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "A prepaus" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Crèdits" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Desconegut" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (32-bit espaci utilizaire)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "" +msgstr "%s; Build ID : %s" #: ../tests/test-ui.c:111 #, c-format msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Un fichièr nomenat « %s » existís ja dins aqueste repertòri, lo fichièr es pas estat apondut." +msgstr "" +"Un fichièr nomenat « %s » existís ja dins aqueste repertòri, lo fichièr es " +"pas estat apondut." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Impossible de migrar l'anciana configuracion del tablèu de bòrd" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalizar los paramètres emmagazinats per Xfconf" diff --git a/po/pl.po b/po/pl.po index ba73103..2b48e65 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,22 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Dominik Wojnar , 2017 -# No Ne, 2020 -# No Ne, 2019-2021 -# Piotr Sokół , 2011-2013 -# Piotr Sokół , 2017 -# Piotr Strębski , 2015-2016 +# Xfce Bot , 2023 +# Marek Adamski, 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-02 18:22+0000\n" -"Last-Translator: No Ne\n" -"Language-Team: Polish (http://www.transifex.com/xfce/libxfce4ui/language/pl/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Marek Adamski, 2023\n" +"Language-Team: Polish (https://app.transifex.com/xfce/teams/16840/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,7 +24,9 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Nie udało się uruchomić przeglądarki internetowej, w celu wyświetlenia dokumentacji sieciowej" +msgstr "" +"Nie udało się uruchomić przeglądarki internetowej, w celu wyświetlenia " +"dokumentacji sieciowej" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -40,11 +41,13 @@ msgstr "Wyświetlić podręcznik sieciowy?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Przeglądarka otworzy stronę dokumentacji, na której tworzone są podręczniki użytkownika i gdzie następuje ich tłumaczenie." +msgstr "" +"Przeglądarka otworzy stronę dokumentacji, na której tworzone są podręczniki " +"użytkownika i gdzie następuje ich tłumaczenie." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Anuluj" @@ -82,14 +85,18 @@ msgstr "Zamknąć okno z wieloma kartami?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "W tym oknie jest otwartych wiele kart. Zamknięcie tego okna zamknie również wszystkie jego karty." +msgstr "" +"W tym oknie otwarto wiele kart. Zamknięcie tego okna zamknie również " +"wszystkie jego karty." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "W tym oknie jest otwartych %d kart. Zamknięcie tego okna zamknie również wszystkie jego karty." +msgstr "" +"W tym oknie otwarto %d kart(y). Zamknięcie tego okna zamknie również " +"wszystkie jego karty." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -127,37 +134,36 @@ msgstr "Opcje zarządzania sesją" msgid "Show session management options" msgstr "Pokaż opcje zarządzania sesją" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Nie udało się połączyć z menadżerem sesji: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Menadżer sesji nie zwrócił poprawnego identyfikatora klienta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Katalog roboczy „%s” nie istnieje. Nie zostanie on użyty podczas wywoływania „%s”." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Separator katalogu niedozwolony w nazwie pliku" +msgstr "" +"Katalog roboczy „%s” nie istnieje. Nie zostanie on użyty podczas wywoływania" +" „%s”." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Nazwa pliku jest za długa" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Separator katalogu niedozwolony w nazwie pliku" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Nazwy plików nie powinny zaczynać się ani kończyć spacją" @@ -201,63 +207,92 @@ msgstr "Ten skrót jest już przypisany do czynności „%s”. Co zrobić?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Proszę wprowadzić inną kombinację klawiszy." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Wykonanie tej czynności zostało już przypisane do skrótu %s." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt działania skrótu klawiszowego %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Ten skrót klawiszowy jest już używany." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Edytor skrótów" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Bieżący skrót. Kliknij, aby edytować..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Wyczyść skrót" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Przywróć domyślny skrót" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Ten skrót klawiszowy jest obecnie używany przez: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Skrót klawiszowy jest już w użyciu" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Skrót klawiszowy czynności menedżera okien" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "czynności" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Skrót klawiszowy" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "polecenia" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Skrót" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Wyczyść" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Naciśnij klawisze klawiatury, aby wyzwolić %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Proszę nacisnąć klawisz" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Nie można przechwycić klawiatury." @@ -366,204 +401,220 @@ msgid "Toggle fullscreen" msgstr "Przełączenie pełnego ekranu" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Przeniesienie okna na dolny monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Przeniesienie okna na lewy monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Przeniesienie okna na prawy monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Przeniesienie okna na górny monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Przemieszczenie na górny obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Przemieszczenie na dolny obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Przemieszczenie na lewy obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Przemieszczenie na prawy obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Przemieszczenie na poprzedni obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Przemieszczenie na następny obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Przemieszczenie na obszar roboczy 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Przemieszczenie na obszar roboczy 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Przemieszczenie na obszar roboczy 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Przemieszczenie na obszar roboczy 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Przemieszczenie na obszar roboczy 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Przemieszczenie na obszar roboczy 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Przemieszczenie na obszar roboczy 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Przemieszczenie na obszar roboczy 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Przemieszczenie na obszar roboczy 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Przemieszczenie na obszar roboczy 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Przemieszczenie na obszar roboczy 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Przemieszczenie na obszar roboczy 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Dopasowanie do górnej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Dopasowanie do dolnej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Dopasowanie do lewej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Dopasowanie do prawej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Dopasowanie do górnej-lewej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Dopasowanie do górnej-prawej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Dopasowanie do dolnej-lewej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Dopasowanie do dolnej-prawej krawędzi ekranu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Wyświetlenie pulpitu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Przełączenie na górny obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Przełączenie na dolny obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Przełączenie na lewy obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Przełączenie na prawy obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Przełączenie na poprzedni obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Przełączenie na następny obszar roboczy" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Przełączenie na obszar roboczy 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Przełączenie na obszar roboczy 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Przełączenie na obszar roboczy 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Przełączenie na obszar roboczy 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Przełączenie na obszar roboczy 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Przełączenie na obszar roboczy 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Przełączenie na obszar roboczy 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Przełączenie na obszar roboczy 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Przełączenie na obszar roboczy 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Przełączenie na obszar roboczy 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Przełączenie na obszar roboczy 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Przełączenie na obszar roboczy 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Dodanie obszaru roboczego" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Dodanie przyległego obszaru roboczego" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Usunięcie ostatniego obszaru roboczego" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Usunięcie bieżącego obszaru roboczego" #: ../glade/libxfce4ui-2.xml.in.h:1 msgid "Titled Dialog" -msgstr "Treść tytułowa" +msgstr "Tytuł okna" #: ../glade/libxfce4ui-2.xml.in.h:2 msgid "Subtitle" @@ -577,186 +628,205 @@ msgstr "Widżety Xfce 4" msgid "Version information" msgstr "Wypisuje informacje o wersji i kończy" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "Procesory graficzne" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Menedżer okien" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Zarządza położeniem okien na ekranie." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Zapewnia miejsce na przyciski okien, aktywatory, menu aplikacji i wiele innych." +msgstr "" +"Zapewnia miejsce na przyciski okien, aktywatory, menu aplikacji i wiele " +"innych." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Menedżer pulpitu" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Ustawia tła pulpitu, obsługuje ikony i wiele innych." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Menedżer plików" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Zarządza plikami w nowoczesny, łatwy w obsłudze i szybki sposób." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Menedżer wolumenów" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Zarządza dyskami wymiennymi i nośnikami dla Thunara." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Menedżer sesji" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Zapisuje i przywraca sesję, obsługuje uruchamianie, automatyczny start i zamykanie." +msgstr "" +"Zapisuje i przywraca sesję, obsługuje uruchamianie, automatyczny start i " +"zamykanie." -#: ../xfce4-about/main.c:165 -msgid "Setting System" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" msgstr "Menedżer ustawień" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Konfiguruje ustawienia: wyglądu, ekranu, klawiatury i myszy." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Wyszukiwarka programów" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Szybko wyszukuje i uruchamia aplikacje zainstalowane w systemie." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Demon ustawień" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Przechowuje ustawienia w systemie konfiguracji opartym na D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Biblioteka menu" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Implementuje menu zgodne z freedesktop.org oparte na GLib i GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Usługa miniatur" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementuje specyfikację D-Bus zarządzania miniaturami." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Odwiedź " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Jeśli znasz kogoś, kogo brakuje na tej liście, nie wahaj się i zgłoś błąd na ." +msgstr "" +"Jeśli znasz kogoś, kogo brakuje na tej liście, nie wahaj się i zgłoś błąd na" +" ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Dziękujemy wszystkim, którzy przyczynili się do stworzenia niniejszego oprogramowania." +msgstr "" +"Dziękujemy wszystkim, którzy przyczynili się do stworzenia niniejszego " +"oprogramowania." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Właścicielem praw autorskich Xfce4 jest Olivier Fourdan (fourdan@xfce.org). Właścicielami praw autorskich poszczególnych komponentów środowiska są ich twórcy." +msgstr "" +"Właścicielem praw autorskich Xfce4 jest Olivier Fourdan (fourdan@xfce.org). " +"Właścicielami praw autorskich poszczególnych komponentów środowiska są ich " +"twórcy." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Pakiety libxfce4ui, libxfce4util i exo są rozprowadzane na warunkach Powszechnej Licencji Publicznej GNU Library, wydanej przez Free Software Foundation - według wersji 2. tej licencji lub którejś z późniejszych wersji." +msgstr "" +"Pakiety libxfce4ui, libxfce4util i exo są rozprowadzane na warunkach " +"Powszechnej Licencji Publicznej GNU Library, wydanej przez Free Software " +"Foundation - według wersji 2. tej licencji lub którejś z późniejszych " +"wersji." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Pakiety thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop i xfwm4 są rozprowadzane na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Free Software Foundation - według wersji 2. tej licencji lub którejś z późniejszych wersji." +msgstr "" +"Pakiety thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings," +" xfconf, xfdesktop i xfwm4 są rozprowadzane na warunkach Powszechnej " +"Licencji Publicznej GNU, wydanej przez Free Software Foundation - według " +"wersji 2. tej licencji lub którejś z późniejszych wersji." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Nie można zainicjować GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Zespół twórców Xfce. Wszystkie prawa zastrzeżone." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Proszę zgłaszać błędy na adres <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Nie udało się wczytać interfejsu" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Główni programiści" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Bieżący współpracownicy" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Opiekunowie serwerów" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Nadzorcy tłumaczeń" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Nadzorcy dokumentacji" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Tłumacze" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Byli współpracownicy" @@ -777,52 +847,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Informacje o środowisku graficznym Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etykieta" +msgid "_Help" +msgstr "_Pomoc" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nazwa systemu operacyjnego" +msgid "_Close" +msgstr "_Zamknij" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Urządzenie" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Pamięć" +msgid "label" +msgstr "etykieta" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Procesor" +msgid "OS Name" +msgstr "Nazwa systemu operacyjnego" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Typ systemu operacyjnego" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Wersja Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Dystrybutor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Wersja Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Wersja GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Wersja jądra" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Procesor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Pamięć" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "Procesor graficzny" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce jest zestawem programów, które razem zapewniają w pełni funkcjonalne środowisko graficzne.\nDo podstawowych programów środowiska Xfce należą:" +msgstr "" +"Xfce jest zestawem programów, które razem zapewniają w pełni funkcjonalne środowisko graficzne.\n" +"Do podstawowych programów środowiska Xfce należą:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -831,48 +919,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce to także platforma programistyczna udostępniająca kilka bibliotek, które pomagają programistom tworzyć aplikacje pasujące do środowiska graficznego.\n\nKomponenty Xfce są licencjonowane na podstawie wolnych lub otwartych licencji; GPL lub BSDL dla aplikacji oraz LGPL lub BSDL dla bibliotek. Zajrzyj do dokumentacji, kodu źródłowego lub na stronę internetową Xfce (https://www.xfce.org), aby uzyskać więcej informacji.\n\nDziękujemy za zainteresowanie Xfce.\n\n\t- Zespół twórców Xfce" +msgstr "" +"Xfce to także platforma programistyczna udostępniająca kilka bibliotek, które pomagają programistom tworzyć aplikacje pasujące do środowiska graficznego.\n" +"\n" +"Komponenty Xfce są licencjonowane na podstawie wolnych lub otwartych licencji; GPL lub BSDL dla aplikacji oraz LGPL lub BSDL dla bibliotek. Zajrzyj do dokumentacji, kodu źródłowego lub na stronę internetową Xfce (https://www.xfce.org), aby uzyskać więcej informacji.\n" +"\n" +"Dziękujemy za zainteresowanie Xfce.\n" +"\n" +"\t- Zespół twórców Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Informacje" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Zasługi" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Prawa autorskie" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Nieznany" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bitowy (32-bitowa przestrzeń użytkownika)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bitowy" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bitowy" @@ -880,7 +975,7 @@ msgstr "32-bitowy" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Identyfikator kompilacji: %s" @@ -896,6 +991,6 @@ msgstr "Plik o nazwie „%s” już istnieje w tym katalogu. Nie dodano pliku." msgid "Failed to migrate the old panel configuration" msgstr "Nie udało się zaimportować starej konfiguracji panelu." -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Konfiguruje ustawienia przechowywane przez Xfconf" diff --git a/po/pt.po b/po/pt.po index 87bc66f..57790f4 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Hugo Carvalho , 2019-2020 -# Nuno Miguel , 2015-2017,2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-22 16:38+0000\n" -"Last-Translator: Hugo Carvalho \n" -"Language-Team: Portuguese (http://www.transifex.com/xfce/libxfce4ui/language/pt/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Portuguese (https://app.transifex.com/xfce/teams/16840/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" @@ -36,11 +38,13 @@ msgstr "Pretende ler o manual na Internet?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Será direcionado para a página de documentação na Internet, na qual as páginas de ajuda são produzidas e traduzidas." +msgstr "" +"Será direcionado para a página de documentação na Internet, na qual as " +"páginas de ajuda são produzidas e traduzidas." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Cancelar" @@ -78,14 +82,18 @@ msgstr "Fechar janela com vários separadores?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Esta janela tem vários separadores abertos. Ao fechar esta janela também irá fechar todos os seus separadores." +msgstr "" +"Esta janela tem vários separadores abertos. Ao fechar esta janela também irá" +" fechar todos os seus separadores." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Esta janela tem %d separadores abertos. Fechar esta janela irá fechar todos os seus separadores." +msgstr "" +"Esta janela tem %d separadores abertos. Fechar esta janela irá fechar todos " +"os seus separadores." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -123,37 +131,34 @@ msgstr "Opções da gestão de sessões" msgid "Show session management options" msgstr "Mostrar opções da gestão de sessões" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Falha ao ligar ao gestor de sessão: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "O gestor de sessão não devolveu uma identificação válida" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "O diretório de trabalho \"%s\" não existe. Não será usado ao criar \"%s\"" - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Separador de diretório ilegal em nome de ficheiro" +msgstr "O diretório de trabalho \"%s\" não existe. Não será usado ao criar \"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "O nome do ficheiro é muito longo" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Separador de diretório ilegal em nome de ficheiro" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Os nomes de ficheiros não devem começar ou terminar com um espaço" @@ -162,7 +167,9 @@ msgstr "Os nomes de ficheiros não devem começar ou terminar com um espaço" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Este atalho já está a ser utilizado pelo comando \"%s\". Que ação pretende usar?" +msgstr "" +"Este atalho já está a ser utilizado pelo comando \"%s\". Que ação pretende " +"usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -186,74 +193,106 @@ msgstr "Manter '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Este atalho já está a ser usado pelo comando '%s'. Que ação pretende usar?" +msgstr "" +"Este atalho já está a ser usado pelo comando '%s'. Que ação pretende usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Este atalho já está a ser utilizado pela ação '%s'. Que ação pretende utilizar?" +msgstr "" +"Este atalho já está a ser utilizado pela ação '%s'. Que ação pretende " +"utilizar?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Use outra combinação de teclas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "a ação já é ativada por %s." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Ações em conflito para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Este atalho já está a ser usado para outra coisa." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor de atalhos" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "O atalho atual. Clicar para editar..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Limpar o atalho" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restaurar o atalho predefinido" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Este atalho de teclado está em uso por: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Atalho de teclado já em uso" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Atalho da ação do gestor de janelas" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "ação" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Atalho do comando" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Atalho" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Limpar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Prima as teclas do teclado para ativar o %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Prima uma tecla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Incapaz de capturar o teclado." @@ -362,198 +401,214 @@ msgid "Toggle fullscreen" msgstr "Trocar para ecrã inteiro" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Mover janela para o monitor abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Mover janela para o monitor à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Mover janela para o monitor à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Mover janela para o monitor acima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mover janela para a área de trabalho acima" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mover janela para a área de trabalho abaixo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mover janela para a área de trabalho à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mover janela para a área de trabalho à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mover janela para a área de trabalho anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mover janela para a área de trabalho seguinte" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mover janela para a área de trabalho 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mover janela para a área de trabalho 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mover janela para a área de trabalho 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mover janela para a área de trabalho 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mover janela para a área de trabalho 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mover janela para a área de trabalho 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mover janela para a área de trabalho 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mover janela para a área de trabalho 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mover janela para a área de trabalho 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mover janela para a área de trabalho 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mover janela para a área de trabalho 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mover janela para a área de trabalho 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Janela em mosaico para cima" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Janela em mosaico para baixo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Janela em mosaico para a esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Janela em mosaico para a direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Janela em moscaico no topo à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Janela em mosaico no topo à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Janela em mosaico em baixo à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Janela em mosaico em baixo à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Mostrar ambiente de trabalho" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Área de trabalho acima" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Área de trabalho abaixo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Área de trabalho esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Área de trabalho direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Área de trabalho anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Área de trabalho seguinte" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Área de trabalho 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Área de trabalho 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Área de trabalho 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Área de trabalho 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Área de trabalho 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Área de trabalho 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Área de trabalho 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Área de trabalho 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Área de trabalho 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Área de trabalho 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Área de trabalho 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Área de trabalho 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Adicionar área de trabalho" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Adicionar área de trabalho adjacente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Apagar última área de trabalho" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Apagar área de trabalho ativa" @@ -573,186 +628,205 @@ msgstr "\"Widgets\" Xfce 4" msgid "Version information" msgstr "Informações da versão" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gestor de janelas" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Gere o posicionamento das janelas no ecrã." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Painel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Fornece uma casa para botões de janela, lançadores, menu de aplicações e muito mais." +msgstr "" +"Fornece uma casa para botões de janela, lançadores, menu de aplicações e " +"muito mais." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gestor de janelas" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "Define os fundos do ambiente de trabalho, gere os ícones e muito mais." +msgstr "" +"Define os fundos do ambiente de trabalho, gere os ícones e muito mais." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gestor de ficheiros" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Gere os seus ficheiros de uma forma moderna, fácil de usar e rápida." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" -msgstr "Gestor de volume" +msgstr "Gestor de Volume" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Gere unidades e suportes amovíveis para o Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gestor de sessão" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Guarda e restaura a sua sessão, trata do arranque, arranque automático e encerramento." +msgstr "" +"Guarda e restaura a sua sessão, trata do arranque, arranque automático e " +"encerramento." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Definições do sistema" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gestor de Definições" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Configura a aparência, visualização, teclado e definições do rato." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Localizar aplicações" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Rapidamente encontra e lança aplicações instaladas no seu sistema." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Serviço de definições" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Armazena as suas definições num sistema de configuração baseado em D-Bus." +msgstr "" +"Armazena as suas definições num sistema de configuração baseado em D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Uma biblioteca de menu" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementa um menu compatível com freedesktop.org baseado em GLib e GIO." +msgstr "" +"Implementa um menu compatível com freedesktop.org baseado em GLib e GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Serviço de miniaturas" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementa a especificação de gestão de miniaturas D-Bus." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Consulte " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Se conhece alguém que está em falta nesta lista; não hesite e registe um bug no ." +msgstr "" +"Se conhece alguém que está em falta nesta lista; não hesite e registe um bug" +" no ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Obrigado a todas as pessoas que ajudaram na disponibilização do Xfce!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Os direitos do Xfce 4 pertencem a Olivier Fourdan (fourdan@xfce.org). Os direitos dos restantes componentes são dos seus autores." +msgstr "" +"Os direitos do Xfce 4 pertencem a Olivier Fourdan (fourdan@xfce.org). Os " +"direitos dos restantes componentes são dos seus autores." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Os pacotes libxfce4ui, libxfce4util e exo são distribuídos nos termos da GNU Library General Public License como publicado pela Free Software Foundation; tanto na versão 2 da licença, ou (por sua opção) qualquer versão mais recente." +msgstr "" +"Os pacotes libxfce4ui, libxfce4util e exo são distribuídos nos termos da GNU" +" Library General Public License como publicado pela Free Software " +"Foundation; tanto na versão 2 da licença, ou (por sua opção) qualquer versão" +" mais recente." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Os pacotes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop e xfwm4 são distribuídos nos termos da GNU General Public License como publicado pela Free Software Foundation; tanto a versão 2 da licença, ou (por sua opção) qualquer versão mais recente." +msgstr "" +"Os pacotes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop e xfwm4 são distribuídos nos termos da GNU" +" General Public License como publicado pela Free Software Foundation; tanto " +"a versão 2 da licença, ou (por sua opção) qualquer versão mais recente." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Digite '%s --help' para instruções de utilização." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Incapaz de iniciar GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "A equipa de desenvolvimento do Xfce. Todos os direitos reservados." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, reporte os erros em <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Falha ao carregar a interface" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Programadores principais" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Programadores ativos" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Manutenção dos servidores por" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervisão das traduções" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Supervisão da documentação" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Tradutores" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Contributos anteriores" @@ -773,52 +847,71 @@ msgid "About the Xfce Desktop Environment" msgstr "Sobre o ambiente de trabalho Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "legenda" +msgid "_Help" +msgstr "_Ajuda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nome do SO" +msgid "_Close" +msgstr "Fe_char" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Dispositivo" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memória" +msgid "label" +msgstr "legenda" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Nome do SO" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tipo de SO" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versão do Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distribuidor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versão do Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Versão do GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Versão do Kernel" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memória" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "O Xfce é constituído por uma colecão de programas que usados em conjunto, disponibilizam um ambiente de trabalho completo. Os seguintes programas fazem parte da base do Xfce:" +msgstr "" +"O Xfce é constituído por uma colecão de programas que usados em conjunto, " +"disponibilizam um ambiente de trabalho completo. Os seguintes programas " +"fazem parte da base do Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,48 +920,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "O Xfce é também uma plataforma de desenvolvimento que fornece várias bibliotecas que ajudam os programadores a criar aplicações que se encaixam bem com o ambiente de trabalho.\n\nOs componentes Xfce são licenciados sob licenças livres ou de código aberto; GPL ou BSDL para aplicações e LGPL ou BSDL para bibliotecas. Veja a documentação, o código fonte ou o website Xfce (https://www.xfce.org) para mais informações.\n\nObrigado pelo seu interesse no Xfce.\n\n\t- A Equipa de desenvolvimento do Xfce" +msgstr "" +"O Xfce é também uma plataforma de desenvolvimento que fornece várias bibliotecas que ajudam os programadores a criar aplicações que se encaixam bem com o ambiente de trabalho.\n" +"\n" +"Os componentes Xfce são licenciados sob licenças livres ou de código aberto; GPL ou BSDL para aplicações e LGPL ou BSDL para bibliotecas. Veja a documentação, o código fonte ou o website Xfce (https://www.xfce.org) para mais informações.\n" +"\n" +"Obrigado pelo seu interesse no Xfce.\n" +"\n" +"\t- A Equipa de desenvolvimento do Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Sobre" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Créditos" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Direitos de autor" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Desconhecido" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit userspace)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -876,7 +976,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID de compilação: %s" @@ -886,12 +986,14 @@ msgstr "%s; ID de compilação: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Um ficheiro com o nome \"%s\" já existe neste diretório, o ficheiro não foi adicionado." +msgstr "" +"Um ficheiro com o nome \"%s\" já existe neste diretório, o ficheiro não foi " +"adicionado." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Falha ao migrar a anterior configuração do painel" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalizar definições guardadas pelo Xfconf" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8bf2781..ac30275 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,30 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Andre Miranda , 2017,2019 -# Andre Miranda , 2016 -# Andre Miranda , 2015 -# C. E., 2020 -# Fábio Nogueira , 2008 -# Lucas Wilm , 2020 -# Michael Martins , 2019-2020 -# Rafael Fontenelle , 2019 -# The Cat, 2020 +# Michael Martins , 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-03 17:30+0000\n" -"Last-Translator: Michael Martins \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/xfce/libxfce4ui/language/pt_BR/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Portuguese (Brazil) (https://app.transifex.com/xfce/teams/16840/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" @@ -33,7 +29,7 @@ msgstr "Falha ao abrir o navegador web para mostrar a documentação online" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format msgid "Do you want to read the %s manual online?" -msgstr "Você quer ler online o manual do %s?" +msgstr "Você quer ler o manual online do %s?" #: ../libxfce4ui/xfce-dialogs.c:267 msgid "Do you want to read the manual online?" @@ -43,11 +39,13 @@ msgstr "Você quer ler o manual online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Você será redirecionado ao site de documentação, onde as páginas de ajuda são mantidas e traduzidas." +msgstr "" +"Você será redirecionado ao site de documentação, onde as páginas de ajuda " +"são mantidas e traduzidas." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Cancelar" @@ -85,14 +83,18 @@ msgstr "Fechar janela com várias abas?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Esta janela possui múltiplas abas abertas. Fechar esta janela também fechará todas as suas abas." +msgstr "" +"Esta janela possui múltiplas abas abertas. Fechar esta janela também fechará" +" todas as suas abas." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Esta janela tem %d abas abertas. Fechar esta janela também fechará todas as suas abas." +msgstr "" +"Esta janela tem %d abas abertas. Fechar esta janela também fechará todas as " +"suas abas." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -130,37 +132,36 @@ msgstr "Opções de gerenciamento de sessão" msgid "Show session management options" msgstr "Mostra as opções de gerenciamento de sessão" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Falhou ao conectar ao gerenciador de sessão: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "O gerenciador de sessão não retornou um ID de cliente válido" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "O diretório de trabalho \"%s\" não existe. Ele não será usado quando gerando \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Separador de diretório ilegal em nome do arquivo" +msgstr "" +"O diretório de trabalho \"%s\" não existe. Ele não será usado quando gerando" +" \"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Nome do arquivo é muito longo" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Separador de diretório ilegal em nome do arquivo" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Nomes de arquivos não devem começar ou terminar com um espaço" @@ -193,7 +194,8 @@ msgstr "Manter \"%s\"" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Este atalho já está em uso pelo comando \"%s\". Qual ação você deseja usar?" +msgstr "" +"Este atalho já está em uso pelo comando \"%s\". Qual ação você deseja usar?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format @@ -204,63 +206,92 @@ msgstr "Este atalho já está em uso pela ação \"%s\". Qual ação você desej #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Por favor, use outra combinação de teclas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s já executa essa ação." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Ações em conflito para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Este atalho já está em uso para outra coisa." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor de Atalhos " + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "O atalho atual. Clique para editar..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Limpe o atalho " + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restaurar o atalho padrão " + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Esta tecla atalho está sendo usada por: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "A tecla atalho já está em uso" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Atalho de ação do gerenciador de janelas" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "ação" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Atalho de comando" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Atalho" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Limpar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "Pressione as teclas para executar %s'%s'." +msgstr "Pressione as teclas para executar %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Por favor, pressione uma tecla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Não foi possível capturar o teclado:" @@ -369,198 +400,214 @@ msgid "Toggle fullscreen" msgstr "Alternar tela cheia" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Mover janela para o monitor abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Mover janela para o monitor à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Mover janela para o monitor à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Mover janela para o monitor acima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mover a janela para o espaço de trabalho acima" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mover a janela para o espaço de trabalho abaixo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mover a janela para o espaço de trabalho à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mover a janela para o espaço de trabalho à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mover a janela para o espaço de trabalho anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mover a janela para o espaço de trabalho seguinte" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mover a janela para o espaço de trabalho 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mover a janela para o espaço de trabalho 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mover a janela para o espaço de trabalho 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mover a janela para o espaço de trabalho 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mover a janela para o espaço de trabalho 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mover a janela para o espaço de trabalho 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mover a janela para o espaço de trabalho 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mover a janela para o espaço de trabalho 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mover a janela para o espaço de trabalho 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mover a janela para o espaço de trabalho 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mover a janela para o espaço de trabalho 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mover a janela para o espaço de trabalho 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Posicionar a janela no topo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Posicionar a janela abaixo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Posicionar a janela à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Posicionar a janela à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Posicionar a janela no topo e à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Posicionar a janela no topo e à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Posicionar a janela abaixo e à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Posicionar a janela abaixo e à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Mostrar área de trabalho" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Espaço de trabalho acima" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Espaço de trabalho abaixo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Espaço de trabalho à esquerda" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Espaço de trabalho à direita" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Espaço de trabalho anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Espaço de trabalho seguinte" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Espaço de trabalho 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Espaço de trabalho 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Espaço de trabalho 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Espaço de trabalho 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Espaço de trabalho 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Espaço de trabalho 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Espaço de trabalho 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Espaço de trabalho 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Espaço de trabalho 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Espaço de trabalho 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Espaço de trabalho 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Espaço de trabalho 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Adicionar espaço de trabalho" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Adicionar espaço de trabalho adjacente" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Excluir o último espaço de trabalho" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Excluir o espaço de trabalho ativo" @@ -580,186 +627,206 @@ msgstr "Widgets do Xfce 4" msgid "Version information" msgstr "Informações de versão" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Gerenciador de Janelas" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Controla o localização das janelas na tela." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Painel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Fornece um lugar para os botões de janela, lançadores, menu de aplicações e mais." +msgstr "" +"Fornece um lugar para os botões de janela, lançadores, menu de aplicações e " +"mais." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Gerenciador de janelas" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Define imagens de fundo da área de trabalho, controla ícones e mais." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Gerenciador de arquivos" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Gerencia seus arquivos de um jeito moderno, fácil de usar e rápido." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Gerenciador de Volume" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Gerencia unidades e mídias removíveis para o Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Gerenciador de sessão" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Salva e restaura sua sessão, controla inicialização, início automático e desligamento." +msgstr "" +"Salva e restaura sua sessão, controla inicialização, início automático e " +"desligamento." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Configurações do sistema" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Gerenciador de configurações" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Configura os ajustes de aparência, monitor, teclado e mouse." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Pesquisador de aplicativos" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Acha rapidamente e lança aplicações instaladas no seu sistema." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Daemon de configurações" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Armazena suas configurações em um sistema de configuração baseado em D-Bus." +msgstr "" +"Armazena suas configurações em um sistema de configuração baseado em D-Bus." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Uma Biblioteca de Menus" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementa um menu compatível com freedesktop.org baseado em GLib e GIO." +msgstr "" +"Implementa um menu compatível com freedesktop.org baseado em GLib e GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Serviço de Miniaturas" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementa a especificação D-Bus de gerenciamento de miniaturas." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Consulte " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Se você conhece alguém que está faltando nesta lista, não hesite e registre um relatório de erro em " +msgstr "" +"Se você conhece alguém que está faltando nesta lista, não hesite e registre " +"um relatório de erro em " -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Obrigado a todos aqueles que ajudaram tornar este software disponível." +msgstr "" +"Obrigado a todos aqueles que ajudaram tornar este software disponível." -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "O Xfce 4 é uma marca registrada de Olivier Fourdan (fourdan@xfce.org). Os componentes diferentes são marcas registradas de seus respectivos autores." +msgstr "" +"O Xfce 4 é uma marca registrada de Olivier Fourdan (fourdan@xfce.org). Os " +"componentes diferentes são marcas registradas de seus respectivos autores." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Os pacotes libxfce4ui, libxfce4util e exo são distribuídos sob os termos da Licença Pública Geral de Biblioteca GNU como publicado pela Free Software Foundation, assim como a versão 2 da licença ou (à sua opção) qualquer versão posterior." +msgstr "" +"Os pacotes libxfce4ui, libxfce4util e exo são distribuídos sob os termos da " +"Licença Pública Geral de Biblioteca GNU como publicado pela Free Software " +"Foundation, assim como a versão 2 da licença ou (à sua opção) qualquer " +"versão posterior." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Os pacotes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-xfconf, xfdesktop e xfwm4 são distribuídos sob os termos da Licença Pública Geral GNU como publicado pela Free Software Foundation, assim como a versão 2 da licença ou (à sua opção) qualquer versão posterior." +msgstr "" +"Os pacotes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-xfconf, xfdesktop e xfwm4 são distribuídos sob os " +"termos da Licença Pública Geral GNU como publicado pela Free Software " +"Foundation, assim como a versão 2 da licença ou (à sua opção) qualquer " +"versão posterior." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Digite \"%s --help\" para as informações de uso." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Impossível inicializar GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Time de desenvolvimento do Xfce. Todos os direitos reservados." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, relate erros para <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Falhou ao carregar a interface" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Desenvolvedores principais" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Contribuidores ativos" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servidores mantidos por" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervisão de traduções" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Supervisão de documentação" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Tradutores" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Contribuidores anteriores" @@ -780,52 +847,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Sobre o Ambiente de área de trabalho Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "rótulo" +msgid "_Help" +msgstr "_Ajuda" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Nome do Sistema Operacional" +msgid "_Close" +msgstr "Fe_char" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Dispositivo" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Memória" +msgid "label" +msgstr "rótulo" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Nome do Sistema Operacional" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Tipo do Sistema Operacional" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Versão do Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distribuidor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Versão do Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Versão do GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Versão do Kernel" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memória" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistema" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "O Xfce é uma coleção de programas que juntos fornecem um ambiente de desktop completo.\nOs programas seguintes fazem parte do núcleo do Xfce:" +msgstr "" +"O Xfce é uma coleção de programas que juntos fornecem um ambiente de desktop completo.\n" +"Os programas seguintes fazem parte do núcleo do Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -834,48 +919,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "O Xfce também é uma plataforma de desenvolvimento que fornece várias bibliotecas que ajudam os programadores a criar aplicativos que se encaixam bem no ambiente de desktop.\n\nOs componentes do Xfce são licenciados sob licenças gratuitas ou de código aberto; GPL ou BSDL para aplicativos e LGPL ou BSDL para bibliotecas. Veja a documentação, o código fonte ou o site do Xfce (https://www.xfce.org) para mais informação.\n\nAgradecemos seu interesse pelo Xfce.\n\n\t- A equipe de desenvolvimento do Xfce" +msgstr "" +"O Xfce também é uma plataforma de desenvolvimento que fornece várias bibliotecas que ajudam os programadores a criar aplicativos que se encaixam bem no ambiente de desktop.\n" +"\n" +"Os componentes do Xfce são licenciados sob licenças gratuitas ou de código aberto; GPL ou BSDL para aplicativos e LGPL ou BSDL para bibliotecas. Veja a documentação, o código fonte ou o site do Xfce (https://www.xfce.org) para mais informação.\n" +"\n" +"Agradecemos seu interesse pelo Xfce.\n" +"\n" +"\t- A equipe de desenvolvimento do Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Sobre" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Créditos" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Desconhecido" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bits (espaço do usuário de 32 bits)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 bits" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 bits" @@ -883,7 +975,7 @@ msgstr "32 bits" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Build ID: %s" @@ -893,12 +985,14 @@ msgstr "%s; Build ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Um arquivo chamado \"%s\" já existe neste diretório, o arquivo não foi adicionado." +msgstr "" +"Um arquivo chamado \"%s\" já existe neste diretório, o arquivo não foi " +"adicionado." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Falha ao migrar a configuração antiga do painel" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalizar configurações armazenadas pelo Xfconf" diff --git a/po/ro.po b/po/ro.po index 07985ff..023bae7 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Alexe Moldovan, 2017 -# Mișu Moldovan , 2015 -# Yupy , 2017 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Romanian (http://www.transifex.com/xfce/libxfce4ui/language/ro/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Romanian (https://app.transifex.com/xfce/teams/16840/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,7 +23,8 @@ msgstr "" #: ../libxfce4ui/xfce-dialogs.c:110 msgid "Failed to open web browser for online documentation" -msgstr "Nu s-a putut deschide navigatorul web pentru accesarea documentației online" +msgstr "" +"Nu s-a putut deschide navigatorul web pentru accesarea documentației online" #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format @@ -37,11 +39,13 @@ msgstr "Doriți să citiți manualul online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Veți fi redirectat către site-ul cu documentație, unde paginile de ajutor sunt întreținute și traduse." +msgstr "" +"Veți fi redirectat către site-ul cu documentație, unde paginile de ajutor " +"sunt întreținute și traduse." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Renunță" @@ -73,13 +77,15 @@ msgstr "Renunță" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "" +msgstr "Închideți fereastra cu file multiple?" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." msgstr "" +"În această fereastră sunt multiple file deschise. Închiderea acestei " +"ferestre va închide de asemenea toate filele. " #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -87,6 +93,8 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"Această fereastră are %d file deschise. Închiderea aceste ferestre va " +"închide de asemenea toate filele." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -94,11 +102,11 @@ msgstr "Atenționare" #: ../libxfce4ui/xfce-dialogs.c:534 msgid "Close T_ab" -msgstr "" +msgstr "Închide Fil_a" #: ../libxfce4ui/xfce-dialogs.c:535 msgid "Close _Window" -msgstr "" +msgstr "Închide _Fereastra" #: ../libxfce4ui/xfce-dialogs.c:540 msgid "Do _not ask me again" @@ -124,46 +132,46 @@ msgstr "Opțiuni pentru managementul de sesiune" msgid "Show session management options" msgstr "Arată opțiunile managementului de sesiune" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Conectarea la managerul de sesiune a eșuat: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Managerul de sesiune nu a returnat un ID valid de client" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Directorul curent „%s” nu mai există. Nu va fi utilizat la crearea „%s”." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"Directorul curent „%s” nu mai există. Nu va fi utilizat la crearea „%s”." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "Numele fișierului e prea lung." + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Separatorul de dosare e ilegal in numele fișierului" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "Numele fișierelor nu ar trebuii să înceapă cu un spațiu" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Această combinație de taste este deja folosită pentru acțiunea „%s”. Ce acțiune doriți să îi fie asociată?" +msgstr "" +"Această combinație de taste este deja folosită pentru acțiunea „%s”. Ce " +"acțiune doriți să îi fie asociată?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +195,107 @@ msgstr "Păstrează „%s”" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Această combinație de taste este deja folosită pentru comanda „%s”. Ce acțiune doriți să îi fie asociată?" +msgstr "" +"Această combinație de taste este deja folosită pentru comanda „%s”. Ce " +"acțiune doriți să îi fie asociată?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Această combinație de taste este deja folosită pentru acțiunea „%s”. Ce acțiune doriți să îi fie asociată?" +msgstr "" +"Această combinație de taste este deja folosită pentru acțiunea „%s”. Ce " +"acțiune doriți să îi fie asociată?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Încercați o altă combinație de taste." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Combinația %s este deja asociată acestei acțiuni." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Acțiuni diferite pentru „%s”" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Această combinație de taste este deja folosită pentru altceva." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editorul de Scurtături" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Detașați scurtătura" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Restaurați scurtătura implicită" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Această scurtătură de tastatură e momentan utilizată de: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Această scurtătura de tastatură e deja utilizată" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Combinație de taste asociată unei acțiuni" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "acțiunea" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Combinație de taste pentru comandă" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "comanda" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Combinație de taste" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Golește" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "Apăsați tastele pentru a declanșa %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "Apăsați o tastă" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Nu s-au putut captura tastele utilizate." @@ -363,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Comută starea „pe tot ecranul”" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Mută în spațiul de deasupra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Mută în spațiul de dedesubt" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Mută în spațiul din stânga" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Mută în spațiul din dreapta" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Mută în spațiul anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Mută în spațiul următor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Mută în spațiul de lucru 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Mută în spațiul de lucru 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Mută în spațiul de lucru 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Mută în spațiul de lucru 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Mută în spațiul de lucru 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Mută în spațiul de lucru 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Mută în spațiul de lucru 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Mută în spațiul de lucru 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Mută în spațiul de lucru 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Mută în spațiul de lucru 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Mută în spațiul de lucru 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Mută în spațiul de lucru 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" -msgstr "Pune în partea de sus a ecranului" +msgstr "Plasează fereastra sus pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" -msgstr "Pune în partea de jos a ecranului" +msgstr "Plasează fereastra jos pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" -msgstr "Pune în partea stângă a ecranului" +msgstr "Plasează fereastra stânga pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" -msgstr "Pune în partea dreaptă a ecranului" +msgstr "Plasează fereastra dreapta pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" -msgstr "" +msgstr "Plasează fereastra stânga-sus pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" -msgstr "" +msgstr "Plasează fereastra dreapta-sus pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" -msgstr "" +msgstr "Plasează fereastra stânga-jos pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" -msgstr "" +msgstr "Plasează fereastra dreapta-jos pe ecran" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Arată desktopul" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Spațiul de lucru de deasupra" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Spațiul de lucru de dedesubt" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Spațiul de lucru din stânga" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Spațiul de lucru din dreapta" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Spațiul de lucru anterior" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Spațiul de lucru următor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Spațiul de lucru 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Spațiul de lucru 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Spațiul de lucru 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Spațiul de lucru 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Spațiul de lucru 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Spațiul de lucru 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Spațiul de lucru 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Spațiul de lucru 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Spațiul de lucru 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Spațiul de lucru 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Spațiul de lucru 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Spațiul de lucru 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Adaugă un spațiu de lucru" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Adaugă un spațiu de lucru adiacent" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Șterge ultimul spațiu de lucru" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Șterge spațiul de lucru activ" @@ -570,116 +627,127 @@ msgstr "Subtitlu" msgid "Xfce 4 Widgets" msgstr "Widget-uri Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Detalii despre versiune" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPU-uri" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Manager de ferestre" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Gestionează plasarea ferestrelor pe ecran." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panoul" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Managerul desktopului" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Manager de fișiere" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Managerul de sesiune" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Sistemul de configurare" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Manager de opțiuni" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Unealta pentru pornirea de programe" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Demonul opțiunilor" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Mulțumim tuturor celor ce au facilitat crearea acestui software!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Drepturile de autor pentru Xfce 4 îi aparțin lui Olivier Fourdan (fourdan@xfce.org). Drepturile de autor pentru diferitele componente aparțin autorilor lor." +msgstr "" +"Drepturile de autor pentru Xfce 4 îi aparțin lui Olivier Fourdan " +"(fourdan@xfce.org). Drepturile de autor pentru diferitele componente aparțin" +" autorilor lor." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -687,7 +755,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -696,65 +764,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Încercați „%s --help” pentru detalii despre utilizare." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Nu s-a putut inițializa GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Echipa de dezvoltare Xfce. Toate drepturile sunt rezervate." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Raportați problemele la <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Nu s-a putut încărca interfața" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Versiunea %s, distribuită de %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Versiunea %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Programatori principali" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Contribuitori activi" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Administratori de servere" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Supervizori ai localizării" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Traducători" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Contribuitori inactivi" @@ -775,48 +834,68 @@ msgid "About the Xfce Desktop Environment" msgstr "Despre mediul desktop Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etichetă" +msgid "_Help" +msgstr "_Ajutor" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "În_chide" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Dispozitiv" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "etichetă" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "Nume OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "Tip OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 +msgid "Distributor" +msgstr "Distribuitor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Xfce Version" +msgstr "Versiune Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Memorie" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,39 +906,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Despre" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Autori" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Drepturi de autor" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Necunoscută" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (32-bit userspace)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -869,12 +963,14 @@ msgstr "" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Un fișier numit \"1 %s\" există deja în acest director, fișierul nu a fost adăugat." +msgstr "" +"Un fișier numit \"1 %s\" există deja în acest director, fișierul nu a fost " +"adăugat." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Imposibil de migrat vechea configurație a panoului" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Personalizați setările stocate de Xfconf" diff --git a/po/ru.po b/po/ru.po index 48560db..fb3f40d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,25 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Aleksandr P, 2015 -# Aleksandr P, 2010 -# Artem Zolochevskiy , 2011 -# Denis Koryavov , 2010 -# Igor , 2016-2017,2019-2020 -# ivmazurenko , 2021 -# Sergey Alyoshin , 2014-2015 -# Simple88, 2016 -# AlexanderFilev , 2020 +# Andrei Stepanov, 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2021-01-10 20:08+0000\n" -"Last-Translator: ivmazurenko \n" -"Language-Team: Russian (http://www.transifex.com/xfce/libxfce4ui/language/ru/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Russian (https://app.transifex.com/xfce/teams/16840/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -43,11 +39,13 @@ msgstr "Вы хотите прочитать руководство в сети? msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и поддерживаются сообществом." +msgstr "" +"Вы будете перенаправлены на сайт с документацией, где страницы помощи " +"переводятся и поддерживаются сообществом." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "О_тменить" @@ -85,14 +83,17 @@ msgstr "Закрыть окно с несколькими вкладками?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Это окно содержит несколько вкладок. Закрытие окна также закроет все его вкладки." +msgstr "" +"Это окно содержит несколько вкладок. Закрытие окна также закроет все его " +"вкладки." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Это окно содержит %d вкладок. Закрытие окна также закроет все его вкладки." +msgstr "" +"Это окно содержит %d вкладок. Закрытие окна также закроет все его вкладки." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -112,11 +113,11 @@ msgstr "_Больше не спрашивать" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "Session management client ID" -msgstr "ID клиента менеджера сеансов" +msgstr "ИД клиента менеджера сеансов" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "ID" -msgstr "ID" +msgstr "ИД" #: ../libxfce4ui/xfce-sm-client.c:1428 msgid "Disable session management" @@ -130,37 +131,36 @@ msgstr "Параметры менеджера сеансов" msgid "Show session management options" msgstr "Показать параметры менеджера сеансов" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Не удалось подключиться к менеджеру сеансов: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Менеджер сеансов не предоставил допустимый идентификатор клиента" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Рабочий каталог «%s» не существует. Он не будет использоваться для вызова «%s»." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Разделитель каталогов запрещён в имени файла" +msgstr "" +"Рабочий каталог «%s» не существует. Он не будет использоваться для вызова " +"«%s»." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Имя файла слишком длинное" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Разделитель каталогов запрещён в имени файла" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Имена файлов не должны начинаться или заканчиваться пробелом" @@ -169,7 +169,9 @@ msgstr "Имена файлов не должны начинаться или з msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Эта комбинация клавиш уже назначена действию «%s». Какое действие требуется использовать?" +msgstr "" +"Эта комбинация клавиш уже назначена действию «%s». Какое действие требуется " +"использовать?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -193,74 +195,108 @@ msgstr "Оставить «%s»" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Эта комбинация клавиш уже назначена команде «%s». Какое действие требуется использовать?" +msgstr "" +"Эта комбинация клавиш уже назначена команде «%s». Какое действие требуется " +"использовать?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Эта комбинация клавиш уже назначена действию «%s». Какое действие требуется использовать?" +msgstr "" +"Эта комбинация клавиш уже назначена действию «%s». Какое действие требуется " +"использовать?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Пожалуйста, используйте другую комбинацию клавиш." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s уже используется для этого действия." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Конфликт действий для %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Эта комбинация клавиш уже задействована." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Редактор сочетаний клавиш" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Текущее сочетание клавиш. Щёлкните для правки…" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Очистить сочетание клавиш" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Восстановить стандартное сочетание клавиш" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Это сочетание клавиш используется: «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Сочетание клавиш уже используется" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Комбинация для действия диспетчера окон" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "действие" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Командная комбинация" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "команда" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Комбинация" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Очистить" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "Нажмите комбинацию клавиш, которую вы хотите использовать для %s «%s»." +msgstr "" +"Нажмите комбинацию клавиш, которую вы хотите использовать для %s «%s»." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Нажмите клавишу" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Не удалось захватить клавиатуру." @@ -369,198 +405,214 @@ msgid "Toggle fullscreen" msgstr "Полноэкранный режим" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Переместить окно в нижнюю часть экрана" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Переместить окно в левую часть экрана" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Переместить окно в правую часть экрана" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Переместить окно в верхнюю часть экрана" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Переместить окно на верхнее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Переместить окно на нижнее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Переместить окно на левое рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Переместить окно на правое рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Переместить окно на предыдущее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Переместить окно на следующее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Переместить окно на рабочее место 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Переместить окно на рабочее место 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Переместить окно на рабочее место 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Переместить окно на рабочее место 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Переместить окно на рабочее место 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Переместить окно на рабочее место 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Переместить окно на рабочее место 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Переместить окно на рабочее место 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Переместить окно на рабочее место 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Переместить окно на рабочее место 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Переместить окно на рабочее место 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Переместить окно на рабочее место 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Разместить в верхней половине" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Разместить в нижней половине" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Разместить в левой половине" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Разместить в правой половине" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Разместить вверху слева" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Разместить вверху справа" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Разместить внизу слева" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Разместить внизу справа" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Показать рабочий стол" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Верхнее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Нижнее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Левое рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Правое рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Предыдущее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Следующее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Рабочее место 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Рабочее место 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Рабочее место 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Рабочее место 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Рабочее место 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Рабочее место 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Рабочее место 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Рабочее место 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Рабочее место 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Рабочее место 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Рабочее место 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Рабочее место 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Добавить рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Добавить соседнее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Удалить последнее рабочее место" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Удалить текущее рабочее место" @@ -580,186 +632,202 @@ msgstr "Элементы интерфейса Xfce 4" msgid "Version information" msgstr "Информация о версии" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" -msgstr "" +msgstr "Графические процессоры" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Диспетчер окон" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Обрабатывает положение окон на экране." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Панель" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Предоставляет дом для кнопок окна, ярлыков, меню приложений и так далее." +msgstr "" +"Предоставляет место для кнопок окна, значков запуска, меню приложений и т.д." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Менеджер рабочего стола" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "Задаёт фон рабочего стола, занимается значками и так далее." +msgstr "Задаёт фон рабочего стола, занимается значками и т.д." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Файловый менеджер" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "Управляет вашими файлами современным, простым в использовании и быстрым способом." +msgstr "" +"Управляет вашими файлами современным, простым в использовании и быстрым " +"способом." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Управление томами" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Управляет съёмными устройствами и накопителями для Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Менеджер сеансов" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Сохраняет и загружает ваш сеанс, занимается загрузкой, автозапуском и завершением работы." +msgstr "" +"Сохраняет и восстанавливает ваш сеанс, занимается начальным запуском, " +"автозапуском и завершением работы." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Поддержка настроек" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Диспетчер настроек" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "Конфигурирует настройки внешнего вида, дисплея, клавиатуры и мыши." +msgstr "Настраивает внешний вид, дисплей, клавиатуру и мышь." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Поиск приложений" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Быстро ищет и запускает установленные в вашей системе приложения." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Служба настроек" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Хранит ваши настройки в основанной на D-Bus системе хранения конфигурации." +msgstr "" +"Хранит ваши настройки в основанной на D-Bus системе хранения настроек." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" -msgstr "Меню приложений" +msgstr "Библиотека меню" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Реализует совместимое с freedesktop.org меню, основанное на GLib и GIO." +msgstr "" +"Реализует совместимое с freedesktop.org меню, основанное на GLib и GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Служба миниатюр" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "Реализует службу миниатюр согласно спецификации управления миниатюрами D-Bus." +msgstr "Реализует спецификацию управления миниатюрами D-Bus." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " -msgstr "" +msgstr "См. " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Если вы знаете кого-то, кто должен быть включён в этот список, пожалуйста, сообщите нам на ." +msgstr "" +"Если вы знаете кого-то, кто должен быть включён в этот список, пожалуйста, " +"сообщите нам на ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Спасибо всем, кто помогал создавать это программное обеспечение!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Авторские права на Xfce 4 принадлежат Olivier Fourdan (fourdan@xfce.org). Авторские права на прочие компоненты принадлежат их авторам." +msgstr "" +"Авторские права на Xfce 4 принадлежат Olivier Fourdan (fourdan@xfce.org). " +"Авторские права на прочие компоненты принадлежат их авторам." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Программное обеспечение libxfce4ui, libxfce4util и exo распространяется под условиями GNU Library General Public License версии 2 или более поздней." +msgstr "" +"Программное обеспечение libxfce4ui, libxfce4util и exo распространяется под " +"условиями GNU Library General Public License версии 2 или более поздней." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Программное обеспечение thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop и xfwm4 распространяется под условиями GNU General Public License версии 2 или более поздней." +msgstr "" +"Программное обеспечение thunar, xfce4-appfinder, xfce4-panel, xfce4-session," +" xfce4-settings, xfconf, xfdesktop и xfwm4 распространяется под условиями " +"Основной общественной лицензии GNU 2-ой версии или более поздней." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Выполните «%s --help» для получения информации об использовании." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Не удалось инициализировать GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Команда разработчиков Xfce. Все права защищены." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Об ошибках сообщайте по адресу <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Не удалось загрузить интерфейс" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Основные разработчики" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Активные участники" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Поддержка серверов" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Ответственный за перевод" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" -msgstr "" +msgstr "Контроль документации" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Переводчики" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Предыдущие авторы" @@ -780,52 +848,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Об окружении Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "метка" +msgid "_Help" +msgstr "_Справка" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Операционная система" +msgid "_Close" +msgstr "_Закрыть" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Устройство" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Память" +msgid "label" +msgstr "метка" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Процессор" +msgid "OS Name" +msgstr "Операционная система" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Тип операционной системы" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Версия Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Дистрибьютор" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Версия Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 -msgid "GPU" -msgstr "" +msgid "GTK Version" +msgstr "Версия GTK" #: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Версия Ядра" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Процессор" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Память" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "Графический процессор" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Система" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce - это набор программ, которые обеспечивают полнофункциональную рабочую среду.\nСледующие программы являются частью ядра Xfce:" +msgstr "" +"Xfce — это набор программ, которые обеспечивают полнофункциональное окружение рабочего стола.\n" +"Следующие программы являются основной частью Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -834,56 +920,63 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce - это также и платформа разработки, предоставляющая несколько библиотек, помогающих программистам создавать приложения, которые хорошо вписываются в окружение рабочего стола.\n\nКомпоненты Xfce распространяются под условиями свободных лицензий или лицензий открытого кода: GPL или BSDL для приложений и LGPL или BSDL для библиотек. Подробности можно найти в документации, в исходном коде и на веб-сайте Xfce (https://www.xfce.org).\n\nСпасибо за интерес к Xfce.\n\n\t- Команда разработчиков Xfce" +msgstr "" +"Xfce — это также и платформа разработки, предоставляющая несколько библиотек, помогающих программистам создавать приложения, которые хорошо вписываются в окружение рабочего стола.\n" +"\n" +"Компоненты Xfce распространяются по условиям свободных лицензий или лицензий открытого кода: GPL или BSDL для приложений и LGPL или BSDL для библиотек. Подробности можно найти в документации, в исходном коде и на веб-сайте Xfce (https://www.xfce.org).\n" +"\n" +"Спасибо за интерес к Xfce.\n" +"\n" +"\t— Команда разработчиков Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "О программе" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Благодарности" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Авторские права" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "(неизвестно)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" -msgstr "" +msgstr "64-разрядный (32-разрядное пользовательское пространство)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" -msgstr "64-бит" +msgstr "64-разрядный" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" -msgstr "32-бит" +msgstr "32-разрядный" #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; сборка: %s" @@ -899,6 +992,6 @@ msgstr "«%s» уже существует в этом каталоге, фай msgid "Failed to migrate the old panel configuration" msgstr "Не удалось перенести конфигурацию старой панели" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Изменение настроек, хранимых в Xfconf" diff --git a/po/sk.po b/po/sk.po index b246a63..403cb50 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Dušan Kazik , 2016-2017,2019-2020 -# Robert Hartl , 2009 -# Slavko , 2014-2015 -# 7dcd6f74323fe8d9c477949ff8fcbb1c_c427b63 <3fcd202e3dfab15fda15b8e88e54d449_7173>, 2011-2012 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-10-02 09:05+0000\n" -"Last-Translator: Dušan Kazik \n" -"Language-Team: Slovak (http://www.transifex.com/xfce/libxfce4ui/language/sk/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Slovak (https://app.transifex.com/xfce/teams/16840/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,11 +38,13 @@ msgstr "Chcete si prečítať online príručku?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Budete presmerovaní na webovú stránku dokumentácie, kde sa stránky pomocníka udržujú a prekladajú." +msgstr "" +"Budete presmerovaní na webovú stránku dokumentácie, kde sa stránky pomocníka" +" udržujú a prekladajú." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Zrušiť" @@ -80,7 +82,9 @@ msgstr "Zavrieť okno s viacerými kartami?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Okno má otvorených viacero kariet. Zavretím tohto okna budú tiež zavreté všetky jeho karty." +msgstr "" +"Okno má otvorených viacero kariet. Zavretím tohto okna budú tiež zavreté " +"všetky jeho karty." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -88,6 +92,8 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"Toto okno má otvorených %d kariet. Zatvorením tohto okna sa zatvoria aj " +"všetky jeho karty." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -125,37 +131,34 @@ msgstr "Voľby správy relácií" msgid "Show session management options" msgstr "Zobraziť voľby správy relácií" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Nepodarilo sa pripojiť k správcovi sedenia: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Správca sedenia nevrátil platný identifikátor klienta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Pracovný adresár \"%s\" neexistuje. Pri spustení \"%s\" nebude použitý." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Názov súboru je príliš dlhý" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Oddeľovač adresárov, neplatný v mene súboru" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Názvy súborov by nemali začínať ani končiť medzerou" @@ -199,63 +202,92 @@ msgstr "Táto skratka už slúži na akciu „%s”. Ktorú akciu chcete použi #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Prosím, použite inú kombináciu klávesov" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "Túto akciu už spúšťa %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt medzi akciami pre %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Táto skratka už slúži na niečo iné." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Editor klávesových skratiek" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Aktuálna klávesová skratka. Kliknite na úpravu…" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Vymazať klávesovú skratku" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Obnoviť predvolenú klávesovú skratku" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Táto klávesová skrátka je použitá na: „%s”" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Klávesová skratka je použitá" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Skratky akcií Správcu okien" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "akcia" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Skratka príkazu" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "príkaz" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Klávesová skratka" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Vymazať" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "Stlačte klávesy na spustenie %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Prosím, stlačte kláves" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Nemožno zachytiť klávesnicu" @@ -364,198 +396,214 @@ msgid "Toggle fullscreen" msgstr "Prepnúť na celú obrazovku" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Presunúť okno na nižší monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Presunúť okno na ľavý monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Presunúť okno na pravý monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Presunúť okno na vyšší monitor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Presunúť okno na vrchnú pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Presunúť okno na spodnú pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Presunúť okno na ľavú pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Presunúť okno na pravú pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Presunúť okno na predchádzajúcu plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Presunúť okno na nasledujúcu plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Presunúť okno na pracovnú plochu 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Presunúť okno na pracovnú plochu 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Presunúť okno na pracovnú plochu 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Presunúť okno na pracovnú plochu 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Presunúť okno na pracovnú plochu 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Presunúť okno na pracovnú plochu 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Presunúť okno na pracovnú plochu 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Presunúť okno na pracovnú plochu 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Presunúť okno na pracovnú plochu 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Presunúť okno na pracovnú plochu 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Presunúť okno na pracovnú plochu 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Presunúť okno na pracovnú plochu 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Umiestniť okno nahor" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Umiestniť okno nadol" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Umiestniť okno naľavo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Umiestniť okno napravo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Umiestniť okno vľavo hore" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Umiestniť okno vpravo hore" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Umiestniť okno vľavo dole" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Umiestniť okno vpravo dole" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Zobraziť pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Vrchná pracovná plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Spodná pracovná plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ľavá pracovná plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Pravá pracovná plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Predchádzajúca pracovná plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Nasledujúca pracovná plocha" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Pracovná plocha 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Pracovná plocha 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Pracovná plocha 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Pracovná plocha 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Pracovná plocha 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Pracovná plocha 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Pracovná plocha 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Pracovná plocha 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Pracovná plocha 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Pracovná plocha 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Pracovná plocha 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Pracovná plocha 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Pridať pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Pridať priľahlú pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Odstrániť poslednú pracovnú plochu" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Odstrániť pracovnú plochu" @@ -571,124 +619,144 @@ msgstr "Podnadpis" msgid "Xfce 4 Widgets" msgstr "Widgety Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Informácia o verzií" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "Grafické karty" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Správca okien" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Riadi umiestnenie okien na obrazovke." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" +"Poskytuje miesto pre tlačidlá okien, spúšťače, menu aplikácie a ďalšie." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Správca prihlásenia" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Nastavuje pozadia pracovnej plochy, spravuje ikony a viac." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Správca súborov" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Spravuje vaše súbory moderným, jednoduchým a rýchlym spôsobom." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Správca hlasitosti" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Správca zväzkov" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Spravuje vymeniteľné jednotky a médiá pre aplikáciu Thunar." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Správca relácií" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Ukladá a obnovuje vaše sedenie, spravuje spúšťanie, automatické spúšťanie a vypínanie." +msgstr "" +"Ukladá a obnovuje vaše sedenie, spravuje spúšťanie, automatické spúšťanie a " +"vypínanie." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Nastavenie systému" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Správca nastavení" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Konfiguruje vzhľad, zobrazenie, klávesnicu a nastavenia myši." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Vyhľadávač aplikácií" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Rýchlo nájde a spustí aplikácie nainštalované vo vašom systéme." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Démon nastavení" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "Uchováva Vaše nastavenia v konfiguračnom systéme na báze D-Bus." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Knižnica menu" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "" +msgstr "Implementuje menu freedesktop.org založené na GLib and GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "Služba miniatúr" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "Implementuje správu miniatúr špecifikácie D-Bus." + +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Prosím, pozrite " -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Ak viete o niekom, kto v tomto zozname chýba, nehanbite sa a nahláste chybu " +"na ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Ďakujeme všetkým, ktorí pomohli k tomu, aby bol tento softvér prístupný." +msgstr "" +"Ďakujeme všetkým, ktorí pomohli k tomu, aby bol tento softvér prístupný." -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 je autorským právom Oliviera Fourdana (fourdan@xfce.org). Rôzne komponenty sú chránené autorskými právami ich autorov." +msgstr "" +"Xfce 4 je autorským právom Oliviera Fourdana (fourdan@xfce.org). Rôzne " +"komponenty sú chránené autorskými právami ich autorov." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." msgstr "" +"Balíčky libxfce4ui, libxfce4util a exo sú šírené pod podmienkami licencie " +"GNU Library General Public License vydanou nadáciou Free Software " +"Foundation, buď verzie 2 tejto licencie alebo (podľa vášho uváženia) " +"ktorejkoľvek neskoršej verzie." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -696,66 +764,61 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" +"Balíčky thunar, xfce4-panel, xfce4-session, xfce4-settings, xfconf, " +"xfdesktop a xfwm4 sú šírené pod podmienkami licencie GNU General Public " +"License, vydanou nadáciou Free Software Foundation; buď verzie 2 tejto " +"licencie alebo (podľa vášho uváženia) ktorejkoľvek neskoršej verzie." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Napíšte „%s --help” na zobrazenie pomocníka." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Nie je možné inicializovať GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Vývojový tím Xfce. Všetky práva vyhradené." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Chyby prosím hláste na <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Načítanie rozhrania zlyhalo" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Verzia %s, šírené cez %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Verzia %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Vývojári jadra" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktívni prispievateia" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servery spravujú" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Dohľad nad prekladmi" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Dohľad nad dokumentáciou" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Preklady" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Predošlí prispievatelia" @@ -776,48 +839,70 @@ msgid "About the Xfce Desktop Environment" msgstr "O pracovnom prostredí Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "popisok" +msgid "_Help" +msgstr "_Pomocník" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Názov OS" +msgid "_Close" +msgstr "_Zatvoriť" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Zariadenie" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Pamäť" +msgid "label" +msgstr "popisok" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Procesor" +msgid "OS Name" +msgstr "Názov OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Typ OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Verzia prostredia Xfce" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distribútor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Verzia prostredia Xfce" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Verzia GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Verzia jadra" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Procesor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Pamäť" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "Grafická karta" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Systém" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce je zbierkou aplikácií, ktoré dokopy poskytujú plne vybavené pracovné " +"prostredie. Súčasťou jadra Xfce sú tieto aplikácie:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -827,40 +912,62 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Xfce je aj vývojová platforma, poskytujúca viacero knižníc na pomoc programátorom vytvárať aplikácie, ktorá zapadajú do pracovného prostredia.\n" +"\n" +"Komponenty Xfce sú licencované pod slobodnými licenciami; GPL alebo BSDL pre aplikácie a LGPL alebo BSDL pre knižnice. Ďalšie informácie nájdete v dokumentácii, zdrojovom kóde alebo na webovej stránke Xfce (https://www.xfce.org).\n" +"\n" +"Vďaka za Váš podiel v Xfce.\n" +"\n" +"\t- Vývojový tím Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "O prostredí" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Zásluhy" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Autorské práva" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Neznámy" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bitový (32-bitový užívateľský priestor)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bitový" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bitový" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID zostavy: %s" @@ -870,12 +977,13 @@ msgstr "%s; ID zostavy: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Súbor s názvom „%s“ už existuje v tomto adresári. Súbor nebol pridaný." +msgstr "" +"Súbor s názvom „%s“ už existuje v tomto adresári. Súbor nebol pridaný." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Nepodarilo sa presunúť starú konfiguráciu panela" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Prispôsobenie nastavení uloženého s Xfconf" diff --git a/po/sl.po b/po/sl.po index 313f3de..89951ef 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Aljoša Žagar , 2013,2017 -# Arnold Marko , 2019-2020 -# Kernc, 2014,2016 -# Kernc, 2017 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-25 10:52+0000\n" -"Last-Translator: Arnold Marko \n" -"Language-Team: Slovenian (http://www.transifex.com/xfce/libxfce4ui/language/sl/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Slovenian (https://app.transifex.com/xfce/teams/16840/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,11 +38,13 @@ msgstr "Želite prebrati priročnik na spletu?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Preusmerjeni boste na spletno stran dokumentacije, kjer se vzdržujejo in prevajajo strani pomoči." +msgstr "" +"Preusmerjeni boste na spletno stran dokumentacije, kjer se vzdržujejo in " +"prevajajo strani pomoči." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Prekliči" @@ -80,14 +82,17 @@ msgstr "Zaprem okno z več zavihki?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "To okno ima odprto več zavihkov. Zaprtje tega okna bo zaprlo tudi te zavihke." +msgstr "" +"To okno ima odprto več zavihkov. Zaprtje tega okna bo zaprlo tudi te " +"zavihke." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "To okno ima odprto %d zavihkov. Zaprtje tega okna bo zaprlo tudi ze zavihke." +msgstr "" +"To okno ima odprto %d zavihkov. Zaprtje tega okna bo zaprlo tudi ze zavihke." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -125,37 +130,34 @@ msgstr "Možnosti upravljalnika seje" msgid "Show session management options" msgstr "Prikaži možnosti upravljalnika seje" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Povezovanje z upravljalnikom seje ni uspelo: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Upravljalnik seje ni vrnil veljavnega identifikatorja odjemalca" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Imenik \"%s\" ne obstaja in ne bo uporabljen ob zagonu \"%s\"." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Ločilnik imenika v imenu datoteke ni pravilen" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Ime datoteke je predolgo" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Ločilnik imenika v imenu datoteke ni pravilen" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Imena datotek se naj ne bi začela ali končala s presledkom" @@ -164,7 +166,9 @@ msgstr "Imena datotek se naj ne bi začela ali končala s presledkom" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Ta bližnjica se že uporablja za dejanje '%s'. Katero dejanje želite uporabiti?" +msgstr "" +"Ta bližnjica se že uporablja za dejanje '%s'. Katero dejanje želite " +"uporabiti?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -188,74 +192,105 @@ msgstr "Obdrži '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Ta bližnjica se že uporablja za ukaz '%s'. Katero dejanje želite uporabiti?" +msgstr "" +"Ta bližnjica se že uporablja za ukaz '%s'. Katero dejanje želite uporabiti?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "To bližnjico že uporablja dejanje '%s'. Katero dejanje želite uporabiti?" +msgstr "" +"To bližnjico že uporablja dejanje '%s'. Katero dejanje želite uporabiti?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Uporabite drugo kombinacijo tipk." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s že sproži to dejanje." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Spor med dejanji za %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Ta bližnjica se že uporablja za nekaj drugega." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Urejevalnik bližnjic" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Trenutna bližnjica. Klikni za urejanje..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Zbriši bližnjico" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Povrni privzeto bližnjico" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "To bližnjico na tipkovnici trenutno uporablja: '%s' " + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Bližnjica na tipkovnici je že v rabi" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Bližnjica dejanja upravljalnika oken" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "dejanje" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Bližnjica ukaza" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "ukaz" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Bližnjica" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Počisti" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Pritisnite tipke na tipkovnici za aktivacijo %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Pritisnite tipko" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Ni mogoče zgrabiti tipkovnice." @@ -364,198 +399,214 @@ msgid "Toggle fullscreen" msgstr "Preklopi celozaslonski način" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Premakni okno na spodnji zaslon" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Premakni okno na levi zaslon" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Premakni okno na desni zaslon" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Premakni okno na zgornji zaslon" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Premakni okno na zgornjo delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Premakni okno na spodnjo delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Premakni okno na levo delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Premakni okno na desno delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Premakni okno na prejšnjo delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Premakni okno na naslednjo delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Premakni okno na delovno površino 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Premakni okno na delovno površino 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Premakni okno na delovno površino 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Premakni okno na delovno površino 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Premakni okno na delovno površino 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Premakni okno na delovno površino 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Premakni okno na delovno površino 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Premakni okno na delovno površino 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Premakni okno na delovno površino 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Premakni okno na delovno površino 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Premakni okno na delovno površino 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Premakni okno na delovno površino 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Razpostavi okno na vrh" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Razpostavi okno na dno" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Razpostavi okno na levo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Razpostavi okno na desno" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Razpostavi okno zgoraj-levo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Razpostavi okno zgoraj-desno" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Razpostavi okno spodaj-levo" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Razpostavi okno spodaj-desno" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Pokaži namizje" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Zgornja delovna površina" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Spodnja delovna površina" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Leva delovna površina" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Desna delovna površina" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Prejšnja delovna površina" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Naslednja delovna površina" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Delovna površina 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Delovna površina 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Delovna površina 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Delovna površina 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Delovna površina 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Delovna površina 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Delovna površina 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Delovna površina 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Delovna površina 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Delovna površina 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Delovna površina 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Delovna površina 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Dodaj delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Dodaj delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Izbriši zadnjo delovno površino" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Izbriši dejavno delovno površino" @@ -575,186 +626,201 @@ msgstr "Xfce 4 gradniki" msgid "Version information" msgstr "Podatki o različici" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "Grafični procesorji" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Upravljalnik oken" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Ureja postavitev oken na zaslonu." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" -msgstr "Pult" +msgstr "Pano" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "Predstavlja dom za gumbe oken, zaganjalnike, menike apliakcij in več." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Upravljalnik namizja" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Nastavi ozadja namizja, rokuje z ikonami in več." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Upravljalnik datotek" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Upravljanje z datotkami na moderen, enostaven in hiter način." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Upravljalnik pogona" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Upravlja odstranljive nosilce in medije v Thunarju." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Upravljalnik seje" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Shrani in obnovi seanso, skrbi za zagon, samodejni zagon in ustavljanje sistema." +msgstr "" +"Shrani in obnovi seanso, skrbi za zagon, samodejni zagon in ustavljanje " +"sistema." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Nastavitve sistema" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Nastavitve" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Nastavljanje videza, zaslona, tipkovnice in in miške." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Iskalnik aplikacije" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Hitro najde in zažene aplikacije, ki so nameščene na sistemu." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Nadzornik nastavitev" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Shrani nastavitve v konfiguracijski sistem, ki temelji na D-Bus-u" -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Knjižnica menijev" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "Implementria freedesktop.org skladen meni, ki temelji na GLib in GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Storitev sličic za predogled" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementira D-Bus specifikacijo za upravljanje sličic." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Preberite " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Če poznate koga, ki na tem seznamu manjka, to prijavite na ." +msgstr "" +"Če poznate koga, ki na tem seznamu manjka, to prijavite na " +" ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Hvala vsem, ki so omogočili izdelavo te programske opreme!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Avtorske pravice nad Xfce 4 ima Olivier Fourdan (fourdan@xfce.org). Avtorske pravice nad posameznimi komponentami imajo njihovi avtorji." +msgstr "" +"Avtorske pravice nad Xfce 4 ima Olivier Fourdan (fourdan@xfce.org). Avtorske" +" pravice nad posameznimi komponentami imajo njihovi avtorji." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfce4util in exo paketi so distribuirani pod licenco GNU Library General Public License, kot je objavljena s strani organizacije Free Software Foundation; bodisi različice 2 licence ali (kot možnost) katerekoli poznejše različice." +msgstr "" +"libxfce4ui, libxfce4util in exo paketi so distribuirani pod licenco GNU " +"Library General Public License, kot je objavljena s strani organizacije Free" +" Software Foundation; bodisi različice 2 licence ali (kot možnost) " +"katerekoli poznejše različice." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Paketi thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop in xfwm4 so distribuirani pod pogoji licence GNU General Public License as published, kot je objavljena s strani organizacije Free Software Foundation; bodisi različice 2 licence ali (kot možnost) katerekoli poznejše različice." +msgstr "" +"Paketi thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop in xfwm4 so distribuirani pod pogoji licence GNU General " +"Public License, kot je objavljena s strani organizacije Free Software " +"Foundation; bodisi različice 2 licence ali (kot možnost) katerekoli poznejše" +" različice." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Za navodila o uporabi zaženite ukaz \"%s --help\"." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ ni mogoče začeti." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce razvojna ekipa. Vse pravice pridržane." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Hrošče prijavite na <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Nalaganje vmesnika ni uspelo" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Glavni razvijalci" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktivni sodelavci" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Strežnike vzdržuje" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Nadzor nad prevajalci" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Nadzor nad dokumentacijo" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Prevajalci" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Predhodni sodelavci" @@ -775,52 +841,70 @@ msgid "About the Xfce Desktop Environment" msgstr "O Xfce namiznem okolju" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "oznaka" +msgid "_Help" +msgstr "_Pomoč" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Ime OS" +msgid "_Close" +msgstr "_Zapri" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Naprava" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Pomnilnik" +msgid "label" +msgstr "oznaka" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Procesor" +msgid "OS Name" +msgstr "Ime OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Vrsta OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce različica" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributer" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce različica" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK različica" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Različica jedra" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Procesor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Pomnilnik" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "Grafični procesor" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce je zbirka programov, ki skupaj sestavljajo polno-zmogljivo namizno okolje.\nNaslednji programi so del Xfce jedra:" +msgstr "" +"Xfce je zbirka programov, ki skupaj sestavljajo polno-zmogljivo namizno okolje.\n" +"Naslednji programi so del Xfce jedra:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -829,48 +913,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce je tudi razvojna platforma, ki ponuja številne knjižnice, ki so v pomoč programerjem pri razvoju aplikaciji, ki se dobro zlivajo z namiznim okoljem.\n\nXfce komponenete so licencirane pod prostokodne ali odprtokodne licence; GPL ali BSDL za aplikacije in LGPL ali BSDL za knjižnice. Za če podatkov si oglejte dokumentacijo, izvorno kodo ali Xfce spletno stran (https://www.xfce.org).\n\nHvala za vaše zanimanje za Xfce.\n\n\t-Xfce razvojna skupina" +msgstr "" +"Xfce je tudi razvojna platforma, ki ponuja številne knjižnice, ki so v pomoč programerjem pri razvoju aplikaciji, ki se dobro zlivajo z namiznim okoljem.\n" +"\n" +"Xfce komponenete so licencirane pod prostokodne ali odprtokodne licence; GPL ali BSDL za aplikacije in LGPL ali BSDL za knjižnice. Za če podatkov si oglejte dokumentacijo, izvorno kodo ali Xfce spletno stran (https://www.xfce.org).\n" +"\n" +"Hvala za vaše zanimanje za Xfce.\n" +"\n" +"\t-Xfce razvojna skupina" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "O programu" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Zasluge" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Avtorske pravice" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Neznano" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bitni (32 bitni uporabniški prostor)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 bitni" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 bitni" @@ -878,7 +969,7 @@ msgstr "32 bitni" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID gradnje: %s" @@ -892,8 +983,8 @@ msgstr "Datoteka z imenom \"%s\" že obstaja v tej mapi, datoteka ni bila dodana #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" -msgstr "Ni bilo mogoče preseliti starih nastavitev pulta" +msgstr "Ni bilo mogoče preseliti starih nastavitev panoja" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Prilagodi nastavitve, ki jih hrani Xfconf" diff --git a/po/sq.po b/po/sq.po index 6838ffa..38344ea 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Besnik Bleta , 2019-2020 -# Besnik Bleta , 2020 -# Besnik Bleta , 2019-2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-15 10:11+0000\n" -"Last-Translator: Besnik Bleta \n" -"Language-Team: Albanian (http://www.transifex.com/xfce/libxfce4ui/language/sq/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Albanian (https://app.transifex.com/xfce/teams/16840/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,11 +38,13 @@ msgstr "Doni ta lexoni doracakun në internet?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Do të ridrejtoheni te sajti i dokumentimit, ku mirëmbahen dhe përkthehen faqet e ndihmës." +msgstr "" +"Do të ridrejtoheni te sajti i dokumentimit, ku mirëmbahen dhe përkthehen " +"faqet e ndihmës." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Anuloje" @@ -79,14 +82,18 @@ msgstr "Të mbyllet dritarja me shumë skeda?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Kjo dritare ka shumë skeda të hapura. Mbyllja e kësaj dritareje do të sjellë mbylljen e krejt skedave të saj." +msgstr "" +"Kjo dritare ka shumë skeda të hapura. Mbyllja e kësaj dritareje do të sjellë" +" mbylljen e krejt skedave të saj." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Kjo dritare ka %d skeda të hapura. Mbyllja e kësaj dritareje do të sjellë mbylljen e krejt skedave të saj." +msgstr "" +"Kjo dritare ka %d skeda të hapura. Mbyllja e kësaj dritareje do të sjellë " +"mbylljen e krejt skedave të saj." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -124,37 +131,34 @@ msgstr "Mundësi administrimi sesioni" msgid "Show session management options" msgstr "Shfaq mundësi administrimi sesioni" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "S’u arrit të lidhej me përgjegjësin e sesioneve: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Përgjegjësi i sesioneve s’u përgjigj me një ID klienti të vlefshme" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "Drejtoria e punës \"%s\" s’ekziston. S’do të përdoret, kur të pillet \"%s\"." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Ndarës i paligjshëm drejtorie te emër kartele" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Emri i kartelës është shumë i gjatë" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Ndarës i paligjshëm drejtorie te emër kartele" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Emri i kartelës s’duhet të fillojë ose përfundojë me një hapësirë" @@ -163,7 +167,9 @@ msgstr "Emri i kartelës s’duhet të fillojë ose përfundojë me një hapësi msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Kjo shkurtore përdoret tashmë për veprimin '%s'. Cilin veprim doni të përdoret?" +msgstr "" +"Kjo shkurtore përdoret tashmë për veprimin '%s'. Cilin veprim doni të " +"përdoret?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +193,107 @@ msgstr "Mbaj '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Kjo shkurtore përdoret tashmë për urdhrin '%s'. Cilin veprim doni të përdoret?" +msgstr "" +"Kjo shkurtore përdoret tashmë për urdhrin '%s'. Cilin veprim doni të " +"përdoret?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Kjo shkurtore përdoret tashmë nga veprimi '%s'. Cilin veprim doni të përdoret?" +msgstr "" +"Kjo shkurtore përdoret tashmë nga veprimi '%s'. Cilin veprim doni të " +"përdoret?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Ju lutemi, përdorni një tjetër kombinim tastesh." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s e shkakton tashmë këtë veprim." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Veprime me përplasje për %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Kjo shkurtore përdoret tashmë për diçka tjetër." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Përpunues Shkurtoresh" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Shkurtorja e tanishme. Klikoni për ta përpunuar…" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Spastroje shkurtoren" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Rikthe shkurtoren parazgjedhje" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Kjo shkurtore tastiere është në përdorim nga: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Shkurtore tastiere tashmë në përdorim" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Shkurtore Veprimi Përgjegjësi Dritaresh" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "veprim" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Shkurtore Urdhri" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "urdhër" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Shkurtore" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Spastroje" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Shtypni taste tastiere për shkaktimin e %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Ju lutemi, shtypni një tast" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "S’u mor dot tastiera." @@ -363,198 +402,214 @@ msgid "Toggle fullscreen" msgstr "Hyr/dil nga mënyra sa krejt ekrani" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Shpjere dritaren te monitori i poshtëm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Shpjere dritaren te monitori majtas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Shpjere dritaren te monitori djathtas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Shpjere dritaren te monitori i sipërm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Kaloje dritaren te hapësira e sipërme e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Kaloje dritaren te hapësira e poshtme e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Kaloje dritaren te hapësira e punës majtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Kaloje dritaren te hapësira e punës djathtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Kaloje dritaren te hapësira e mëparshme e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Kaloje dritaren te hapësira pasuese e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Kaloje dritaren te hapësira 1 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Kaloje dritaren te hapësira 2 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Kaloje dritaren te hapësira 3 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Kaloje dritaren te hapësira 4 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Kaloje dritaren te hapësira 5 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Kaloje dritaren te hapësira 6 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Kaloje dritaren te hapësira 7 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Kaloje dritaren te hapësira 8 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Kaloje dritaren te hapësira 9 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Kaloje dritaren te hapësira 10 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Kaloje dritaren te hapësira 11 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Kaloje dritaren te hapësira 12 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Tjegullzoje dritaren në krye" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Tjegullzoje dritaren në fund" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Tjegullzoje dritaren majtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Tjegullzoje dritaren djathtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Tjegullzoje dritaren sipër majtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Tjegullzoje dritaren sipër djathtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Tjegullzoje dritaren poshtë majtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Tjegullzoje dritaren poshtë majtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Shfaq desktop" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Hapësira e sipërme e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Hapësira e poshtme e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Hapësira e punës majtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Hapësira e punës djathtas" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Hapësira e mëparshme e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Hapësira pasuese e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Hapësira 1 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Hapësira 2 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Hapësira 3 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Hapësira 4 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Hapësira 5 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Hapësira 6 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Hapësira 7 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Hapësira 8 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Hapësira 9 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Hapësira 10 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Hapësira 11 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Hapësira 12 e punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Shtoni hapësirë pune" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Shtoni hapësirë pune ngjitur" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Fshi hapësirën e fundit të punës" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Fshi hapësirën aktive të punës" @@ -570,191 +625,210 @@ msgstr "Nëntitull" msgid "Xfce 4 Widgets" msgstr "Widget-e Xfc 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Të dhëna versioni" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPU" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Përgjegjës Dritaresh" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Merret me vendosjen e dritareve në ekran." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Furnizon një vend për butona dritaresh, nisës, menu aplikacionesh, etj." +msgstr "" +"Furnizon një vend për butona dritaresh, nisës, menu aplikacionesh, etj." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Përgjegjës Desktopi" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Cakton sfonde desktopi, trajton ikona, etj." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Përgjegjës Kartelash" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "Administron kartelat tuaja në një mënyrë moderne, të lehtë për përdorim dhe të shpejtë." +msgstr "" +"Administron kartelat tuaja në një mënyrë moderne, të lehtë për përdorim dhe " +"të shpejtë." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Përgjegjës vëllimesh" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Përgjegjës Vëllimesh" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Administron pajisje dhe media të heqshme për Thunar-in." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Përgjegjës Sesionesh" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Ruan dhe rikthen sesionin tuaj, merret me nisjen, vetënisjet dhe fikjen." +msgstr "" +"Ruan dhe rikthen sesionin tuaj, merret me nisjen, vetënisjet dhe fikjen." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Rregullim Sistemi" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Përgjegjës Rregullimesh" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Formëson rregullimet për dukjen, ekranin, tastierën dhe miun." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Gjetës Aplikacionesh" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Gjen dhe nis shpejt aplikacione të instaluar në sistemin tuaj." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Demon Rregullimesh" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "Depoziton rregullimet tuaja në një sistem formësimesh bazuar në D-Bus." +msgstr "" +"Depoziton rregullimet tuaja në një sistem formësimesh bazuar në D-Bus." -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "Librari menush" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "Një Librari Menush" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Sendërton një menu të përputhshme me freedesktop.org, bazuar në GLib dhe GIO." +msgstr "" +"Sendërton një menu të përputhshme me freedesktop.org, bazuar në GLib dhe " +"GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Shërbim miniaturash" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Shërbim Miniaturash" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Sendërton specifikime D-Bus administrimi miniaturash." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Ju lutemi, shihni " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Nëse dini dikë që mungon në këtë listë, mos ngurroni të hapni një çështje te ." +msgstr "" +"Nëse dini dikë që mungon në këtë listë, mos ngurroni të hapni një çështje te" +" ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Falënderime për të gjithë ata që ndihmuan në realizimin e këtij software-i!" +msgstr "" +"Falënderime për të gjithë ata që ndihmuan në realizimin e këtij software-i!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 është e drejtë kopjimi e Olivier Fourdan-it (fourdan@xfce.org). Përbërësit e ndryshëm janë nën të drejta kopjimi nga autorët përkatës." +msgstr "" +"Xfce 4 është e drejtë kopjimi e Olivier Fourdan-it (fourdan@xfce.org). " +"Përbërësit e ndryshëm janë nën të drejta kopjimi nga autorët përkatës." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Paketat libxfce4ui, libxfce4util dhe exo qarkullojnë sipas kushteve të licencës GNU Library General Public License, siç botohet ajo nga Free Software Foundation; versioni 2 i Licencës, ose (në dëshirën tuaj) çfarëdo versioni të mëvonshëm." +msgstr "" +"Paketat libxfce4ui, libxfce4util dhe exo qarkullojnë sipas kushteve të " +"licencës GNU Library General Public License, siç botohet ajo nga Free " +"Software Foundation; versioni 2 i Licencës, ose (në dëshirën tuaj) çfarëdo " +"versioni të mëvonshëm." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Paketat thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop dhe xfwm4 shpërndahen sipas kushteve të licencës GNU General Public License, siç botohet nga Free Software Foundation; versioni 2 i Licencës, ose (në dëshirën tuaj) çfarëdo versioni të mëvonshëm." +msgstr "" +"Paketat thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings," +" xfconf, xfdesktop dhe xfwm4 shpërndahen sipas kushteve të licencës GNU " +"General Public License, siç botohet nga Free Software Foundation; versioni 2" +" i Licencës, ose (në dëshirën tuaj) çfarëdo versioni të mëvonshëm." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Për përdorimin, shtypni '%s --help'." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "S’arrihet të gatitet dot GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Ekipi i zhvillimit të Xfce-së. Tërë të drejtat të rezervuara." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Ju lutemi, njoftoni të meta te <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "S’u arrit të ngarkohej ndërfaqe" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Version %s, shpërndarë nga %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Versioni %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Zhvillues bazë" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Pjesëmarrës aktivë" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Mirëmbajtja e shërbyesve nga" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Mbikëqyrje përkthimesh" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Mbikëqyrje dokumentimi" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Përkthyes" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Pjesëmarrës të mëparshëm" @@ -775,48 +849,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Mbi Mjedisin Desktop Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiketë" +msgid "_Help" +msgstr "_Ndihmë" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Emër OS-i" +msgid "_Close" +msgstr "_Mbylle" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Pajisje" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Kujtesë" +msgid "label" +msgstr "etiketë" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "Emër OS-i" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Lloj OS-i" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Version Xfce-je" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Shpërndarës" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Version Xfce-je" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Version GTK-je" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Version Kerneli" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Kujtesë" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce-ja është një koleksion programesh që të tërë tok furnizojnë një mjedis desktop të plotë.\nProgramet vijuese janë pjesë e paketës bazë Xfce:" +msgstr "" +"Xfce-ja është një koleksion programesh që të tërë tok furnizojnë një mjedis desktop të plotë.\n" +"Programet vijuese janë pjesë e paketës bazë Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -825,41 +921,63 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce-ja është edhe një platformë zhvillimi që furnizon disa librari të cilat i ndihmojnë programuesit të krijojnë aplikacione që i përshtaten mjedisit desktop.\n\nPërbërësit Xfce licenconhen sipas licencash të lira ose me burim të hapët; GPL ose BSDL për aplikacionet dhe LGPL ose BSDL për libraritë. Për më tepër të dhëna, shihni dokumentimin, kodin burim ose sajtin Xfce (https://www.xfce.org).\n\nFaleminderit për interesin që tregoni për Xfce-në.\n\n\t- Ekipi i Zhvillimit të Xfce-së" +msgstr "" +"Xfce-ja është edhe një platformë zhvillimi që furnizon disa librari të cilat i ndihmojnë programuesit të krijojnë aplikacione që i përshtaten mjedisit desktop.\n" +"\n" +"Përbërësit Xfce licenconhen sipas licencash të lira ose me burim të hapët; GPL ose BSDL për aplikacionet dhe LGPL ose BSDL për libraritë. Për më tepër të dhëna, shihni dokumentimin, kodin burim ose sajtin Xfce (https://www.xfce.org).\n" +"\n" +"Faleminderit për interesin që tregoni për Xfce-në.\n" +"\n" +"\t- Ekipi i Zhvillimit të Xfce-së" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Mbi" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Falënderime" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Të drejta kopjimi" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "I panjohur" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-bit (32-bit userspace)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-bit" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-bit" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID Montimi: %s" @@ -869,12 +987,14 @@ msgstr "%s; ID Montimi: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "Ka tashmë në këtë drejtori një kartelë të quajtur \"%s\", kartela s’është shtuar." +msgstr "" +"Ka tashmë në këtë drejtori një kartelë të quajtur \"%s\", kartela s’është " +"shtuar." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "S’u arrit të migrohej formësimi i panelit të vjetër" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Përshtatni rregullimet e depozituara nga Xfconf-i" diff --git a/po/sr.po b/po/sr.po index ece0da1..dab184d 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Саша Петровић , 2012 -# Саша Петровић , 2012-2013,2015,2017,2019 -# Саша Петровић , 2015,2017,2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-23 13:33+0000\n" -"Last-Translator: Саша Петровић \n" -"Language-Team: Serbian (http://www.transifex.com/xfce/libxfce4ui/language/sr/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Serbian (https://app.transifex.com/xfce/teams/16840/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,7 +42,7 @@ msgstr "Бићете преусмерени на страницу веба гд #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Откажи" @@ -79,14 +80,18 @@ msgstr "Да ли затворити прозор са вишеструким л msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Овај прозор има више отворених листова. Затварање овог прозора ће такође затворити и све његове листове." +msgstr "" +"Овај прозор има више отворених листова. Затварање овог прозора ће такође " +"затворити и све његове листове." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Овај прозор има %d отворених листова. Затварање\n овог прозора ће такође затворити и све његове листове." +msgstr "" +"Овај прозор има %d отворених листова. Затварање\n" +" овог прозора ће такође затворити и све његове листове." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -124,37 +129,35 @@ msgstr "Могућности управљања седницом" msgid "Show session management options" msgstr "Прикажи могућности управљања седницом" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Нисам успео да се повежем са управником седнице: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Управник седнице није вратио исправни ЛБ корисника" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Радна фасцикла „%s“ не постоји. Неће бити коришћена приликом израђања „%s“." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Разделник путање је неправилан у датотеци имена" +msgstr "" +"Радна фасцикла „%s“ не постоји. Неће бити коришћена приликом израђања „%s“." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Име датотеке је предугачно" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Разделник путање је неправилан у датотеци имена" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Имена датотека не би требала почињати размаком" @@ -163,7 +166,9 @@ msgstr "Имена датотека не би требала почињати р msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да користите?" +msgstr "" +"Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да " +"користите?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +192,107 @@ msgstr "Задржи „%s“" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Ова пречица се већ користи за наредбу „%s“. Које дејство желите да примените?" +msgstr "" +"Ова пречица се већ користи за наредбу „%s“. Које дејство желите да " +"примените?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Ова пречица се већ користи за наредбу „%s“. Које дејство желите да користите?" +msgstr "" +"Ова пречица се већ користи за наредбу „%s“. Које дејство желите да " +"користите?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Молим, користите други низ дугмади." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s већ окида ову радњу." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Сукобљавајућа дејства за %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Ова пречица се већ користи за нешто друго." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Уредник пречица" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Тренутна пречица. Кликните ради уређивања..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Поништи пречицу" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Поврати подразумевану пречицу" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Пречица са тастатуре се тренутно користи за: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Пречица са тастатуре је већ у употреби" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Пречица радње управника прозора" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "радња" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Пречица наредбе" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "наредба" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Пречица" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Очисти" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Притисните низ дугмади ради окидања %s „%s“." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Молим, притисните дугме" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Нисам успео да захватим тастатуру." @@ -360,201 +398,217 @@ msgstr "Прекидач стања изнад осталих" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 msgid "Toggle fullscreen" -msgstr "Прекидач стања преко целог екрана" +msgstr "Прекидач стања преко целог заслона" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Премести прозор на нижи заслон" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Премести прозор на леви заслон" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Премести прозор на десни заслон" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Премести прозор на горњи заслон" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Премести прозор на радни простор изнад" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Премести прозор на радни простор испод" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Премести прозор на радни простор лево" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Премести прозор на радни простор десно" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Премести прозор на претходни радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Премести прозор на наредни радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Премести прозор на радни простор 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Премести прозор на радни простор 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Премести прозор на радни простор 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Премести прозор на радни простор 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Премести прозор на радни простор 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Премести прозор на радни простор 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Премести прозор на радни простор 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Премести прозор на радни простор 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Премести прозор на радни простор 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Премести прозор на радни простор 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Премести прозор на радни простор 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Премести прозор на радни простор 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Поплочај прозор до врха" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Поплочај прозор до дна" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Поплочај прозор на лево" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Поплочај прозор на десно" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Поплочај прозор нагоре лево" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Поплочај прозор нагоре десно" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Поплочај прозор надоле лево" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Поплочај прозор надоле десно" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Прикажи радну површ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Горњи радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Доњи радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Леви радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Десни радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Претходни радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Следећи радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "радни простор 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "радни простор 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "радни простор 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "радни простор 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "радни простор 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "радни простор 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "радни простор 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "радни простор 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "радни простор 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "радни простор 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "радни простор 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "радни простор 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Додај радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Додај суседни радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Обриши последњи радни простор" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Обриши тренутни радни простор" @@ -574,186 +628,202 @@ msgstr "Справице ИксФЦЕ-а 4" msgid "Version information" msgstr "Подаци о издању" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "ГПУ-ови" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Управник прозора" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Управља смештајем прозора на приказу." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Полица" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Обезбеђује матицу за дугмад прозора, покретаче, изборник програма и још тога." +msgstr "" +"Обезбеђује матицу за дугмад прозора, покретаче, изборник програма и још " +"тога." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Управник радне површи" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Поставља позадине радне површи, управља сличицама и још тога." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Управник датотека" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Управља датотекама на савремен, лак за употребу и брз начин." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Управник меморија" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Управља уклоњивим уређајима и посредницима за Тунара." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Управник седнице" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Чува и враћа Ваше седнице, управља почетним, самопокрећућим и завршним програмима." +msgstr "" +"Чува и враћа Ваше седнице, управља почетним, самопокрећућим и завршним " +"програмима." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Поставке система" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Управник поставки" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Подешава изглед, приказ, поставке тастатуре и миша." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Проналазач програма" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Брзо налази и покреће уграђене програме на систему." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Домар поставки" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Храни поставке на систему заснованим на поставкама Д-сабирнице." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Књижница изборника" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Спроводи изборник сагласан са freedesktop.org-ом заснован на Глиб и ГИО." +msgstr "" +"Спроводи изборник сагласан са freedesktop.org-ом заснован на Глиб и ГИО." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Служитељ умањених сличица" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Спроводи одредбе Д-сабирнице управљањем умањеним сличицама." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Молим, погледајте " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Уколико знате било кога ко недостаје на списку, не оклевајте да пријавите бубу на ." +msgstr "" +"Уколико знате било кога ко недостаје на списку, не оклевајте да пријавите " +"бубу на ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Хвала свима који су помогли да ове мекотворине буду доступне!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Права умножавања над Иксце-ом 4 задржава Оливје Фурдан (fourdan@xfce.org). Права над разним деловима задржавају њихови одговарајући творци." +msgstr "" +"Права умножавања над Иксце-ом 4 задржава Оливје Фурдан (fourdan@xfce.org). " +"Права над разним деловима задржавају њихови одговарајући творци." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Пакети libxfce4ui, libxfce4util и exo се раздељују под условима књижница ГНУ-а и објављени су од стране Задужбине слободног софтвера; или издања 2 дозволе, или (по вашем нахођењу) неког наредног издања." +msgstr "" +"Пакети libxfce4ui, libxfce4util и exo се раздељују под условима књижница " +"ГНУ-а и објављени су од стране Задужбине слободног софтвера; или издања 2 " +"дозволе, или (по вашем нахођењу) неког наредног издања." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Пакети thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop и xfwm4 се расподељују под условима опште јавне дозволе ГНУ објављеној од стране Задужбине слободног софтвера: или издања 2 дозволе, или (по вашем нахођењу) неког наредног издања." +msgstr "" +"Пакети thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop и xfwm4 се расподељују под условима опште јавне дозволе " +"ГНУ објављеној од стране Задужбине слободног софтвера: или издања 2 дозволе," +" или (по вашем нахођењу) неког наредног издања." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Упишите „%s --help“ за упутство за употребу." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Нисам успео да покренем ГТК+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Развојна дружина Иксфце-а. Сва права су задржана." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Молим, пријавите грешке на <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Нисам успео да учитам сучеље" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Програмери језгра" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Садашњи доприносиоци" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Служитеље одржавају" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Надгледање превођења" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Надзор документације" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Преводиоци" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Претходни доприносиоци" @@ -774,52 +844,70 @@ msgid "About the Xfce Desktop Environment" msgstr "О радном окружењу Иксфце-а" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "натпис" +msgid "_Help" +msgstr "_Помоћи" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Име оперативног система" +msgid "_Close" +msgstr "_Затвори" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Уређај" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Меморија" +msgid "label" +msgstr "натпис" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "ЦПУ" +msgid "OS Name" +msgstr "Име оперативног система" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Врста оперативног система" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Издање ИксФЦЕ-а" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Раздељивач" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Издање ИксФЦЕ-а" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Издање ГТК-а" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Издање језгра" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "ЦПУ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Меморија" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "ГПУ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Систем" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "ИксФЦЕ је збирка програма које заједно обезбеђују потпуно радно окружење.\nСледећи програми су део језгра ИксФЦЕ-а:" +msgstr "" +"ИксФЦЕ је збирка програма које заједно обезбеђују потпуно радно окружење.\n" +"Следећи програми су део језгра ИксФЦЕ-а:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -828,48 +916,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "ИксФЦЕ је такође и развојна платформа која пружа неколико библиотека помажућих програмерима да их лепо ускладе у радно окружење.\n\nЈединице ИксФЦЕ-а су објављене под слободним и отворненог кода дозволама: ОЈЛ или БСДЛ за програме и ЛОЈЛ или БСДЛ за библиотеке. Погледајте упутства, изворни код и странице ИксФЦЕ-а (https://www.xfce.org) ради више података.\n\nХвала Вам на занимању за ИксФЦЕ.\n\nt- Развојна дружина ИксФЦЕ-а" +msgstr "" +"ИксФЦЕ је такође и развојна платформа која пружа неколико библиотека помажућих програмерима да их лепо ускладе у радно окружење.\n" +"\n" +"Јединице ИксФЦЕ-а су објављене под слободним и отворненог кода дозволама: ОЈЛ или БСДЛ за програме и ЛОЈЛ или БСДЛ за библиотеке. Погледајте упутства, изворни код и странице ИксФЦЕ-а (https://www.xfce.org) ради више података.\n" +"\n" +"Хвала Вам на занимању за ИксФЦЕ.\n" +"\n" +"t- Развојна дружина ИксФЦЕ-а" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "О програму" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Заслуге" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "ОЈД" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "КОЈД" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "БСД" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Права умножавања" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Непознато" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-бита (32-битно корисничко окружење)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-бита" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-бита" @@ -877,7 +972,7 @@ msgstr "32-бита" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ЛБ изградње: %s" @@ -893,6 +988,6 @@ msgstr "Датотека са именом „%s“ већ постоји у ф msgid "Failed to migrate the old panel configuration" msgstr "Нисам успео преселити старе поставке полице" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Прилагодите поставке које чува Иксфконф" diff --git a/po/sv.po b/po/sv.po index 9be3535..eeabf25 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Daniel Nylander , 2008-2009 -# Luna Jernberg , 2020 -# Påvel Nicklasson , 2015,2018 -# Påvel Nicklasson, 2015 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-23 00:45+0000\n" -"Last-Translator: Luna Jernberg \n" -"Language-Team: Swedish (http://www.transifex.com/xfce/libxfce4ui/language/sv/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Swedish (https://app.transifex.com/xfce/teams/16840/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,11 +38,13 @@ msgstr "Vill du läsa manualen online?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Du kommer att skickas vidare till hemsidan för dokumentation där hjälpsidorna finns och översätts." +msgstr "" +"Du kommer att skickas vidare till hemsidan för dokumentation där " +"hjälpsidorna finns och översätts." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Avbryt" @@ -80,14 +82,18 @@ msgstr "Stäng fönster med flera flikar?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Detta fönster har flera flikar öppna. Att stänga fönstret kommer också att stänga alla dess flikar." +msgstr "" +"Detta fönster har flera flikar öppna. Att stänga fönstret kommer också att " +"stänga alla dess flikar." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Detta fönster har %d flikar öppna. Att stänga detta fönster kommer också att stänga alla dess flikar." +msgstr "" +"Detta fönster har %d flikar öppna. Att stänga detta fönster kommer också " +"att stänga alla dess flikar." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -125,37 +131,36 @@ msgstr "Alternativ för sessionshantering" msgid "Show session management options" msgstr "Visa alternativ för sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Misslyckades att ansluta till sessionshanteraren: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Sessionshanteraren returnerade inte ett giltigt klient-id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Arbetskatalogen \"%s\" finns inte. Den kommer inte att användas när \"%s\" startas." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Katalogavgränsare olagligt i filnamn" +msgstr "" +"Arbetskatalogen \"%s\" finns inte. Den kommer inte att användas när \"%s\" " +"startas." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Filnamnet är för långt" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Katalogavgränsare olagligt i filnamn" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Filnamn ska inte börja eller sluta med ett mellanslag" @@ -164,7 +169,9 @@ msgstr "Filnamn ska inte börja eller sluta med ett mellanslag" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Denna genväg används redan för funktionen '%s'. Vilken funktion vill du använda?" +msgstr "" +"Denna genväg används redan för funktionen '%s'. Vilken funktion vill du " +"använda?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -188,74 +195,107 @@ msgstr "Behåll \"%s\"" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Denna genväg används redan för kommandot '%s'. Vilken åtgärd vill du använda?" +msgstr "" +"Denna genväg används redan för kommandot '%s'. Vilken åtgärd vill du " +"använda?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Denna genväg används redan av funktionen '%s'. Vilken funktion vill du använda?" +msgstr "" +"Denna genväg används redan av funktionen '%s'. Vilken funktion vill du " +"använda?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Använd en annan tangentkombination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s utlöser redan denna funktion." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Åtgärder i konflikt för %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Denna genväg används redan för någonting annat." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Genvägsredigerare" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Den aktuella genvägen. Klicka för att redigera..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Rensa genvägen" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Återställ standardgenvägen" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Denna tangentbordsgenväg används för närvarande av: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Tangentbordsgenvägen används redan" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Åtgärdsgenväg för fönsterhanterare" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "åtgärd" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Kommandogenväg" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "kommando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Genväg" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Rensa" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "Tryck på tangentbordstangenterna för att utlösa %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Tryck på en tangent" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Det gick inte att fånga tangentbordet." @@ -364,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Växla fullskärmsläge" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Flytta fönster till nedre skärm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Flytta fönster till vänster skärm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Flytta fönster till högra skärm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Flytta fönster till övre skärm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Flytta fönster till övre skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Flytta fönster till nedre skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Flytta fönster till vänstra skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Flytta fönster till högra skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Flytta fönster till föregående skrivbord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Flytta fönster till nästa skrivbord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Flytta fönster till skrivbord 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Flytta fönster till skrivbord 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Flytta fönster till skrivbord 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Flytta fönster till skrivbord 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Flytta fönster till skrivbord 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Flytta fönster till skrivbord 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Flytta fönster till skrivbord 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Flytta fönster till skrivbord 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Flytta fönster till skrivbord 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Flytta fönster till skrivbord 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Flytta fönster till skrivbord 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Flytta fönster till skrivbord 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Placera fönster överst" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Placera fönster nederst" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Placera fönster till vänster" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Placera fönster till höger" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Placera fönster överst till vänster" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Placera fönster överst till höger" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Placera fönster nederst till vänster" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Placera fönster nederst till höger" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Visa skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Övre skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Nedre skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Vänstra skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Högra skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Föregående skrivbord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Nästa skrivbord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Skrivbord 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Skrivbord 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Skrivbord 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Skrivbord 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Skrivbord 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Skrivbord 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Skrivbord 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Skrivbord 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Skrivbord 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Skrivbord 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Skrivbord 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Skrivbord 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Lägg till skrivbord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Lägg till angränsande skrivbord" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Ta bort det sista skrivbordet" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Ta bort aktivt skrivbord" @@ -575,186 +631,203 @@ msgstr "Xfce 4-widgetar" msgid "Version information" msgstr "Versionsinformation" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Fönsterhanterare" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Hanterar placeringen av fönster på skärmen" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "Ger ett hem för fönsterknappar, startprogram, app-meny och mer." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Skrivbordshanterare" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Ställer in skrivbordsbakgrunder, hanterar ikoner och mer." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Filhanterare" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Hanterar dina filer på ett modernt, lättanvänt och snabbt sätt." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Volymhanterare" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Hanterar flyttbara enheter och media för Thunar." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Sessionshanterare" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Sparar och återställer din session, hanterar start, autostart och avstängning." +msgstr "" +"Sparar och återställer din session, hanterar start, autostart och " +"avstängning." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Inställningssystem" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Inställningshanterare" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Konfigurerar utseende, skärm, tangentbord och mus inställningar." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Programsökare" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Hittar snabbt och startar program som är installerade på ditt system." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Inställningsdaemon" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Lagrar dina inställningar i ett D-Bus-baserat konfigurationssystem." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Ett meny bibliotek" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "Implementerar en freedesktop.org-kompatibel meny baserad på GLib och GIO." +msgstr "" +"Implementerar en freedesktop.org-kompatibel meny baserad på GLib och GIO." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Miniatyrbildstjänst" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Implementerar D-Bus-specifikationen för miniatyrbildhantering." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Titta på " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Om du känner till någon som saknas från den här listan; tveka inte att posta en felrapport på ." +msgstr "" +"Om du känner till någon som saknas från den här listan; tveka inte att posta" +" en felrapport på ." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "Tack till alla som hjälpt till att göra denna programvara tillgänglig!" +msgstr "" +"Tack till alla som hjälpt till att göra denna programvara tillgänglig!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 är copyright Olivier Fourdan (fourdan@xfce.org). De olika komponenterna är skyddade av upphovsrätt av deras respektive författare." +msgstr "" +"Xfce 4 är copyright Olivier Fourdan (fourdan@xfce.org). De olika " +"komponenterna är skyddade av upphovsrätt av deras respektive författare." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui, libxfce4util och exo paketen distribueras under villkoren i GNU Library General Public License såsom publicerad av the Free Software Foundation; antingen version 2 av licensen, eller (om du så önskar) någon senare version." +msgstr "" +"libxfce4ui, libxfce4util och exo paketen distribueras under villkoren i GNU " +"Library General Public License såsom publicerad av the Free Software " +"Foundation; antingen version 2 av licensen, eller (om du så önskar) någon " +"senare version." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Paketen: thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop och xfwm4 distribueras under villkoren i GNU General Public License såsom publicerade av the Free Software Foundation; antingen version 2 av licensen, eller (om du så önskar) någon senare version." +msgstr "" +"Paketen: thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfconf, xfdesktop och xfwm4 distribueras under villkoren i " +"GNU General Public License såsom publicerade av the Free Software " +"Foundation; antingen version 2 av licensen, eller (om du så önskar) någon " +"senare version." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Skriv '%s --help' för användningsinformation." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Det gick inte att initiera GTK+." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce:s utvecklingsteam. Alla rättigheter förbehållna." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Var vänlig och rapportera fel till <%s>." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Misslyckades läsa in gränssnittet" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Kärnutvecklare" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktiva bidragsgivare" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Servrar tillhandahållna av" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Tillsyn översättningar" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Tillsyn Dokumentation" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Översättare" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Tidigare bidragsgivare" @@ -775,52 +848,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Om skrivbordsmiljön Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etikett" +msgid "_Help" +msgstr "_Hjälp" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "OS Namn" +msgid "_Close" +msgstr "S_täng" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Enhet" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Minne" +msgid "label" +msgstr "etikett" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "OS Namn" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "OS typ" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce Version" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Distributör" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce Version" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK Version" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Kärna Version" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Minne" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "System" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce är en samling av program som tillsammans tillhandahåller en komplett skrivbordsmiljö. Följande program är delar av Xfce:s kärna:" +msgstr "" +"Xfce är en samling av program som tillsammans tillhandahåller en komplett " +"skrivbordsmiljö. Följande program är delar av Xfce:s kärna:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -829,48 +920,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce är också en utvecklingsplattform med flera bibliotek som hjälper programmerare att ska program som passar bra in i skrivbordsmiljön.\n\nXfce-komponenter är licensierade under fria öppenkällkodslicenser GPL eller BSDL för program och LGPL eller BSDL för bibliotek. Titta i dokumentationen, källkoden eller på Xfce:s hemsida (https://www.xfce.org) för mer information.\n\nTack för du visar intresse för Xfce.\n\n\t-Xfce-utvecklingsteamet" +msgstr "" +"Xfce är också en utvecklingsplattform med flera bibliotek som hjälper programmerare att ska program som passar bra in i skrivbordsmiljön.\n" +"\n" +"Xfce-komponenter är licensierade under fria öppenkällkodslicenser GPL eller BSDL för program och LGPL eller BSDL för bibliotek. Titta i dokumentationen, källkoden eller på Xfce:s hemsida (https://www.xfce.org) för mer information.\n" +"\n" +"Tack för du visar intresse för Xfce.\n" +"\n" +"\t-Xfce-utvecklingsteamet" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Om" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Tack" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Copyright" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Okänd" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64-bit (32-bit användarutrymme)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64-bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32-bit" @@ -878,7 +976,7 @@ msgstr "32-bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; Bygg ID: %s" @@ -888,12 +986,14 @@ msgstr "%s; Bygg ID: %s" msgid "" "A file named \"%s\" already exists in this directory, the file hasn't been " "added." -msgstr "En fil med namnet \"%s\" finns redan i den här katalogen, filen har inte lagts till." +msgstr "" +"En fil med namnet \"%s\" finns redan i den här katalogen, filen har inte " +"lagts till." #: ../tests/test-ui.c:122 msgid "Failed to migrate the old panel configuration" msgstr "Misslyckades med att flytta den gamla panelkonfigurationen" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Anpassa inställningar lagrade av Xfconf" diff --git a/po/te.po b/po/te.po index 50d5fd1..82d69fd 100644 --- a/po/te.po +++ b/po/te.po @@ -1,17 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# ప్రవీణ్ ఇళ్ళ , 2011 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Telugu (http://www.transifex.com/xfce/libxfce4ui/language/te/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Telugu (https://app.transifex.com/xfce/teams/16840/te/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,7 +42,7 @@ msgstr "" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "రద్దుచేయి (_C)" @@ -122,37 +125,36 @@ msgstr "సెషన్ నిర్వహణ ఐచ్ఛికాలు" msgid "Show session management options" msgstr "సెషన్ నిర్వహణ ఐచ్ఛికాలను చూపించు" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "సెషన్ నిర్వాహకానికి అనుసంధానించుటలో విఫలమైంది: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "సెషన్ నిర్వాహకము ఒక సరైన క్లయింటు ఐడీని తిరిగి ఇచ్చుటలేదు" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "పనిచేస్తున్న డైరెక్టరీ \"%s\" ఉనికిలో లేదు. \"%s\" స్పానింగులో ఉన్నపుడు అది వాడబడదు." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" msgstr "" +"పనిచేస్తున్న డైరెక్టరీ \"%s\" ఉనికిలో లేదు. \"%s\" స్పానింగులో ఉన్నపుడు అది " +"వాడబడదు." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -185,7 +187,9 @@ msgstr "'%s' ఉంచు" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "ఈ షార్ట్‍కట్ ఇదివరకే '%s' ఆదేశము కొరకు వాడబడింది. మీరు ఏ చర్యను వాడాలనుకుంటున్నారు?" +msgstr "" +"ఈ షార్ట్‍కట్ ఇదివరకే '%s' ఆదేశము కొరకు వాడబడింది. మీరు ఏ చర్యను " +"వాడాలనుకుంటున్నారు?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format @@ -196,63 +200,92 @@ msgstr "" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s కొరకు సంఘర్షణ చర్యలు" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "ఈ షార్ట్‍కట్ ఇదివరకే వేరేదానికి వాడబడుతున్నది." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "విండో నిర్వాహకము చర్య షార్ట్‍కట్" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "ఆదేశము షార్ట్‍కట్" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "అడ్డదారి" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "శుభ్రపరుచు" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "కీబోర్డును హరించలేకపోయింది." @@ -361,198 +394,214 @@ msgid "Toggle fullscreen" msgstr "" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "విండోని ఎగువ కార్యక్షేత్రానికి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "విండోని దిగువ కార్యక్షేత్రానికి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "విండోని ఎడమవైపు కార్యక్షేత్రానికి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "విండోని కుడివైపు కార్యక్షేత్రానికి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "విండోని మునుపటి కార్యక్షేత్రానికి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "విండోని తదుపరి కార్యక్షేత్రానికి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "విండోని కార్యక్షేత్రం 1కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "విండోని కార్యక్షేత్రం 2కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "విండోని కార్యక్షేత్రం 3కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "విండోని కార్యక్షేత్రం 4కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "విండోని కార్యక్షేత్రం 5కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "విండోని కార్యక్షేత్రం 6కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "విండోని కార్యక్షేత్రం 7కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "విండోని కార్యక్షేత్రం 8కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "విండోని కార్యక్షేత్రం 9కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "విండోని కార్యక్షేత్రం 10కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "విండోని కార్యక్షేత్రం 11కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "విండోని కార్యక్షేత్రం 12కి తరలించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "డెస్క్‍టాప్ చూపించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "ఎగువ కార్యక్షేత్రం" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "దిగువ కార్యక్షేత్రం" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "ఎడమవైపు కార్యక్షేత్రం" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "కుడివైపు కార్యక్షేత్రం" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "మునుపటి కార్యక్షేత్రం" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "తదుపరి కార్యక్షేత్రం" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "కార్యక్షేత్రం 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "కార్యక్షేత్రం 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "కార్యక్షేత్రం 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "కార్యక్షేత్రం 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "కార్యక్షేత్రం 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "కార్యక్షేత్రం 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "కార్యక్షేత్రం 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "కార్యక్షేత్రం 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "కార్యక్షేత్రం 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "కార్యక్షేత్రం 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "కార్యక్షేత్రం 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "కార్యక్షేత్రం 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "కార్యక్షేత్రాన్ని జతచేయి" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "చివరి కార్యక్షేత్రాన్ని తొలగించు" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "క్రియాశీల కార్యక్షేత్రాన్ని తొలగించు" @@ -568,116 +617,124 @@ msgstr "ఉపశీర్షిక" msgid "Xfce 4 Widgets" msgstr "Xfce 4 విడ్జెట్లు" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "రూపాంతర సమాచారం" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "విండో నిర్వాహకం" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "ప్యానల్" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "డెస్క్‍టాప్ నిర్వాహకం" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "దస్త్ర నిర్వాహకము" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "చర్యాకాల నిర్వహకం" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "వ్యవస్థ అమరిక" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "అమరికల నిర్వాహకం" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "అనువర్తన కనుగొనునది" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "అమరికల సూత్రధారి" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." msgstr "" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -685,7 +742,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -694,65 +751,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce అభివృద్ధి జట్టు. అన్ని హక్కులు కలిగివున్నారు." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "దయచేసి లోపాలను <%s>కు నివేదించండి." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "అంతరవర్తిని నింపుటలో విఫలమైంది" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "రూపాంతరం %s, పంపిణీచేయువారు %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "రూపాంతరం %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "అంతర్భాగ అభివృద్ధికారులు" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "క్రియాశీల సహాయకులు" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "సేవకాలు నిర్వహించువారు" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "అనువాదకలు" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "మునుపటి సహాయకులు" @@ -773,23 +821,23 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce డెస్క్‍టాప్ పర్యావరణం గురించి" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "లేబుల్" +msgid "_Help" +msgstr "సహాయం (_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "మూసివేయి (_C)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "పరికరం" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "లేబుల్" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 @@ -797,24 +845,44 @@ msgid "OS Type" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +msgid "Xfce Version" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "వ్యవస్థ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -825,39 +893,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "గురించి" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "పరపతులు" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "జిపియల్" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "నకలుహక్కు" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "తెలియదు" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -873,6 +956,6 @@ msgstr "" msgid "Failed to migrate the old panel configuration" msgstr "" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Xfconf చే భద్రపరుచబడిన అమరికలను అనురూపించు" diff --git a/po/th.po b/po/th.po index 0fc8c19..d339024 100644 --- a/po/th.po +++ b/po/th.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Theppitak Karoonboonyanan , 2013 -# Theppitak Karoonboonyanan , 2015-2016,2019 -# Theppitak Karoonboonyanan , 2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Thai (http://www.transifex.com/xfce/libxfce4ui/language/th/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Thai (https://app.transifex.com/xfce/teams/16840/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,7 +42,7 @@ msgstr "คุณจะถูกนำไปสู่เว็บไซต์เ #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_ยกเลิก" @@ -73,13 +74,15 @@ msgstr "ยกเลิก" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "" +msgstr "ยืนยันปิดหน้าต่างที่มีหลายแท็บหรือไม่?" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." msgstr "" +"หน้าต่างนี้มีแท็บเปิดไว้หลายแท็บ " +"หากปิดหน้าต่างนี้ก็จะปิดแท็บทั้งหมดในหน้าต่างด้วย" #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format @@ -87,6 +90,8 @@ msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." msgstr "" +"หน้าต่างนี้มีแท็บเปิดไว้ %d แท็บ " +"หากปิดหน้าต่างนี้ก็จะปิดแท็บทั้งหมดในหน้าต่างด้วย" #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -124,39 +129,36 @@ msgstr "ตัวเลือกของการจัดการวาระ msgid "Show session management options" msgstr "แสดงตัวเลือกของการจัดการวาระ" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "เชื่อมต่อไปยังโปรแกรมจัดการวาระไม่สำเร็จ: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "โปรแกรมจัดการวาระไม่ได้คืนค่า ID ลูกข่ายที่ใช้การได้กลับมา" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "ไดเรกทอรีทำงาน \"%s\" ไม่มีอยู่ จะไม่ใช้สำหรับ spawn \"%s\"" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" -msgstr "" +msgstr "ชื่อแฟ้มยาวเกินไป" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "อักขระคั่นไดเรกทอรีในชื่อแฟ้มไม่ถูกต้อง" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "" +msgstr "ชื่อแฟ้มไม่ควรขึ้นต้นหรือลงท้ายด้วยช่องว่าง" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format @@ -198,63 +200,92 @@ msgstr "ปุ่มลัดนี้ถูกใช้โดยการกร #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "กรุณาใช้ปุ่มลัดชุดอื่น" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s ได้ใช้เรียกการกระทำนี้ไปแล้ว" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "การกระทำขัดแย้งกันสำหรับ %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "ปุ่มลัดนี้ถูกใช้ทำอย่างอื่นไปแล้ว" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "ปุ่มลัดนี้กำลังถูกใช้สำหรับ: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "ปุ่มลัดแป้นพิมพ์ถูกใช้งานอยู่" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "ปุ่มลัดสำหรับโปรแกรมจัดการหน้าต่าง" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "การกระทำ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "ปุ่มลัดสำหรับคำสั่ง" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "คำสั่ง" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "ปุ่มลัด" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "ล้าง" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "กดปุ่มแป้นพิมพ์ที่จะเรียก%s '%s'" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "กรุณากดปุ่ม" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "ไม่สามารถจับยึดแป้นพิมพ์" @@ -363,198 +394,214 @@ msgid "Toggle fullscreen" msgstr "เปิด/ปิดการแสดงเต็มจอ" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านบน" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านล่าง" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านซ้าย" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านขวา" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานก่อนหน้า" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานถัดไป" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "เรียงหน้าต่างต่อชนกันที่ขอบบน" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "เรียงหน้าต่างต่อชนกันที่ขอบล่าง" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "เรียงหน้าต่างต่อชนกันที่ขอบซ้าย" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "เรียงหน้าต่างต่อชนกันที่ขอบขวา" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "เรียงหน้าต่างต่อชนกันที่มุมบนซ้าย" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "เรียงหน้าต่างต่อชนกันที่มุมบนขวา" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "เรียงหน้าต่างต่อชนกันที่มุมล่างซ้าย" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "เรียงหน้าต่างต่อชนกันที่มุมล่างขวา" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "แสดงพื้นโต๊ะ" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "พื้นที่ทำงานด้านบน" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "พื้นที่ทำงานด้านล่าง" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "พื้นที่ทำงานด้านซ้าย" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "พื้นที่ทำงานด้านขวา" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "พื้นที่ทำงานก่อนหน้า" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "พื้นที่ทำงานถัดไป" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "พื้นที่ทำงาน 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "พื้นที่ทำงาน 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "พื้นที่ทำงาน 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "พื้นที่ทำงาน 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "พื้นที่ทำงาน 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "พื้นที่ทำงาน 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "พื้นที่ทำงาน 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "พื้นที่ทำงาน 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "พื้นที่ทำงาน 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "พื้นที่ทำงาน 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "พื้นที่ทำงาน 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "พื้นที่ทำงาน 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "เพิ่มพื้นที่ทำงาน" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "เพิ่มพื้นที่ทำงานติดกัน" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "ลบพื้นที่ทำงานสุดท้าย" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "ลบพื้นที่ทำงานที่กำลังใช้อยู่" @@ -570,191 +617,204 @@ msgstr "หัวเรื่องย่อย" msgid "Xfce 4 Widgets" msgstr "วิดเจ็ตของ Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "ข้อมูลรุ่น" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPUs" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "โปรแกรมจัดการหน้าต่าง" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "จัดการการจัดวางของหน้าต่างบนหน้าจอ" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "พาเนล" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" +"พื้นที่สำหรับปุ่มเลือกหน้าต่าง, ปุ่มเรียกโปรแกรม, เมนูเรียกแอป และอื่นๆ" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "โปรแกรมจัดการพื้นโต๊ะ" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "กำหนดพื้นหลังของพื้นโต๊ะ จัดการไอคอนต่างๆ และอื่นๆ" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "โปรแกรมจัดการแฟ้ม" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "จัดการแฟ้มของคุณด้วยวิธีที่ทันสมัย ง่าย และรวดเร็ว" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "ส่วนขยายจัดการโวลุม" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "ตัวจัดการโวลุม" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "จัดการไดรว์และสื่อถอดเสียบสำหรับ Thunar" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "โปรแกรมจัดการวาระ" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"บันทึกและเปิดคืนวาระของคุณ, จัดการการเริ่มวาระ, เปิดโปรแกรมที่เริ่มอัตโนมัติ" +" และการปิดระบบ" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "ระบบตั้งค่า" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "โปรแกรมจัดการการตั้งค่า" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "ตั้งค่ารูปลักษณ์, จอแสดงผล, แป้นพิมพ์ และเมาส์" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" -msgstr "เครื่องมือค้นหาโปรแกรม" +msgstr "เครื่องมือค้นหาแอปพลิเคชัน" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "" +msgstr "ค้นหาและเรียกทำงานแอปพลิเคชันที่ติดตั้งไว้ในระบบอย่างเร็ว" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "ดีมอนค่าตั้ง" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "จัดเก็บค่าตั้งของคุณในระบบตั้งค่าที่ทำงานบน D-Bus" -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "ไลบรารีจัดการเมนู" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "" +msgstr "จัดทำเมนูตามข้อกำหนดของ freedesktop.org โดยอาศัย GLib และ GIO" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "บริการภาพย่อ" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "จัดการภาพย่อตามข้อกำหนดของ D-Bus" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "กรุณาอ่าน " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"หากคุณพบว่ามีผู้ใดตกหล่นจากรายชื่อนี้ ก็โปรดอย่าลังเลที่จะรายงานบั๊กที่ " +"" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "ขอขอบคุณทุกท่านที่ช่วยทำให้ซอฟต์แวร์นี้เกิดขึ้นได้!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 สงวนลิขสิทธิ์โดย Olivier Fourdan (fourdan@xfce.org) ส่วนองค์ประกอบต่างๆ สงวนลิขสิทธิ์โดยผู้พัฒนาของแต่ละองค์ประกอบ" +msgstr "" +"Xfce 4 สงวนลิขสิทธิ์โดย Olivier Fourdan (fourdan@xfce.org) " +"ส่วนองค์ประกอบต่างๆ สงวนลิขสิทธิ์โดยผู้พัฒนาของแต่ละองค์ประกอบ" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "แพกเกจ libxfce4ui, libxfce4util และ exo เผยแพร่ภายใต้เงื่อนไขของสัญญาอนุญาต GNU Library General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)" +msgstr "" +"แพกเกจ libxfce4ui, libxfce4util และ exo เผยแพร่ภายใต้เงื่อนไขของสัญญาอนุญาต " +"GNU Library General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี " +"ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "แพกเกจ thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop และ xfwm4 เผยแพร่ภายใต้เงื่อนไขของสัญญาอนุญาต GNU General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)" +msgstr "" +"แพกเกจ thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfconf, xfdesktop และ xfwm4 เผยแพร่ภายใต้เงื่อนไขของสัญญาอนุญาต GNU General " +"Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี " +"ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "สั่ง '%s --help' เพื่อดูข้อมูลเพิ่มเติม" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "ไม่สามารถตั้งต้น GTK+" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "หากพบปัญหา กรุณารายงานที่ <%s>" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "โหลดส่วนติดต่อผู้ใช้ไม่สำเร็จ" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "รุ่น %s, แจกจ่ายโดย %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "รุ่น %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "นักพัฒนาแกนหลัก" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "ผู้ร่วมสมทบงานที่ยังทำงานอยู่" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "ดูแลเซิร์ฟเวอร์ต่างๆ โดย" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "ดูแลให้คำปรึกษางานแปล" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "ดูแลให้คำปรึกษางานเอกสาร" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "ผู้แปล" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "ผู้ร่วมสมทบงานในอดีต" @@ -775,48 +835,70 @@ msgid "About the Xfce Desktop Environment" msgstr "เกี่ยวกับเดสก์ท็อป Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "ฉลาก" +msgid "_Help" +msgstr "_วิธีใช้" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "ปิ_ด" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "อุปกรณ์" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "ฉลาก" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "" +msgid "OS Name" +msgstr "ชื่อ OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "ชนิด OS" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 +msgid "Distributor" +msgstr "ผู้จัดแจก" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Xfce Version" +msgstr "รุ่นของ Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:11 +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "หน่วยความจำ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "ระบบ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce เป็นชุดของโปรแกรมซึ่งรวมกันเป็นชุดเดสก์ท็อปที่ความสามารถเพียบพร้อม\n" +"ส่วนแกนหลักของ Xfce ประกอบด้วยโปรแกรมต่อไปนี้:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,43 +908,65 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"นอกจากนี้ Xfce ยังเป็นแพลตฟอร์มสำหรับพัฒนาโปรแกรม โดยจัดเตรียมไลบรารีต่างๆ ให้หลายชุด ซึ่งจะช่วยโปรแกรมเมอร์ในการสร้างโปรแกรมที่เข้ากันกับตัวเดสก์ท็อป\n" +"\n" +"องค์ประกอบของ Xfce เผยแพร่ภายใต้เงื่อนไขสัญญาอนุญาตเสรีหรือโอเพนซอร์ส กล่าวคือ GPL หรือ BSDL สำหรับโปรแกรม และ LGPL หรือ BSDL สำหรับไลบรารี คุณสามารถอ่านข้อมูลเพิ่มเติมได้จากเอกสาร ซอร์สโค้ด หรือเว็บไซต์ของ Xfce (https://www.xfce.org)\n" +"\n" +"ขอขอบคุณที่ให้ความสนใจใน Xfce\n" +"\n" +"\t- ทีมพัฒนา Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "เกี่ยวกับ" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "เครดิต" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "ลิขสิทธิ์" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "ไม่ทราบ" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64 บิต (userspace 32 บิต)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64 บิต" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32 บิต" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "" +msgstr "%s; หมายเลขบิลด์: %s" #: ../tests/test-ui.c:111 #, c-format @@ -875,6 +979,6 @@ msgstr "มีแฟ้มชื่อ \"%s\" อยู่ก่อนแล้ msgid "Failed to migrate the old panel configuration" msgstr "ย้ายไปใช้ค่าตั้งพาเนลแบบเก่าไม่สำเร็จ" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "ปรับแต่งค่าตั้งที่เก็บด้วย Xfconf" diff --git a/po/tr.po b/po/tr.po index b9caa79..b2b152f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,27 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Ayhan YALÇINSOY , 2010 -# Butterfly , 2020 -# 0d1bdb3b9a0d4e8f77bc854af8bf3dfc_e6913f4, 2019 -# Demiray Muhterem , 2019-2020 -# Emin Tufan Çetin , 2020 -# Emin Tufan Çetin , 2020 -# Gökmen Görgen , 2008 -# Natavan Mirzayeva , 2015 -# Necdet Yücel , 2016-2017 -# Serdar Sağlam , 2019-2020 -# Volkan Gezer , 2013 +# Xfce Bot , 2023 +# Sabri Ünal , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-22 00:45+0100\n" -"PO-Revision-Date: 2020-12-22 14:08+0000\n" -"Last-Translator: Emin Tufan Çetin \n" -"Language-Team: Turkish (http://www.transifex.com/xfce/libxfce4ui/language/tr/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Sabri Ünal , 2023\n" +"Language-Team: Turkish (https://app.transifex.com/xfce/teams/16840/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -45,13 +39,15 @@ msgstr "Kılavuzu çevrim içi okumak ister misiniz?" msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Yardım sayfalarının güncellendiği ve çevrildiği belgelendirme sayfasına yönlendirileceksiniz." +msgstr "" +"Yardım sayfalarının güncellendiği ve çevrildiği belgelendirme sayfasına " +"yönlendirileceksiniz." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" -msgstr "_İptal" +msgstr "İ_ptal" #: ../libxfce4ui/xfce-dialogs.c:277 msgid "_Read Online" @@ -87,14 +83,17 @@ msgstr "Birden çok sekmeli pencere kapatılsın mı?" msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Bu pencerede açık birden çok sekme var. Bu pencerenin kapatılması tüm sekmeleri kapatır." +msgstr "" +"Bu pencerede açık birden çok sekme var. Bu pencerenin kapatılması tüm " +"sekmeleri kapatır." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Bu pencerede %d sekme açık. Bu pencerenin kapatılması tüm sekmeleri kapatır." +msgstr "" +"Bu pencerede %d sekme açık. Bu pencerenin kapatılması tüm sekmeleri kapatır." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -132,37 +131,34 @@ msgstr "Oturum yönetimi seçenekleri" msgid "Show session management options" msgstr "Oturum yönetimi seçeneklerini göster" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Oturum yöneticisine bağlanırken hata oluştu: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "Oturum yöneticisi geçerli istemci kimliği döndürmedi" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "\"%s\" çalışma dizini yok. \"%s\" oluşturulurken kullanılmayacak." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Dosya adında dizin ayırıcı geçersiz" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Dosya adı çok uzun" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Dosya adında dizin ayırıcı geçersiz" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "Dosya adları boşlukla başlamamalı veya bitmemelidir" @@ -171,7 +167,9 @@ msgstr "Dosya adları boşlukla başlamamalı veya bitmemelidir" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Bu kısayol, aynı zamanda '%s' eylemi için de kullanılmaktadır. Hangi eylemi kullanmak istersiniz?" +msgstr "" +"Bu kısayol, aynı zamanda '%s' eylemi için de kullanılmaktadır. Hangi eylemi " +"kullanmak istersiniz?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -195,74 +193,107 @@ msgstr "Koru: '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Bu kısayol aynı zamanda '%s' komutu için de kullanılmaktadır. Hangi eylemi kullanmak istersiniz?" +msgstr "" +"Bu kısayol aynı zamanda '%s' komutu için de kullanılmaktadır. Hangi eylemi " +"kullanmak istersiniz?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Bu kısayol aynı zamanda '%s' eylemi için de kullanılmaktadır. Hangi eylemi kullanmak istersiniz?" +msgstr "" +"Bu kısayol aynı zamanda '%s' eylemi için de kullanılmaktadır. Hangi eylemi " +"kullanmak istersiniz?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Lütfen başka tuş bileşimi kullanın." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s zaten bu eylemi tetikliyor." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s için çelişen eylemler" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Bu kısayol başka bir şey için de kullanılmış durumda." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Kısayol Düzenleyici" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Geçerli kısayol. Düzenlemek için tıklayın..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Kısayolu temizle" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Varsayılan kısayolu geri yükle" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Bu klavye kısayolunu şu kullanıyor: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Klavye kısayolu zaten kullanılıyor" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "Pencere Yönetimi Eylemi Kısayolu" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "eylem" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Komut Kısayolu" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "komut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Kısayol" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Temizle" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "%s '%s' tetiklemek için klavye tuşlarına basın." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "Lütfen bir tuşa basın" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Klavye yakalanamadı." @@ -371,198 +402,214 @@ msgid "Toggle fullscreen" msgstr "Tam ekrana geç" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Pencereyi aşağıdaki ekrana taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Pencereyi soldaki ekrana taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Pencereyi sağdaki ekrana taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Pencereyi üstteki ekrana taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Pencereyi üst çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Pencereyi alt çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Pencereyi sol çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Pencereyi sağ çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Pencereyi önceki çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Pencereyi sonraki çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Pencereyi 1. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Pencereyi 2. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Pencereyi 3. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Pencereyi 4. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Pencereyi 5. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Pencereyi 6. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Pencereyi 7. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Pencereyi 8. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Pencereyi 9. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Pencereyi 10. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Pencereyi 11. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Pencereyi 12. çalışma alanına taşı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Pencere yukarıyı kaplasın" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Pencere aşağıyı kaplasın" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Pencere solu kaplasın" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Pencere sağı kaplasın" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Pencereyi sol üste döşe" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Pencereyi sağ üste döşe" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Pencereyi sol alta döşe" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Pencereyi sağ alta döşe" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Masaüstünü göster" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Üst çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Alt çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Sol çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Sağ çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Önceki çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Sonraki çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "1. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "2. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "3. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "4. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "5. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "6. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "7. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "8. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "9. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "10. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "11. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "12. çalışma alanı" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Çalışma alanı ekle" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Bitişik çalışma alanı ekle" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Son çalışma alanını sil" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Etkin çalışma alanını sil" @@ -582,186 +629,202 @@ msgstr "Xfce 4 Gereçleri" msgid "Version information" msgstr "Sürüm bilgisi" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU'lar" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "Pencere Yöneticisi" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "Pencerelerin ekran üzerinde yerleştirilmesiyle ilgilenir." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Panel" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." -msgstr "Pencere düğmeleri, başlatıcılar, uygulama menüsü ve daha fazlası için bir yuva sağlar." +msgstr "" +"Pencere düğmeleri, başlatıcılar, uygulama menüsü ve daha fazlası için bir " +"yuva sağlar." -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "Masaüstü Yöneticisi" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "Masaüstü arka planlarını, simgeleri ve daha çoğunu ayarlar." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "Dosya Yöneticisi" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "Dosyalarınızı çağdaş, kullanımı kolay ve hızlıca yönetir." -#: ../xfce4-about/main.c:155 +#: ../xfce4-about/main.c:166 msgid "Volume Manager" msgstr "Birim Yönetici" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Thunar için çıkarılabilir sürücüleri ve ortamları yönetir." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "Oturum Yöneticisi" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." -msgstr "Oturumunuzu kaydeder ve geri yükler, başlatma, kendiliğinden başlatma ve kapatma işlemlerini gerçekleştirir." +msgstr "" +"Oturumunuzu kaydeder ve geri yükler, başlatma, kendiliğinden başlatma ve " +"kapatma işlemlerini gerçekleştirir." -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "Ayar Sistemi" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Ayarlar Yöneticisi" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "Görünüm, ekran, klavye ve fare ayarlarını yapılandırır." -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Uygulama Bulucu" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "Sisteminizde kurulu uygulamaları hızla bulur ve başlatır." -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Ayar Yardımcısı" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "Ayarlarınızı D-Bus tabanlı yapılandırma sisteminde saklar." -#: ../xfce4-about/main.c:180 +#: ../xfce4-about/main.c:191 msgid "A Menu Library" msgstr "Menü Kitaplığı" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "GLib ve GIO tabanlı freedesktop.org uyumlu menü uygular." -#: ../xfce4-about/main.c:185 +#: ../xfce4-about/main.c:196 msgid "Thumbnails Service" msgstr "Küçük Resim Servisi" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "Küçük resim yönetimi D-Bus belirtimini uygular." -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "Lütfen şuna bakın: " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "Bu listede eksik birileri olduğunu düşünüyorsanız; tereddüt etmeyin ve adresine hata bildirimi gönderin." +msgstr "" +"Bu listede eksik birileri olduğunu düşünüyorsanız; tereddüt etmeyin ve " +" adresine hata bildirimi " +"gönderin." -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Bu yazılıma yardım eden ve emeği geçen herkese teşekkürler!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4'ün kopyalama hakları Olivier Fourdan'a (fourdan@xfce.org) aittir. Farklı bileşenlerin kopyalama hakları ilgili yazarlara aittir." +msgstr "" +"Xfce 4'ün kopyalama hakları Olivier Fourdan'a (fourdan@xfce.org) aittir. " +"Farklı bileşenlerin kopyalama hakları ilgili yazarlara aittir." -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Libxfce4ui, libxfce4util ve exo paketleri, Özgür Yazılım Vakfınca yayımlanan GNU Kısıtlı Genel Kamu Lisansı koşullarında dağıtılmaktadır; Lisansın 2. sürümü veya (isteğe bağlı olarak) daha sonraki bir sürüm." +msgstr "" +"Libxfce4ui, libxfce4util ve exo paketleri, Özgür Yazılım Vakfınca yayımlanan" +" GNU Kısıtlı Genel Kamu Lisansı koşullarında dağıtılmaktadır; Lisansın 2. " +"sürümü veya (isteğe bağlı olarak) daha sonraki bir sürüm." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop ve xfwm4 paketleri, Özgür Yazılım Vakfınca yayımlanan GNU Genel Kamu Lisansı koşullarında dağıtılmaktadır; Lisansın 2. sürümü veya (isteğe bağlı olarak) daha sonraki bir sürüm." +msgstr "" +"Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf," +" xfdesktop ve xfwm4 paketleri, Özgür Yazılım Vakfınca yayımlanan GNU Genel " +"Kamu Lisansı koşullarında dağıtılmaktadır; Lisansın 2. sürümü veya (isteğe " +"bağlı olarak) daha sonraki bir sürüm." -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "Kullanım bilgisi için '%s --help' yazın." -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ başlatılamıyor." -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce geliştirme takımı. Tüm hakları saklıdır." -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Lütfen hataları <%s> adresine bildirin." -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Arayüzün yüklenmesi başarısız oldu" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Ana geliştiriciler" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "Aktif katkıcılar" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "Sunucuların bakımını yapanlar" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Çeviri denetimi" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "Belgelendirme denetimi" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Çevirmenler" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Önceki katkıcılar" @@ -782,52 +845,70 @@ msgid "About the Xfce Desktop Environment" msgstr "Xfce Masaüstü Ortamı Hakkında" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "etiket" +msgid "_Help" +msgstr "_Yardım" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "İS Adı" +msgid "_Close" +msgstr "_Kapat" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Aygıt" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Bellek" +msgid "label" +msgstr "etiket" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "MİB" +msgid "OS Name" +msgstr "İS Adı" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "İS Türü" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce Sürümü" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "Dağıtıcı" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce Sürümü" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK Sürümü" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Çekirdek Sürümü" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "MİB" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Bellek" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Sistem" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce, birlikte tam özellikli masaüstü ortamı sağlayan programlar derlemidir.\nAşağıdaki programlar Xfce çekirdeğinin parçasıdır:" +msgstr "" +"Xfce, birlikte tam özellikli masaüstü ortamı sağlayan programlar derlemidir.\n" +"Aşağıdaki programlar Xfce çekirdeğinin parçasıdır:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -836,48 +917,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce, ayrıca, programcıların masaüstü ortamına uyumlu uygulamalar yaratmasına yardımcı türlü kütüphaneleri sağlayan geliştirme platformudur.\n\nXfce bileşenleri, özgür veya açık kaynak lisansları altında lisanslanır; Uygulamalar için GPL veya BSDL, kütüphaneler için LGPL veya BSDL. Daha çok bilgi için belgelere, kaynak koduna veya Xfce web sitesine (https://www.xfce.org) bakın.\n\nXfce'ye gösterdiğiniz ilgiye teşekkür ederiz.\n\n\t- Xfce Geliştirme Takımı" +msgstr "" +"Xfce, ayrıca, programcıların masaüstü ortamına uyumlu uygulamalar yaratmasına yardımcı türlü kütüphaneleri sağlayan geliştirme platformudur.\n" +"\n" +"Xfce bileşenleri, özgür veya açık kaynak lisansları altında lisanslanır; Uygulamalar için GPL veya BSDL, kütüphaneler için LGPL veya BSDL. Daha çok bilgi için belgelere, kaynak koduna veya Xfce web sitesine (https://www.xfce.org) bakın.\n" +"\n" +"Xfce'ye gösterdiğiniz ilgiye teşekkür ederiz.\n" +"\n" +"\t- Xfce Geliştirme Takımı" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Hakkında" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Geliştiriciler" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Telif Hakkı" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Bilinmeyen" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 bit (32 bit kullanıcı uzamı)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 bit" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 bit" @@ -885,7 +973,7 @@ msgstr "32 bit" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; İnşa Kimliği: %s" @@ -901,6 +989,6 @@ msgstr "\"%s\" adlı dosya bu dizinde var olduğundan dosya eklenmedi." msgid "Failed to migrate the old panel configuration" msgstr "Eski panel yapılandırılmasına geri dönülmesi başarısız oldu" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Xfconf tarafından saklanan ayarları özelleştir" diff --git a/po/ug.po b/po/ug.po index 609422f..e7d5153 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Abduqadir Abliz , 2013 -# Gheyret Kenji , 2013,2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-08-28 07:52+0000\n" -"Last-Translator: Gheyret Kenji \n" -"Language-Team: Uyghur (http://www.transifex.com/xfce/libxfce4ui/language/ug/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Uyghur (https://app.transifex.com/xfce/teams/16840/ug/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,7 +42,7 @@ msgstr "سىز ياردەم بەتلىرى ۋە تەرجىمىلىرى بار ب #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "ۋاز كەچ(_C)" @@ -123,37 +125,34 @@ msgstr "سۆزلىشىش باشقۇرۇش تاللانمىلىرى" msgid "Show session management options" msgstr "سۆزلىشىش باشقۇرۇش تاللانمىلىرىنى كۆرسەت" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "ئەڭگىمە باشقۇرغۇغا باغلىنىش مەغلۇپ بولدى: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "ئەڭگىمە باشقۇرغۇ ئىناۋەتلىك خېرىدار كىملىكىنى قايتۇرمىدى" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "خىزمەت مۇندەرىجىسى «%s» يوق. «%s» نى ھاسىل قىلغاندا ئىشلىتىلمەيدۇ." -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" +msgstr "ھۆججەت ئىسمى بەك ئۇزۇن" + +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" msgstr "" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "" @@ -162,7 +161,9 @@ msgstr "" msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "بۇ قىسقا يول '%s' مەشغۇلات ئۈچۈن ئىشلىتىلگەن. سىز قايسى مەشغۇلاتنى ئىشلىتىسىز؟" +msgstr "" +"بۇ قىسقا يول '%s' مەشغۇلات ئۈچۈن ئىشلىتىلگەن. سىز قايسى مەشغۇلاتنى " +"ئىشلىتىسىز؟" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -193,67 +194,98 @@ msgstr "مەزكۇر تېزلەتمە ‹%s› بۇيرۇقتا ئىشلىتىل msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "بۇ قىسقا يول'%s' مەشغۇلات ئۈچۈن ئىشلىتىلگەن. سىز قايسى مەشغۇلاتنى ئىشلىتىسىز؟" +msgstr "" +"بۇ قىسقا يول'%s' مەشغۇلات ئۈچۈن ئىشلىتىلگەن. سىز قايسى مەشغۇلاتنى " +"ئىشلىتىسىز؟" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "باشقا بىرىكمە كۇنۇپكا ئىشلىتىڭ." -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "بۇ %s بولسا ئاللىقاچان مەزكۇر مەشغۇلاتنى پايلاۋاتىدۇ." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s توقۇنۇشۇپ قالدى" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "مەزكۇر تېزلەتمە باشقا يەردە ئىشلىتىلىۋاتىدۇ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "كۆزنەك باشقۇرغۇچ مەشغۇلات قىسقا يولى" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "مەشغۇلات" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "بۇيرۇق قىسقا يولى" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "بۇيرۇق" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "تېزلەتمە" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "تازىلا" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "بىر كۇنۇپكىنى بېسىڭ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "ھەرپتاختا كىرگۈزۈشىگە ئېرىشەلمىدى." @@ -362,198 +394,214 @@ msgid "Toggle fullscreen" msgstr "پۈتۈن ئېكران شەكلىگە ئالماشتۇر" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "كۆزنەكنى ئۈستىدىكى خىزمەت رايونىغا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "كۆزنەكنى تۆۋەندىكى خىزمەت رايونىغا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "كۆزنەكنى سولدىكى خىزمەت رايونىغا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "كۆزنەكنى ئوڭدىكى خىزمەت رايونىغا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "كۆزنەكنى ئالدىنقى خىزمەت رايونىغا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "كۆزنەكنى كېيىنكى خىزمەت رايونىغا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "كۆزنەكنى خىزمەت رايونى 1 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "كۆزنەكنى خىزمەت رايونى 2 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "كۆزنەكنى خىزمەت رايونى 3 كە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "كۆزنەكنى خىزمەت رايونى 4 كە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "كۆزنەكنى خىزمەت رايونى 5 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "كۆزنەكنى خىزمەت رايونى 6 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "كۆزنەكنى خىزمەت رايونى 7 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "كۆزنەكنى خىزمەت رايونى 8 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "كۆزنەكنى خىزمەت رايونى 1 غا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "كۆزنەكنى خىزمەت رايونى 10 غا يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "كۆزنەكنى خىزمەت رايونى 11 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "كۆزنەكنى خىزمەت رايونى 12 گە يۆتكە" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "ئۈستى تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "ئاستى تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "سول تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "ئوڭ تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "ئۈستەلئۈستىنى كۆرسەت" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "ئۈستىدىكى خىزمەت رايونى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "ئاستىدىكى خىزمەت رايونى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "سولدىكى خىزمەت رايونى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "ئوڭدىكى خىزمەت رايونى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "ئالدىنقى خىزمەت رايونى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "كېيىنكى خىزمەت رايونى" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "خىزمەت رايونى 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "خىزمەت رايونى 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "خىزمەت رايونى 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "خىزمەت رايونى 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "خىزمەت رايونى 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "خىزمەت رايونى 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "خىزمەت رايونى 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "خىزمەت رايونى 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "خىزمەت رايونى 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "خىزمەت رايونى 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "خىزمەت رايونى 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "خىزمەت رايونى 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "خىزمەت رايونى قوش" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "تۇتاش خىزمەت رايونى قوش" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "ئەڭ ئاخىرقى خىزمەت رايونىنى ئۆچۈر" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "ئاكتىپ خىزمەت رايونىنى ئۆچۈر" @@ -569,116 +617,127 @@ msgstr "تارماق ماۋزۇ" msgid "Xfce 4 Widgets" msgstr "بۇ Xfce 4 نىڭ كىچىك ئەپلىرى" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "نەشر ئۇچۇرى" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "GPUs" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "كۆزنەك باشقۇرغۇ" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "كۆزنەكنىڭ ئېكراندىكى جايلاشتۇرۇلۇشىنى بىر تەرەپ قىلىدۇ." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "كۆزنەك" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "ئۈستەلئۈستى باشقۇرغۇچ" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "ھۆججەت باشقۇرغۇ" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "دىسكا باشقۇرغۇ" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "سۆزلىشىش باشقۇرغۇچ" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "سىستېما تەڭشەش" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "تەڭشەك باشقۇرغۇ" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "پروگرامما ئىزدىگۈ" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "تەڭشەك كۆزەتكۈچى" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" -msgstr "مەزكۇر يۇمشاق دېتالغا تۆھپە قوشقان بارلىق كىشىلەرگە تەشەككۈرلەر بولسۇن!" +msgstr "" +"مەزكۇر يۇمشاق دېتالغا تۆھپە قوشقان بارلىق كىشىلەرگە تەشەككۈرلەر بولسۇن!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "نەشر ھوقۇقى Olivier Fourdan (fourdan@xfce.org) غا تەۋە. ئوخشىمىغان بۆلەكلەرنىڭ نەشر ھوقۇقى ئۇلارنىڭ ئاپتورلىرىغا تەۋە." +msgstr "" +"نەشر ھوقۇقى Olivier Fourdan (fourdan@xfce.org) غا تەۋە. ئوخشىمىغان " +"بۆلەكلەرنىڭ نەشر ھوقۇقى ئۇلارنىڭ ئاپتورلىرىغا تەۋە." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " @@ -686,7 +745,7 @@ msgid "" "any later version." msgstr "" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " @@ -695,65 +754,56 @@ msgid "" "version." msgstr "" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "ئىشلىتىش ئۇسۇلى ئۈچۈن '%s --help' نى كىرگۈزۈڭ" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "GTK+ دەسلەپلەشتۈرگىلى بولمىدى." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce ئىجادىيەت گۇرۇپپىسى. نەشر ھوقۇقى ئۆزىمىزگە تەۋە." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "كەمتۈكنى <%s> غا دوكلات قىلىڭ." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "ئارايۈزنى ئوقۇش مەغلۇپ بولدى" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "نەشر %s، تارقاتقۇچى %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "نەشرى %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "ئاساسلىق ئىجادىيەتچىلەر" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "ئاكتىپ تۆھپىكارلار" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "مۇلازىمېتىر مەسئۇللىرى" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "تەرجىمە يېتەكچىسى" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "تەرجىمانلار" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "ئىلگىرىكى تۆھپىكارلار" @@ -774,48 +824,68 @@ msgid "About the Xfce Desktop Environment" msgstr "مەزكۇر ئۈستەلئۈستى مۇھىتى(Xfce) ھەققىدە" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "ئەن" +msgid "_Help" +msgstr "ياردەم(_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "" +msgid "_Close" +msgstr "تاقا(_C)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "ئۈسكۈنە" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "" +msgid "label" +msgstr "ئەن" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" +msgid "OS Name" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" -msgstr "" +msgstr "مەشغۇلات سىستېمىسى" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" +msgid "Distributor" msgstr "" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" -msgstr "" +msgid "Xfce Version" +msgstr "Xfce نەشرى" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "GPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "سىستېما" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,39 +896,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "ھەققىدە" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "تەشەككۈر" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "نەشر ھوقۇقى" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "نامەلۇم" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64 بىت" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32 بىت" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "" @@ -874,6 +959,6 @@ msgstr "" msgid "Failed to migrate the old panel configuration" msgstr "كونا كۆزنەك تەڭشىكى يۆتكەپ كېلىش مەغلۇپ بولدى" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "Xfconf ساقلىغان تەڭشەكلەرنى ئۆزلەشتۈر" diff --git a/po/uk.po b/po/uk.po index ed927d4..ac67b8d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,19 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Dmitry Nikitin , 2008 -# Vasyl Khrystiuk , 2020 -# Yarema aka Knedlyk , 2015-2017,2019 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Ukrainian (http://www.transifex.com/xfce/libxfce4ui/language/uk/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Ukrainian (https://app.transifex.com/xfce/teams/16840/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,7 +28,7 @@ msgstr "Не можу відкрити переглядач для докуме #: ../libxfce4ui/xfce-dialogs.c:265 #, c-format msgid "Do you want to read the %s manual online?" -msgstr "Ви бажаєте переглянути документацію по %s онлайн?" +msgstr "Ви бажаєте переглянути документацію з %s онлайн?" #: ../libxfce4ui/xfce-dialogs.c:267 msgid "Do you want to read the manual online?" @@ -37,11 +38,13 @@ msgstr "Ви бажаєте переглянути документацію он msgid "" "You will be redirected to the documentation website where the help pages are" " maintained and translated." -msgstr "Вас буде скеровано до веб-сторінки з документацією, що містить допомогу і її переклади." +msgstr "" +"Вас буде скеровано на вебсторінку документації, що містить довідку і її " +"переклади." #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "_Скасувати" @@ -73,20 +76,24 @@ msgstr "Скасувати" #: ../libxfce4ui/xfce-dialogs.c:518 msgid "Close window with multiple tabs?" -msgstr "Закрити вікно з декількома вкладками?" +msgstr "Закрити вікно з кількома вкладками?" #: ../libxfce4ui/xfce-dialogs.c:520 msgid "" "This window has multiple tabs open. Closing this window will also close all " "its tabs." -msgstr "Це вікно має декілька відкритих вкладок. Закриття цього вікна призведе до закриття всіх його вкладок." +msgstr "" +"Це вікно має декілька відкритих вкладок. Закриття цього вікна призведе до " +"закриття всіх його вкладок." #: ../libxfce4ui/xfce-dialogs.c:523 #, c-format msgid "" "This window has %d tabs open. Closing this window will also close all its " "tabs." -msgstr "Це вікно має %d відкритих вкладок. Закриття цього вікна призведе до закриття всіх його вкладок." +msgstr "" +"Це вікно має %d відкритих вкладок. Закриття цього вікна призведе до закриття" +" всіх його вкладок." #: ../libxfce4ui/xfce-dialogs.c:529 msgid "Warning" @@ -106,7 +113,7 @@ msgstr "_Не питати надалі" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "Session management client ID" -msgstr "ID клієнта менеджера сесії" +msgstr "ID клієнта керівника сеансу" #: ../libxfce4ui/xfce-sm-client.c:1427 msgid "ID" @@ -114,56 +121,57 @@ msgstr "ІН" #: ../libxfce4ui/xfce-sm-client.c:1428 msgid "Disable session management" -msgstr "Відключення менеджера сесії" +msgstr "Відключення керівника сеансів" #: ../libxfce4ui/xfce-sm-client.c:1438 msgid "Session management options" -msgstr "Властивості менеджера сесії" +msgstr "Параметри керівника сеансів" #: ../libxfce4ui/xfce-sm-client.c:1439 msgid "Show session management options" -msgstr "Показати властивості менеджера сесії" +msgstr "Показати параметри керівника сеансів" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Не вдалось з'єднатись з менеджером сеансів: %s" +msgstr "Не вдалося зʼєднатись з керівником сеансів: %s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" -msgstr "Менеджер сеансів не повернув правильного ІН клієнта" +msgstr "Керівник сеансів не повернув правильного ІН клієнта" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." -msgstr "Робоча тека \"%s\" не існує. Вона не буде використовуватися, поки створюється \"%s\"." - -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "Ім'я файлу не може містити символ розділювача тек" +msgstr "" +"Робоча тека \"%s\" не існує. Вона не використовуватиметься, поки створюється" +" \"%s\"." -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "Ім'я файлу занадто довге" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "Ім'я файлу не може містити символ розділювача тек" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" -msgstr "Ім'я файлу не повинно починатись і закінчуватись пробілами" +msgstr "Ім'я файлу не має починатися і закінчуватися пропусками" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #, c-format msgid "" "This shortcut is already being used for the action '%s'. Which action do you" " want to use?" -msgstr "Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте використати?" +msgstr "" +"Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте" +" використати?" #: ../libxfce4kbd-private/xfce-shortcuts.c:54 #: ../libxfce4kbd-private/xfce-shortcuts.c:57 @@ -187,74 +195,107 @@ msgstr "Зберегти '%s'" msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте використати?" +msgstr "" +"Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте" +" використати?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid "" "This shortcut is already being used by the action '%s'. Which action do you " "want to use?" -msgstr "Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте використати?" +msgstr "" +"Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте" +" використати?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "Будь ласка, використайте іншу комбінацію клавіш" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s вже відповідає за цю дію." -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "Конфліктуючі дії для %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "Цей запускач вже використовується для чогось іншого." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "Редактор Швидких клавіш" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "Поточне скорочення. Клацніть, щоб змінити..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "Очистити швидку клавішу" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "Відновити типову швидку клавішу" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "Ці швидкі клавіші клавіатури вже використовується: '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "Ці швидкі клавіші вже використовується" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" -msgstr "Комбінації клавіш дій віконного менеджера" +msgstr "Комбінації клавіш дій керівника вікон" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "дія" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "Комбінація клавіш для команди" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "команда" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "Комбінація клавіш" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "Очистити" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "" +msgstr "Натисніть клавіші клавіатури, щоб перемкнути %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "" +msgstr "Натисніть клавішу" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "Неможливо захопити клавіатуру." @@ -363,198 +404,214 @@ msgid "Toggle fullscreen" msgstr "Повноекранний режим" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "Перемістити вікно на нижній монітор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "Перемістити вікно на лівий монітор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "Перемістити вікно на правий монітор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "Перемістити вікно на верхній монітор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "Перемістити вікно на верхню робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "Перемістити вікно на нижню робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "Перемістити вікно на ліву робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "Перемістити вікно на праву робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "Перемістити вікно на попередню робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "Перемістити вікно на наступну робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "Перемістити вікно на робочу область 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "Перемістити вікно на робочу область 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "Перемістити вікно на робочу область 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "Перемістити вікно на робочу область 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "Перемістити вікно на робочу область 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "Перемістити вікно на робочу область 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "Перемістити вікно на робочу область 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "Перемістити вікно на робочу область 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "Перемістити вікно на робочу область 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "Перемістити вікно на робочу область 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "Перемістити вікно на робочу область 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "Перемістити вікно на робочу область 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "Перемістити вікно догори" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "Перемістити вікно донизу" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "Перемістити вікно ліворуч" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "Перемістити вікно праворуч" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "Перемістити вікно вверх ліворуч" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "Перемістити вікно вверх праворуч" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "Перемістити вікно вниз ліворуч" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "Перемістити вікно вниз праворуч" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "Показати стільницю" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "Верхня робоча область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "Нижня робоча область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "Ліва робоча область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "Права робоча область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "Попередня робоча область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "Наступна робоча область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "Робоча область 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "Робоча область 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "Робоча область 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "Робоча область 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "Робоча область 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "Робоча область 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "Робоча область 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "Робоча область 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "Робоча область 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "Робоча область 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "Робоча область 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "Робоча область 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "Додати робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "Додати суміжну робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "Видалити останню робочу область" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "Видалити активну робочу область" @@ -570,191 +627,204 @@ msgstr "Підзаголовок" msgid "Xfce 4 Widgets" msgstr "Віджети Xfce 4" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "Інформація про версію" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "ГП" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" -msgstr "Менеджер вікон" +msgstr "Керівник вікон" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." -msgstr "Управляє розміщення вікон на екрані." +msgstr "Управляє розміщенням вікон на екрані." -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "Панель" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" +"Забезпечує місце для кнопок вікон, запускачів, меню програм та іншого." -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" -msgstr "Менеджер стільниці" +msgstr "Керівник стільниці" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." -msgstr "" +msgstr "Налаштовує зображення стільниці, відображення значків тощо." -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" -msgstr "Файловий менеджер" +msgstr "Керівник файлів" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." -msgstr "" +msgstr "Керує вашими файлами в сучасний, легкий і швидкий спосіб." -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "Менеджер розділів" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "Керівник накопичувачів" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." -msgstr "" +msgstr "Керує портативними пристроями і медія для Thunar." -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" -msgstr "Менеджер сесії" +msgstr "Керівник сеансів" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" +"Зберігає і відновлює ваші сеанси, керує запуском, автозавантаженням і " +"вимкненням." -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "Налаштування системи" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "Менеджер параметрів" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." -msgstr "" +msgstr "Налаштовує вигляд, дисплей, клавіятуру і налаштування мишки." -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "Пошук програм" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." -msgstr "" +msgstr "Швидкий пошук і запуск застосунків, що встановлені у вашій системі." -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "Демон властивостей" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." -msgstr "" +msgstr "Зберігає ваші налаштування в конфіґураційній системі на основі D-Bus." -#: ../xfce4-about/main.c:170 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "Бібліотека меню" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." -msgstr "" +msgstr "Реалізує сумісне з freedesktop.org меню на основі GLib та GIO." -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "Сервіс перегляду мініатюр" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "Сервіс ескізів" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." -msgstr "" +msgstr "Реалізує специфікацію D-Bus керування ескізами." -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "Дивіться " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" +"Якщо ви знаєте когось, кого немає в цьому списку; не соромтеся і подайте " +"помилку на ." -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "Дякуємо усім, хто допоміг появитися цій програмі!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Всі права на Xfce 4 належать до Olivier Fourdan (fourdan@xfce.org). Права на різні компоненти належать до відповідних авторам." +msgstr "" +"Всі права на Xfce 4 належать Olivier Fourdan (fourdan@xfce.org). Права на " +"різні компоненти належать відповідним авторам." -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "Пакунки libxfce4ui, libxfcegui4 і exo розповсюджуються згідно умов GNU Library General Public License, виданою Free Software Foundation; або версії 2 цієї ліцензії, або (на Ваш розгляд) будь-якої пізнішої версії." +msgstr "" +"Пакунки libxfce4ui, libxfcegui4 і exo розповсюджуються згідно умов GNU " +"Library General Public License, виданою Free Software Foundation; або версії" +" 2 цієї ліцензії, або (на Ваш розгляд) будь-якої пізнішої версії." -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "Пакунки thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfconf, xfdesktop і xfwm4 розповсюджуються згідно умов GNU Library General Public License, виданою Free Software Foundation; або версії 2 цієї ліцензії, або (на Ваш розгляд) будь-якої пізнішої версії." +msgstr "" +"Пакунки thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings," +" xfconf, xfdesktop і xfwm4 розповсюджуються згідно умов GNU Library General " +"Public License, виданою Free Software Foundation; або версії 2 цієї " +"ліцензії, або (на Ваш розгляд) будь-якої пізнішої версії." -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." -msgstr "Введіть \"%s --help\" для допомоги по використанню." +msgstr "Введіть \"%s --help\" для довідки з використання." -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "Не можу ініціалізувати GTK+." -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Команда розробників Xfce. Всі права застережено." -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "Будь-ласка, повідомте про помилку до <%s>." -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "Неможливо завантажити інтерфейс" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "Версія %s, випущена через %s" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "Версія %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "Основні розробники" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" -msgstr "Активний внесок через" +msgstr "Активний внесок від" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" -msgstr "Сервери під наглядом через" +msgstr "Сервери підтримуються" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "Керівник перекладачів" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "Завідувач документацією" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "Перекладачі" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "Попередні розробники" @@ -764,7 +834,7 @@ msgstr "Про Xfce" #: ../xfce4-about/xfce4-about.desktop.in.h:2 msgid "Information about the Xfce Desktop Environment" -msgstr "Інформація про середовище робочого столу Xfce" +msgstr "Інформація про середовище стільниці Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:1 msgid "License" @@ -772,51 +842,73 @@ msgstr "Ліцензія" #: ../xfce4-about/xfce4-about-dialog.glade.h:2 msgid "About the Xfce Desktop Environment" -msgstr "Про середовище робочого столу Xfce" +msgstr "Про середовище стільниці Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "мітка" +msgid "_Help" +msgstr "_Довідка" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "Ім'я системи" +msgid "_Close" +msgstr "_Закрити" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "Пристрій" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "Пам'ять" +msgid "label" +msgstr "мітка" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "Процесор" +msgid "OS Name" +msgstr "Назва системи" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "Тип системи" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Версія Xfce" +msgid "Distributor" +msgstr "Дистрибʼютор" #: ../xfce4-about/xfce4-about-dialog.glade.h:10 -msgid "Distributor" -msgstr "Дистриб'ютор" +msgid "Xfce Version" +msgstr "Версія Xfce" #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "Версія GTK" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "Версія ядра" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "Процесор" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "Пам'ять" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "Графічний процесор" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "Система" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" +"Xfce це колекція програм, що разом створюють багатофункціональне стільничне\n" +"середовище. Наступні програми є частиною ядра Xfce:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,43 +918,65 @@ msgid "" "\n" "\t- The Xfce Development Team" msgstr "" +"Xfce це також платформа розробки, що надає багато бібліотек, які допомагають програмістам створювати застосунки, які добре вписуються в середовище стільниці.\n" +"\n" +"Компоненти Xfce ліцензуються вільними і відкритими (open source) ліцензіями; GPL або BSDL для застосунків і LGPL або BSDL для бібліотек. Перегляньте документацію, вихідний код або вебсайт Xfce (https://www.xfce.org), щоб дізнатися більше.\n" +"\n" +"Дякуємо за вашу цікавість до Xfce.\n" +"\n" +"\t- Команда розробників Xfce" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "Про" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "Подяки" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "Права застережено" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "Невідомий" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "64-бітна (32-бітний користувацький простір)" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "64-бітна" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "32-бітна" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" -msgstr "%s; IH зборки: %s" +msgstr "%s; IH збірки: %s" #: ../tests/test-ui.c:111 #, c-format @@ -875,6 +989,6 @@ msgstr "Файл з назвою \"%s\" вже існує в цій теці, т msgid "Failed to migrate the old panel configuration" msgstr "Не вдалось провести міграцію старої конфігурації панелі" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" -msgstr "Змінити налаштування, збережені за допомогою Xfconf" +msgstr "Пристосувати налаштування, збережені через Xfconf" diff --git a/po/zh_CN.po b/po/zh_CN.po index 32fef03..8bcb24d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,25 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Chipong Luo , 2011-2012 -# Chris K. Zhang , 2009 -# Dongyu Chu , 2019 -# Hunt Xu , 2009-2010,2012 -# Levi Zhou , 2016 -# Mingcong Bai , 2015-2016 -# Xiaobo Zhou , 2017 -# 玉堂白鹤 , 2015,2017,2019-2020 -# Mingcong Bai , 2015 +# 浩翔 赵 <1637979429@qq.com>, 2023 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-26 12:45+0100\n" -"PO-Revision-Date: 2020-11-29 23:45+0000\n" -"Last-Translator: 玉堂白鹤 \n" -"Language-Team: Chinese (China) (http://www.transifex.com/xfce/libxfce4ui/language/zh_CN/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Chinese (China) (https://app.transifex.com/xfce/teams/16840/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,7 +43,7 @@ msgstr "您将被重定向至维护和翻译帮助文档的网站。" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "取消 (_C)" @@ -70,7 +66,7 @@ msgstr "否" #: ../libxfce4ui/xfce-dialogs.c:455 msgid "Yes" -msgstr "是的" +msgstr "是" #: ../libxfce4ui/xfce-dialogs.c:459 #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 @@ -130,37 +126,34 @@ msgstr "会话管理选项" msgid "Show session management options" msgstr "显示会话管理选项" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "无法与会话管理器连接:%s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "会话管理器未返回一个有效的客户端 ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "工作目录 \"%s\" 不存在。启动 \"%s\" 时不会使用它。" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "文件名中的目录分隔符非法" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "文件名太长" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "文件名中的目录分隔符非法" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "文件名不应以空格开头或结尾" @@ -204,63 +197,92 @@ msgstr "该快捷键已被动作 '%s' 使用。您要使用哪个动作?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "请使用另一组按键组合。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s 已经触发此动作。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "因 %s 冲突的动作" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "其它动作在使用此快捷键。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "快捷键编辑器" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "当前快捷键。点击以编辑..." + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "清除快捷键" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "重置默认快捷键" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "此键盘快捷键正被: '%s'使用" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "键盘快捷键已被使用" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "窗口管理器动作快捷键" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "动作" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "命令快捷键" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "命令" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "快捷键" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "清除" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." -msgstr "按键触发 %s '%s'." +msgstr "按下按键以触发 %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" -msgstr "请按一个键" +msgstr "请按下一个键" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "未能捕获键盘输入。" @@ -369,198 +391,214 @@ msgid "Toggle fullscreen" msgstr "全屏切换" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "将窗口移至下方显示器" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "将窗口移至左侧显示器" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "将窗口移至右侧显示器" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "将窗口移至上方显示器" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "移动窗口至上方工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "移动窗口至下方工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "移动窗口至左边工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "移动窗口至右边工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "移动窗口至上一工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "移动窗口至下一工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "移动窗口至工作区 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "移动窗口至工作区 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "移动窗口至工作区 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "移动窗口至工作区 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "移动窗口至工作区 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "移动窗口至工作区 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "移动窗口至工作区 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "移动窗口至工作区 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "移动窗口至工作区 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "移动窗口至工作区 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "移动窗口至工作区 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "移动窗口至工作区 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "窗口平铺在顶部" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "窗口平铺在底部" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "窗口平铺在左边" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "窗口平铺在右边" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "窗口平铺在左上" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "窗口平铺在右上" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "窗口平铺在左下" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "窗口平铺在右下" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "显示桌面" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "上方工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "下方工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "左边工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "右边工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "上一工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "下一工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "工作区 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "工作区 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "工作区 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "工作区 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "工作区 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "工作区 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "工作区 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "工作区 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "工作区 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "工作区 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "工作区 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "工作区 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "添加工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "添加相邻工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "删除最后一个工作区" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "删除当前工作区" @@ -576,182 +614,196 @@ msgstr "子标题" msgid "Xfce 4 Widgets" msgstr "Xfce 4 控件" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "版本信息" -#: ../xfce4-about/main.c:118 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPUs" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "窗口管理器" -#: ../xfce4-about/main.c:137 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "处理窗口在屏幕上的位置摆放" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "面板" -#: ../xfce4-about/main.c:142 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "为窗口按钮,启动器,应用程序菜单等提供了一个家。" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "桌面管理器" -#: ../xfce4-about/main.c:147 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "设置桌面背景,处理图标等。" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "文件管理器" -#: ../xfce4-about/main.c:152 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "以现代,易用和快速的方式管理文件。" -#: ../xfce4-about/main.c:156 -msgid "Volume manager" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" msgstr "卷管理器" -#: ../xfce4-about/main.c:157 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "Thunar 可移动驱动器和介质管理" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "会话管理器" -#: ../xfce4-about/main.c:162 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "保存和恢复会话,处理启动、自动启动和关闭。" -#: ../xfce4-about/main.c:166 -msgid "Setting System" -msgstr "设置系统" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "设置管理器" -#: ../xfce4-about/main.c:167 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "配置外观、显示、键盘和鼠标设置。" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "应用程序查找器" -#: ../xfce4-about/main.c:172 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "快速查找和启动在您系统上安装的应用程序" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "设置守护进程" -#: ../xfce4-about/main.c:177 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "将您的设置存储在基于 D-Bus 的配置系统中。" -#: ../xfce4-about/main.c:181 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "菜单库" -#: ../xfce4-about/main.c:182 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "实现基于 GLib 和 GIO 的 freedesktop.org 兼容菜单。" -#: ../xfce4-about/main.c:186 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "缩略图服务" -#: ../xfce4-about/main.c:187 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "实现缩略图管理 D-Bus 规范。" -#: ../xfce4-about/main.c:340 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "请参阅 " + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "如果您知道此列表漏掉了某个人,请毫不犹豫地在 上提交缺陷。" +msgstr "" +"如果您知道此列表漏掉了某个人,请毫不犹豫地在 " +"上提交缺陷。" -#: ../xfce4-about/main.c:344 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "感谢所有成就该软件的人们!" -#: ../xfce4-about/main.c:361 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." msgstr "Xfce 4 版权归 Olivier Fourdan(fourdan@xfce.org)所有。不同组件的版权归它们各自的作者所有。" -#: ../xfce4-about/main.c:366 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui、libxfce4util 和 exo 软件包以自由软件基金会发布的 GNU 宽通用公共许可协议第 2 版或按(您可以选择的)更高版本发布。" +msgstr "" +"libxfce4ui、libxfce4util 和 exo 软件包以自由软件基金会发布的 GNU 宽通用公共许可协议第 2 " +"版或按(您可以选择的)更高版本发布。" -#: ../xfce4-about/main.c:373 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "thunar、xfce4-appfinder、xfce4-panel、xfce4-session、xfce4-settings、xfconf、xfdesktop 和 xfwm4 软件包以自由软件基金会发布的 GNU 通用公共许可协议的第 2 版或按(您可以选择的)更高版本发布。" +msgstr "" +"thunar、xfce4-appfinder、xfce4-panel、xfce4-session、xfce4-settings、xfconf、xfdesktop" +" 和 xfwm4 软件包以自由软件基金会发布的 GNU 通用公共许可协议的第 2 版或按(您可以选择的)更高版本发布。" -#: ../xfce4-about/main.c:519 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "输入 '%s --help' 获取用法。" -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "未能初始化 GTK+。" -#: ../xfce4-about/main.c:534 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 开发团队。保留所有权利。" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "请向 <%s> 报告缺陷。" -#: ../xfce4-about/main.c:545 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "无法载入界面" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "核心开发者" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "活跃贡献者" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "服务器维护者" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "翻译管理" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "文档管理" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "翻译者" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "先前的贡献者" @@ -772,52 +824,70 @@ msgid "About the Xfce Desktop Environment" msgstr "关于 Xfce 桌面环境" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "标签" +msgid "_Help" +msgstr "帮助(_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "操作系统名称" +msgid "_Close" +msgstr "关闭(_C)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "设备" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "内存" +msgid "label" +msgstr "标签" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "操作系统名称" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "操作系统类型" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce 版本" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "发行版" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce 版本" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK 版本" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "核心版本" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "内存" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "系统" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce 是一个提供全功能桌面环境的程序集。\n以下程序是 Xfce 核心的部分:" +msgstr "" +"Xfce 是一个提供全功能桌面环境的程序集。\n" +"以下程序是 Xfce 核心的部分:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,48 +896,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce 还是一个开发平台,提供了多个库,可帮助程序员创建与桌面环境相适应的应用程序。\n\nXfce 组件以自由或开源许可协议授权;应用程序以 GPL 或 BSDL,库文件以 LGPL 或BSDL 授权。浏览文档、源代码或 Xfce 站点 (https://www.xfce.org) 以获取详情。\n\n感谢您对 Xfce 的关注。\n\n\t- Xfce 开发团队" +msgstr "" +"Xfce 还是一个开发平台,提供了多个库,可帮助程序员创建与桌面环境相适应的应用程序。\n" +"\n" +"Xfce 组件以自由或开源许可协议授权;应用程序以 GPL 或 BSDL,库文件以 LGPL 或BSDL 授权。浏览文档、源代码或 Xfce 站点 (https://www.xfce.org) 以获取详情。\n" +"\n" +"感谢您对 Xfce 的关注。\n" +"\n" +"\t- Xfce 开发团队" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "关于" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "鸣谢" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "版权" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "未知" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 位 (32 位用户空间)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 位" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 位" @@ -875,7 +952,7 @@ msgstr "32 位" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; 内部版本 ID : %s" @@ -891,6 +968,6 @@ msgstr "名叫%s的文件已经存在于该目录中,未能完成文件的添 msgid "Failed to migrate the old panel configuration" msgstr "无法应用至旧面板配置" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "自定义 Xfconf 存储的设置" diff --git a/po/zh_HK.po b/po/zh_HK.po index c62ae42..c9a844d 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Cheng-Chia Tseng , 2010 -# Ivan , 2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-07 12:45+0200\n" -"PO-Revision-Date: 2020-07-07 10:45+0000\n" -"Last-Translator: Xfce Bot \n" -"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/xfce/libxfce4ui/language/zh_HK/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Chinese (Hong Kong) (https://app.transifex.com/xfce/teams/16840/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,7 +42,7 @@ msgstr "您會被重新引導至我們保存和翻譯說明文件的網站。" #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "取消(_C)" @@ -123,37 +125,34 @@ msgstr "工作階段管理選項" msgid "Show session management options" msgstr "顯示工作階段管理選項" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "未能連接工作階段管理員:%s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "工作階段管理員沒有傳回有效的用戶端 ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:423 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "工作目錄「%s」不存在。當建立「%s」時不會用。" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "非法目錄分隔符在文件名" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "文件名太長" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "非法目錄分隔符在文件名" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "文件名不應以空格開頭或結尾" @@ -197,63 +196,92 @@ msgstr "此捷徑鍵正給動作「%s」使用。您想要使用何動作?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "請使用另一個按鍵組合。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s 已會觸發此動作。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s 的動作發生衝突" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "此捷徑正被其它動作使用。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "視窗管理程式動作捷徑鍵" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "動作" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "指令捷徑鍵" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "指令" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "捷徑鍵" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "清除" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "無法抓取鍵盤。" @@ -362,198 +390,214 @@ msgid "Toggle fullscreen" msgstr "切換全螢幕模式" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "將視窗移至上方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "將視窗移至下方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "將視窗移至左方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "將視窗移至右方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "將視窗移至上一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "將視窗移至下一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "將視窗移至工作區 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "將視窗移至工作區 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "將視窗移至工作區 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "將視窗移至工作區 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "將視窗移至工作區 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "將視窗移至工作區 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "將視窗移至工作區 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "將視窗移至工作區 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "將視窗移至工作區 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "將視窗移至工作區 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "將視窗移至工作區 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "將視窗移至工作區 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "將視窗鋪在頂部" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "將視窗鋪在底部" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "將視窗鋪在左方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "將視窗鋪在右方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "平鋪視窗至左上角" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "平鋪視窗至右上方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "平鋪視窗至左下角" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "平鋪視窗至右下方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "顯示桌面" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "上方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "下方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "左方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "右方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "上一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "下一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "工作區 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "工作區 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "工作區 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "工作區 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "工作區 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "工作區 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "工作區 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "工作區 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "工作區 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "工作區 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "工作區 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "工作區 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "新增工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "加入相鄰工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "刪除最後一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "刪除活動中的工作區" @@ -569,191 +613,193 @@ msgstr "子標題" msgid "Xfce 4 Widgets" msgstr "Xfce 4 器件" -#: ../xfce4-about/main.c:59 +#: ../xfce4-about/main.c:58 msgid "Version information" msgstr "版本資訊" -#: ../xfce4-about/main.c:125 +#: ../xfce4-about/main.c:128 +msgid "GPUs" +msgstr "" + +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "視窗管理員" -#: ../xfce4-about/main.c:126 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "處理如何於螢幕置放視窗。" -#: ../xfce4-about/main.c:130 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "面板" -#: ../xfce4-about/main.c:131 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "視窗管理員" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "檔案管理員" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "" -#: ../xfce4-about/main.c:145 -msgid "Volume manager" -msgstr "儲存裝置管理" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "工作階段管理員" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "" -#: ../xfce4-about/main.c:155 -msgid "Setting System" -msgstr "設定系統" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "設定管理員" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "應用程式協尋器" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "" -#: ../xfce4-about/main.c:165 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "設定幕後程式" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "" -#: ../xfce4-about/main.c:170 -msgid "A menu library" -msgstr "選單庫" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" +msgstr "" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "" -#: ../xfce4-about/main.c:175 -msgid "Thumbnails service" -msgstr "縮圖服務" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" +msgstr "" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "" -#: ../xfce4-about/main.c:329 +#: ../xfce4-about/main.c:251 +msgid "Please see " +msgstr "" + +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." msgstr "" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "感謝所有幫助製作出這個軟件的人!" -#: ../xfce4-about/main.c:350 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." msgstr "Xfce 4 版權所有者為 Olivier Fourdan (fourdan@xfce.org)。不同的部件是由其各自的作者擁有其版權。" -#: ../xfce4-about/main.c:355 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui,libxfce4util和exo軟件包根據自由軟件基金會發布的GNU庫通用公共許可證的條款分發;許可的版本2,或(由您選擇)任何更高的版本。" +msgstr "" +"libxfce4ui,libxfce4util和exo軟件包根據自由軟件基金會發布的GNU庫通用公共許可證的條款分發;許可的版本2,或(由您選擇)任何更高的版本。" -#: ../xfce4-about/main.c:362 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "thunar,xfce4-appfinder,xfce4-panel,xfce4-session,xfce4-settings,xfconf,xfdesktop和xfwm4軟件包是根據自由軟件基金會發布的GNU通用公共許可證的條款分發的; 許可的版本2,或(由您選擇)任何更高的版本。" +msgstr "" +"thunar,xfce4-appfinder,xfce4-panel,xfce4-session,xfce4-settings,xfconf,xfdesktop和xfwm4軟件包是根據自由軟件基金會發布的GNU通用公共許可證的條款分發的;" +" 許可的版本2,或(由您選擇)任何更高的版本。" -#: ../xfce4-about/main.c:509 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "請輸入「%s --help」以瞭解用法資訊。" -#: ../xfce4-about/main.c:515 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "無法初始化 GTK+。" -#: ../xfce4-about/main.c:524 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 開發團隊。保留所有權利。" -#: ../xfce4-about/main.c:525 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "請回報臭蟲至 <%s>。" -#: ../xfce4-about/main.c:535 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "未能載入介面" -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:549 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "版本 %s,透過 %s 散布" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:553 -#, c-format -msgid "Version %s" -msgstr "版本 %s" - #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:128 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "核心開發者" -#: ../xfce4-about/contributors.h:131 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "活躍的開發者" -#: ../xfce4-about/contributors.h:134 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "伺服器維護者:" -#: ../xfce4-about/contributors.h:137 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "翻譯監督" -#: ../xfce4-about/contributors.h:140 +#: ../xfce4-about/contributors.h:156 +msgid "Documentation supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "翻譯者" -#: ../xfce4-about/contributors.h:143 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "之前的貢獻者" @@ -774,48 +820,68 @@ msgid "About the Xfce Desktop Environment" msgstr "關於 Xfce 桌面環境" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "標籤" +msgid "_Help" +msgstr "求助(_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "操作系統名稱" +msgid "_Close" +msgstr "關閉(_C)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "裝置" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "記憶" +msgid "label" +msgstr "標籤" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "操作系統名稱" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "操作系統類型" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce版本" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "發行人" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce版本" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "記憶" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +msgid "GPU" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "系統" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -826,39 +892,54 @@ msgid "" "\t- The Xfce Development Team" msgstr "" -#: ../xfce4-about/xfce4-about-dialog.glade.h:21 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "關於" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "鳴謝" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "版權所有" -#: ../xfce4-about/system-info.c:274 ../xfce4-about/system-info.c:322 +#: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "不詳" +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:658 +msgid "64-bit (32-bit userspace)" +msgstr "" + +#. translators: This is the type of architecture for the OS +#: ../xfce4-about/system-info.c:661 +msgid "64-bit" +msgstr "" + +#: ../xfce4-about/system-info.c:661 +msgid "32-bit" +msgstr "" + #. translators: This is the name of the OS, followed by the build ID, for #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:330 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s;內部版本號: %s" @@ -874,6 +955,6 @@ msgstr "名為 「%s」的文件在此目錄中已經存在,尚未添加文件 msgid "Failed to migrate the old panel configuration" msgstr "未能轉移舊式面板組態" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "自訂 Xfconf 儲存的設定" diff --git a/po/zh_TW.po b/po/zh_TW.po index 11d34ee..a474237 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # # Translators: -# Cheng-Chia Tseng , 2010,2017 -# 黃柏諺 , 2015-2017,2019 -# Walter Cheuk , 2013 -# 黃柏諺 , 2019-2020 +# Xfce Bot , 2023 +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Libxfce4ui\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-20 00:45+0100\n" -"PO-Revision-Date: 2020-12-21 01:38+0000\n" -"Last-Translator: 黃柏諺 \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/xfce/libxfce4ui/language/zh_TW/)\n" +"POT-Creation-Date: 2023-05-30 00:46+0200\n" +"PO-Revision-Date: 2023-02-20 11:56+0000\n" +"Last-Translator: Xfce Bot , 2023\n" +"Language-Team: Chinese (Taiwan) (https://app.transifex.com/xfce/teams/16840/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -42,7 +42,7 @@ msgstr "您會被重新引導至我們保存和翻譯幫助頁面的說明文件 #. Create cancel button #: ../libxfce4ui/xfce-dialogs.c:275 ../libxfce4ui/xfce-dialogs.c:533 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:253 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:256 msgid "_Cancel" msgstr "取消(_C)" @@ -125,37 +125,34 @@ msgstr "工作階段管理選項" msgid "Show session management options" msgstr "顯示工作階段管理選項" -#: ../libxfce4ui/xfce-sm-client.c:1614 +#: ../libxfce4ui/xfce-sm-client.c:1609 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "連接到工作階段管理程式失敗:%s" -#: ../libxfce4ui/xfce-sm-client.c:1620 +#: ../libxfce4ui/xfce-sm-client.c:1615 #, c-format msgid "Session manager did not return a valid client id" msgstr "工作階段管理程式沒有回傳有效的用戶端 ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:400 +#: ../libxfce4ui/xfce-spawn.c:397 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." msgstr "工作目錄「%s」不存在。當建立「%s」時不會被使用。" -#. the string contains a directory separator -#: ../libxfce4ui/xfce-filename-input.c:414 -msgid "Directory separator illegal in file name" -msgstr "檔案名稱中的目錄分隔符號並不合法" - -#. the string is too long -#: ../libxfce4ui/xfce-filename-input.c:422 +#. retrieve the error and warning messages +#: ../libxfce4ui/xfce-filename-input.c:232 msgid "Filename is too long" msgstr "檔案名稱太長" -#. the string starts or ends with whitespace -#. * this does not make the filename invalid, but we warn the user about it -#: ../libxfce4ui/xfce-filename-input.c:430 +#: ../libxfce4ui/xfce-filename-input.c:233 +msgid "Directory separator illegal in file name" +msgstr "檔案名稱中的目錄分隔符號並不合法" + +#: ../libxfce4ui/xfce-filename-input.c:234 msgid "Filenames should not start or end with a space" msgstr "檔案名稱不應以空格開始或結束" @@ -199,63 +196,92 @@ msgstr "「%s」動作已經用了此捷徑鍵。您想要使用何動作?" #. This shortcut already exists in the provider, we don't want it twice #. Warn the user -#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts.c:113 msgid "Please use another key combination." msgstr "請使用另一個按鍵組合。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts.c:114 #, c-format msgid "%s already triggers this action." msgstr "%s 已會觸發此動作。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#: ../libxfce4kbd-private/xfce-shortcuts.c:119 #, c-format msgid "Conflicting actions for %s" msgstr "%s 的動作發生衝突" -#: ../libxfce4kbd-private/xfce-shortcuts.c:178 +#: ../libxfce4kbd-private/xfce-shortcuts.c:181 msgid "This shortcut is already being used for something else." msgstr "此捷徑鍵已經用了。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-editor-dialog.c:131 +msgid "Shortcuts Editor" +msgstr "快捷鍵編輯器" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:380 +msgid "The current shortcut. Click to edit..." +msgstr "目前的快捷鍵。點擊以編輯……" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:391 +msgid "Clear the shortcut" +msgstr "清除快捷鍵" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:401 +msgid "Restore the default shortcut" +msgstr "還原預設快捷鍵" + +#. skip leading slash +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:473 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:562 +#, c-format +msgid "This keyboard shortcut is currently used by: '%s'" +msgstr "這個鍵盤快捷鍵目前被用於:「%s」" + +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:476 +#: ../libxfce4kbd-private/xfce-shortcuts-editor.c:565 +msgid "Keyboard shortcut already in use" +msgstr "鍵盤快捷鍵使用中" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 msgid "Window Manager Action Shortcut" msgstr "視窗管理程式動作捷徑鍵" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:220 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:236 msgid "action" msgstr "動作" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:222 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 msgid "Command Shortcut" msgstr "指令捷徑鍵" #. TRANSLATORS: this string will be used to create an explanation for #. * the user in a following string -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:225 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:228 msgid "command" msgstr "指令" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:230 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:233 msgid "Shortcut" msgstr "捷徑鍵" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:250 msgid "Clear" msgstr "清除" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:270 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:273 #, c-format msgid "Press keyboard keys to trigger the %s '%s'." msgstr "按下鍵盤按鍵以觸發 %s「%s」。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:295 msgid "Please press a key" msgstr "請按下按鍵" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:345 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:350 msgid "Could not grab the keyboard." msgstr "無法抓取鍵盤。" @@ -364,198 +390,214 @@ msgid "Toggle fullscreen" msgstr "切換全螢幕模式" #: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to lower monitor" +msgstr "將視窗移至下方螢幕" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to left monitor" +msgstr "將視窗移至左方螢幕" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to right monitor" +msgstr "將視窗移至右方螢幕" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to upper monitor" +msgstr "將視窗移至上方螢幕" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 msgid "Move window to upper workspace" msgstr "將視窗移至上方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 msgid "Move window to bottom workspace" msgstr "將視窗移至下方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 msgid "Move window to left workspace" msgstr "將視窗移至左方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 msgid "Move window to right workspace" msgstr "將視窗移至右方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 msgid "Move window to previous workspace" msgstr "將視窗移至上一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 msgid "Move window to next workspace" msgstr "將視窗移至下一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 msgid "Move window to workspace 1" msgstr "將視窗移至工作區 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 msgid "Move window to workspace 2" msgstr "將視窗移至工作區 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 msgid "Move window to workspace 3" msgstr "將視窗移至工作區 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 msgid "Move window to workspace 4" msgstr "將視窗移至工作區 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 msgid "Move window to workspace 5" msgstr "將視窗移至工作區 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 msgid "Move window to workspace 6" msgstr "將視窗移至工作區 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 msgid "Move window to workspace 7" msgstr "將視窗移至工作區 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 msgid "Move window to workspace 8" msgstr "將視窗移至工作區 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 msgid "Move window to workspace 9" msgstr "將視窗移至工作區 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 msgid "Move window to workspace 10" msgstr "將視窗移至工作區 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 msgid "Move window to workspace 11" msgstr "將視窗移至工作區 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 msgid "Move window to workspace 12" msgstr "將視窗移至工作區 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 msgid "Tile window to the top" msgstr "將視窗鋪在頂部" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 msgid "Tile window to the bottom" msgstr "將視窗鋪在底部" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 msgid "Tile window to the left" msgstr "將視窗鋪在左方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 msgid "Tile window to the right" msgstr "將視窗鋪在右方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 msgid "Tile window to the top-left" msgstr "將視窗鋪在左上方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 msgid "Tile window to the top-right" msgstr "將視窗鋪在右上方" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 msgid "Tile window to the bottom-left" msgstr "將視窗鋪在左下角" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 msgid "Tile window to the bottom-right" msgstr "將視窗鋪在右下角" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 msgid "Show desktop" msgstr "顯示桌面" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 msgid "Upper workspace" msgstr "上方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 msgid "Bottom workspace" msgstr "下方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 msgid "Left workspace" msgstr "左方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 msgid "Right workspace" msgstr "右方工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 msgid "Previous workspace" msgstr "上一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 msgid "Next workspace" msgstr "下一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 msgid "Workspace 1" msgstr "工作區 1" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 msgid "Workspace 2" msgstr "工作區 2" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 msgid "Workspace 3" msgstr "工作區 3" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 msgid "Workspace 4" msgstr "工作區 4" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 msgid "Workspace 5" msgstr "工作區 5" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 msgid "Workspace 6" msgstr "工作區 6" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 msgid "Workspace 7" msgstr "工作區 7" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 msgid "Workspace 8" msgstr "工作區 8" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 msgid "Workspace 9" msgstr "工作區 9" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 msgid "Workspace 10" msgstr "工作區 10" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 msgid "Workspace 11" msgstr "工作區 11" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 msgid "Workspace 12" msgstr "工作區 12" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:112 msgid "Add workspace" msgstr "新增工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:113 msgid "Add adjacent workspace" msgstr "加入相鄰工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:114 msgid "Delete last workspace" msgstr "刪除最後一個工作區" -#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:115 msgid "Delete active workspace" msgstr "刪除活動中的工作區" @@ -575,186 +617,194 @@ msgstr "Xfce 4 器件" msgid "Version information" msgstr "版本資訊" -#: ../xfce4-about/main.c:117 +#: ../xfce4-about/main.c:128 msgid "GPUs" msgstr "GPU" -#: ../xfce4-about/main.c:135 +#: ../xfce4-about/main.c:146 msgid "Window Manager" msgstr "視窗管理程式" -#: ../xfce4-about/main.c:136 +#: ../xfce4-about/main.c:147 msgid "Handles the placement of windows on the screen." msgstr "處理如何於螢幕置放視窗。" -#: ../xfce4-about/main.c:140 +#: ../xfce4-about/main.c:151 msgid "Panel" msgstr "面板" -#: ../xfce4-about/main.c:141 +#: ../xfce4-about/main.c:152 msgid "Provides a home for window buttons, launchers, app menu and more." msgstr "提供視窗按鈕、啟動器、應用程式選單與更多其他東西的首頁。" -#: ../xfce4-about/main.c:145 +#: ../xfce4-about/main.c:156 msgid "Desktop Manager" msgstr "視窗管理程式" -#: ../xfce4-about/main.c:146 +#: ../xfce4-about/main.c:157 msgid "Sets desktop backgrounds, handles icons and more." msgstr "設定桌面背景、處理圖示與更多。" -#: ../xfce4-about/main.c:150 +#: ../xfce4-about/main.c:161 msgid "File Manager" msgstr "檔案管理員" -#: ../xfce4-about/main.c:151 +#: ../xfce4-about/main.c:162 msgid "Manages your files in a modern, easy-to-use and fast way." msgstr "以現在化、易於使用且快速的方式管理您的檔案。" -#: ../xfce4-about/main.c:155 -msgid "Volume manager" -msgstr "卷冊管理員" +#: ../xfce4-about/main.c:166 +msgid "Volume Manager" +msgstr "儲存裝置管理員" -#: ../xfce4-about/main.c:156 +#: ../xfce4-about/main.c:167 msgid "Manages removable drives and media for Thunar." msgstr "使用 Thunar 管理可移除式磁碟與媒體。" -#: ../xfce4-about/main.c:160 +#: ../xfce4-about/main.c:171 msgid "Session Manager" msgstr "工作階段管理員" -#: ../xfce4-about/main.c:161 +#: ../xfce4-about/main.c:172 msgid "" "Saves and restores your session, handles startup, autostart and shutdown." msgstr "儲存並復原您的工作階段、處理啟動程式、自動啟動與關機。" -#: ../xfce4-about/main.c:165 -msgid "Setting System" -msgstr "設定值系統" +#: ../xfce4-about/main.c:176 +msgid "Settings Manager" +msgstr "設定管理員" -#: ../xfce4-about/main.c:166 +#: ../xfce4-about/main.c:177 msgid "Configures appearance, display, keyboard and mouse settings." msgstr "設定外觀、顯示、鍵盤與滑鼠設定。" -#: ../xfce4-about/main.c:170 +#: ../xfce4-about/main.c:181 msgid "Application Finder" msgstr "應用程式協尋器" -#: ../xfce4-about/main.c:171 +#: ../xfce4-about/main.c:182 msgid "Quickly finds and launches applications installed on your system." msgstr "快速搜尋與啟動安裝自您的系統上的應用程式。" -#: ../xfce4-about/main.c:175 +#: ../xfce4-about/main.c:186 msgid "Settings Daemon" msgstr "設定值幕後程式" -#: ../xfce4-about/main.c:176 +#: ../xfce4-about/main.c:187 msgid "Stores your settings in a D-Bus-based configuration system." msgstr "將您的設定儲存在以 D-Bus 為基礎的設定系統中。" -#: ../xfce4-about/main.c:180 -msgid "A menu library" +#: ../xfce4-about/main.c:191 +msgid "A Menu Library" msgstr "選單函式庫" -#: ../xfce4-about/main.c:181 +#: ../xfce4-about/main.c:192 msgid "Implements a freedesktop.org compliant menu based on GLib and GIO." msgstr "以 GLib 與 GIO 為基礎實作與 freedesktop.org 相容的選單。" -#: ../xfce4-about/main.c:185 -msgid "Thumbnails service" +#: ../xfce4-about/main.c:196 +msgid "Thumbnails Service" msgstr "縮圖服務" -#: ../xfce4-about/main.c:186 +#: ../xfce4-about/main.c:197 msgid "Implements the thumbnail management D-Bus specification." msgstr "實作縮圖管理的 D-Bus 規範。" -#: ../xfce4-about/main.c:240 +#: ../xfce4-about/main.c:251 msgid "Please see " msgstr "請見 " -#: ../xfce4-about/main.c:300 +#: ../xfce4-about/main.c:312 msgid "" "If you know of anyone missing from this list; don't hesitate and file a bug " "on ." -msgstr "若您發現清單中有些人沒有列出來,請不要猶豫在 遞交臭蟲回報。" +msgstr "" +"若您發現清單中有些人沒有列出來,請不要猶豫在 " +"遞交臭蟲回報。" -#: ../xfce4-about/main.c:304 +#: ../xfce4-about/main.c:316 msgid "Thanks to all who helped making this software available!" msgstr "感謝所有幫助製作出這個軟體的人!" -#: ../xfce4-about/main.c:321 +#: ../xfce4-about/main.c:333 msgid "" "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 著作權所有者為 Olivier Fourdan (fourdan@xfce.org)。不同的部件是由其各自的作者擁有其著作權。" +msgstr "" +"Xfce 4 著作權所有者為 Olivier Fourdan (fourdan@xfce.org)。不同的部件是由其各自的作者擁有其著作權。" -#: ../xfce4-about/main.c:326 +#: ../xfce4-about/main.c:338 msgid "" "The libxfce4ui, libxfce4util and exo packages are distributed under the " "terms of the GNU Library General Public License as published by the Free " "Software Foundation; either version 2 of the License, or (at your option) " "any later version." -msgstr "libxfce4ui、libxfce4util 與 exo 套件是基於自由軟體基金會發佈的 GNU Library General Public License 授權條款給予授權;不管是該授權的第 2 版,或(根據您自己選擇)的後續版本都可以。" +msgstr "" +"libxfce4ui、libxfce4util 與 exo 套件是基於自由軟體基金會發佈的 GNU Library General Public " +"License 授權條款給予授權;不管是該授權的第 2 版,或(根據您自己選擇)的後續版本都可以。" -#: ../xfce4-about/main.c:333 +#: ../xfce4-about/main.c:345 msgid "" "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " "xfce4-settings, xfconf, xfdesktop and xfwm4 are distributed under the terms " "of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." -msgstr "thunar、xfce4-appfinder、xfce-panel、xfce4-session、xfce4-settings、xfconf、xfdeskop 與 xfwm4 套件是基於自由軟體基金會發佈的 GNU General Public License 授權條款給予授權;不管是該授權的第 2 版,或(根據您自己選擇)的後續版本都可以。" +msgstr "" +"thunar、xfce4-appfinder、xfce-" +"panel、xfce4-session、xfce4-settings、xfconf、xfdeskop 與 xfwm4 套件是基於自由軟體基金會發佈的 " +"GNU General Public License 授權條款給予授權;不管是該授權的第 2 版,或(根據您自己選擇)的後續版本都可以。" -#: ../xfce4-about/main.c:479 +#: ../xfce4-about/main.c:491 #, c-format msgid "Type '%s --help' for usage information." msgstr "請輸入「%s --help」以瞭解用法資訊。" -#: ../xfce4-about/main.c:485 +#: ../xfce4-about/main.c:497 msgid "Unable to initialize GTK+." msgstr "無法初始化 GTK+。" -#: ../xfce4-about/main.c:494 +#: ../xfce4-about/main.c:506 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 開發團隊。保留所有權利。" -#: ../xfce4-about/main.c:495 +#: ../xfce4-about/main.c:507 #, c-format msgid "Please report bugs to <%s>." msgstr "請回報臭蟲至 <%s>。" -#: ../xfce4-about/main.c:505 +#: ../xfce4-about/main.c:517 msgid "Failed to load interface" msgstr "無法載入介面" #. { N_("Project Lead"), #. xfce_contributors_lead #. }, -#: ../xfce4-about/contributors.h:136 +#: ../xfce4-about/contributors.h:144 msgid "Core developers" msgstr "核心開發者" -#: ../xfce4-about/contributors.h:139 +#: ../xfce4-about/contributors.h:147 msgid "Active contributors" msgstr "活躍的開發者" -#: ../xfce4-about/contributors.h:142 +#: ../xfce4-about/contributors.h:150 msgid "Servers maintained by" msgstr "伺服器維護者" -#: ../xfce4-about/contributors.h:145 +#: ../xfce4-about/contributors.h:153 msgid "Translations supervision" msgstr "翻譯監督" -#: ../xfce4-about/contributors.h:148 +#: ../xfce4-about/contributors.h:156 msgid "Documentation supervision" msgstr "文件監督" -#: ../xfce4-about/contributors.h:151 +#: ../xfce4-about/contributors.h:159 msgid "Translators" msgstr "翻譯者" -#: ../xfce4-about/contributors.h:154 +#: ../xfce4-about/contributors.h:162 msgid "Previous contributors" msgstr "之前的貢獻者" @@ -775,52 +825,70 @@ msgid "About the Xfce Desktop Environment" msgstr "關於 Xfce 桌面環境" #: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "label" -msgstr "標籤" +msgid "_Help" +msgstr "說明(_H)" #: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "OS Name" -msgstr "作業系統名稱" +msgid "_Close" +msgstr "關閉(_C)" #: ../xfce4-about/xfce4-about-dialog.glade.h:5 msgid "Device" msgstr "裝置" #: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "Memory" -msgstr "記憶體" +msgid "label" +msgstr "標籤" #: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "CPU" -msgstr "CPU" +msgid "OS Name" +msgstr "作業系統名稱" #: ../xfce4-about/xfce4-about-dialog.glade.h:8 msgid "OS Type" msgstr "作業系統類型" #: ../xfce4-about/xfce4-about-dialog.glade.h:9 -msgid "Xfce Version" -msgstr "Xfce 版本" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:10 msgid "Distributor" msgstr "散佈者" +#: ../xfce4-about/xfce4-about-dialog.glade.h:10 +msgid "Xfce Version" +msgstr "Xfce 版本" + #: ../xfce4-about/xfce4-about-dialog.glade.h:11 +msgid "GTK Version" +msgstr "GTK 版本" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +msgid "Kernel Version" +msgstr "核心版本" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +msgid "CPU" +msgstr "CPU" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:14 +msgid "Memory" +msgstr "記憶體" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:15 msgid "GPU" msgstr "GPU" -#: ../xfce4-about/xfce4-about-dialog.glade.h:12 +#: ../xfce4-about/xfce4-about-dialog.glade.h:16 msgid "System" msgstr "系統" -#: ../xfce4-about/xfce4-about-dialog.glade.h:13 +#: ../xfce4-about/xfce4-about-dialog.glade.h:17 msgid "" "Xfce is a collection of programs that together provide a full-featured desktop environment.\n" "The following programs are part of the Xfce core:" -msgstr "Xfce 是個程式的集合,這些程式一同提供多功能的桌面環境。\n下列程式為 Xfce 的核心部份:" +msgstr "" +"Xfce 是個程式的集合,這些程式一同提供多功能的桌面環境。\n" +"下列程式為 Xfce 的核心部份:" -#: ../xfce4-about/xfce4-about-dialog.glade.h:15 +#: ../xfce4-about/xfce4-about-dialog.glade.h:19 msgid "" "Xfce is also a development platform providing several libraries that help programmers create applications that fit in well with the desktop environment.\n" "\n" @@ -829,48 +897,55 @@ msgid "" "Thank you for your interest in Xfce.\n" "\n" "\t- The Xfce Development Team" -msgstr "Xfce 也是一個提供許多協助程式設計師建立適於桌面環境使用的應用程式的函式庫之開發平臺。\n\nXfce 元件以自由或開放原始碼的授權條款提供;應用程式使用 GPL 或 BSDL,而函式庫則使用 LGPL 或 BSDL。請見文件、原始碼或 Xfce 網站 (https://www.xfce.org) 以取得更多資訊。\n\n感謝您對 Xfce 的關心。\n\n\t- Xfce 開發團隊" +msgstr "" +"Xfce 也是一個提供許多協助程式設計師建立適於桌面環境使用的應用程式的函式庫之開發平臺。\n" +"\n" +"Xfce 元件以自由或開放原始碼的授權條款提供;應用程式使用 GPL 或 BSDL,而函式庫則使用 LGPL 或 BSDL。請見文件、原始碼或 Xfce 網站 (https://www.xfce.org) 以取得更多資訊。\n" +"\n" +"感謝您對 Xfce 的關心。\n" +"\n" +"\t- Xfce 開發團隊" -#: ../xfce4-about/xfce4-about-dialog.glade.h:22 +#: ../xfce4-about/xfce4-about-dialog.glade.h:26 msgid "About" msgstr "關於" -#: ../xfce4-about/xfce4-about-dialog.glade.h:23 +#: ../xfce4-about/xfce4-about-dialog.glade.h:27 msgid "Credits" msgstr "鳴謝" -#: ../xfce4-about/xfce4-about-dialog.glade.h:24 +#: ../xfce4-about/xfce4-about-dialog.glade.h:28 msgid "GPL" msgstr "GPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:25 +#: ../xfce4-about/xfce4-about-dialog.glade.h:29 msgid "LGPL" msgstr "LGPL" -#: ../xfce4-about/xfce4-about-dialog.glade.h:26 +#: ../xfce4-about/xfce4-about-dialog.glade.h:30 msgid "BSD" msgstr "BSD" -#: ../xfce4-about/xfce4-about-dialog.glade.h:27 +#: ../xfce4-about/xfce4-about-dialog.glade.h:31 msgid "Copyright" msgstr "著作權所有" #: ../xfce4-about/system-info.c:533 ../xfce4-about/system-info.c:555 -#: ../xfce4-about/system-info.c:656 ../xfce4-about/system-info.c:701 +#: ../xfce4-about/system-info.c:673 ../xfce4-about/system-info.c:721 msgid "Unknown" msgstr "未知" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:641 +#: ../xfce4-about/system-info.c:658 msgid "64-bit (32-bit userspace)" msgstr "64 位元(32 位元使用者空間)" #. translators: This is the type of architecture for the OS -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "64-bit" msgstr "64 位元" -#: ../xfce4-about/system-info.c:644 +#: ../xfce4-about/system-info.c:661 msgid "32-bit" msgstr "32 位元" @@ -878,7 +953,7 @@ msgstr "32 位元" #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: ../xfce4-about/system-info.c:709 +#: ../xfce4-about/system-info.c:729 #, c-format msgid "%s; Build ID: %s" msgstr "%s; 組建 ID:%s" @@ -894,6 +969,6 @@ msgstr "名為「%s」的檔案已存在於此目錄中,檔案尚未被加入 msgid "Failed to migrate the old panel configuration" msgstr "遷移舊的面板設定失敗" -#: ../tests/test-ui.c:170 ../tests/test-ui.c:195 +#: ../tests/test-ui.c:172 ../tests/test-ui.c:197 msgid "Customize settings stored by Xfconf" msgstr "自訂由 Xfconf 儲存的設定" diff --git a/test-driver b/test-driver index b8521a4..be73b80 100755 --- a/test-driver +++ b/test-driver @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,11 +42,13 @@ print_usage () { cat <$log_file 2>&1 +# Test script is run here. We create the file first, then append to it, +# to ameliorate tests themselves also writing to the log file. Our tests +# don't, but others can (automake bug#35762). +: >"$log_file" +"$@" >>"$log_file" 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -126,7 +131,7 @@ esac # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file +echo "$res $test_name (exit status: $estatus)" >>"$log_file" # Report outcome to console. echo "${col}${res}${std}: $test_name" diff --git a/tests/Makefile.in b/tests/Makefile.in index 172801d..63216df 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -116,11 +116,11 @@ noinst_PROGRAMS = $(am__EXEEXT_1) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -200,8 +200,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -218,6 +216,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -232,8 +232,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -606,7 +608,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/tests/test-ui.c b/tests/test-ui.c index 162e17d..51f95e9 100644 --- a/tests/test-ui.c +++ b/tests/test-ui.c @@ -160,11 +160,13 @@ show_xfce_titled_dialog_new_with_buttons (GtkButton *button, { GtkWidget *dialog_gtk3; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS dialog_gtk3 = xfce_titled_dialog_new_with_buttons ("Settings Editor (Gtk3)", NULL, GTK_DIALOG_DESTROY_WITH_PARENT, "help-browser", GTK_RESPONSE_HELP, "window-close-symbolic", GTK_RESPONSE_OK, NULL); +G_GNUC_END_IGNORE_DEPRECATIONS xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog_gtk3), _("Customize settings stored by Xfconf")); @@ -213,7 +215,7 @@ show_xfce_gdk_screen_get_active (GtkButton *button, screen = xfce_gdk_screen_get_active (&monitor_num); xfce_dialog_show_info (NULL, NULL, "monitor num: %d of %d", - monitor_num, gdk_screen_get_n_monitors (screen)); + monitor_num, gdk_display_get_n_monitors (gdk_screen_get_display (screen))); } static void diff --git a/xfce4-about/Makefile.in b/xfce4-about/Makefile.in index 717c691..2a08b77 100644 --- a/xfce4-about/Makefile.in +++ b/xfce4-about/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -100,11 +100,11 @@ bin_PROGRAMS = xfce4-about$(EXEEXT) subdir = xfce4-about ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -218,8 +218,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -236,6 +234,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -250,8 +250,10 @@ EPOXY_CFLAGS = @EPOXY_CFLAGS@ EPOXY_LIBS = @EPOXY_LIBS@ EPOXY_REQUIRED_VERSION = @EPOXY_REQUIRED_VERSION@ EPOXY_VERSION = @EPOXY_VERSION@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADEUI2_CATALOGDIR = @GLADEUI2_CATALOGDIR@ GLADEUI2_CFLAGS = @GLADEUI2_CFLAGS@ @@ -722,7 +724,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -766,7 +767,8 @@ installdirs: done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -869,7 +871,7 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ diff --git a/xfce4-about/about-dialog-ui.h b/xfce4-about/about-dialog-ui.h index 7efd36d..731247b 100644 --- a/xfce4-about/about-dialog-ui.h +++ b/xfce4-about/about-dialog-ui.h @@ -656,239 +656,260 @@ static const char xfce_about_dialog_ui[] = "operty>1236TrueFalsecenter128computer6FalseTrue0TrueFalsecenter612TrueFalselabel012TrueFalselabel011TrueFalseFalseOS Name10" - "1" + ">start128computer6FalseTrue0TrueFalsecenter612" + "True" + "FalseFalseDevice10<" + "/property>0<" + "child>TrueFalselabel01" + "0" "TrueFalseFalseD" - "evice100TrueFalse" - "label010TrueFals" - "eFalseMemory106T" - "rueFalselabel016TrueFalseFalseTrueCPU10" - "5" - "FalseO" + "S Name101TrueFalselabel011TrueFal" + "seFalseOS Type102TrueFalselabel015TrueFalseFalseOS " - "Type1" - "02TrueFalse<" - "/property>FalseXfce Version1032TrueFalseFalseDistributor1" "04" - "TrueFalselabel013TrueFalselabel014TrueFalseFalseTruebaselineGPU107T" + ">3T" "rueFalsebaselinelabel0" - "17TrueTrue1label013TrueFalseFalse12Xfce Version104<" + "/child>TrueFalse12label014TrueFalseFalse<" + "/property>GTK Version105TrueFalselab" + "el01" + "5TrueFalseFalseKernel Version10" + "6" + "TrueFalselabel016T" + "rueFalseFalse12CPU107TrueFalse12label017TrueFalseFalseMemory108TrueFalseSystem<" - "/object>False" - "TrueTrue6neverTrueFalsenonelabel018TrueFalse" + "FalseGPU" + "109TrueFalselabel0<" + "/property>1" + "9TrueTrue1TrueFalse" + "SystemFalseTrueTrueneverTrueFalse<" - "property name=\"border_width\">12vertical12<" - "object class=\"GtkImage\">TrueFalse1212128xfce4-log" - "oFalseTrue0TrueFalseXfce is a collectio" - "n of programs that together provide a full-featured desktop environment" - ".\nThe following programs are part of the Xfce core:True0FalseTrue1TrueFals" - "e12vertical12<" - "placeholder/>False<" - "/property>True2<" - "property name=\"visible\">TrueF" - "alseXfce is al" - "so a development platform providing several libraries that help program" - "mers create applications that fit in well with the desktop environment." - "\n\nXfce components are licensed under free or open source licences; GP" - "L or BSDL for applications and LGPL or BSDL for libraries. Look at the " - "documentation, the source code or the Xfce website (<a href=\"https:" - "//www.xfce.org\">https://www.xfce.org</a>) for more informatio" - "n.\n\nThank you for your interest in Xfce.\n\n\t- The Xfce Development " - "TeamTrueTrue0noneTrue<" + "property name=\"can_focus\">False18vertical12" + "True" + "False1212128xfce4-logoFalseT" + "rue0TrueFalseXfce is a collection of programs that togethe" + "r provide a full-featured desktop environment.\nThe following programs " + "are part of the Xfce core:True0FalseTrue" + "1Tru" + "eFalse12vertical<" + "/property>12" + "FalseTrue31TrueFalseAbout1FalseTrueTrue6etched-inTrueTrueFalseword33Falsecredits-buffer" - "2TrueFalse" - "Credits2FalseTrue6etched-inTrue" - "TrueFalseword33Falsevendor-buffer<" - "property name=\"position\">3TrueFalseVendor3False" - "TrueFalseverticalTrue" - "Trueetched-inTrueTrueFa" - "lseword33Falsecopyright-buffer<" - "property name=\"expand\">TrueTrue1TrueFalsecenterTruestartGPLTrueTrueTrue<" - "/property>False<" - "property name=\"fill\">False0LGPL<" - "property name=\"visible\">TrueT" - "rueTrueFalseFalse1BSDTrueTrueTrueFalseFalse2True2T" + "rueFalseXfce is also a development platform p" + "roviding several libraries that help programmers create applications th" + "at fit in well with the desktop environment.\n\nXfce components are lic" + "ensed under free or open source licences; GPL or BSDL for applications " + "and LGPL or BSDL for libraries. Look at the documentation, the source c" + "ode or the Xfce website (<a href=\"https://www.xfce.org\">https:/" + "/www.xfce.org</a>) for more information.\n\nThank you for your in" + "terest in Xfce.\n\n\t- The Xfce Development TeamTrueTrue0FalseTrue24TrueFalseCopyright4FalseTrueTrue1help-button" - "close-button" + "perty name=\"position\">3" + "1TrueFalseAbout1FalseTrueTrueetched-inTrueTrue12False<" + "/property>word33<" + "property name=\"cursor_visible\">Falsecredits-buffer2" + "Tru" + "eFalseCredits2False<" + "/property>Trueetched-inTrueTrue12Falseword33Falsevendor-buffer" + "3True" + "FalseV" + "endor3FalseTrueFalseverticalTrueTrueetched-in<" + "/property>TrueTrue6Falseword33Falsecopyright-buffer" + "TrueTrue1TrueFalsecenter" + "Truestart<" + "object class=\"GtkButton\" id=\"gpl-button\">GPLTrueTrueTrueFalseFalse0LGPLTrueTrueTrue" + "False" + "False1BSDTrueTr" + "ueTrueFalseFalse2FalseTr" + "ue2" + "4TrueFalse" + "Copyright4FalseTrueTrue" + "1help-butto" + "nclose-button" }; -static const unsigned xfce_about_dialog_ui_length = 61082u; +static const unsigned xfce_about_dialog_ui_length = 62515u; diff --git a/xfce4-about/contributors.h b/xfce4-about/contributors.h index 3c9ebb0..2fcfb03 100644 --- a/xfce4-about/contributors.h +++ b/xfce4-about/contributors.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Xfce Development Team + * Copyright (C) 2022 Xfce Development Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,26 +36,31 @@ ContributorGroup; static const ContributorInfo xfce_contributors_core[] = { { "Alexander Schwinn", "alexxcons@xfce.org" }, - { "Ali Abdallah", "ali@xfce.org" }, { "Andre Miranda", "andreldm@xfce.org" }, + { "Brian J. Tarricone", "kelnos@xfce.org" }, + { "Gaël Bonithon", "gael@xfce.org" }, { "Olivier Fourdan", "fourdan@xfce.org" }, { "Romain Bouvier", "skunnyk@alteroot.org" }, - { "Sean Davis", "bluesabre@xfce.org" }, + { "Sergios Anestis Kefalidis", "skefalidis@xfce.org" }, { "Simon Steinbeiß", "simon@xfce.org" }, + { "Theo Linkspfeifer", "lastonestanding@tutanota.com" }, { NULL, NULL} }; static const ContributorInfo xfce_contributors_active[] = { + { "Akbarkhon Variskhanov", "akbarkhon.variskhanov@gmail.com" }, + { "Ali Abdallah", "ali@xfce.org" }, { "Alistair Buxton", "a.j.buxton@gmail.com" }, - { "Gaël Bonithon", "gael@xfce.org" }, - { "Igor", "f2404@yandex.ru" }, - { "Maurizio Galli", "maurizio.galli@gmail.com" }, + { "Arkadiy Illarionov", "qarkai@gmail.com" }, + { "Erkki Moorits", "erkki.moorits@mail.ee" }, + { "Graeme Gott", "graeme@gottcode.org" }, + { "Jan Ziak", "0xe2.0x9a.0x9b@xfce.org" }, { "Landry Breuil", "landry@xfce.org" }, - { "Olivier Duchateau", "duchateau.olivier@gmail.com" }, - { "Theo Linkspfeifer", "lastonestanding@tutanota.com" }, + { "Sean Davis", "bluesabre@xfce.org" }, + { "Stephan Haller", "nomad@froevel.de" }, { "Tony Paulic", "tony.paulic@gmail.com" }, - { "Yves-Alexis Perez", "corsac@debian.org" }, + { "Yongha Hwang", "mshrimp@sogang.ac.kr" }, { NULL, NULL } }; @@ -85,7 +90,6 @@ static const ContributorInfo xfce_contributors_previous[] = { "Benedikt Meurer", "benny@xfce.org" }, { "Bernhard Walle", "bernhard.walle@gmx.de" }, { "Biju Chacko", "botsie@xfce.org" }, - { "Brian J. Tarricone", "kelnos@xfce.org" }, { "Craig Betts", "craig.betts@dfrc.nasa.gov" }, { "Daichi Kawahata", "daichi@xfce.org" }, { "Danny Milosavljevic", "dannym@xfce.org" }, @@ -101,6 +105,7 @@ static const ContributorInfo xfce_contributors_previous[] = { "François Le Clainche", "fleclainche@wanadoo.fr" }, { "Guido Berhoerster", "guido+xfce@berhoerster.name" }, { "Harald Judt", "hjudt@xfce.org" }, + { "Igor", "f2404@yandex.ru" }, { "Jannis Pohlmann", "jannis@xfce.org" }, { "Jasper Huijsmans", "jasper@xfce.org" }, { "Jean-François Wauthy", "pollux@xfce.org" }, @@ -111,10 +116,12 @@ static const ContributorInfo xfce_contributors_previous[] = { "Karsten Luetkewitz", "phrep@plskthx.org" }, { "Lionel Le Folgoc", "mrpouit@gmail.com" }, { "Martin Loschwitz", "madkiss@debian.org" }, + { "Maurizio Galli", "maurizio.galli@gmail.com" }, { "Maximilian Schleiss", "maximilian@xfce.org" }, { "Michael Mosier", "michael@spyonit.com" }, { "Mickaël Graf", "korbinus@xfce.org" }, { "Nick Schermer", "nick@xfce.org" }, + { "Olivier Duchateau", "duchateau.olivier@gmail.com" }, { "Pau Rul·lan Ferragut", "paurullan@bulma.net" }, { "Peter de Ridder", "peter@xfce.org" }, { "Samuel Verstraete", "elangelo@xfce.org" }, @@ -125,6 +132,7 @@ static const ContributorInfo xfce_contributors_previous[] = { "Tobias Henle", "tobias@page23.de" }, { "Viktor Odintsev", "ninetls@xfce.org" }, { "Xavier Maillard", "zedek@fxgsproject.org" }, + { "Yves-Alexis Perez", "corsac@debian.org" }, { NULL, NULL } }; diff --git a/xfce4-about/main.c b/xfce4-about/main.c index 98c615b..3d83c41 100644 --- a/xfce4-about/main.c +++ b/xfce4-about/main.c @@ -71,6 +71,8 @@ xfce_about_system (GtkBuilder *builder) g_autofree char *device_text = NULL; g_autofree char *cpu_text = NULL; g_autofree char *gpu_text = NULL; + g_autofree char *gtk_text = NULL; + g_autofree char *kernel_text = NULL; g_autofree char *memory_text = NULL; g_autofree char *os_name_text = NULL; g_autofree char *os_type_text = NULL; @@ -88,18 +90,27 @@ xfce_about_system (GtkBuilder *builder) os_type_text = get_os_type (); gtk_label_set_text (GTK_LABEL (label), os_type_text ? os_type_text : ""); - label = gtk_builder_get_object (builder, "xfce-version"); - gtk_label_set_text (GTK_LABEL (label), xfce_version_string ()); - label = gtk_builder_get_object (builder, "vendor-info"); vendor_info = gtk_builder_get_object (builder, "vendor-info-label"); #ifdef VENDOR_INFO gtk_label_set_text (GTK_LABEL (label), VENDOR_INFO); + gtk_widget_show (GTK_WIDGET (vendor_info)); #else gtk_widget_hide (GTK_WIDGET (vendor_info)); gtk_widget_hide (GTK_WIDGET (label)); #endif + label = gtk_builder_get_object (builder, "xfce-version"); + gtk_label_set_text (GTK_LABEL (label), xfce_version_string ()); + + label = gtk_builder_get_object (builder, "gtk-version"); + gtk_text = g_strdup_printf ("%d.%d.%d", gtk_get_major_version (), gtk_get_minor_version (), gtk_get_micro_version ()); + gtk_label_set_text (GTK_LABEL (label), gtk_text); + + label = gtk_builder_get_object (builder, "kernel-version"); + kernel_text = get_system_info (KERNEL); + gtk_label_set_text (GTK_LABEL (label), kernel_text ? kernel_text : ""); + label = gtk_builder_get_object (builder, "cpu"); info = glibtop_get_sysinfo (); cpu_text = get_cpu_info (info); @@ -162,7 +173,7 @@ xfce_about_about (GtkWidget *vbox) }, { "xfce4-settings", "org.xfce.settings.manager", - N_("Setting System"), + N_("Settings Manager"), N_("Configures appearance, display, keyboard and mouse settings.") }, { "xfce4-appfinder", @@ -256,6 +267,7 @@ xfce_about_credits (GtkTextBuffer *buffer) g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); title = gtk_text_buffer_create_tag (buffer, "title", + "pixels-below-lines", 6, "scale", 1.1, "weight", PANGO_WEIGHT_BOLD, NULL); @@ -490,7 +502,7 @@ main (gint argc, if (G_UNLIKELY (opt_version)) { g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ()); - g_print ("%s\n", "Copyright (c) 2008-2019"); + g_print ("%s\n", "Copyright (c) 2008-2024"); g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved.")); g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT); g_print ("\n"); diff --git a/xfce4-about/system-info.c b/xfce4-about/system-info.c index baf0940..01b767a 100644 --- a/xfce4-about/system-info.c +++ b/xfce4-about/system-info.c @@ -27,10 +27,7 @@ #include #include -#include #include -#include -#include #include #ifdef HAVE_EPOXY @@ -69,6 +66,7 @@ static const gchar *const arch_64[] = { "aarch64", "amd64", "ia64", + "loongarch64", "ppc64", "sparc64", "x86_64", @@ -89,7 +87,7 @@ prettify_info (const char *info) { "Core[(]TM[)]", "Core\342\204\242"}, { "Atom[(]TM[)]", "Atom\342\204\242"}, { "Gallium .* on (AMD .*)", "\\1"}, - { "(AMD .*) [(].*", "\\1"}, + { "(AMD .*) [(][^)]*[)]", "\\1"}, { "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"}, { "AMD", "AMD\302\256"}, { "GeForce ", "GeForce\302\256 "}, @@ -201,7 +199,7 @@ get_cpu_info (const glibtop_sysinfo *info) /* count duplicates */ for (i = 0; i != info->ncpu; ++i) { - const char * const keys[] = { "model name", "cpu", "Processor" }; + const char * const keys[] = { "model name", "cpu", "Model Name", "Processor" }; char *model; int *count; @@ -326,15 +324,16 @@ get_drm_cards (GList *gpus) { GUdevDevice *parent; const char *property; + char *cleanedup_property; parent = g_udev_device_get_parent (d); property = g_udev_device_get_property (parent, "ID_MODEL_FROM_DATABASE"); - if (property) + if (property && (cleanedup_property = info_cleanup (property)) != NULL) { GPUInfo *const gpu = g_new0 (GPUInfo, 1); - gpu->name = info_cleanup (property); + gpu->name = cleanedup_property; g_strstrip (gpu->name); /* Example GPU names before cleanup: @@ -439,22 +438,23 @@ get_gpu_info (guint *num_gpus) if (glXMakeCurrent (dpy, win, ctx)) { GPUInfo *gpu = g_new0 (GPUInfo, 1); - gchar *renderer; + gchar *renderer, *cleanedup_renderer; gpu->is_default = TRUE; renderer = g_strdup ((const gchar*) glGetString (GL_RENDERER)); - if (renderer) { - gsize length = strlen (renderer); - gchar *renderer_lc = g_ascii_strdown (renderer, length); - gchar *s; - gboolean strip = true; + if (renderer && (cleanedup_renderer = info_cleanup (renderer)) != NULL) + { + gsize length; + gchar *renderer_lc; + gboolean strip = TRUE; - s = info_cleanup (renderer); g_free (renderer); - renderer = s; + renderer = cleanedup_renderer; + length = strlen (renderer); /* Return full renderer string in the following cases: */ + renderer_lc = g_ascii_strdown (renderer, length); strip = strip && !g_str_has_prefix (renderer_lc, "llvmpipe"); strip = strip && !g_str_has_prefix (renderer_lc, "softpipe"); strip = strip && !g_str_has_prefix (renderer_lc, "swr"); @@ -474,8 +474,8 @@ get_gpu_info (guint *num_gpus) } gpu->name = g_strndup (renderer, length); - g_free (renderer); } + g_free (renderer); if (epoxy_has_glx_extension (dpy, 0, "GLX_MESA_query_renderer")) { @@ -559,6 +559,34 @@ get_gpu_info (guint *num_gpus) +/** + * @string: A string which might be quoted with ' or ". + * + * Unquotes the given string if both leading and trailing quotes are present, + * and if the quotes are of the same type (single or double). + * The returned string has to be freed with g_free() when no longer needed. + * + * Return value: A newly-allocated, unquoted string. + */ +static gchar * +unquote_string (const gchar *string) +{ + gint size = 0; + + if ((g_str_has_prefix (string, "\"") && g_str_has_suffix (string, "\"")) + || (g_str_has_prefix (string, "\'") && g_str_has_suffix (string, "\'"))) + { + string += 1; + size -= 1; + } + + size += strlen (string); + + return g_strndup (string, size); +} + + + static GHashTable* get_os_info (void) { @@ -586,7 +614,6 @@ get_os_info (void) if (delimiter != NULL) { - gint size; gchar *key, *value; key = g_strndup (lines[i], delimiter - lines[i]); @@ -594,17 +621,7 @@ get_os_info (void) /* Jump the '=' */ delimiter += strlen ("="); - /* Eventually jump the ' " ' character */ - if (g_str_has_prefix (delimiter, "\"")) - delimiter += strlen ("\""); - - size = strlen (delimiter); - - /* Don't consider the last ' " ' too */ - if (g_str_has_suffix (delimiter, "\"")) - size -= strlen ("\""); - - value = g_strndup (delimiter, size); + value = unquote_string (delimiter); g_hash_table_insert (hashtable, key, value); } @@ -665,6 +682,9 @@ get_system_info (guint infotype) case DEVICE_NAME: result = g_strdup (buffer.nodename); break; + case KERNEL: + result = g_strdup (buffer.release); + break; } return result; diff --git a/xfce4-about/system-info.h b/xfce4-about/system-info.h index a652bf4..c913e3c 100644 --- a/xfce4-about/system-info.h +++ b/xfce4-about/system-info.h @@ -25,7 +25,16 @@ #endif #include + +#if G_GNUC_CHECK_VERSION (4, 6) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wundef" +#endif #include +#if G_GNUC_CHECK_VERSION (4, 6) +#pragma GCC diagnostic pop +#endif + #include @@ -33,8 +42,8 @@ enum { OS_NAME, - ARCH, - DEVICE_NAME + DEVICE_NAME, + KERNEL }; char *get_os_type (void); diff --git a/xfce4-about/xfce4-about-dialog.glade b/xfce4-about/xfce4-about-dialog.glade index 0683df3..527c2e8 100644 --- a/xfce4-about/xfce4-about-dialog.glade +++ b/xfce4-about/xfce4-about-dialog.glade @@ -411,7 +411,7 @@ NO WARRANTY True False - center + start 128 computer 6 @@ -430,7 +430,20 @@ NO WARRANTY 6 12 - + + True + False + False + Device + 1 + + + 0 + 0 + + + + True False label @@ -438,7 +451,20 @@ NO WARRANTY 1 - 2 + 0 + + + + + True + False + False + OS Name + 1 + + + 0 + 1 @@ -458,29 +484,41 @@ NO WARRANTY True False False - OS Name + OS Type 1 0 - 1 + 2 - + + True + False + label + 0 + + + 1 + 2 + + + + True False False - Device + Distributor 1 0 - 0 + 3 - + True False label @@ -488,7 +526,7 @@ NO WARRANTY 1 - 0 + 3 @@ -496,24 +534,26 @@ NO WARRANTY True False False - Memory + 12 + Xfce Version 1 0 - 6 + 4 - + True False + 12 label 0 1 - 6 + 4 @@ -521,8 +561,7 @@ NO WARRANTY True False False - True - CPU + GTK Version 1 @@ -531,7 +570,7 @@ NO WARRANTY - + True False label @@ -547,54 +586,68 @@ NO WARRANTY True False False - OS Type + Kernel Version 1 0 - 2 + 6 - + True - False False - Xfce Version - 1 + label + 0 - 0 - 3 + 1 + 6 - + True False False - Distributor + 12 + CPU 1 0 - 4 + 7 - + True False + 12 label 0 1 - 3 + 7 - + + True + False + False + Memory + 1 + + + 0 + 8 + + + + True False label @@ -602,7 +655,7 @@ NO WARRANTY 1 - 4 + 8 @@ -610,27 +663,24 @@ NO WARRANTY True False False - True - baseline GPU 1 0 - 7 + 9 True False - baseline label 0 1 - 7 + 9 @@ -656,7 +706,6 @@ NO WARRANTY True True - 6 never @@ -667,7 +716,7 @@ NO WARRANTY True False - 12 + 18 vertical 12 @@ -768,12 +817,12 @@ Thank you for your interest in Xfce. True True - 6 etched-in True True + 12 False word 3 @@ -801,12 +850,12 @@ Thank you for your interest in Xfce. True - 6 etched-in True True + 12 False word 3 @@ -845,6 +894,7 @@ Thank you for your interest in Xfce. True True + 6 False word 3