From 75cb08f0b99667ae12e836086396b41a7f7e5acd Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Tue, 8 Jun 2021 20:42:29 -0400 Subject: Migrate from LGPL2 to LGPL2.1. --- COPYING | 216 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 118 insertions(+), 98 deletions(-) diff --git a/COPYING b/COPYING index bf50f20d..4362b491 100644 --- a/COPYING +++ b/COPYING @@ -1,112 +1,125 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 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.] +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] - 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 Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -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. +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs @@ -133,7 +146,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 @@ -255,7 +268,7 @@ distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - 6. As an exception to the Sections above, you may also compile or + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit @@ -282,23 +295,31 @@ of these things: Library will not necessarily be able to recompile the application to use the modified definitions.) - b) Accompany the work with a written offer, valid for at + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. - c) If distribution of the work is made by offering access to copy + d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. - d) Verify that the user has already received a copy of these + e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. @@ -347,7 +368,7 @@ Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to +You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent @@ -390,7 +411,7 @@ excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. +versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. @@ -411,7 +432,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,7 +455,7 @@ 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 @@ -453,19 +474,18 @@ convey the exclusion of warranty; and each file should have at least the Copyright (C) This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + 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 - Library General Public License for more details. + Lesser 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307 USA. + You should have received a copy of the GNU Lesser 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. -- cgit From 0b5313bc006fa0f42f5f522de5b32cf2f77b39ac Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Tue, 8 Jun 2021 20:43:26 -0400 Subject: Remove superfluous MAINTAINERS file. DOAP file contains pertinent information regarding maintainers. Having a separate MAINTAINERS file is duplicitous and may lead to conflicting information. --- MAINTAINERS | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index b33bb87f..00000000 --- a/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -Luis Medinas -E-mail: lmedinas@src.gnome.org -Userid: lmedinas - -Arx Cruz -E-mail: arxcruz@src.gnome.org -Userid: arxcruz -- cgit From ae51b769019ea5e4c32ec6e386f3d2183562c1cb Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Tue, 8 Jun 2021 22:55:49 -0400 Subject: Port build system from autotools to meson. --- Makefile.am | 32 ------------ autogen.sh | 38 -------------- configure.ac | 140 -------------------------------------------------- data/Makefile.am | 23 --------- data/meson.build | 22 ++++++++ help/LINGUAS | 1 + help/Makefile.am | 45 ---------------- help/meson.build | 48 +++++++++++++++++ meson.build | 109 +++++++++++++++++++++++++++++++++++++++ meson_options.txt | 5 ++ meson_post_install.py | 15 ++++++ po/Makevars | 78 ---------------------------- po/POTFILES.skip | 2 - po/meson.build | 4 ++ src/Makefile.am | 57 -------------------- src/main.c | 2 +- src/meson.build | 51 ++++++++++++++++++ src/zenity.h | 10 ---- 18 files changed, 256 insertions(+), 426 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 data/Makefile.am create mode 100644 data/meson.build create mode 100644 help/LINGUAS delete mode 100644 help/Makefile.am create mode 100644 help/meson.build create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 meson_post_install.py delete mode 100644 po/Makevars delete mode 100644 po/POTFILES.skip create mode 100644 po/meson.build delete mode 100644 src/Makefile.am create mode 100644 src/meson.build diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 81ae6a7d..00000000 --- a/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -AM_CPPFLAGS = src - -SUBDIRS = \ - src \ - po \ - data \ - help - -EXTRA_DIST = \ - autogen.sh \ - config.rpath \ - COPYING \ - HACKING \ - ChangeLog \ - NEWS \ - README \ - AUTHORS - -dist-hook: - @if test -d "$(srcdir)/.git"; \ - then \ - echo Creating ChangeLog && \ - ( cd "$(top_srcdir)" && \ - echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ - || ( rm -f ChangeLog.tmp ; \ - echo Failed to generate ChangeLog >&2 ); \ - else \ - echo A git clone is required to generate a ChangeLog >&2; \ - fi diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index d9d12ecf..00000000 --- a/autogen.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -test -n "$srcdir" || srcdir=$(dirname "$0") -test -n "$srcdir" || srcdir=. - -olddir=$(pwd) - -cd $srcdir - -(test -f configure.ac) || { - echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" - exit 1 -} - -# shellcheck disable=SC2016 -PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 - echo "*** If you wish to pass any to it, please specify them on the" >&2 - echo "*** '$0' command line." >&2 - echo "" >&2 -fi - -autoreconf --verbose --force --install || exit 1 - -cd "$olddir" -if [ "$NOCONFIGURE" = "" ]; then - $srcdir/configure "$@" || exit 1 - - if [ "$1" = "--help" ]; then - exit 0 - else - echo "Now type 'make' to compile $PKG_NAME" || exit 1 - fi -else - echo "Skipping configure process." -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 5dccdb07..00000000 --- a/configure.ac +++ /dev/null @@ -1,140 +0,0 @@ -AC_INIT([Zenity],[3.32.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity]) - -AC_PREREQ([2.69]) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SRCDIR([src]) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([1.10 foreign no-dist-gzip dist-xz]) -AM_MAINTAINER_MODE([enable]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -# ******************************* -# Debug -# ******************************* - -AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG]) - -# Check for programs -AC_PROG_CC - -GTK_REQUIRED=3.0.0 - -PKG_CHECK_MODULES([ZENITY],[gtk+-3.0 >= $GTK_REQUIRED glib-2.0]) -AC_SUBST([ZENITY_CFLAGS]) -AC_SUBST([ZENITY_LIBS]) - -dnl ************************* -dnl Check for the GTK+ backend, if it's X11, we -lX11 -dnl ************************* - -zenity_save_cflags="$CFLAGS" -# pull in the CFLAGS to locate gdkconfig.h -CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` -AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -#include - -int main(void) { -#ifndef GDK_WINDOWING_X11 -#error GDK_WINDOWING_X11 not defined -#endif - return 0; -} -])], - GDK_BACKEND_X11=yes, - GDK_BACKEND_X11=no) - -CFLAGS="$zenity_save_cflags" - -if test "x$GDK_BACKEND_X11" = "xyes"; then - PKG_CHECK_MODULES(X, x11) - ZENITY_CFLAGS="$ZENITY_CFLAGS $X_CFLAGS" - ZENITY_LIBS="$ZENITY_LIBS $X_LIBS" -fi - -# ******************************* -# perl check -# ******************************* - -AC_PATH_PROG([PERL],[perl],) - -# ******************************* -# libnotify check -# ******************************* - -LIBNOTIFY_REQUIRED=0.6.1 - -AC_ARG_ENABLE([libnotify], - [AS_HELP_STRING([--enable-libnotify], - [Enable libnotify support])], - [], - [enable_libnotify=yes]) - -if test x$enable_libnotify = xyes; then - PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], - [HAVE_LIBNOTIFY="yes"],[HAVE_LIBNOTIFY="no"]) - AC_SUBST([LIBNOTIFY_CFLAGS]) - AC_SUBST([LIBNOTIFY_LIBS]) - if test "x$HAVE_LIBNOTIFY" = "xyes"; then - AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify is available on this machine]) - fi -fi - -# ******************************* -# webkit check -# ******************************* - -WEBKITGTK_REQUIRED=2.8.1 - -AC_ARG_ENABLE([webkitgtk], - [AS_HELP_STRING([--enable-webkitgtk], - [Enable webkit support])], - [], - [enable_webkitgtk=yes]) - -if test x$enable_webkitgtk = xyes; then - PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0 >= $WEBKITGTK_REQUIRED], - [HAVE_WEBKITGTK="yes"],[HAVE_WEBKITGTK="no"]) - AC_SUBST([WEBKIT_CFLAGS]) - AC_SUBST([WEBKIT_LIBS]) - if test "x$HAVE_WEBKITGTK" = "xyes"; then - AC_DEFINE([HAVE_WEBKITGTK], [1], [webkitgtk is available on this machine]) - fi -fi - - -# ******************************* -# Internationalization -# ******************************* -AM_GNU_GETTEXT_VERSION([0.19.4]) -AM_GNU_GETTEXT([external]) - -GETTEXT_PACKAGE=zenity -AC_SUBST([GETTEXT_PACKAGE]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) - -# ******************************* -# User manual -# ******************************* -YELP_HELP_INIT - -# ******************************* - -AC_SUBST([AM_CPPFLAGS]) -AC_SUBST([AM_CFLAGS]) -AC_SUBST([AM_LDFLAGS]) - -# ******************************* - -AC_CONFIG_FILES([ -Makefile -po/Makefile.in -src/Makefile -src/gdialog -data/Makefile -help/Makefile -]) - -AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index cc185118..00000000 --- a/data/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -clothesdir = $(datadir)/zenity/clothes -clothes_DATA = \ - monk.png \ - gnome-tshirt.png \ - sunglasses.png \ - surfboard.png \ - hawaii-shirt.png - -imagesdir = $(datadir)/zenity -images_DATA = \ - zenity.png \ - zenity-calendar.png \ - zenity-list.png \ - zenity-file.png \ - zenity-progress.png \ - zenity-text.png \ - zenity-scale.png \ - zenity-entry.png \ - zenity-notification.png - -man_MANS = zenity.1 - -EXTRA_DIST = $(images_DATA) $(clothes_DATA) $(man_MANS) diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 00000000..373efcf4 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,22 @@ +install_man('zenity.1') + +install_data( + ['zenity.png', + 'zenity-calendar.png', + 'zenity-list.png', + 'zenity-file.png', + 'zenity-progress.png', + 'zenity-text.png', + 'zenity-scale.png', + 'zenity-entry.png', + 'zenity-notification.png'] + ) + +install_data( + ['monk.png', + 'gnome-tshirt.png', + 'sunglasses.png', + 'surfboard.png', + 'hawaii-shirt.png'], + install_dir: join_paths(zenity_datadir, 'clothes') + ) diff --git a/help/LINGUAS b/help/LINGUAS new file mode 100644 index 00000000..9940fa36 --- /dev/null +++ b/help/LINGUAS @@ -0,0 +1 @@ +bg ca cs da de el en_GB es eu fi fr gl hu ja oc pl pt_BR ru sl sv uk zh_CN diff --git a/help/Makefile.am b/help/Makefile.am deleted file mode 100644 index d7904727..00000000 --- a/help/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -@YELP_HELP_RULES@ - -HELP_ID = zenity - -HELP_MEDIA = \ - figures/zenity-calendar-screenshot.png \ - figures/zenity-colorselection-screenshot.png \ - figures/zenity-entry-screenshot.png \ - figures/zenity-error-screenshot.png \ - figures/zenity-fileselection-screenshot.png \ - figures/zenity-forms-screenshot.png \ - figures/zenity-information-screenshot.png \ - figures/zenity-list-screenshot.png \ - figures/zenity-notification-listen-screenshot.png \ - figures/zenity-notification-screenshot.png \ - figures/zenity-password-screenshot.png \ - figures/zenity-progress-screenshot.png \ - figures/zenity-question-screenshot.png \ - figures/zenity-scale-screenshot.png \ - figures/zenity-text-screenshot.png \ - figures/zenity-warning-screenshot.png - -HELP_FILES = \ - legal.xml \ - calendar.page \ - color-selection.page \ - entry.page \ - error.page \ - file-selection.page \ - forms.page \ - index.page \ - info.page \ - intro.page \ - list.page \ - message.page \ - notification.page \ - password.page \ - progress.page \ - question.page \ - scale.page \ - text.page \ - usage.page \ - warning.page - -HELP_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl hu ja oc pl pt_BR ru sl sv uk zh_CN diff --git a/help/meson.build b/help/meson.build new file mode 100644 index 00000000..cd09412b --- /dev/null +++ b/help/meson.build @@ -0,0 +1,48 @@ +help_pages = [ + 'legal.xml', + 'calendar.page', + 'color-selection.page', + 'entry.page', + 'error.page', + 'file-selection.page', + 'forms.page', + 'index.page', + 'info.page', + 'intro.page', + 'list.page', + 'message.page', + 'notification.page', + 'password.page', + 'progress.page', + 'question.page', + 'scale.page', + 'text.page', + 'usage.page', + 'warning.page' +] + +help_media = [ + 'figures/zenity-calendar-screenshot.png', + 'figures/zenity-colorselection-screenshot.png', + 'figures/zenity-entry-screenshot.png', + 'figures/zenity-error-screenshot.png', + 'figures/zenity-fileselection-screenshot.png', + 'figures/zenity-forms-screenshot.png', + 'figures/zenity-information-screenshot.png', + 'figures/zenity-list-screenshot.png', + 'figures/zenity-notification-listen-screenshot.png', + 'figures/zenity-notification-screenshot.png', + 'figures/zenity-password-screenshot.png', + 'figures/zenity-progress-screenshot.png', + 'figures/zenity-question-screenshot.png', + 'figures/zenity-scale-screenshot.png', + 'figures/zenity-text-screenshot.png', + 'figures/zenity-warning-screenshot.png' +] + +gnome.yelp( + meson.project_name(), + sources: help_pages, + media: help_media, + symlink_media: false +) diff --git a/meson.build b/meson.build new file mode 100644 index 00000000..f65475a0 --- /dev/null +++ b/meson.build @@ -0,0 +1,109 @@ +project('zenity', 'c', + version: '3.34.0', + meson_version: '>=0.53.0', + license: 'LGPL-2.1-or-later' +) + +version_arr = meson.project_version().split('.') +zenity_version_major = version_arr[0].to_int() +zenity_version_minor = version_arr[1] +zenity_version_micro = version_arr[2].to_int() + +zenity_prefix = get_option('prefix') +zenity_bindir = join_paths(zenity_prefix, get_option('bindir')) +zenity_libdir = join_paths(zenity_prefix, get_option('libdir')) +zenity_datadir = join_paths(zenity_prefix, get_option('datadir'), 'zenity') +zenity_localedir = join_paths(zenity_prefix, get_option('localedir')) + +zenity_root_dir = include_directories('.') +zenity_po_dir = join_paths(meson.source_root(), 'po') + +gnome = import('gnome') +i18n = import('i18n') + +cc = meson.get_compiler('c') + +zenity_conf = configuration_data() +zenity_conf.set_quoted('ZENITY_NAME', meson.project_name()) +zenity_conf.set_quoted('ZENITY_VERSION', meson.project_version()) +zenity_conf.set_quoted('ZENITY_STRING', + '@0@ @1@'.format(meson.project_name(), meson.project_version())) +zenity_conf.set_quoted('ZENITY_DATADIR', zenity_datadir) +zenity_conf.set_quoted('ZENITY_LIBDIR', zenity_libdir) +zenity_conf.set_quoted('ZENITY_LOCALE_DIR', zenity_localedir) + +zenity_conf.set('VERSION', 'ZENITY_VERSION') +zenity_conf.set('GETTEXT_PACKAGE', 'ZENITY_NAME') +zenity_conf.set('LOCALEDIR', 'ZENITY_LOCALE_DIR') + +zenity_conf.set('DEBUG', get_option('debug')) + +check_headers = [ + 'sys/types.h', + 'unistd.h', + 'langinfo.h', + 'locale.h' +] + +foreach h : check_headers + cc.has_header(h, required: true) +endforeach + +gtk_dep = dependency('gtk+-3.0', version: '>= 3.0.0') + +# Optional dependencies + +opt_missing_str = ''' +Requested optional @0@ support but library not found. +Please ensure you have any required development libraries installed.''' + +libnotify = dependency('libnotify', version: '>= 0.6.1', required: false) +if get_option('libnotify') + if libnotify.found() + zenity_conf.set('HAVE_LIBNOTIFY', true) + else + error(opt_missing_str.format('libnotify')) + endif +endif + +webkitgtk = dependency('webkit2gtk-4.0', version: '>= 2.8.1', required: false) +if get_option('webkitgtk') + if webkitgtk.found() + zenity_conf.set('HAVE_WEBKITGTK', true) + else + error(opt_missing_str.format('webkitgtk')) + endif +endif + +# link Xlib if we have it. This will likely be removed after gtk4 migration. +x11 = dependency('x11', required: false) + +perl = find_program('perl', required: false) +if perl.found() + zenity_conf.set('PERL', perl.path()) +endif + +configure_file( + output: 'config.h', + configuration: zenity_conf +) + +# Print a summary of options at the end. + +summary({'prefix': zenity_prefix, + 'libdir': zenity_libdir, + 'datadir': zenity_datadir, + 'localedir': zenity_localedir, + }, section: 'Directories') + +summary({'libnotify': get_option('libnotify'), + 'webkitgtk': get_option('webkitgtk'), + 'gdialog script': perl.found(), + }, section: 'Configuration') + +subdir('src') +subdir('data') +subdir('po') +subdir('help') + +meson.add_install_script('meson_post_install.py') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 00000000..b0554fcd --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,5 @@ +option('libnotify', type : 'boolean', value : true, + description : 'enable libnotify for desktop notification support') + +option('webkitgtk', type : 'boolean', value : true, + description : 'enable webkitgtk support') diff --git a/meson_post_install.py b/meson_post_install.py new file mode 100644 index 00000000..2654e49d --- /dev/null +++ b/meson_post_install.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python3 + +import os +import subprocess + +prefix = os.environ.get('MESON_INSTALL_PREFIX', '/usr/local') +datadir = os.path.join(prefix, 'share') + +# Packaging tools define DESTDIR and this isn't needed for them +if 'DESTDIR' not in os.environ: + print('Updating icon cache...') + icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor') + if not os.path.exists(icon_cache_dir): + os.makedirs(icon_cache_dir) + subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir]) diff --git a/po/Makevars b/po/Makevars deleted file mode 100644 index ac406bb9..00000000 --- a/po/Makevars +++ /dev/null @@ -1,78 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = Zenity authors - -# This tells whether or not to prepend "GNU " prefix to the package -# name that gets inserted into the header of the $(DOMAIN).pot file. -# Possible values are "yes", "no", or empty. If it is empty, try to -# detect it automatically by scanning the files in $(top_srcdir) for -# "GNU packagename" string. -PACKAGE_GNU = no - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = https://gitlab.gnome.org/GNOME/zenity/issues - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = - -# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' -# context. Possible values are "yes" and "no". Set this to yes if the -# package uses functions taking also a message context, like pgettext(), or -# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. -USE_MSGCTXT = yes - -# These options get passed to msgmerge. -# Useful options are in particular: -# --previous to keep previous msgids of translated messages, -# --quiet to reduce the verbosity. -MSGMERGE_OPTIONS = - -# These options get passed to msginit. -# If you want to disable line wrapping when writing PO files, add -# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and -# MSGINIT_OPTIONS. -MSGINIT_OPTIONS = - -# This tells whether or not to regenerate a PO file when $(DOMAIN).pot -# has changed. Possible values are "yes" and "no". Set this to no if -# the POT file is checked in the repository and the version control -# program ignores timestamps. -PO_DEPENDS_ON_POT = no - -# This tells whether or not to forcibly update $(DOMAIN).pot and -# regenerate PO files on "make dist". Possible values are "yes" and -# "no". Set this to no if the POT file and PO files are maintained -# externally. -DIST_DEPENDS_ON_UPDATE_PO = no diff --git a/po/POTFILES.skip b/po/POTFILES.skip deleted file mode 100644 index 0fb3682e..00000000 --- a/po/POTFILES.skip +++ /dev/null @@ -1,2 +0,0 @@ -# List of source files that should *not* be translated. -# Please keep this file sorted alphabetically. diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 00000000..66362aa5 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,4 @@ +i18n.gettext( + meson.project_name(), + preset: 'glib' +) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index bcdd2056..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -bin_PROGRAMS = zenity - -bin_SCRIPTS = gdialog - -zenity_SOURCES = \ - about.c \ - calendar.c \ - entry.c \ - fileselection.c \ - main.c \ - msg.c \ - notification.c \ - option.c \ - option.h \ - progress.c \ - scale.c \ - text.c \ - tree.c \ - color.c \ - password.c \ - util.c \ - util.h \ - forms.c \ - zenity.h - -zenity_CPPFLAGS = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DZENITY_DATADIR=\""$(pkgdatadir)"\" \ - $(AM_CPPFLAGS) - -zenity_CFLAGS = \ - $(ZENITY_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(WEBKIT_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CFLAGS) - -zenity_LDFLAGS = \ - $(AM_LDFLAGS) - -zenity_LDADD = \ - $(ZENITY_LIBS) \ - $(LIBNOTIFY_LIBS) \ - $(WEBKIT_LIBS) - -uidir = $(datadir)/zenity - -ui_DATA = \ - zenity.ui - -DISTCLEANFILES= \ - gdialog - -EXTRA_DIST = \ - $(ui_DATA) \ - gdialog \ - gdialog.in diff --git a/src/main.c b/src/main.c index 7f0c2db7..18b2a725 100644 --- a/src/main.c +++ b/src/main.c @@ -43,7 +43,7 @@ main (gint argc, gchar **argv) { setlocale (LC_ALL, ""); #endif - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 00000000..748fe316 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,51 @@ +# for i in `ls *.c`; do echo " '${i}',"; done +zenity_sources = [ + 'about.c', + 'calendar.c', + 'color.c', + 'entry.c', + 'fileselection.c', + 'forms.c', + 'main.c', + 'msg.c', + 'notification.c', + 'option.c', + 'password.c', + 'progress.c', + 'scale.c', + 'text.c', + 'tree.c', + 'util.c' +] + +zenity_deps = [ + gtk_dep, + libnotify, + webkitgtk, + x11 +] + +zenity_c_args = [ + '-DG_LOG_DOMAIN="Zenity"' +] + +zenity = executable( + meson.project_name(), + zenity_sources, + include_directories: zenity_root_dir, + dependencies: zenity_deps, + c_args: zenity_c_args, + install: true +) + +if perl.found() + configure_file( + input: 'gdialog.in', + output: 'gdialog', + configuration: zenity_conf, + install_dir: zenity_bindir, + install: true + ) +endif + +install_data('zenity.ui') diff --git a/src/zenity.h b/src/zenity.h index b86a264d..404eec77 100644 --- a/src/zenity.h +++ b/src/zenity.h @@ -5,7 +5,6 @@ G_BEGIN_DECLS -#ifdef ENABLE_NLS #include #define _(String) dgettext (GETTEXT_PACKAGE, String) #ifdef gettext_noop @@ -13,15 +12,6 @@ G_BEGIN_DECLS #else #define N_(String) (String) #endif -#else /* NLS is disabled */ -#define _(String) (String) -#define N_(String) (String) -#define textdomain(String) (String) -#define gettext(String) (String) -#define dgettext(Domain, String) (String) -#define dcgettext(Domain, String, Type) (String) -#define bindtextdomain(Domain, Directory) (Domain) -#endif typedef struct { gchar *dialog_title; -- cgit From 7e6f48ddeff5a517c36392091c7bcc3dab97f1c2 Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Wed, 9 Jun 2021 20:56:22 -0400 Subject: Change gitlab-ci.yml file to use meson --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50990ec4..2d6e13b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,5 +7,5 @@ build_fedora_33: before_script: - dnf install -y --nogpgcheck $DEPENDENCIES script: - - ./autogen.sh - - make -j + - meson --buildtype=debug build + - ninja -v -C build -- cgit From 57f274f70bf19a40dd9666b0a8bd293f4f95c9f7 Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Wed, 9 Jun 2021 21:09:13 -0400 Subject: gitlab-ci.yml: switch autotools deps for meson --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d6e13b2..7437fd7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - DEPENDENCIES: gettext gettext-devel gcc redhat-rpm-config automake libtool autoconf autoconf-archive git + DEPENDENCIES: gettext gettext-devel gcc redhat-rpm-config meson libtool git gtk3-devel yelp-tools build_fedora_33: -- cgit From d1a5cd3b915a18217c20581aa2d1a4a8c5918a01 Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Wed, 9 Jun 2021 23:14:21 -0400 Subject: meson: disable libnotify and webkitgtk by default --- meson_options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index b0554fcd..7dd5b5a9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,5 @@ -option('libnotify', type : 'boolean', value : true, +option('libnotify', type : 'boolean', value : false, description : 'enable libnotify for desktop notification support') -option('webkitgtk', type : 'boolean', value : true, +option('webkitgtk', type : 'boolean', value : false, description : 'enable webkitgtk support') -- cgit From 8d343b714fa4c0aeaa7e639892159aa0d619f124 Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Mon, 28 Jun 2021 23:17:46 -0400 Subject: meson: bump gtk req. Suppress compiler warning. --- meson.build | 6 +++++- src/text.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f65475a0..20ce5082 100644 --- a/meson.build +++ b/meson.build @@ -49,7 +49,11 @@ foreach h : check_headers cc.has_header(h, required: true) endforeach -gtk_dep = dependency('gtk+-3.0', version: '>= 3.0.0') +gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0') + +# this is the minimum required glib according to the above-mentioned version of gtk +# it's really just being documented here for ease of reference. +glib_dep = dependency('glib-2.0', version: '>= 2.43.4') # Optional dependencies diff --git a/src/text.c b/src/text.c index ffe7b35e..bbfa4212 100644 --- a/src/text.c +++ b/src/text.c @@ -289,11 +289,13 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) { if (text_data->no_wrap) gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (text_data->font) { PangoFontDescription *fontDesc = pango_font_description_from_string (text_data->font); gtk_widget_override_font (GTK_WIDGET (text_view), fontDesc); } +G_GNUC_END_IGNORE_DEPRECATIONS if (text_data->uri) zenity_util_fill_file_buffer (text_buffer, text_data->uri); -- cgit From 5610796889391029f4ad201b7b818a036ca9d2d7 Mon Sep 17 00:00:00 2001 From: Alexey Rubtsov Date: Mon, 28 Jun 2021 10:46:19 +0000 Subject: Update Russian translation --- po/ru.po | 635 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 323 insertions(+), 312 deletions(-) diff --git a/po/ru.po b/po/ru.po index 01782932..41925229 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,21 +13,20 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=zenity&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 15:27+0000\n" -"PO-Revision-Date: 2016-03-17 19:38+0300\n" -"Last-Translator: Yuri Myasoedov \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n" +"POT-Creation-Date: 2020-07-10 08:25+0000\n" +"PO-Revision-Date: 2021-06-27 19:44+0300\n" +"Last-Translator: Alexey Rubtsov \n" "Language-Team: Русский \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Poedit 3.0\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/about.c:63 +#: src/about.c:60 msgid "" "This program 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 " @@ -39,7 +38,7 @@ msgstr "" "Foundation; либо версии 2 этой лицензии, либо (на ваш выбор) любой более " "поздней версии.\n" -#: src/about.c:67 +#: src/about.c:65 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -52,7 +51,7 @@ msgstr "" "ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений " "обратитесь к универсальной общественной лицензии GNU.\n" -#: src/about.c:71 +#: src/about.c:69 msgid "" "You should have received a copy of the GNU Lesser General Public License " "along with this program; if not, write to the Free Software Foundation, " @@ -63,29 +62,43 @@ msgstr "" "адресу Free Software Foundation, Inc.: Franklin Street, Fifth Floor, Boston, " "MA 02110-1301, США." -#: src/about.c:263 +#: src/about.c:260 msgid "translator-credits" msgstr "" -"Ильдар Шайнуров , 2003.\n" -"Леонид Кантер , 2004, 2005, 2006, 2010.\n" -"Юрий Козлов , 2010, 2013.\n" -"Юрий Мясоедов , 2012, 2016.\n" -"Стас Соловей , 2015." +"Станислав Соловей , 2013-2019.\n" +"Юрий Мясоедов , 2014.\n" +"Alexey Rubtsov , 2021" -#: src/about.c:275 +#: src/about.c:277 msgid "Display dialog boxes from shell scripts" msgstr "Программа для создания диалоговых окон из сценариев оболочки" +#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60 +msgid "_OK" +msgstr "_ОК" + +#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57 +msgid "_Cancel" +msgstr "_Отменить" + #: src/main.c:105 msgid "You must specify a dialog type. See 'zenity --help' for details\n" msgstr "" "Укажите тип диалога. См. «zenity --help» для получения подробной информации\n" -#: src/notification.c:51 +#: src/msg.c:38 +msgid "_No" +msgstr "_Нет" + +#: src/msg.c:40 +msgid "_Yes" +msgstr "_Да" + +#: src/notification.c:50 msgid "Could not parse message\n" msgstr "Не удалось разобрать сообщение\n" -#: src/notification.c:140 +#: src/notification.c:132 msgid "" "Invalid value for a boolean typed hint.\n" "Supported values are 'true' or 'false'.\n" @@ -94,388 +107,261 @@ msgstr "" "Возможные значения: «true» или «false».\n" #. (iibiiay) -#: src/notification.c:156 +#: src/notification.c:149 msgid "Unsupported hint. Skipping.\n" msgstr "Неподдерживаемое свойство, пропускается.\n" #. unknown hints -#: src/notification.c:173 +#: src/notification.c:166 msgid "Unknown hint name. Skipping.\n" msgstr "Неизвестное имя свойства, пропускается.\n" -#: src/notification.c:228 +#: src/notification.c:218 msgid "Could not parse command from stdin\n" msgstr "Не удалось разобрать команду из стандартного ввода\n" -#: src/notification.c:326 +#: src/notification.c:318 msgid "Zenity notification" msgstr "Уведомление Zenity" -#: src/password.c:55 -msgid "_Cancel" -msgstr "_Отменить" - -#: src/password.c:58 -msgid "_OK" -msgstr "_ОК" - -#. Checks if username has been passed as a parameter -#: src/password.c:73 -msgid "Type your password" -msgstr "Введите пароль" - -#: src/password.c:76 -msgid "Type your username and password" -msgstr "Введите имя пользователя и пароль" - -#: src/password.c:113 -msgid "Username:" -msgstr "Имя пользователя:" - -#: src/password.c:127 -msgid "Password:" -msgstr "Пароль:" - -#: src/scale.c:57 -msgid "Maximum value must be greater than minimum value.\n" -msgstr "Максимальное значение должно быть больше, чем минимальное.\n" - -#: src/scale.c:64 -msgid "Value out of range.\n" -msgstr "Значение за пределами диапазона.\n" - -#: src/tree.c:376 -msgid "No column titles specified for List dialog.\n" -msgstr "Для диалога со списком не указаны заголовки столбцов.\n" - -#: src/tree.c:382 -msgid "You should use only one List dialog type.\n" -msgstr "Необходимо использовать только один тип диалога «Список».\n" - -#: src/zenity.ui:14 src/zenity.ui:76 -msgid "Adjust the scale value" -msgstr "Изменение значения масштаба" - -#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378 -#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970 -msgid "Cancel" -msgstr "Отменить" - -#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392 -#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798 -#: src/zenity.ui:984 src/zenity.ui:1080 -msgid "OK" -msgstr "ОК" - -#: src/zenity.ui:117 -msgid "Text View" -msgstr "Текстовая область" - -#: src/zenity.ui:231 -msgid "Calendar selection" -msgstr "Выбор даты" - -#: src/zenity.ui:298 -msgid "Select a date from below." -msgstr "Выберите дату." - -#: src/zenity.ui:319 -msgid "C_alendar:" -msgstr "_Календарь:" - -#: src/zenity.ui:361 -msgid "Add a new entry" -msgstr "Добавление нового поля" - -#: src/zenity.ui:428 -msgid "_Enter new text:" -msgstr "_Введите новый текст:" - -#: src/zenity.ui:465 -msgid "Error" -msgstr "Ошибка" - -#: src/zenity.ui:530 -msgid "An error has occurred." -msgstr "Произошла ошибка." - -#: src/zenity.ui:658 -msgid "Forms dialog" -msgstr "Диалог форм" - -#: src/zenity.ui:681 -msgid "Information" -msgstr "Информация" - -#: src/zenity.ui:741 -msgid "All updates are complete." -msgstr "Все обновления завершены." - -#: src/zenity.ui:768 -msgid "Progress" -msgstr "Индикатор выполнения" - -#: src/zenity.ui:831 -msgid "Running..." -msgstr "Выполняется…" - -#: src/zenity.ui:882 -msgid "Question" -msgstr "Вопрос" - -#: src/zenity.ui:929 src/zenity.ui:1126 -msgid "Are you sure you want to proceed?" -msgstr "Уверены, что хотите продолжить?" - -#: src/zenity.ui:953 -msgid "Select items from the list" -msgstr "Выберите элементы из списка" - -#: src/zenity.ui:1015 -msgid "Select items from the list below." -msgstr "Выберите элементы из списка." - -#: src/zenity.ui:1064 -msgid "Warning" -msgstr "Предупреждение" - -#: src/option.c:169 +#: src/option.c:164 msgid "Set the dialog title" msgstr "Установить заголовок диалога" -#: src/option.c:170 +#: src/option.c:165 msgid "TITLE" msgstr "ЗАГОЛОВОК" -#: src/option.c:178 +#: src/option.c:171 msgid "Set the window icon" msgstr "Установить значок диалога" -#: src/option.c:179 +#: src/option.c:172 msgid "ICONPATH" msgstr "ПУТЬ_К_ЗНАЧКУ" -#: src/option.c:187 +#: src/option.c:178 msgid "Set the width" msgstr "Установить ширину" -#: src/option.c:188 +#: src/option.c:179 msgid "WIDTH" msgstr "ШИРИНА" -#: src/option.c:196 +#: src/option.c:185 msgid "Set the height" msgstr "Установить высоту" -#: src/option.c:197 +#: src/option.c:186 msgid "HEIGHT" msgstr "ВЫСОТА" -#: src/option.c:205 +#: src/option.c:192 msgid "Set dialog timeout in seconds" msgstr "Установить задержку диалога в секундах" #. Timeout for closing the dialog -#: src/option.c:207 +#: src/option.c:194 msgid "TIMEOUT" msgstr "ЗАДЕРЖКА" -#: src/option.c:215 +#: src/option.c:200 msgid "Set the label of the OK button" msgstr "Устанавливает метку для кнопки «ОК»" -#: src/option.c:216 src/option.c:225 src/option.c:234 src/option.c:276 -#: src/option.c:336 src/option.c:345 src/option.c:379 src/option.c:437 -#: src/option.c:574 src/option.c:699 src/option.c:717 src/option.c:743 -#: src/option.c:823 src/option.c:917 src/option.c:926 src/option.c:988 -#: src/option.c:1046 src/option.c:1215 +#: src/option.c:201 src/option.c:208 src/option.c:215 src/option.c:245 +#: src/option.c:289 src/option.c:296 src/option.c:319 src/option.c:362 +#: src/option.c:468 src/option.c:565 src/option.c:579 src/option.c:598 +#: src/option.c:658 src/option.c:730 src/option.c:737 src/option.c:786 +#: src/option.c:829 src/option.c:960 msgid "TEXT" msgstr "ТЕКСТ" -#: src/option.c:224 +#: src/option.c:207 msgid "Set the label of the Cancel button" msgstr "Устанавливает метку для кнопки «Отменить»" -#: src/option.c:233 +#: src/option.c:214 msgid "Add an extra button" msgstr "Добавляет дополнительную кнопку" -#: src/option.c:242 +#: src/option.c:221 msgid "Set the modal hint" msgstr "Установить модальное свойство" -#: src/option.c:251 +#: src/option.c:228 msgid "Set the parent window to attach to" msgstr "Установить родительское окно для прикрепления" -#: src/option.c:252 +#: src/option.c:229 msgid "WINDOW" msgstr "ОКНО" -#: src/option.c:266 +#: src/option.c:237 msgid "Display calendar dialog" msgstr "Показать диалог выбора даты" -#: src/option.c:275 src/option.c:335 src/option.c:378 src/option.c:436 -#: src/option.c:573 src/option.c:742 src/option.c:822 src/option.c:987 -#: src/option.c:1045 src/option.c:1214 +#: src/option.c:244 src/option.c:288 src/option.c:318 src/option.c:361 +#: src/option.c:467 src/option.c:597 src/option.c:657 src/option.c:785 +#: src/option.c:828 src/option.c:959 msgid "Set the dialog text" msgstr "Установить текст диалога" -#: src/option.c:284 +#: src/option.c:251 msgid "Set the calendar day" msgstr "Установить день в календаре" -#: src/option.c:285 +#: src/option.c:252 msgid "DAY" msgstr "ДЕНЬ" -#: src/option.c:293 +#: src/option.c:258 msgid "Set the calendar month" msgstr "Установить месяц в календаре" -#: src/option.c:294 +#: src/option.c:259 msgid "MONTH" msgstr "МЕСЯЦ" -#: src/option.c:302 +#: src/option.c:265 msgid "Set the calendar year" msgstr "Установить год в календаре" -#: src/option.c:303 +#: src/option.c:266 msgid "YEAR" msgstr "ГОД" -#: src/option.c:311 src/option.c:1232 +#: src/option.c:272 src/option.c:973 msgid "Set the format for the returned date" msgstr "Установить формат возвращаемой даты" -#: src/option.c:312 src/option.c:1233 +#: src/option.c:273 src/option.c:974 msgid "PATTERN" msgstr "ШАБЛОН" -#: src/option.c:326 +#: src/option.c:281 msgid "Display text entry dialog" msgstr "Показать диалог с полем ввода" -#: src/option.c:344 +#: src/option.c:295 msgid "Set the entry text" msgstr "Установить текст для поля ввода" -#: src/option.c:353 +#: src/option.c:302 msgid "Hide the entry text" msgstr "Скрывать текст в поле ввода" -#: src/option.c:369 +#: src/option.c:311 msgid "Display error dialog" msgstr "Показать диалог для вывода ошибки" -#: src/option.c:387 src/option.c:445 src/option.c:831 src/option.c:996 +#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792 msgid "Set the dialog icon" msgstr "Установить значок диалога" -#: src/option.c:388 src/option.c:446 src/option.c:832 src/option.c:997 +#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793 msgid "ICON-NAME" msgstr "ИМЯ_ЗНАЧКА" -#: src/option.c:396 src/option.c:454 src/option.c:840 src/option.c:1005 +#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799 msgid "Do not enable text wrapping" msgstr "Запретить перенос текста" -#: src/option.c:405 src/option.c:463 src/option.c:849 src/option.c:1014 +#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806 msgid "Do not enable Pango markup" msgstr "Не включать разметку Pango" -#: src/option.c:413 src/option.c:471 src/option.c:866 src/option.c:1022 +#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812 msgid "" "Enable ellipsizing in the dialog text. This fixes the high window size with " "long texts" msgstr "" "Включить усечение текста в диалогах. Это функция уменьшает размер окна с " -"длинным текстом." +"длинным текстом" -#: src/option.c:427 +#: src/option.c:354 msgid "Display info dialog" msgstr "Показать диалог для вывода информации" -#: src/option.c:485 +#: src/option.c:398 msgid "Display file selection dialog" msgstr "Показать диалог выбора файлов" -#: src/option.c:494 +#: src/option.c:405 msgid "Set the filename" msgstr "Установить имя файла" -#: src/option.c:495 src/option.c:899 +#: src/option.c:406 src/option.c:716 msgid "FILENAME" msgstr "ИМЯ_ФАЙЛА" -#: src/option.c:503 +#: src/option.c:412 msgid "Allow multiple files to be selected" msgstr "Разрешить выбор нескольких файлов" -#: src/option.c:512 +#: src/option.c:419 msgid "Activate directory-only selection" msgstr "Включить выделение только по каталогам" -#: src/option.c:521 +#: src/option.c:426 msgid "Activate save mode" msgstr "Включить безопасный режим" -#: src/option.c:530 src/option.c:618 src/option.c:1223 +#: src/option.c:433 src/option.c:502 src/option.c:966 msgid "Set output separator character" msgstr "Установить выходной разделяющий символ" -#: src/option.c:531 src/option.c:619 src/option.c:1224 +#: src/option.c:434 src/option.c:503 src/option.c:967 msgid "SEPARATOR" msgstr "РАЗДЕЛИТЕЛЬ" -#: src/option.c:539 +#: src/option.c:440 msgid "Confirm file selection if filename already exists" msgstr "Подтверждать выбор файла, если имя файла уже существует" -#: src/option.c:548 +#: src/option.c:448 msgid "Set a filename filter" msgstr "Устанавливает фильтр имён файлов" -#. Help for file-filter argument (name and patterns for file selection) -#: src/option.c:550 +#. Help for file-filter argument (name and patterns for file +#. selection) +#: src/option.c:451 msgid "NAME | PATTERN1 PATTERN2 ..." msgstr "ИМЯ или ШАБЛОН1 ШАБЛОН2 …" -#: src/option.c:564 +#: src/option.c:460 msgid "Display list dialog" msgstr "Показать диалог со списком" -#: src/option.c:582 +#: src/option.c:474 msgid "Set the column header" msgstr "Установить заголовок столбца" -#: src/option.c:583 +#: src/option.c:475 msgid "COLUMN" msgstr "СТОЛБЕЦ" -#: src/option.c:591 +#: src/option.c:481 msgid "Use check boxes for the first column" msgstr "Использовать флажки для первого столбца" -#: src/option.c:600 +#: src/option.c:488 msgid "Use radio buttons for the first column" msgstr "Использовать переключатели для первого столбца" -#: src/option.c:609 +#: src/option.c:495 msgid "Use an image for the first column" msgstr "Использовать изображение для первого столбца" -#: src/option.c:627 +#: src/option.c:509 msgid "Allow multiple rows to be selected" msgstr "Разрешить выбор нескольких строк" -#: src/option.c:636 src/option.c:907 +#: src/option.c:516 src/option.c:722 msgid "Allow changes to text" msgstr "Разрешить изменять текст" -#: src/option.c:645 +#: src/option.c:523 msgid "" "Print a specific column (Default is 1. 'ALL' can be used to print all " "columns)" @@ -483,19 +369,19 @@ msgstr "" "Показать указанный столбец (по умолчанию — 1-й; «ALL» — показать все столбцы)" #. Column index number to print out on a list dialog -#: src/option.c:647 src/option.c:656 +#: src/option.c:526 src/option.c:533 msgid "NUMBER" msgstr "ЧИСЛО" -#: src/option.c:655 +#: src/option.c:532 msgid "Hide a specific column" msgstr "Скрыть указанный столбец" -#: src/option.c:664 +#: src/option.c:539 msgid "Hide the column headers" msgstr "Скрыть заголовки столбцов" -#: src/option.c:673 +#: src/option.c:546 msgid "" "Change list default search function searching for text in the middle, not on " "the beginning" @@ -503,89 +389,89 @@ msgstr "" "Изменить функцию поисковой системы списка для поиска текста в середине, а не " "в начале" -#: src/option.c:689 +#: src/option.c:557 msgid "Display notification" msgstr "Показать диалог уведомления" -#: src/option.c:698 +#: src/option.c:564 msgid "Set the notification text" msgstr "Установить текст уведомления" -#: src/option.c:707 +#: src/option.c:571 msgid "Listen for commands on stdin" msgstr "Выполнять команды со стандартного ввода" -#: src/option.c:716 +#: src/option.c:578 msgid "Set the notification hints" msgstr "Установить свойства уведомления" -#: src/option.c:733 +#: src/option.c:590 msgid "Display progress indication dialog" msgstr "Показать диалог выполнения процесса" -#: src/option.c:751 +#: src/option.c:604 msgid "Set initial percentage" msgstr "Указать начальный процент" -#: src/option.c:752 +#: src/option.c:605 msgid "PERCENTAGE" msgstr "ПРОЦЕНТЫ" -#: src/option.c:760 +#: src/option.c:611 msgid "Pulsate progress bar" msgstr "Пульсирующий индикатор выполнения" -#: src/option.c:770 +#: src/option.c:619 #, no-c-format msgid "Dismiss the dialog when 100% has been reached" msgstr "Закрыть диалог при достижении 100%" -#: src/option.c:779 +#: src/option.c:626 msgid "Kill parent process if Cancel button is pressed" msgstr "Завершить родительский процесс, если нажата кнопка «Отменить»" -#: src/option.c:788 +#: src/option.c:633 msgid "Hide Cancel button" msgstr "Скрыть кнопку «Отменить»" -#: src/option.c:798 +#: src/option.c:641 #, no-c-format msgid "Estimate when progress will reach 100%" msgstr "Расчётное время, когда прогресс достигнет 100%" -#: src/option.c:813 +#: src/option.c:650 msgid "Display question dialog" msgstr "Показать диалог с вопросом" -#: src/option.c:857 +#: src/option.c:684 msgid "Give Cancel button focus by default" msgstr "Фокус по умолчанию находится на кнопке «Отменить»" -#: src/option.c:874 +#: src/option.c:698 msgid "Suppress OK and Cancel buttons" msgstr "Скрыть кнопки «ОК» и «Отменить»" -#: src/option.c:889 +#: src/option.c:708 msgid "Display text information dialog" msgstr "Показать диалог с текстовой информацией" -#: src/option.c:898 +#: src/option.c:715 msgid "Open file" msgstr "Открыть файл" -#: src/option.c:916 +#: src/option.c:729 msgid "Set the text font" msgstr "Установить шрифт текста" -#: src/option.c:925 +#: src/option.c:736 msgid "Enable an I read and agree checkbox" msgstr "Включить кнопку с флагом «Я прочитал(а) и согласен(на)»" -#: src/option.c:935 +#: src/option.c:744 msgid "Enable HTML support" msgstr "Включить поддержку HTML" -#: src/option.c:944 +#: src/option.c:751 msgid "" "Do not enable user interaction with the WebView. Only works if you use --" "html option" @@ -593,293 +479,418 @@ msgstr "" "Запретить взаимодействие пользователя с WebView. Работает только с " "параметром --html" -#: src/option.c:953 +#: src/option.c:759 msgid "Set an URL instead of a file. Only works if you use --html option" msgstr "Устанавливает вместо файла URL. Работает только с параметром --html" -#: src/option.c:954 +#: src/option.c:761 msgid "URL" msgstr "URL" -#: src/option.c:963 +#: src/option.c:768 msgid "Auto scroll the text to the end. Only when text is captured from stdin" msgstr "" "Автоматически прокручивать текст до конца. Только когда текст захвачен из " "стандартного ввода" -#: src/option.c:978 +#: src/option.c:778 msgid "Display warning dialog" msgstr "Показать диалог с предупреждением" -#: src/option.c:1036 +#: src/option.c:821 msgid "Display scale dialog" msgstr "Показать диалог масштаба" -#: src/option.c:1054 +#: src/option.c:835 msgid "Set initial value" msgstr "Установить начальное значение" -#: src/option.c:1055 src/option.c:1064 src/option.c:1073 src/option.c:1082 -#: src/option.c:1281 +#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857 +#: src/option.c:1008 msgid "VALUE" msgstr "ЗНАЧЕНИЕ" -#: src/option.c:1063 +#: src/option.c:842 msgid "Set minimum value" msgstr "Установить минимальное значение" -#: src/option.c:1072 +#: src/option.c:849 msgid "Set maximum value" msgstr "Установить максимальное значение" -#: src/option.c:1081 +#: src/option.c:856 msgid "Set step size" msgstr "Установить шаг" -#: src/option.c:1090 +#: src/option.c:863 msgid "Print partial values" msgstr "Печатать частичные значения" -#: src/option.c:1099 +#: src/option.c:870 msgid "Hide value" msgstr "Скрыть величину" -#: src/option.c:1114 +#: src/option.c:879 msgid "Display forms dialog" msgstr "Показать диалог форм" -#: src/option.c:1123 +#: src/option.c:886 msgid "Add a new Entry in forms dialog" msgstr "Добавить новое поле в диалог форм" -#: src/option.c:1124 src/option.c:1133 +#: src/option.c:887 src/option.c:894 msgid "Field name" msgstr "Название поля" -#: src/option.c:1132 +#: src/option.c:893 msgid "Add a new Password Entry in forms dialog" msgstr "Добавить новое поле с паролем в диалог форм" -#: src/option.c:1141 +#: src/option.c:900 msgid "Add a new Calendar in forms dialog" msgstr "Добавить новый календарь в диалог форм" -#: src/option.c:1142 +#: src/option.c:901 msgid "Calendar field name" msgstr "Название поле календаря" -#: src/option.c:1150 +#: src/option.c:907 msgid "Add a new List in forms dialog" msgstr "Добавить новый список в диалог форм" -#: src/option.c:1151 +#: src/option.c:908 msgid "List field and header name" msgstr "Поле списка и название заголовка" -#: src/option.c:1159 +#: src/option.c:914 msgid "List of values for List" msgstr "Список значений для списка" -#: src/option.c:1160 src/option.c:1169 src/option.c:1187 +#: src/option.c:915 src/option.c:922 src/option.c:936 msgid "List of values separated by |" msgstr "Список значений, разделённых «|»" -#: src/option.c:1168 +#: src/option.c:921 msgid "List of values for columns" msgstr "Список значений для столбцов" -#: src/option.c:1177 +#: src/option.c:928 msgid "Add a new combo box in forms dialog" msgstr "Добавить новый выпадающий список в диалог форм" -#: src/option.c:1178 +#: src/option.c:929 msgid "Combo box field name" msgstr "Название поле выпадающего списка" -#: src/option.c:1186 +#: src/option.c:935 msgid "List of values for combo box" msgstr "Список значений для выпадающего списка" -#: src/option.c:1205 +#: src/option.c:952 msgid "Show the columns header" msgstr "Показать заголовок столбцов" -#: src/option.c:1247 +#: src/option.c:983 msgid "Display password dialog" msgstr "Показать диалог пароля" -#: src/option.c:1256 +#: src/option.c:990 msgid "Display the username option" msgstr "Показать параметр имени пользователя" -#: src/option.c:1271 +#: src/option.c:1000 msgid "Display color selection dialog" msgstr "Показать диалог выбора цвета" -#: src/option.c:1280 +#: src/option.c:1007 msgid "Set the color" msgstr "Установить цвет" -#: src/option.c:1289 +#: src/option.c:1014 msgid "Show the palette" msgstr "Показать палитру цветов" -#: src/option.c:1304 +#: src/option.c:1023 msgid "About zenity" msgstr "О программе zenity" -#: src/option.c:1313 +#: src/option.c:1030 msgid "Print version" msgstr "Вывести версию" -#: src/option.c:2261 +#: src/option.c:1913 msgid "General options" msgstr "Общие параметры" -#: src/option.c:2262 +#: src/option.c:1914 msgid "Show general options" msgstr "Показать общие параметры" -#: src/option.c:2272 +#: src/option.c:1926 msgid "Calendar options" msgstr "Параметры календаря" -#: src/option.c:2273 +#: src/option.c:1927 msgid "Show calendar options" msgstr "Показать параметры календаря" -#: src/option.c:2283 +#: src/option.c:1939 msgid "Text entry options" msgstr "Параметры ввода текста" -#: src/option.c:2284 +#: src/option.c:1940 msgid "Show text entry options" msgstr "Показать параметры ввода текста" -#: src/option.c:2294 +#: src/option.c:1952 msgid "Error options" msgstr "Параметры диалога вывода ошибки" -#: src/option.c:2295 +#: src/option.c:1952 msgid "Show error options" msgstr "Показать параметры диалога вывода ошибки" -#: src/option.c:2305 +#: src/option.c:1962 msgid "Info options" msgstr "Параметры диалога вывода информации" -#: src/option.c:2306 +#: src/option.c:1962 msgid "Show info options" msgstr "Показать параметры диалога вывода информации" -#: src/option.c:2316 +#: src/option.c:1972 msgid "File selection options" msgstr "Параметры диалога выбора файла" -#: src/option.c:2317 +#: src/option.c:1973 msgid "Show file selection options" msgstr "Показать параметры диалога выбора файлов" -#: src/option.c:2327 +#: src/option.c:1985 msgid "List options" msgstr "Параметры списка" -#: src/option.c:2328 +#: src/option.c:1985 msgid "Show list options" msgstr "Показать параметры списка" -#: src/option.c:2339 +#: src/option.c:1996 msgid "Notification icon options" msgstr "Параметры значка уведомления" -#: src/option.c:2340 +#: src/option.c:1997 msgid "Show notification icon options" msgstr "Показать параметры значка уведомления" -#: src/option.c:2351 +#: src/option.c:2011 msgid "Progress options" msgstr "Параметры хода процесса" -#: src/option.c:2352 +#: src/option.c:2012 msgid "Show progress options" msgstr "Показать параметры хода процесса" -#: src/option.c:2362 +#: src/option.c:2024 msgid "Question options" msgstr "Параметры запроса" -#: src/option.c:2363 +#: src/option.c:2025 msgid "Show question options" msgstr "Показать параметры запроса" -#: src/option.c:2373 +#: src/option.c:2037 msgid "Warning options" msgstr "Параметры диалога для вывода предупреждения" -#: src/option.c:2374 +#: src/option.c:2038 msgid "Show warning options" msgstr "Показать параметры диалога для вывода предупреждения" -#: src/option.c:2384 +#: src/option.c:2050 msgid "Scale options" msgstr "Параметры масштаба" -#: src/option.c:2385 +#: src/option.c:2050 msgid "Show scale options" msgstr "Показать параметры масштаба" -#: src/option.c:2395 +#: src/option.c:2060 msgid "Text information options" msgstr "Параметры текстовой информации" -#: src/option.c:2396 +#: src/option.c:2061 msgid "Show text information options" msgstr "Показать параметры текстовой информации" -#: src/option.c:2406 +#: src/option.c:2073 msgid "Color selection options" msgstr "Параметры выбора цвета" -#: src/option.c:2407 +#: src/option.c:2074 msgid "Show color selection options" msgstr "Показать параметры диалога выбора файлов" -#: src/option.c:2417 +#: src/option.c:2086 msgid "Password dialog options" msgstr "Параметры диалога ввода пароля" -#: src/option.c:2418 +#: src/option.c:2087 msgid "Show password dialog options" msgstr "Показать параметры диалога ввода пароля" -#: src/option.c:2428 +#: src/option.c:2099 msgid "Forms dialog options" msgstr "Параметры диалога форм" -#: src/option.c:2429 +#: src/option.c:2100 msgid "Show forms dialog options" msgstr "Показать параметры диалога форм" -#: src/option.c:2439 +#: src/option.c:2112 msgid "Miscellaneous options" msgstr "Прочие параметры" -#: src/option.c:2440 +#: src/option.c:2113 msgid "Show miscellaneous options" msgstr "Показать прочие параметры" -#: src/option.c:2465 +#: src/option.c:2139 msgid "" "This option is not available. Please see --help for all possible usages.\n" msgstr "" "Этот параметр недоступен. Используйте --help для просмотра всех возможных " "параметров.\n" -#: src/option.c:2469 +#: src/option.c:2144 #, c-format msgid "--%s is not supported for this dialog\n" msgstr "--%s не поддерживается данным диалогом\n" -#: src/option.c:2473 +#: src/option.c:2148 msgid "Two or more dialog options specified\n" msgstr "Указано два или более параметра для диалога\n" + +#. Checks if username has been passed as a parameter +#: src/password.c:70 +msgid "Type your password" +msgstr "Введите пароль" + +#: src/password.c:73 +msgid "Type your username and password" +msgstr "Введите имя пользователя и пароль" + +#: src/password.c:100 +msgid "Username:" +msgstr "Имя пользователя:" + +#: src/password.c:110 +msgid "Password:" +msgstr "Пароль:" + +#: src/progress.c:102 +#, c-format +msgid "Time remaining: %lu:%02lu:%02lu" +msgstr "Оставшееся время: %lu:%02lu:%02lu" + +#: src/scale.c:62 +msgid "Maximum value must be greater than minimum value.\n" +msgstr "Максимальное значение должно быть больше, чем минимальное.\n" + +#: src/scale.c:69 +msgid "Value out of range.\n" +msgstr "Значение за пределами диапазона.\n" + +#: src/tree.c:393 +msgid "No column titles specified for List dialog.\n" +msgstr "Для диалога со списком не указаны заголовки столбцов.\n" + +#: src/tree.c:399 +msgid "You should use only one List dialog type.\n" +msgstr "Необходимо использовать только один тип диалога «Список».\n" + +#: src/zenity.ui:14 src/zenity.ui:76 +msgid "Adjust the scale value" +msgstr "Изменение значения масштаба" + +#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378 +#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970 +msgid "Cancel" +msgstr "Отменить" + +#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392 +#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798 +#: src/zenity.ui:984 src/zenity.ui:1080 +msgid "OK" +msgstr "ОК" + +#: src/zenity.ui:117 +msgid "Text View" +msgstr "Текстовая область" + +#: src/zenity.ui:231 +msgid "Calendar selection" +msgstr "Выбор даты" + +#: src/zenity.ui:298 +msgid "Select a date from below." +msgstr "Выберите дату." + +#: src/zenity.ui:319 +msgid "C_alendar:" +msgstr "_Календарь:" + +#: src/zenity.ui:361 +msgid "Add a new entry" +msgstr "Добавление нового поля" + +#: src/zenity.ui:428 +msgid "_Enter new text:" +msgstr "_Введите новый текст:" + +#: src/zenity.ui:465 +msgid "Error" +msgstr "Ошибка" + +#: src/zenity.ui:530 +msgid "An error has occurred." +msgstr "Произошла ошибка." + +#: src/zenity.ui:658 +msgid "Forms dialog" +msgstr "Диалог форм" + +#: src/zenity.ui:681 +msgid "Information" +msgstr "Информация" + +#: src/zenity.ui:741 +msgid "All updates are complete." +msgstr "Все обновления завершены." + +#: src/zenity.ui:768 +msgid "Progress" +msgstr "Индикатор выполнения" + +#: src/zenity.ui:831 +msgid "Running..." +msgstr "Выполняется…" + +#: src/zenity.ui:882 +msgid "Question" +msgstr "Вопрос" + +#: src/zenity.ui:929 src/zenity.ui:1126 +msgid "Are you sure you want to proceed?" +msgstr "Уверены, что хотите продолжить?" + +#: src/zenity.ui:953 +msgid "Select items from the list" +msgstr "Выберите элементы из списка" + +#: src/zenity.ui:1015 +msgid "Select items from the list below." +msgstr "Выберите элементы из списка." + +#: src/zenity.ui:1064 +msgid "Warning" +msgstr "Предупреждение" -- cgit