New Upstream Release - zenity

Ready changes

Summary

Merged new upstream version: 3.99.0 (was: 3.44.0).

Diff

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 369b8090..8d08a5fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,10 @@
 variables:
-  FEDORA_DEPENDENCIES: gettext gettext-devel gcc redhat-rpm-config meson libtool git
-                gtk3-devel yelp-tools
-
-  UBUNTU_DEPENDENCIES: meson git gcc gettext libtool libnotify-dev libgtk-3-dev
-                libwebkit2gtk-4.1-dev yelp-tools
-
-# Fedora does a plain vanilla build in its specfile with no meson options
-# https://src.fedoraproject.org/rpms/zenity/blob/rawhide/f/zenity.spec
+  DEPENDENCIES: gettext gettext-devel gcc git libadwaita-devel meson gtk4-devel yelp-tools webkitgtk6.0-devel
 
 build_fedora:
   image: fedora:latest
   before_script:
-    - dnf install -y --nogpgcheck $FEDORA_DEPENDENCIES
-  script:
-    - meson --buildtype=debug build
-    - ninja -v -C build
-
-# Ubuntu image here is mostly to test whether the webkitgtk build works
-
-build_ubuntu:
-  image: ubuntu:rolling
-  before_script:
-    - apt-get update
-    - apt-get install -q -y --no-install-recommends $UBUNTU_DEPENDENCIES
+    - dnf install -y --nogpgcheck $DEPENDENCIES
   script:
-    - meson --buildtype=debug -Dlibnotify=true -Dwebkitgtk=true build
-    - ninja -v -C build
+    - meson -Dwebkitgtk=true build/
+    - ninja -C build/
diff --git a/NEWS b/NEWS
index 4f1a3aae..54f0cc48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,79 @@
+Zenity 3.99.0
+  1st beta release of the upcoming zenity 4.x, based on libadwaita/gtk4.
+
+  I would consider this release feature-complete for 4.0, but there are still
+  some bug reports flowing in, particularly for STDIN-related operations, that
+  need some further tweaking before a stable 4.0 release.
+
+    - option: Add various non-fatal deprecation warnings that were previously
+      missing, and fix a misleading deprecation message for `--window-icon`
+      (Logan Rathbone)
+    - main: Add G_APPLICATION_FLAGS_NON_UNIQUE to GApplication flags (fixes
+      #58) (Logan Rathbone)
+    - util: remove fatal assert on exit if window invalid GtkWindow (Logan
+      Rathbone)
+    - progress: Cleanup unnecessary static objects and remove spurious builder
+      unref (Logan Rathbone)
+    - util: Ignore superfluous quit requests (Logan Rathbone)
+    - util: Remove superfluous GtkWindow cast check (Logan Rathbone)
+    - data: Manpage generation changes; don't automatically generate the
+      manpage from help2man for now (this will preferably be reinstated
+      post-4.0 once the issues are worked out) (Logan Rathbone)
+    - a11y: Label the widgets in a forms UI properly (Lukáš Tyrychtr)
+    - Translation updates:
+        Anders Jonsson (sv)
+        Ekaterine Papava (ka)
+        Jordi Mas i Hernandez (ca)
+        Kukuh Syafaat (id)
+        Piotr Drąg (pl)
+        Sabri Ünal (tr)
+        Sergej A (ru)
+        Yuri Chornoivan (uk)
+
+Zenity 3.92.0
+  3rd alpha release of the upcoming zenity 4.x, based on libadwaita/gtk4.
+    - progress: don't update responses that aren't there (see: !25 and
+      https://bugzilla.redhat.com/show_bug.cgi?id=2177287) (Adam Williamson)
+    - Set dialog 'heading', not 'title' for the --title option (see: !26) (Adam
+      Williamson)
+    - tree: fix handling of multi-row stdin input (#54) (Adam Williamson)
+    - tree-column-view: don't steal children (see: !28) (Adam Williamson)
+    - Port to webkitgtk 6.0 (Adam Williamson)
+    - webkit: Fix leak by removing unnecessary ref sink (Logan Rathbone)
+    - option: Add non-fatal deprecation warning for --confirm-overwrite (#55)
+      (Logan Rathbone)
+    - help: Fix typo in Basque help translation (Andre Klapper)
+    - Translation updates:
+        Andika Triwidada (id)
+        Asier Sarasua Garmendia (eu)
+        Balázs Úr (hu)
+        Ekaterine Papava (ka)
+        Piotr Drąg (pl)
+        Sergej A (ru)
+        Yuri Chornoivan (uk)
+
+Zenity 3.91.0
+    - tree: Port to GtkColumnView (Logan Rathbone)
+    - desktop file: Remove spurious translation comment (Logan Rathbone)
+    - i18n: rename POTFILES to POTFILES.in (Piotr Drąg)
+    - help: Fix invalid markup in German help translation (Andre Klapper)
+    - help: Freedesktop.org spec fixes (Anders Jonsson)
+    - Translation updates:
+        Anders Jonsson (sv)
+        Yuri Chornoivan (uk)
+        Jürgen Benvenuti (de)
+        Ekaterine Papava (ka)
+        Kukuh Syafaat (id)
+        Martin (sl)
+        Aurimas Černius (lt)
+        Aleksandr Melman (ru)
+        Sergej A (ru)
+        Sabri Ünal (tr)
+        Anders Jonsson (sv)
+
+Zenity 3.90.0
+    - Initial alpha release based on libadwaita and GTK4 (Logan Rathbone)
+
 Zenity 3.44.0
     - scale: set a page increment so mouse wheel can be used on widget (Hg)
     - build: Use GNOME module post_install() (Matt Turner)
diff --git a/README.md b/README.md
index 57d8a184..6888b437 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,25 @@
 # Zenity
 
-This is Zenity - a rewrite of gdialog, the GNOME port of dialog
-which allows you to display dialog boxes from the commandline
+This is Zenity: the GNOME port of the venerable 'dialog' program,
+which allows you to display dialog boxes from the command-line
 and shell scripts.
 
-This software is licensed under the LGPL.
+This software is licensed under the GNU Lesser General Public
+License, version 2.1, or, at your option, a later version.
+
+Please see COPYING for a full copy of the license.
 
 Zenity is part of the GNOME Extra Apps family and is not a core
 GNOME application.
 
 ## Dependencies
 
-* gtk+-3.16
+* gtk >= 4.6
+* libadwaita >= 1.2
 
 ## Optional Dependencies
 
-* libnotify (for desktop notification support)
-* webkit2gtk-4.1 (for HTML support)
+* webkit2gtk-5.0 (for HTML support)
 
 Please see the meson.build file for minimal versions required
 for optional dependencies, and meson_options.txt for the build
diff --git a/THANKS b/THANKS
deleted file mode 100644
index 2ffed689..00000000
--- a/THANKS
+++ /dev/null
@@ -1,158 +0,0 @@
-  "Authors",
-  "=======",
-  "Glynn Foster <glynn foster sun com>",
-  "Mike Newman <mikegtn gnome org>",
-  "Lucas Rocha <lucasr gnome org>",
-
-  "Patches from the following people",
-  "=================================",
-  "Darren Adams  <darrenadams dsl pipex com>"
-  "Timo Aaltonen  <tjaaltonen gnome cc hut fi>",
-  "Peter Astrand  <astrand lysator liu se>",
-  "Jonathan Blandford  <jrb redhat com>",
-  "Paul Bolle  <pebolle tiscali nl>",
-  "Paolo Borelli  <pborelli katamail com>",
-  "Leonardo Boshell  <p kapcoweb com>",
-  "Ross Burton  <ross burtonini com>",
-  "Damien Carbery  <damien carbery sun com>",
-  "Anders Carlsson  <andersca codefactory se>",
-  "Ed Catmur  <ed catmur co uk>",
-  "Nicholas Curran  <quasar austar net au>",
-  "John Fleck  <jfleck inkstain net>",
-  "Sebastian Heinlein <glatzor pimpzkru de>",
-  "James Henstridge  <james daa com au>",
-  "Chris Lahey  <clahey ximian com>",
-  "Mihai T Lazarescu  <mihai email it>",
-  "Sebastian Kapfer <sebastian_kapfer web de>",
-  "Tomasz Koczko  <kloczek pld org pl>",
-  "Jordi Mallach  <jordi sindominio net>",
-  "Kjartan Maraas  <kmaraas gnome org>",
-  "Breda McColgan  <breda mccolgan sun com>",
-  "Baptiste Mille-Mathias  <bmm80 free fr>",
-  "Buhan Milne  <bgmilne linux-mandrake com>",
-  "Christian Monneckes  <c-w-m gmx de>",
-  "Ivan Noris  <vix vazka sk>",
-  "Carlos Parra  <cparra emergya info>",
-  "Havoc Pennington  <hp redhat com>",
-  "Jan Arne Petersen  <jpetersen uni-bonn de>",
-  "Kevin C  Krinke  <kckrinke opendoorsoftware com>",
-  "Sriram Ramkrishna  <sri aracnet com>",
-  "Kristian Rietveld  <kris gtk org>",
-  "Lucas Rocha  <lucasr im ufba br>",
-  "Christian Rose  <menthos menthos com>",
-  "Jakub Steiner  <jimmac ximian com>",
-  "Luke Suchocki  <gnome lukiepoo com>",
-  "Daniel d'Surreal  <dagmar speakeasy net>",
-  "Hidetoshi Tajima  <hidetoshi tajima sun com>",
-  "Tom Tromey  <tromey redhat com>",
-  "Yann  <bloch iie cnam fr>",
-  "Norman Rasmussen <normanr gmail com>",
-  "Benoît Dejean <tazforever dlfp org>",
-  "",
-  "And all the translators that rock my world",
-  "==========================================",
-  "Vincent van Adrighem  <v vanadrighem dirck mine nu>",
-  "Taneem Ahmed  <taneem bengalinux org>",
-  "Takeshi Aihana <aihana gnome gr jp>",
-  "Amanpreet Singh Alam  <amanlinux netscape net>",
-  "Metin Amiroff  <metin karegen com>",
-  "Sanlig Badral  <badral openmn org>",
-  "John C Barstow  <jbowtie amathaine com>",
-  "Aygimantas Beruka  <uid0 tuxfamily org>",
-  "Alberto Fernandez Benito <afernn euskalnet net>",
-  "Stefano Canepa  <sc linux it>",
-  "Young-Ho Cha <ganadist mizi com>",
-  "Abel Cheung  <maddog linux org hk>",
-  "Zbigniew Chyla  <cyba gnome pl>",
-  "Mohammad Damt  <mdamt bisnisweb com>",
-  "Fatih Demir  <kabalak gtranslator org>",
-  "Laurent Dhima  <laurenti alblinux net>",
-  "Paul Duffy <dubhthach frink nuigalway ie>",
-  "Laszlo Dvornik  <dvornik gnome hu>",
-  "Maxim Dziumanenko  <mvd mylinux com ua>",
-  "Francisco Javier Fernandez  <serrador arrakis es>",
-  "Artur Flinta  <aflinta cvs gnome org>",
-  "Alessio Frusciante  <algol firenze linux it>",
-  "Evandro Fernandes Giovanini  <evandrofg ig com br>",
-  "Pablo Gonzalo del Campo  <pablodc bigfoot com>",
-  "Dhurba Gnawali  <dhurbagnawali hotmail com>",
-  "Sammi Gunnarsson  <sammi techattack nu>",
-  "Martin Willemoes Hansen  <mwh sysrq dk>",
-  "Dafydd Harries  <daf parnassus ath cx>",
-  "Raphael Higino  <raphaelh cvs gnome org>",
-  "Wang Jian  <lark linux net cn>",
-  "Guntupalli Karunakar  <karunakar freedomink org>",
-  "Tomas Kuliavas  <tokul users sourceforge net>",
-  "Priit Laes  <amd tt ee>",
-  "Inaki Larranaga  <dooteo euskalgnu org>",
-  "Ole Laursen  <olau hardworking dk>",
-  "Toivo Leedjrv  <toivo linux ee>",
-  "David Lodge  <dave cirt net>",
-  "Duarte Loreto  <happyguy_pt hotmail com>",
-  "Johanna Makkonen  <johanna makkonen iki fi>",
-  "Jordi Mallach  <jordi sindominio net>",
-  "Kjartan Maraas  <kmaraas gnome org>",
-  "Jordi Mas  <jmas softcatala org>",
-  "Kamagasako Masatoshi  <emerald gnome gr jp>",
-  "Dmitry G  Mastrukov  <dmitry taurussoft org>",
-  "Arafat Medini  <lumina silverpen de>",
-  "Christophe Merlet  <redfox redfoxcenter org>",
-  "Mike Newman  <mikegtn gnome org>",
-  "Ahmad Riza H Nst  <rizahnst eriagempita co id>",
-  "Alexandre Folle de Menezes  <afmenez terra com br>",
-  "Christian Neumair  <chris gnome-de org>",
-  "Metin Omirov  <metin karegen com>",
-  "Gareth Owen  <gowen72 yahoo com>",
-  "Kostas Papadimas  <pkst gmx net>",
-  "Ankit Patel  <ankit redhat com>",
-  "Sami Pesonen  <sampeson iki fi>",
-  "Roozbeh Pournader  <roozbeh sharif edu>",
-  "Jarkko Ranta  <jjranta cc joensuu fi>",
-  "Rostislav Raykov  <zbrox dir bg>",
-  "Hendrik Richter  <hendrik gnome de org>",
-  "Christian Rose  <menthos menthos com>",
-  "Changwoo Ryu  <cwryu debian org>",
-  "Pablo Saratxaga  <pablo mandrakesoft com>",
-  "Robert Sedak  <robert sedak sk htnet hr>",
-  "Paisa Seeluangsawat  <paisa users sf net>",
-  "Danilo Segan  <dsegan gmx net>",
-  "Alexander Shopov  <ash contact bg>",
-  "Aasmund Skjaveland  <aasmunds fys uio no>",
-  "Yuriy Syrota  <rasta renome rovno ua>",
-  "Marcel Telka  <marcel telka sk>",
-  "Andras Timar  <timar gnome hu>",
-  "Miloslav Trmac  <mitr volny cz>",
-  "Mugurel Tudor <mugurelu go ro>",
-  "Daniel Yacob  <locales geez org>",
-  "Funda Wang <fundawang linux net cn>",
-  "Alexander Winston  <alexander winston comcast net>",
-  "Theppitak Karoonboonyanan <thep linux thai net>",
-  "Martin Willemoes Hansen <mwh sysrq dk>",
-  "Ignacio Casal Quinteiro <nacho.resa gmail com>",
-  "Pawan Chitrakar <pawan nplinux org>",
-  "Rajesh Ranjan <rajeshkajha yahoo org>",
-  "Vladimir Petkov <vpetkov i-space org>",
-  "Abduxukur Abdurixit <abduxukur.abdurixit t-systems ch>",
-  "Adi Attar <aattar cvs gnome org>",
-  "Steve Murphy <murf e-tools com>",
-  "Josep Puigdemont <josep imatge-sintetica com>",
-  "Adam Weinberger <adamw gnome org>",
-  "Ivar Smolin <okul linux ee>",
-  "Jens Seidel <jensseidel users sf net>",
-  "Benoît Dejean <tazforever dlfp org>",
-  "Yair Hershkovitz <yairhr gmail com>",
-  "Clytie Siddall <clytie riverland net au>",
-  "Ilkka Tuohela <hile iki fi>",
-  "Chao-Hsiung Liao <j_h_liau yahoo com tw>",
-  "Žygimantas Beručka <zygis gnome org>",
-  "Gabor Kelemen <kelemeng gnome hu>",
-  "Telsa Gwynne <hobbit aloss ukuu org uk>",
-  "Slobodan D. Sredojevic <ssl uns ns ac yu>",
-  "Baris Cicek <baris teamforce name tr>",
-  "Runa Bhattacharjee <runa bengalinux org>",
-  "Erdal Ronahi <erdal.ronahi gmail com>",
-  "Luca Ferretti <elle.uca infinito it>",
-  "Lasse Bang Mikkelsen <lbm fatalerror dk>",
-  "Vincent Untz <vuntz gnome org>",
-  "Leonid Kanter <leon asplinux ru>",
-  "Daniel Nylander <po danielnylander se>",
diff --git a/TODO b/TODO
deleted file mode 100644
index 98329fdd..00000000
--- a/TODO
+++ /dev/null
@@ -1,14 +0,0 @@
-* Support extra buttons, help buttons with the ability to change the label on the button
-  	- Suggested by Kevin Krinke <kckrinke@opendoorsoftware.com>
-* Would be nice to have an option to use your own icon in the info/warning/message/question dialogs
-  	- Suggested by Kevin Krinke <kckrinke@opendoorsoftware.com>
-* Add pixmap support to list dialog
-	- Suggested by Dani Brody <brodydani@hotmail.com>
-* Add new format
-	--list --column=check,hide --column=pixmap --column=string,editable
-	- Suggested by Dani Brody <brodydani@hotmail.com>
-* Add support for DML (Dialog Meta Language)
-	- ftp://ftp.pld.org.pl/people/malekith/dml/
-	- Suggested by Michal Moskal <malekith@pld-linux.org>
-
-For further information about future development, see http://live.gnome.org/Zenity
diff --git a/data/README.manpage b/data/README.manpage
new file mode 100644
index 00000000..5ac64a35
--- /dev/null
+++ b/data/README.manpage
@@ -0,0 +1,6 @@
+In order to generate the manpage for zenity, run the script
+`generate-manpage.sh` after installing zenity.
+
+The `help2man` utility is required. When new command-line arguments are
+added or deleted, this script should be re-run manually and
+git-committed.
diff --git a/data/generate-manpage.sh b/data/generate-manpage.sh
new file mode 100755
index 00000000..84092c77
--- /dev/null
+++ b/data/generate-manpage.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+help2man --no-info --name='display GTK dialogs' --version-string=' ' --section=1 --help-option='--help-all' --include='zenity.roff' --output='zenity.1' zenity
diff --git a/data/meson.build b/data/meson.build
index 339b3cff..04cfc15d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,13 +1,27 @@
-install_man('zenity.1')
+# .desktop file
+
+desktop_file = i18n.merge_file(
+  input: '@0@.desktop.in'.format(app_id),
+  output: '@0@.desktop'.format(app_id),
+  po_dir: zenity_po_dir,
+  type: 'desktop',
+  install_dir: join_paths(zenity_datadir, 'applications'),
+  install: true
+)
+
+desktop_file_validate_prg = find_program(
+  'desktop-file-validate',
+  required: false
+)
 
-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']
+if desktop_file_validate_prg.found()
+  test(
+    'Validate desktop file',
+    desktop_file_validate_prg,
+    args: [desktop_file]
   )
+endif
+
+# manpage
+
+install_man('zenity.1')
diff --git a/data/org.gnome.Zenity.desktop.in b/data/org.gnome.Zenity.desktop.in
new file mode 100644
index 00000000..de4530d6
--- /dev/null
+++ b/data/org.gnome.Zenity.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Zenity
+Comment=Display dialog boxes from the command line
+Exec=zenity
+Terminal=false
+Type=Application
+NoDisplay=true
+StartupNotify=true
+DBusActivatable=true
+X-GNOME-UsesNotifications=true
diff --git a/data/zenity-calendar.png b/data/zenity-calendar.png
deleted file mode 100644
index 873528a9..00000000
Binary files a/data/zenity-calendar.png and /dev/null differ
diff --git a/data/zenity-entry.png b/data/zenity-entry.png
deleted file mode 100644
index 3621ea38..00000000
Binary files a/data/zenity-entry.png and /dev/null differ
diff --git a/data/zenity-file.png b/data/zenity-file.png
deleted file mode 100644
index bac63921..00000000
Binary files a/data/zenity-file.png and /dev/null differ
diff --git a/data/zenity-list.png b/data/zenity-list.png
deleted file mode 100644
index 5a593b73..00000000
Binary files a/data/zenity-list.png and /dev/null differ
diff --git a/data/zenity-notification.png b/data/zenity-notification.png
deleted file mode 100644
index 6b44ef9b..00000000
Binary files a/data/zenity-notification.png and /dev/null differ
diff --git a/data/zenity-progress.png b/data/zenity-progress.png
deleted file mode 100644
index b789e023..00000000
Binary files a/data/zenity-progress.png and /dev/null differ
diff --git a/data/zenity-scale.png b/data/zenity-scale.png
deleted file mode 100644
index 8526c317..00000000
Binary files a/data/zenity-scale.png and /dev/null differ
diff --git a/data/zenity-text.png b/data/zenity-text.png
deleted file mode 100644
index 07569920..00000000
Binary files a/data/zenity-text.png and /dev/null differ
diff --git a/data/zenity.1 b/data/zenity.1
index 8b957fa5..9ddf02ff 100644
--- a/data/zenity.1
+++ b/data/zenity.1
@@ -1,10 +1,9 @@
-.TH ZENITY 1 "December 2011"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH ZENITY "1" "May 2023" "zenity  " "User Commands"
 .SH NAME
-zenity \- display GTK+ dialogs
-.SH SYNOPSIS
-.B zenity
-.RI [ options ]
+zenity \- display GTK dialogs
 .SH DESCRIPTION
+
 \fBzenity\fP is a program that will display GTK+ dialogs, and return
 (either in the return code, or on standard output) the users
 input. This allows you to present information, and ask for information
@@ -12,371 +11,445 @@ from the user, from all manner of shell scripts.
 .PP
 For example, \fBzenity \-\-question\fP will return either 0, 1 or 5,
 depending on whether the user pressed \fIOK\fP, \fICancel\fP or timeout
-has been reached. \fBzenity --entry\fP will output on standard output
+has been reached. \fBzenity \-\-entry\fP will output on standard output
 what the user typed into the text entry field.
 .PP
-Comprehensive documentation is available in the GNOME Help Browser.
-.SH OPTIONS
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-
-.PP
-Dialog options
-
+Comprehensive documentation is also available in the GNOME Help Browser.
+.SS "Usage:"
+.IP
+zenity [OPTION?]
+.SS "Help Options:"
 .TP
-.B \-\-calendar
-Display calendar dialog
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
 .TP
-.B \-\-entry
-Display text entry dialog
+\fB\-\-help\-all\fR
+Show all help options
 .TP
-.B \-\-error
-Display error dialog
+\fB\-\-help\-general\fR
+Show general options
 .TP
-.B \-\-file\-selection
-Display file selection dialog
+\fB\-\-help\-calendar\fR
+Show calendar options
 .TP
-.B \-\-info
-Display info dialog
+\fB\-\-help\-entry\fR
+Show text entry options
 .TP
-.B \-\-list
-Display list dialog
+\fB\-\-help\-error\fR
+Show error options
 .TP
-.B \-\-notification
-Display notification
+\fB\-\-help\-info\fR
+Show info options
 .TP
-.B \-\-progress
-Display progress indication dialog
+\fB\-\-help\-file\-selection\fR
+Show file selection options
 .TP
-.B \-\-question
-Display question dialog
+\fB\-\-help\-list\fR
+Show list options
 .TP
-.B \-\-text-info
-Display text information dialog
+\fB\-\-help\-notification\fR
+Show notification options
 .TP
-.B \-\-warning
-Display warning dialog
+\fB\-\-help\-progress\fR
+Show progress options
 .TP
-.B \-\-scale
-Display scale dialog
+\fB\-\-help\-question\fR
+Show question options
 .TP
-.B \-\-color-selection
-Display color selection dialog
+\fB\-\-help\-warning\fR
+Show warning options
 .TP
-.B \-\-password
-Display password dialog
+\fB\-\-help\-scale\fR
+Show scale options
 .TP
-.B \-\-forms
-Display forms dialog
-
+\fB\-\-help\-text\-info\fR
+Show text information options
+.TP
+\fB\-\-help\-color\-selection\fR
+Show color selection options
+.TP
+\fB\-\-help\-password\fR
+Show password dialog options
+.TP
+\fB\-\-help\-forms\fR
+Show forms dialog options
+.TP
+\fB\-\-help\-misc\fR
+Show miscellaneous options
 .PP
 General options
-
 .TP
-.B \-\-title=TITLE
+\fB\-\-title\fR=\fI\,TITLE\/\fR
 Set the dialog title
 .TP
-.B \-\-window-icon=ICONPATH
-Set the window icon with the path to an image. Alternatively, one of the four stock icons can be used: 'error', 'info', 'question' or 'warning'
+\fB\-\-width\fR=\fI\,WIDTH\/\fR
+Set the width
+.TP
+\fB\-\-height\fR=\fI\,HEIGHT\/\fR
+Set the height
+.TP
+\fB\-\-timeout\fR=\fI\,TIMEOUT\/\fR
+Set dialog timeout in seconds
 .TP
-.B \-\-icon-name=ICONNAME
-The name of the icon to display on the dialog to override the default stock icons
+\fB\-\-ok\-label\fR=\fI\,TEXT\/\fR
+Set the label of the OK button
 .TP
-.B \-\-width=WIDTH
-Set the dialog width
+\fB\-\-cancel\-label\fR=\fI\,TEXT\/\fR
+Set the label of the Cancel button
 .TP
-.B \-\-height=HEIGHT
-Set the dialog height
+\fB\-\-extra\-button\fR=\fI\,TEXT\/\fR
+Add an extra button
 .TP
-.B \-\-timeout=TIMEOUT
-Set the dialog timeout in seconds
-.PP 
+\fB\-\-modal\fR
+Set the modal hint
+.TP
+\fB\-\-attach\fR=\fI\,WINDOW\/\fR
+DEPRECATED; does nothing
+.PP
 Calendar options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-day=INT
+\fB\-\-day\fR=\fI\,DAY\/\fR
 Set the calendar day
 .TP
-.B \-\-month=INT
+\fB\-\-month\fR=\fI\,MONTH\/\fR
 Set the calendar month
 .TP
-.B \-\-year=INT
+\fB\-\-year\fR=\fI\,YEAR\/\fR
 Set the calendar year
 .TP
-.B \-\-date-format=PATTERN
-Set the format for the returned date. The default depends on the user locale or be set with the strftime style. For example %A %d/%m/%y
-
+\fB\-\-date\-format\fR=\fI\,PATTERN\/\fR
+Set the format for the returned date
 .PP
 Text entry options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-entry-text=STRING
+\fB\-\-entry\-text\fR=\fI\,TEXT\/\fR
 Set the entry text
 .TP
-.B \-\-hide-text
+\fB\-\-hide\-text\fR
 Hide the entry text
-
 .PP
 Error options
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-no\-wrap
+\fB\-\-icon\fR=\fI\,ICON\-NAME\/\fR
+Set the icon name
+.TP
+\fB\-\-no\-wrap\fR
 Do not enable text wrapping
 .TP
-.B \-\-no\-markup
-Do not enable pango markup
-
+\fB\-\-no\-markup\fR
+Do not enable Pango markup
+.TP
+\fB\-\-ellipsize\fR
+Enable ellipsizing in the dialog text. This fixes the high window size with long texts
 .PP
-File selection options
+Info options
 .TP
-.B \-\-filename=FILENAME
-Set the file or directory to be selected by default
+\fB\-\-text\fR=\fI\,TEXT\/\fR
+Set the dialog text
 .TP
-.B \-\-multiple
-Allow selection of multiple filenames in file selection dialog
+\fB\-\-icon\fR=\fI\,ICON\-NAME\/\fR
+Set the icon name
 .TP
-.B \-\-directory
-Activate directory-only selection
+\fB\-\-no\-wrap\fR
+Do not enable text wrapping
 .TP
-.B \-\-save
-Activate save mode
+\fB\-\-no\-markup\fR
+Do not enable Pango markup
 .TP
-.B \-\-separator=SEPARATOR
-Specify separator character when returning multiple filenames
+\fB\-\-ellipsize\fR
+Enable ellipsizing in the dialog text. This fixes the high window size with long texts
+.PP
+File selection options
 .TP
-.B \-\-confirm\-overwrite
-Confirm file selection if filename already exists
+\fB\-\-filename\fR=\fI\,FILENAME\/\fR
+Set the filename
 .TP
-.B \-\-file\-filter=NAME | PATTERN1 PATTERN2
-Sets a filename filter
-
-
-.PP
-Info options
+\fB\-\-multiple\fR
+Allow multiple files to be selected
 .TP
-.B \-\-text=STRING
-Set the dialog text
+\fB\-\-directory\fR
+Activate directory\-only selection
 .TP
-.B \-\-no\-wrap
-Do not enable text wrapping
+\fB\-\-save\fR
+Activate save mode
 .TP
-.B \-\-no\-markup
-Do not enable pango markup
-
+\fB\-\-separator\fR=\fI\,SEPARATOR\/\fR
+Set output separator character
+.TP
+\fB\-\-file\-filter\fR=\fI\,NAME\/\fR | PATTERN1 PATTERN2 ...
+Set a filename filter
+.TP
+\fB\-\-confirm\-overwrite\fR
+DEPRECATED; does nothing
 .PP
 List options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-column=STRING
+\fB\-\-column\fR=\fI\,COLUMN\/\fR
 Set the column header
 .TP
-.B \-\-checklist
-Use check boxes for first column
+\fB\-\-checklist\fR
+Use check boxes for the first column
+.TP
+\fB\-\-radiolist\fR
+Use radio buttons for the first column
 .TP
-.B \-\-radiolist
-Use radio buttons for first column
+\fB\-\-imagelist\fR
+Use an image for the first column
 .TP
-.B \-\-separator=STRING
+\fB\-\-separator\fR=\fI\,SEPARATOR\/\fR
 Set output separator character
 .TP
-.B \-\-multiple
+\fB\-\-multiple\fR
 Allow multiple rows to be selected
 .TP
-.B \-\-editable
+\fB\-\-editable\fR
 Allow changes to text
 .TP
-.B \-\-print-column=NUMBER
-Specify what column to print to standard output. The default is to return
-the first column. 'ALL' may be used to print all columns.
+\fB\-\-print\-column\fR=\fI\,NUMBER\/\fR
+Print a specific column (Default is 1. 'ALL' can be used to print all columns)
 .TP
-.B \-\-hide\-column=NUMBER
+\fB\-\-hide\-column\fR=\fI\,NUMBER\/\fR
 Hide a specific column
 .TP
-.B \-\-hide\-header
-Hides the column headers
-
+\fB\-\-hide\-header\fR
+Hide the column headers
+.TP
+\fB\-\-mid\-search\fR
+DEPRECATED; does nothing
 .PP
 Notification options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the notification text
 .TP
-.B \-\-listen
-Listen for commands on stdin. Commands include 'message', 'tooltip', 'icon', and 'visible' separated by a colon. For example, 'message: Hello world', 'visible: false', or 'icon: /path/to/icon'. The icon command also accepts the four stock icon: 'error', 'info', 'question', and 'warning'
-
+\fB\-\-icon\fR=\fI\,ICON\-NAME\/\fR
+Set the icon name
+.TP
+\fB\-\-listen\fR
+Listen for commands on stdin
+.TP
+\fB\-\-hint\fR=\fI\,TEXT\/\fR
+DEPRECATED; does nothing
 .PP
 Progress options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-percentage=INT
+\fB\-\-percentage\fR=\fI\,PERCENTAGE\/\fR
 Set initial percentage
 .TP
-.B \-\-auto\-close
-Close dialog when 100% has been reached
+\fB\-\-pulsate\fR
+Pulsate progress bar
 .TP
-.B \-\-auto\-kill
-Kill parent process if cancel button is pressed
+\fB\-\-auto\-close\fR
+Dismiss the dialog when 100% has been reached
 .TP
-.B \-\-pulsate
-Pulsate progress bar
+\fB\-\-auto\-kill\fR
+Kill parent process if Cancel button is pressed
 .TP
-.B \-\-no\-cancel
-Hides the cancel button
-
+\fB\-\-no\-cancel\fR
+Hide Cancel button
+.TP
+\fB\-\-time\-remaining\fR
+Estimate when progress will reach 100%
 .PP
 Question options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-no\-wrap
-Do not enable text wrapping
-.TP
-.B \-\-no\-markup
-Do not enable pango markup
-.TP
-.B \-\-ok\-label
-Set the text of the OK button
-.TP
-.B \-\-cancel\-label
-Set the text of the cancel button
-
-.PP
-Text options
-
+\fB\-\-icon\fR=\fI\,ICON\-NAME\/\fR
+Set the icon name
 .TP
-.B \-\-filename=FILENAME
-Open file
+\fB\-\-no\-wrap\fR
+Do not enable text wrapping
 .TP
-.B \-\-editable
-Allow changes to text
+\fB\-\-no\-markup\fR
+Do not enable Pango markup
 .TP
-.B \-\-checkbox=TEXT
-Enable a checkbox for use like a 'I read and accept the terms.'
+\fB\-\-default\-cancel\fR
+Give Cancel button focus by default
 .TP
-.B \-\-ok\-label
-Set the text of the OK button
+\fB\-\-ellipsize\fR
+Enable ellipsizing in the dialog text. This fixes the high window size with long texts
 .TP
-.B \-\-cancel\-label
-Set the text of the cancel button
-
+\fB\-\-switch\fR
+Suppress OK and Cancel buttons
 .PP
 Warning options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-no\-wrap
+\fB\-\-icon\fR=\fI\,ICON\-NAME\/\fR
+Set the icon name
+.TP
+\fB\-\-no\-wrap\fR
 Do not enable text wrapping
 .TP
-.B \-\-no\-markup
-Do not enable pango markup
-
+\fB\-\-no\-markup\fR
+Do not enable Pango markup
+.TP
+\fB\-\-ellipsize\fR
+Enable ellipsizing in the dialog text. This fixes the high window size with long texts
 .PP
 Scale options
-
 .TP
-.B \-\-text=STRING
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-value=VALUE
+\fB\-\-value\fR=\fI\,VALUE\/\fR
 Set initial value
 .TP
-.B \-\-min\-value=VALUE
+\fB\-\-min\-value\fR=\fI\,VALUE\/\fR
 Set minimum value
 .TP
-.B \-\-max\-value=VALUE
+\fB\-\-max\-value\fR=\fI\,VALUE\/\fR
 Set maximum value
 .TP
-.B \-\-step=VALUE
+\fB\-\-step\fR=\fI\,VALUE\/\fR
 Set step size
 .TP
-.B \-\-print\-partial
+\fB\-\-print\-partial\fR
 Print partial values
 .TP
-.B \-\-hide\-value
+\fB\-\-hide\-value\fR
 Hide value
-
+.PP
+Text information options
+.TP
+\fB\-\-filename\fR=\fI\,FILENAME\/\fR
+Open file
+.TP
+\fB\-\-editable\fR
+Allow changes to text
+.TP
+\fB\-\-font\fR=\fI\,TEXT\/\fR
+Set the text font
+.TP
+\fB\-\-checkbox\fR=\fI\,TEXT\/\fR
+Enable an I read and agree checkbox
+.TP
+\fB\-\-auto\-scroll\fR
+Auto scroll the text to the end. Only when text is captured from stdin
 .PP
 Color selection options
-
 .TP
-.B \-\-color=VALUE
-Set the initial color
+\fB\-\-color\fR=\fI\,VALUE\/\fR
+Set the color
 .TP
-.B \-\-show\-palette
+\fB\-\-show\-palette\fR
 Show the palette
-
 .PP
 Password dialog options
-
 .TP
-.B \-\-username
-Display the username field
-
+\fB\-\-username\fR
+Display the username option
 .PP
 Forms dialog options
-
 .TP
-.B \-\-add\-entry=FIELDNAME
+\fB\-\-add\-entry\fR=\fI\,Field\/\fR name
 Add a new Entry in forms dialog
 .TP
-.B \-\-add\-password=FIELDNAME
+\fB\-\-add\-password\fR=\fI\,Field\/\fR name
 Add a new Password Entry in forms dialog
 .TP
-.B \-\-add\-calendar=FIELDNAME
+\fB\-\-add\-calendar\fR=\fI\,Calendar\/\fR field name
 Add a new Calendar in forms dialog
 .TP
-.B \-\-text=STRING
+\fB\-\-add\-list\fR=\fI\,List\/\fR field and header name
+Add a new List in forms dialog
+.TP
+\fB\-\-list\-values\fR=\fI\,List\/\fR of values separated by |
+List of values for List
+.TP
+\fB\-\-column\-values\fR=\fI\,List\/\fR of values separated by |
+List of values for columns
+.TP
+\fB\-\-add\-combo\fR=\fI\,Combo\/\fR box field name
+Add a new combo box in forms dialog
+.TP
+\fB\-\-combo\-values\fR=\fI\,List\/\fR of values separated by |
+List of values for combo box
+.TP
+\fB\-\-show\-header\fR
+Show the columns header
+.TP
+\fB\-\-text\fR=\fI\,TEXT\/\fR
 Set the dialog text
 .TP
-.B \-\-separator=STRING
+\fB\-\-separator\fR=\fI\,SEPARATOR\/\fR
 Set output separator character
 .TP
-.B \-\-forms\-date-format=PATTERN
-Set the format for the returned date. The default depends on the user locale or be set with the strftime style. For example %A %d/%m/%y
-
+\fB\-\-forms\-date\-format\fR=\fI\,PATTERN\/\fR
+Set the format for the returned date
 .PP
 Miscellaneous options
-
 .TP
-.B \-?, \-\-help
-Show summary of options.
+\fB\-\-about\fR
+About zenity
 .TP
-.B \-\-about
-Display an about dialog.
+\fB\-\-version\fR
+Print version
+.SS "Application Options:"
 .TP
-.B \-\-version
-Show version of program.
-
-.PP
-Also the standard GTK+ options are accepted. For more information about the GTK+ options, execute following command.
-.IP
-zenity \-\-help\-gtk
-
-.SH ENVIRONMENT
-
-Normally, zenity detects the terminal window from which it was launched and
-keeps itself above that window.  This behavior can be disabled by unsetting the
-WINDOWID environment variable.
-
+\fB\-\-calendar\fR
+Display calendar dialog
+.TP
+\fB\-\-entry\fR
+Display text entry dialog
+.TP
+\fB\-\-error\fR
+Display error dialog
+.TP
+\fB\-\-info\fR
+Display info dialog
+.TP
+\fB\-\-file\-selection\fR
+Display file selection dialog
+.TP
+\fB\-\-list\fR
+Display list dialog
+.TP
+\fB\-\-notification\fR
+Display notification
+.TP
+\fB\-\-progress\fR
+Display progress indication dialog
+.TP
+\fB\-\-question\fR
+Display question dialog
+.TP
+\fB\-\-warning\fR
+Display warning dialog
+.TP
+\fB\-\-scale\fR
+Display scale dialog
+.TP
+\fB\-\-text\-info\fR
+Display text information dialog
+.TP
+\fB\-\-color\-selection\fR
+Display color selection dialog
+.TP
+\fB\-\-password\fR
+Display password dialog
+.TP
+\fB\-\-forms\fR
+Display forms dialog
 .SH EXAMPLES
 
 Display a file selector with the title \fISelect a file to
@@ -401,9 +474,9 @@ and the text \fIFinding all header files...\fP.
 .IP
 find . \-name '*.h' | zenity \-\-list \-\-title "Search Results" \-\-text "Finding all header files.." \-\-column "Files"
 .PP
-Show a notification in the message tray
+Show a passive notification
 .IP
-zenity \-\-notification \-\-window-icon=update.png \-\-text "System update necessary!"
+zenity \-\-notification \-\-icon=software-update-available \-\-text "System update necessary!"
 .PP
 Display a weekly shopping list in a check list dialog with \fIApples\fP and \fIOranges\fP pre selected
 .IP
@@ -413,9 +486,11 @@ Display a progress dialog while searching for all the postscript files in your h
 .P
 find $HOME \-name '*.ps' | zenity \-\-progress \-\-pulsate
 .SH AUTHOR
-\fBZenity\fP was written by Glynn Foster <glynn.foster@sun.com>.
-.P
-This manual page was written by Ross Burton <ross@burtonini.com>.
 
-.SH SEE ALSO
+.PP
+\fBZenity\fP was originally written by Glynn Foster <glynn.foster@sun.com>. It has since been maintained by a number of contributors since then.
+.PP
+This manual page was originally written by Ross Burton <ross@burtonini.com>. It currently contains portions which are automatically generated, and other portions written by its original author.
+.SH "SEE ALSO"
+
 \fBdialog\fP(1)
diff --git a/data/zenity.roff b/data/zenity.roff
new file mode 100644
index 00000000..6063a7a1
--- /dev/null
+++ b/data/zenity.roff
@@ -0,0 +1,60 @@
+[description]
+
+\fBzenity\fP is a program that will display GTK dialogs, and return
+(either in the return code, or on standard output) the users
+input. This allows you to present information, and ask for information
+from the user, from all manner of shell scripts.
+.PP
+For example, \fBzenity \-\-question\fP will return either 0, 1 or 5,
+depending on whether the user pressed \fIOK\fP, \fICancel\fP or timeout
+has been reached. \fBzenity \-\-entry\fP will output on standard output
+what the user typed into the text entry field.
+.PP
+Comprehensive documentation is also available in the GNOME Help Browser.
+
+[examples]
+
+Display a file selector with the title \fISelect a file to
+remove\fP. The file selected is returned on standard output.
+.IP
+zenity  \-\-title="Select a file to remove" \-\-file-selection
+.PP
+Display a text entry dialog with the title \fISelect Host\fP and the
+text \fISelect the host you would like to flood-ping\fP. The entered
+text is returned on standard output.
+.IP
+zenity  \-\-title "Select Host" \-\-entry \-\-text "Select the host you would like to flood-ping"
+.PP
+Display a dialog, asking \fIMicrosoft Windows has been found! Would
+you like to remove it?\fP. The return code will be 0 (true in shell)
+if \fIOK\fP is selected, and 1 (false) if \fICancel\fP is selected.
+.IP
+zenity  \-\-question \-\-title "Alert"  \-\-text "Microsoft Windows has been found! Would you like to remove it?"
+.PP
+Show the search results in a list dialog with the title \fISearch Results\fP
+and the text \fIFinding all header files...\fP.
+.IP
+find . \-name '*.h' | zenity \-\-list \-\-title "Search Results" \-\-text "Finding all header files.." \-\-column "Files"
+.PP
+Show a passive notification
+.IP
+zenity \-\-notification \-\-icon=software-update-available \-\-text "System update necessary!"
+.PP
+Display a weekly shopping list in a check list dialog with \fIApples\fP and \fIOranges\fP pre selected
+.IP
+zenity \-\-list \-\-checklist \-\-column "Buy" \-\-column "Item" TRUE Apples TRUE Oranges FALSE Pears FALSE Toothpaste
+.PP
+Display a progress dialog while searching for all the postscript files in your home directory
+.P
+find $HOME \-name '*.ps' | zenity \-\-progress \-\-pulsate
+
+[author]
+
+.PP
+\fBZenity\fP was originally written by Glynn Foster <glynn.foster@sun.com>. It has since been maintained by a number of contributors since then.
+.PP
+This manual page was originally written by Ross Burton <ross@burtonini.com>. It currently contains portions which are automatically generated, and other portions written by its original author.
+
+[see also]
+
+\fBdialog\fP(1)
diff --git a/debian/changelog b/debian/changelog
index 90e9a674..f171864b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zenity (3.99.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 07 Jun 2023 23:58:10 -0000
+
 zenity (3.44.0-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/help/C/l10n.txt b/help/C/l10n.txt
old mode 100755
new mode 100644
index f03a73fe..d91b277d
--- a/help/C/l10n.txt
+++ b/help/C/l10n.txt
@@ -1,16 +1,6 @@
-Zenity Manual V2.0
-
-------------------------
-SUMMARY OF CHANGES
-------------------------
-
-Created by: Breda McColgan
-Date: July 2004
-Manual version: 2.0
-
-------------------------
-SCREENSHOT INSTRUCTIONS
-------------------------
+---------------------------------------
+SCREENSHOT INSTRUCTIONS FOR TRANSLATORS
+---------------------------------------
 
 To create the screenshots, perform the following steps:
 1. Create a directory called /tmp/l10n_scripts.
@@ -37,7 +27,6 @@ zenity-entry-screenshot.png
 <script-name> = text_entry.sh
 
 
-
 zenity-error-screenshot.png
 ===========================
 
@@ -62,6 +51,18 @@ zenity-list-screenshot.png
 <script-name> = list.sh
 
 
+zenity-notification-screenshot.png
+==========================
+
+<script-name> = notification.sh
+
+
+zenity-notification-listen-screenshot.png
+==========================
+
+<script-name> = notification-listen.sh
+
+
 zenity-progress-screenshot.png
 ==============================
 
@@ -78,8 +79,8 @@ zenity-text-screenshot.png
 ==========================
 
 <script-name> = text_info.sh
-Select cvs.txt from the File Selector dialog.
-Resize the window so that only the text appears -- no blank space.
+Before running, be prepared to open a text file of your choice (traditionally,
+COPYING has been used).
 
 
 zenity-warning-screenshot.png
diff --git a/help/C/l10n_scripts/cvs.txt b/help/C/l10n_scripts/cvs.txt
deleted file mode 100755
index f470f666..00000000
--- a/help/C/l10n_scripts/cvs.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Getting the most out of CVS in GNOME
-====================================
-
-Introductory Beginnings-
-
-Current Versions System, CVS, is a powerful
-method of allowing many developers
-to work on the same source code. It is used
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                                                                                     
diff --git a/help/C/l10n_scripts/notification-listen.sh b/help/C/l10n_scripts/notification-listen.sh
new file mode 100755
index 00000000..d773a890
--- /dev/null
+++ b/help/C/l10n_scripts/notification-listen.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cat << EOH| zenity --notification --listen
+message: this is the message text
+EOH
diff --git a/help/C/l10n_scripts/notification.sh b/help/C/l10n_scripts/notification.sh
index b7de9aba..fe5e482a 100755
--- a/help/C/l10n_scripts/notification.sh
+++ b/help/C/l10n_scripts/notification.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
                                                                                                                                                              
-/gnome/head/cvs/zenity/src/zenity --notification \
---window-icon="info" \
+zenity --notification \
 --text="There are system updates necessary!"
diff --git a/help/C/notification.page b/help/C/notification.page
index f7ff3c95..7194b0b4 100644
--- a/help/C/notification.page
+++ b/help/C/notification.page
@@ -7,7 +7,7 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
   <title>Notification Icon</title>
-    <p>Use the <cmd>--notification</cmd> option to create a notification icon.</p>
+    <p>Use the <cmd>--notification</cmd> option to create a passive desktop notification.</p>
 
   <terms>
     <item>
@@ -15,11 +15,20 @@
       <p>Specifies the text that is displayed in the notification area.</p>
     </item>
     <item>
-      <title><cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', tooltip: '<var>text</var>', visible: '<var>text</var>',</title>
+      <title><cmd>--icon</cmd>=<var>path</var></title>
+      <p>Set the notification icon using a string containing a path to a valid icon on the system.</p>
+    </item>
+    <item>
+      <title><cmd>--listen</cmd></title>
       <p>Listens for commands at standard input. At least one command must be specified. Commands are comma separated. A command must be followed by a colon and a value. </p>
       <note style="tip">
-        <p>The <cmd>icon</cmd> command also accepts four stock icon values such as <var>error</var>, <var>info</var>, <var>question</var> and <var>warning</var>.</p>
+        <p>The <cmd>icon</cmd> command also accepts icon theme name values in accordance with the FreeDesktop.org Icon Naming Specification such as <var>dialog-error</var>, <var>dialog-information</var> and <var>security-high</var>.</p>
       </note>
+      <p>Examples include:</p>
+      <code>
+      message: Hello, my name is Joe
+      icon: /usr/share/pixmaps/monitor.xpm
+      </code>
     </item>
   </terms>
 
@@ -27,8 +36,8 @@
   <code>
   #!/bin/sh
 
-  zenity --notification\
-    --window-icon="info" \
+  zenity --notification \
+    --icon="/usr/share/pixmaps/monitor.xpm" \
     --text="There are system updates necessary!"
   </code>
 
diff --git a/help/C/usage.page b/help/C/usage.page
index 8aa88cc8..c219eedc 100644
--- a/help/C/usage.page
+++ b/help/C/usage.page
@@ -120,14 +120,6 @@
 	<p>Specifies the title of a dialog.</p>
       </item>
 
-      <item>
-        <title><cmd>--window-icon</cmd>=<var>icon_path</var></title>
-	<p>Specifies the icon that is displayed in the window frame of the dialog. There are
-	      4 stock icons also available by providing the following keywords - 'info', 'warning', 'question' and
-	      'error'.
-        </p>
-      </item>
-
       <item>
         <title><cmd>--width</cmd>=<var>width</var></title>
 	<p>Specifies the width of the dialog.</p>
diff --git a/help/ChangeLog b/help/ChangeLog.pre-git
similarity index 100%
rename from help/ChangeLog
rename to help/ChangeLog.pre-git
diff --git a/help/de/de.po b/help/de/de.po
index 5cdd791d..c9104fab 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -3,20 +3,21 @@
 # Christian Kirbach <Christian.Kirbach@gmail.com>, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2015.
 # Tim Sabsch <tim@sabsch.com>, 2020.
+# Jürgen Benvenuti <gastornis@posteo.org>, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity master\n"
-"POT-Creation-Date: 2020-01-13 08:18+0000\n"
-"PO-Revision-Date: 2020-02-15 17:10+0100\n"
-"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
-"Language-Team: Deutsch <gnome-de@gnome.org>\n"
-"Language: de_DE\n"
+"POT-Creation-Date: 2023-01-25 22:40+0000\n"
+"PO-Revision-Date: 2023-01-28 22:29+0100\n"
+"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #. (itstool) path: p/link
 #: C/legal.xml:5
@@ -33,7 +34,7 @@ msgstr ""
 #. (itstool) path: p/link
 #: C/legal.xml:15
 msgid "link"
-msgstr "Link"
+msgstr "Verweis"
 
 #. (itstool) path: license/p
 #: C/legal.xml:8
@@ -153,7 +154,8 @@ msgid "translator-credits"
 msgstr ""
 "Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2012\n"
 "Christian Kirbach <Christian.Kirbach@gmail.com>, 2012, 2019\n"
-"Tim Sabsch <tim@sabsch.com>, 2020"
+"Tim Sabsch <tim@sabsch.com>, 2020\n"
+"Jürgen Benvenuti <gastornis@posteo.org>, 2023."
 
 #. (itstool) path: info/desc
 #: C/calendar.page:6
@@ -343,7 +345,7 @@ msgstr "Die anfängliche Farbe festlegen (z.B. #FF0000)"
 #. (itstool) path: item/title
 #: C/color-selection.page:25
 msgid "<cmd>--show-palette</cmd>"
-msgstr "--show-palette"
+msgstr "<cmd>--show-palette</cmd>"
 
 #. (itstool) path: item/p
 #: C/color-selection.page:26
@@ -761,8 +763,8 @@ msgstr "Einen neuen Eintrag im Formulardialog hinzufügen."
 
 #. (itstool) path: item/title
 #: C/forms.page:26
-msgid "--add-password<cmd/>=<var>FieldName</var>"
-msgstr "--add-password<cmd/>=<var>Feldname</var>"
+msgid "<cmd>--add-password</cmd>=<var>FieldName</var>"
+msgstr "<cmd>--add-password</cmd>=<var>Feldname</var>"
 
 #. (itstool) path: item/p
 #: C/forms.page:27
diff --git a/help/eu/eu.po b/help/eu/eu.po
index d764ef3b..3d7b035c 100644
--- a/help/eu/eu.po
+++ b/help/eu/eu.po
@@ -37,7 +37,7 @@ msgid ""
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
 "of the GFDL at this <_:link-1/>."
-msgstr "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzetan, atal aldaezinik gabe, aurreko azaleko testurik gabe eta atzeko azaleko testurik gabe. GFDL lizentziaren kopia esteka honetan: <_:ulink-1/>."
+msgstr "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzetan, atal aldaezinik gabe, aurreko azaleko testurik gabe eta atzeko azaleko testurik gabe. GFDL lizentziaren kopia esteka honetan: <_:link-1/>."
 
 #. (itstool) path: license/p
 #: C/legal.xml:17
diff --git a/help/hu/hu.po b/help/hu/hu.po
index ad6f32ea..9e5d3620 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -1,26 +1,25 @@
 # Hungarian translation for zenity_help.
-# Copyright (C) 2012, 2014, 2015, 2019. Free Software Foundation, Inc.
+# Copyright (C) 2012, 2014, 2015, 2019, 2023 Free Software Foundation, Inc.
 # This file is distributed under the same license as the zenity package.
 #
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2012, 2014.
-# Balázs Úr <ur.balazs at fsf dot hu>, 2014, 2015, 2019.
+# Balázs Úr <ur.balazs at fsf dot hu>, 2014, 2015, 2019, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity_help master\n"
-"POT-Creation-Date: 2019-09-07 13:19+0000\n"
-"PO-Revision-Date: 2019-09-09 08:13+0200\n"
+"POT-Creation-Date: 2023-03-06 19:55+0000\n"
+"PO-Revision-Date: 2023-03-08 23:06+0100\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 22.08.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. (itstool) path: p/link
 #: C/legal.xml:5
-#| msgid "GNU Free Documentation License (GFDL)"
 msgid "GNU Free Documentation License Version 1.1"
 msgstr "GNU Free Documentation License 1.1-es verzió"
 
@@ -36,13 +35,6 @@ msgstr "hivatkozáson"
 
 #. (itstool) path: license/p
 #: C/legal.xml:8
-#| msgid ""
-#| "Permission is granted to copy, distribute and/or modify this document "
-#| "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 "
-#| "or any later version published by the Free Software Foundation with no "
-#| "Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You "
-#| "can find a copy of the GFDL at this <_:link-1/> or in the file COPYING-"
-#| "DOCS distributed with this manual."
 msgid ""
 "Permission is granted to copy, distribute and/or modify this document under "
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
@@ -86,10 +78,6 @@ msgstr ""
 
 #. (itstool) path: license/p
 #: C/legal.xml:33
-#| msgid ""
-#| "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE "
-#| "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER "
-#| "UNDERSTANDING THAT: <_:orderedlist-1/>"
 msgid ""
 "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
 "OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:"
@@ -761,8 +749,9 @@ msgstr "Új bejegyzés hozzáadása az Űrlapok ablakhoz."
 
 #. (itstool) path: item/title
 #: C/forms.page:26
-msgid "--add-password<cmd/>=<var>FieldName</var>"
-msgstr "--add-password<cmd/>=<var>Mezőnév</var>"
+#| msgid "--add-password<cmd/>=<var>FieldName</var>"
+msgid "<cmd>--add-password</cmd>=<var>FieldName</var>"
+msgstr "<cmd>--add-password</cmd>=<var>Mezőnév</var>"
 
 #. (itstool) path: item/p
 #: C/forms.page:27
@@ -1294,10 +1283,14 @@ msgstr "Értesítési ikon"
 
 #. (itstool) path: page/p
 #: C/notification.page:10
-msgid "Use the <cmd>--notification</cmd> option to create a notification icon."
+#| msgid ""
+#| "Use the <cmd>--notification</cmd> option to create a notification icon."
+msgid ""
+"Use the <cmd>--notification</cmd> option to create a passive desktop "
+"notification."
 msgstr ""
-"A <cmd>--notification</cmd> kapcsoló használatával értesítési ikont hozhat "
-"létre."
+"A <cmd>--notification</cmd> kapcsoló használatával passzív asztali értesítést"
+" hozhat létre."
 
 #. (itstool) path: item/p
 #: C/notification.page:15
@@ -1306,15 +1299,27 @@ msgstr "Az értesítési területen megjelenítendő szöveg megadása."
 
 #. (itstool) path: item/title
 #: C/notification.page:18
+#| msgid "<cmd>--month</cmd>=<var>month</var>"
+msgid "<cmd>--icon</cmd>=<var>path</var>"
+msgstr "<cmd>--icon</cmd>=<var>útvonal</var>"
+
+#. (itstool) path: item/p
+#: C/notification.page:19
 msgid ""
-"<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
-"tooltip: '<var>text</var>', visible: '<var>text</var>',"
+"Set the notification icon using a string containing a path to a valid icon "
+"on the system."
 msgstr ""
-"<cmd>--listen</cmd>=icon: '<var>szöveg</var>', message: '<var>szöveg</var>', "
-"tooltip: '<var>szöveg</var>', visible: '<var>szöveg</var>',"
+"Az értesítési ikon beállítása a rendszerben lévő érvényes ikonra mutató"
+" útvonalat tartalmazó karakterlánc használatával."
+
+#. (itstool) path: item/title
+#: C/notification.page:22
+#| msgid "<cmd>--pulsate</cmd>"
+msgid "<cmd>--listen</cmd>"
+msgstr "<cmd>--listen</cmd>"
 
 #. (itstool) path: item/p
-#: C/notification.page:19
+#: C/notification.page:23
 msgid ""
 "Listens for commands at standard input. At least one command must be "
 "specified. Commands are comma separated. A command must be followed by a "
@@ -1325,48 +1330,82 @@ msgstr ""
 "értéknek kell követnie."
 
 #. (itstool) path: note/p
-#: C/notification.page:21
+#: C/notification.page:25
+#| msgid ""
+#| "The <cmd>icon</cmd> command also accepts four stock icon values such as "
+#| "<var>error</var>, <var>info</var>, <var>question</var> and <var>warning</"
+#| "var>."
+msgid ""
+"The <cmd>icon</cmd> command also accepts icon theme name values in "
+"accordance with the FreeDesktop.org Icon Naming Specification such as "
+"<var>dialog-error</var>, <var>dialog-information</var> and <var>security-"
+"high</var>."
+msgstr ""
+"A <cmd>icon</cmd> parancs elfogadja a FreeDesktop.org ikonelnevezési"
+" specifikációja szerinti ikontémák névértékeit is, mint például <var"
+">dialog-error</var>, <var>dialog-information</var> és <var>security-high</var"
+">."
+
+#. (itstool) path: item/p
+#: C/notification.page:27
+msgid "Examples include:"
+msgstr "Ilyenek például:"
+
+#. (itstool) path: item/code
+#: C/notification.page:28
+#, no-wrap
 msgid ""
-"The <cmd>icon</cmd> command also accepts four stock icon values such as "
-"<var>error</var>, <var>info</var>, <var>question</var> and <var>warning</"
-"var>."
+"\n"
+"      message: Hello, my name is Joe\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 msgstr ""
-"Az <cmd>icon</cmd> parancs elfogad négy alap ikonértéket is, mint az "
-"<var>error</var>, <var>info</var>, <var>question</var> és <var>warning</var>."
+"\n"
+"      message: Helló, a nevem János\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 
 #. (itstool) path: page/p
-#: C/notification.page:26
+#: C/notification.page:35
 msgid "The following example script shows how to create a notification icon:"
 msgstr ""
 "A következő példa parancsfájl bemutatja az értesítési ikon létrehozását:"
 
 #. (itstool) path: page/code
-#: C/notification.page:27
+#: C/notification.page:36
 #, no-wrap
+#| msgid ""
+#| "\n"
+#| "  #!/bin/sh\n"
+#| "\n"
+#| "  zenity --notification\\\n"
+#| "    --window-icon=\"info\" \\\n"
+#| "    --text=\"There are system updates necessary!\"\n"
+#| "  "
 msgid ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"There are system updates necessary!\"\n"
 "  "
 msgstr ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"Rendszerfrissítés szükséges!\"\n"
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:36
+#: C/notification.page:45
 msgid "Notification Icon Example"
 msgstr "Példa értesítési ikon"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:37
+#: C/notification.page:46
 msgid "<app>Zenity</app> notification icon example"
 msgstr "<app>Zenity</app> példa értesítési ikon"
 
@@ -1375,7 +1414,7 @@ msgstr "<app>Zenity</app> példa értesítési ikon"
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:38
+#: C/notification.page:47
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-screenshot.png' "
@@ -1385,7 +1424,7 @@ msgstr ""
 "md5='723bd2d1283f5a888967815991cbe858'"
 
 #. (itstool) path: page/p
-#: C/notification.page:41
+#: C/notification.page:50
 msgid ""
 "The following example script shows how to create a notification icon along "
 "with <cmd>--listen</cmd>:"
@@ -1394,7 +1433,7 @@ msgstr ""
 "<cmd>--listen</cmd> használatával:"
 
 #. (itstool) path: page/code
-#: C/notification.page:42
+#: C/notification.page:51
 #, no-wrap
 msgid ""
 "\n"
@@ -1412,12 +1451,12 @@ msgstr ""
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:50
+#: C/notification.page:59
 msgid "Notification Icon with <cmd>--listen</cmd> Example"
 msgstr "Példa értesítési ikon a <cmd>--listen</cmd> használatával"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:51
+#: C/notification.page:60
 msgid "<app>Zenity</app> notification with <cmd>--listen</cmd> example"
 msgstr ""
 "<app>Zenity</app> példa értesítési ikon a <cmd>--listen</cmd> használatával"
@@ -1427,7 +1466,7 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:52
+#: C/notification.page:61
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-listen-screenshot.png' "
@@ -2227,11 +2266,11 @@ msgstr "<var>0</var>"
 #. (itstool) path: td/p
 #: C/usage.page:74
 msgid ""
-"The user has pressed either <gui style=\"button\">OK</gui> or <gui style="
-"\"button\">Close</gui>."
+"The user has pressed either <gui style=\"button\">OK</gui> or <gui "
+"style=\"button\">Close</gui>."
 msgstr ""
-"A felhasználó megnyomta az <gui style=\"button\">OK</gui> vagy a <gui style="
-"\"button\">Bezárás</gui> gombot."
+"A felhasználó megnyomta az <gui style=\"button\">OK</gui> vagy a <gui "
+"style=\"button\">Bezárás</gui> gombot."
 
 #. (itstool) path: td/p
 #: C/usage.page:79
@@ -2289,237 +2328,221 @@ msgstr "Az ablak címének megadása."
 
 #. (itstool) path: item/title
 #: C/usage.page:124
-msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
-msgstr "<cmd>--window-icon</cmd>=<var>ikonútvonal</var>"
-
-#. (itstool) path: item/p
-#: C/usage.page:125
-msgid ""
-"Specifies the icon that is displayed in the window frame of the dialog. "
-"There are 4 stock icons also available by providing the following keywords - "
-"'info', 'warning', 'question' and 'error'."
-msgstr ""
-"Az ablakkeretben megjelenő ikon megadása. A következő kulcsszavak "
-"megadásával elérhető 4 alapértelmezett ikon is: „info”, "
-"„warning” (figyelmeztetés), „question” (kérdés) és „error” (hiba)."
-
-#. (itstool) path: item/title
-#: C/usage.page:132
 msgid "<cmd>--width</cmd>=<var>width</var>"
 msgstr "<cmd>--width</cmd>=<var>szélesség</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:133
+#: C/usage.page:125
 msgid "Specifies the width of the dialog."
 msgstr "Az ablak szélességének megadása."
 
 #. (itstool) path: item/title
-#: C/usage.page:137
+#: C/usage.page:129
 msgid "<cmd>--height</cmd>=<var>height</var>"
 msgstr "<cmd>--height</cmd>=<var>magasság</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:138
+#: C/usage.page:130
 msgid "Specifies the height of the dialog."
 msgstr "Az ablak magasságának megadása."
 
 #. (itstool) path: item/title
-#: C/usage.page:142
+#: C/usage.page:134
 msgid "<cmd>--timeout</cmd>=<var>timeout</var>"
 msgstr "<cmd>--timeout</cmd>=<var>időkorlát</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:143
+#: C/usage.page:135
 msgid "Specifies the timeout in seconds after which the dialog is closed."
 msgstr "Időkorlát megadása másodpercben, amely után az ablak bezárandó."
 
 #. (itstool) path: section/title
-#: C/usage.page:153
+#: C/usage.page:145
 msgid "Help Options"
 msgstr "Súgólehetőségek"
 
 #. (itstool) path: section/p
-#: C/usage.page:155
+#: C/usage.page:147
 msgid "Zenity provides the following help options:"
 msgstr "A Zenity a következő súgólehetőségeket biztosítja:"
 
 #. (itstool) path: item/title
-#: C/usage.page:162
+#: C/usage.page:154
 msgid "<cmd>--help</cmd>"
 msgstr "<cmd>--help</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:163
+#: C/usage.page:155
 msgid "Displays shortened help text."
 msgstr "Rövid súgószöveg megjelenítése."
 
 #. (itstool) path: item/title
-#: C/usage.page:167
+#: C/usage.page:159
 msgid "<cmd>--help-all</cmd>"
 msgstr "<cmd>--help-all</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:168
+#: C/usage.page:160
 msgid "Displays full help text for all dialogs."
 msgstr "Részletes súgószöveg megjelenítése minden ablakhoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:172
+#: C/usage.page:164
 msgid "<cmd>--help-general</cmd>"
 msgstr "<cmd>--help-general</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:173
+#: C/usage.page:165
 msgid "Displays help text for general dialog options."
 msgstr "Súgószöveg megjelenítése az általános ablakbeállításokhoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:177
+#: C/usage.page:169
 msgid "<cmd>--help-calendar</cmd>"
 msgstr "<cmd>--help-calendar</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:178
+#: C/usage.page:170
 msgid "Displays help text for calendar dialog options."
 msgstr "Súgószöveg megjelenítése a naptár ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:182
+#: C/usage.page:174
 msgid "<cmd>--help-entry</cmd>"
 msgstr "<cmd>--help-entry</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:183
+#: C/usage.page:175
 msgid "Displays help text for text entry dialog options."
 msgstr "Súgószöveg megjelenítése a szövegbeviteli ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:187
+#: C/usage.page:179
 msgid "<cmd>--help-error</cmd>"
 msgstr "<cmd>--help-error</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:188
+#: C/usage.page:180
 msgid "Displays help text for error dialog options."
 msgstr "Súgószöveg megjelenítése a hibaablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:192
+#: C/usage.page:184
 msgid "<cmd>--help-info</cmd>"
 msgstr "<cmd>--help-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:193
+#: C/usage.page:185
 msgid "Displays help text for information dialog options."
 msgstr "Súgószöveg megjelenítése az információs ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:197
+#: C/usage.page:189
 msgid "<cmd>--help-file-selection</cmd>"
 msgstr "<cmd>--help-file-selection</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:198
+#: C/usage.page:190
 msgid "Displays help text for file selection dialog options."
 msgstr "Súgószöveg megjelenítése a fájlválasztó ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:202
+#: C/usage.page:194
 msgid "<cmd>--help-list</cmd>"
 msgstr "<cmd>--help-list</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:203
+#: C/usage.page:195
 msgid "Displays help text for list dialog options."
 msgstr "Súgószöveg megjelenítése a lista ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:207
+#: C/usage.page:199
 msgid "<cmd>--help-notification</cmd>"
 msgstr "<cmd>--help-notification</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:208
+#: C/usage.page:200
 msgid "Displays help text for notification icon options."
 msgstr "Súgószöveg megjelenítése az értesítési ikon beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:212
+#: C/usage.page:204
 msgid "<cmd>--help-progress</cmd>"
 msgstr "<cmd>--help-progress</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:213
+#: C/usage.page:205
 msgid "Displays help text for progress dialog options."
 msgstr "Súgószöveg megjelenítése a folyamatjelző ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:217
+#: C/usage.page:209
 msgid "<cmd>--help-question</cmd>"
 msgstr "<cmd>--help-question</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:218
+#: C/usage.page:210
 msgid "Displays help text for question dialog options."
 msgstr "Súgószöveg megjelenítése a kérdés ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:222
+#: C/usage.page:214
 msgid "<cmd>--help-warning</cmd>"
 msgstr "<cmd>--help-warning</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:223
+#: C/usage.page:215
 msgid "Displays help text for warning dialog options."
 msgstr "Súgószöveg megjelenítése a figyelmeztető ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:227
+#: C/usage.page:219
 msgid "<cmd>--help-text-info</cmd>"
 msgstr "<cmd>--help-text-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:228
+#: C/usage.page:220
 msgid "Displays help for text information dialog options."
 msgstr "Súgószöveg megjelenítése a szöveges információs ablak beállításaihoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:232
+#: C/usage.page:224
 msgid "<cmd>--help-misc</cmd>"
 msgstr "<cmd>--help-misc</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:233
+#: C/usage.page:225
 msgid "Displays help for miscellaneous options."
 msgstr "Súgószöveg megjelenítése egyéb beállításokhoz."
 
 #. (itstool) path: item/title
-#: C/usage.page:237
+#: C/usage.page:229
 msgid "<cmd>--help-gtk</cmd>"
 msgstr "<cmd>--help-gtk</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:238
+#: C/usage.page:230
 msgid "Displays help for GTK+ options."
 msgstr "Súgószöveg megjelenítése a GTK+ beállításokhoz."
 
 #. (itstool) path: section/title
-#: C/usage.page:248
+#: C/usage.page:240
 msgid "Miscellaneous Options"
 msgstr "Egyéb beállítások"
 
 #. (itstool) path: section/p
-#: C/usage.page:250
+#: C/usage.page:242
 msgid "Zenity also provides the following miscellaneous options:"
 msgstr "A Zenity a következő egyéb beállításokat is biztosítja:"
 
 #. (itstool) path: item/title
-#: C/usage.page:257
+#: C/usage.page:249
 msgid "<cmd>--about</cmd>"
 msgstr "<cmd>--about</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:258
+#: C/usage.page:250
 msgid ""
 "Displays the <gui>About Zenity</gui> dialog, which contains Zenity version "
 "information, copyright information, and developer information."
@@ -2528,37 +2551,37 @@ msgstr ""
 "jogi és fejlesztői információkat tartalmaz."
 
 #. (itstool) path: item/title
-#: C/usage.page:262
+#: C/usage.page:254
 msgid "<cmd>--version</cmd>"
 msgstr "<cmd>--version</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:263
+#: C/usage.page:255
 msgid "Displays the version number of Zenity."
 msgstr "A Zenity verziószámának megjelenítése."
 
 #. (itstool) path: section/title
-#: C/usage.page:273
+#: C/usage.page:265
 msgid "GTK+ Options"
 msgstr "GTK+ beállításai"
 
 #. (itstool) path: section/p
-#: C/usage.page:275
+#: C/usage.page:267
 msgid ""
-"Zenity supports the standard GTK+ options. For more information about the GTK"
-"+ options, execute the <cmd>zenity --help-gtk</cmd> command."
+"Zenity supports the standard GTK+ options. For more information about the "
+"GTK+ options, execute the <cmd>zenity --help-gtk</cmd> command."
 msgstr ""
 "A Zenity támogatja a szabványos GTK+ beállításokat. A GTK+ beállításokkal "
 "kapcsolatos további információkért adja ki a <cmd>zenity --help-gtk</cmd> "
 "parancsot."
 
 #. (itstool) path: section/title
-#: C/usage.page:284
+#: C/usage.page:276
 msgid "Environment Variables"
 msgstr "Környezeti változók"
 
 #. (itstool) path: section/p
-#: C/usage.page:286
+#: C/usage.page:278
 msgid ""
 "Normally, Zenity detects the terminal window from which it was launched and "
 "keeps itself above that window. This behavior can be disabled by unsetting "
diff --git a/help/pl/pl.po b/help/pl/pl.po
index 9459a5ec..e62f248c 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -1,14 +1,14 @@
 # Polish translation for zenity help.
-# Copyright © 2017-2019 the zenity authors.
+# Copyright © 2017-2023 the zenity authors.
 # This file is distributed under the same license as the zenity help.
-# Piotr Drąg <piotrdrag@gmail.com>, 2017-2019.
-# Aviary.pl <community-poland@mozilla.org>, 2017-2019.
+# Piotr Drąg <piotrdrag@gmail.com>, 2017-2023.
+# Aviary.pl <community-poland@mozilla.org>, 2017-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity-help\n"
-"POT-Creation-Date: 2019-09-07 13:19+0000\n"
-"PO-Revision-Date: 2019-09-08 10:50+0200\n"
+"POT-Creation-Date: 2023-03-08 22:07+0000\n"
+"PO-Revision-Date: 2023-03-12 15:19+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -140,8 +140,8 @@ msgstr ""
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Piotr Drąg <piotrdrag@gmail.com>, 2017-2019\n"
-"Aviary.pl <community-poland@mozilla.org>, 2017-2019"
+"Piotr Drąg <piotrdrag@gmail.com>, 2017-2023\n"
+"Aviary.pl <community-poland@mozilla.org>, 2017-2023"
 
 #. (itstool) path: info/desc
 #: C/calendar.page:6
@@ -738,8 +738,8 @@ msgstr "Dodaje nowy wpis w oknie formularza."
 
 #. (itstool) path: item/title
 #: C/forms.page:26
-msgid "--add-password<cmd/>=<var>FieldName</var>"
-msgstr "--add-password<cmd/>=<var>NazwaPola</var>"
+msgid "<cmd>--add-password</cmd>=<var>FieldName</var>"
+msgstr "<cmd>--add-password</cmd>=<var>NazwaPola</var>"
 
 #. (itstool) path: item/p
 #: C/forms.page:27
@@ -1263,9 +1263,11 @@ msgstr "Ikona powiadomienia"
 
 #. (itstool) path: page/p
 #: C/notification.page:10
-msgid "Use the <cmd>--notification</cmd> option to create a notification icon."
+msgid ""
+"Use the <cmd>--notification</cmd> option to create a passive desktop "
+"notification."
 msgstr ""
-"Użyj opcji <cmd>--notification</cmd>, aby utworzyć ikonę powiadomienia."
+"Użyj opcji <cmd>--notification</cmd>, aby utworzyć powiadomienie na pulpicie."
 
 #. (itstool) path: item/p
 #: C/notification.page:15
@@ -1274,15 +1276,25 @@ msgstr "Określa tekst wyświetlany w obszarze powiadamiania."
 
 #. (itstool) path: item/title
 #: C/notification.page:18
+msgid "<cmd>--icon</cmd>=<var>path</var>"
+msgstr "<cmd>--icon</cmd>=<var>ścieżka</var>"
+
+#. (itstool) path: item/p
+#: C/notification.page:19
 msgid ""
-"<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
-"tooltip: '<var>text</var>', visible: '<var>text</var>',"
+"Set the notification icon using a string containing a path to a valid icon "
+"on the system."
 msgstr ""
-"<cmd>--listen</cmd>=icon: '<var>tekst</var>', message: '<var>tekst</var>', "
-"tooltip: '<var>tekst</var>', visible: '<var>tekst</var>',"
+"Ustawia ikonę powiadomienia za pomocą ciągu zawierającego ścieżkę do "
+"prawidłowej ikony na komputerze."
+
+#. (itstool) path: item/title
+#: C/notification.page:22
+msgid "<cmd>--listen</cmd>"
+msgstr "<cmd>--listen</cmd>"
 
 #. (itstool) path: item/p
-#: C/notification.page:19
+#: C/notification.page:23
 msgid ""
 "Listens for commands at standard input. At least one command must be "
 "specified. Commands are comma separated. A command must be followed by a "
@@ -1293,48 +1305,69 @@ msgstr ""
 "dwukropek i wartość."
 
 #. (itstool) path: note/p
-#: C/notification.page:21
+#: C/notification.page:25
+msgid ""
+"The <cmd>icon</cmd> command also accepts icon theme name values in "
+"accordance with the FreeDesktop.org Icon Naming Specification such as "
+"<var>dialog-error</var>, <var>dialog-information</var> and <var>security-"
+"high</var>."
+msgstr ""
+"Polecenie <cmd>icon</cmd> przyjmuje także wartości nazw motywu ikon "
+"w zgodzie ze specyfikacją nazywania ikon FreeDesktop.org: <var>dialog-error</"
+"var> (okno z błędem), <var>dialog-information</var> (okno z informacją) "
+"i <var>security-high</var> (wysoki poziom zagrożenia bezpieczeństwa)."
+
+#. (itstool) path: item/p
+#: C/notification.page:27
+msgid "Examples include:"
+msgstr "Przykłady:"
+
+#. (itstool) path: item/code
+#: C/notification.page:28
+#, no-wrap
 msgid ""
-"The <cmd>icon</cmd> command also accepts four stock icon values such as "
-"<var>error</var>, <var>info</var>, <var>question</var> and <var>warning</"
-"var>."
+"\n"
+"      message: Hello, my name is Joe\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 msgstr ""
-"Polecenie <cmd>icon</cmd> przyjmuje także wartości czterech standardowych "
-"ikon: <var>error</var> (błąd), <var>info</var> (informacja), <var>question</"
-"var> (pytanie) i <var>warning</var> (ostrzeżenie)."
+"\n"
+"      message: Cześć, nazywam się Alicja\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 
 #. (itstool) path: page/p
-#: C/notification.page:26
+#: C/notification.page:35
 msgid "The following example script shows how to create a notification icon:"
 msgstr "Ten przykładowy skrypt pokazuje, jak utworzyć ikonę powiadomienia:"
 
 #. (itstool) path: page/code
-#: C/notification.page:27
+#: C/notification.page:36
 #, no-wrap
 msgid ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"There are system updates necessary!\"\n"
 "  "
 msgstr ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"Niezbędne są aktualizacje systemu.\"\n"
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:36
+#: C/notification.page:45
 msgid "Notification Icon Example"
 msgstr "Przykład ikony powiadamiania"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:37
+#: C/notification.page:46
 msgid "<app>Zenity</app> notification icon example"
 msgstr "Przykład ikony powiadamiania <app>Zenity</app>"
 
@@ -1343,7 +1376,7 @@ msgstr "Przykład ikony powiadamiania <app>Zenity</app>"
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:38
+#: C/notification.page:47
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-screenshot.png' "
@@ -1353,7 +1386,7 @@ msgstr ""
 "md5='723bd2d1283f5a888967815991cbe858'"
 
 #. (itstool) path: page/p
-#: C/notification.page:41
+#: C/notification.page:50
 msgid ""
 "The following example script shows how to create a notification icon along "
 "with <cmd>--listen</cmd>:"
@@ -1362,7 +1395,7 @@ msgstr ""
 "<cmd>--listen</cmd>:"
 
 #. (itstool) path: page/code
-#: C/notification.page:42
+#: C/notification.page:51
 #, no-wrap
 msgid ""
 "\n"
@@ -1380,12 +1413,12 @@ msgstr ""
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:50
+#: C/notification.page:59
 msgid "Notification Icon with <cmd>--listen</cmd> Example"
 msgstr "Przykład ikony powiadamiania z opcją <cmd>--listen</cmd>"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:51
+#: C/notification.page:60
 msgid "<app>Zenity</app> notification with <cmd>--listen</cmd> example"
 msgstr ""
 "Przykład ikony powiadamiania <app>Zenity</app> z opcją <cmd>--listen</cmd>"
@@ -1395,7 +1428,7 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:52
+#: C/notification.page:61
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-listen-screenshot.png' "
@@ -2173,11 +2206,11 @@ msgstr "<var>0</var>"
 #. (itstool) path: td/p
 #: C/usage.page:74
 msgid ""
-"The user has pressed either <gui style=\"button\">OK</gui> or <gui style="
-"\"button\">Close</gui>."
+"The user has pressed either <gui style=\"button\">OK</gui> or <gui "
+"style=\"button\">Close</gui>."
 msgstr ""
-"Użytkownik kliknął przycisk <gui style=\"button\">OK</gui> lub <gui style="
-"\"button\">Zamknij</gui>."
+"Użytkownik kliknął przycisk <gui style=\"button\">OK</gui> lub <gui "
+"style=\"button\">Zamknij</gui>."
 
 #. (itstool) path: td/p
 #: C/usage.page:79
@@ -2234,238 +2267,222 @@ msgstr "Określa tytuł okna."
 
 #. (itstool) path: item/title
 #: C/usage.page:124
-msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
-msgstr "<cmd>--window-icon</cmd>=<var>ścieżka-do-ikony</var>"
-
-#. (itstool) path: item/p
-#: C/usage.page:125
-msgid ""
-"Specifies the icon that is displayed in the window frame of the dialog. "
-"There are 4 stock icons also available by providing the following keywords - "
-"'info', 'warning', 'question' and 'error'."
-msgstr ""
-"Określa ikonę wyświetlaną w ramce okna. Dostępne są także cztery standardowe "
-"ikony, które można określić słowami kluczowymi „info” (informacja), "
-"„warning” (ostrzeżenie), „question” (pytanie) i „error” (błąd)."
-
-#. (itstool) path: item/title
-#: C/usage.page:132
 msgid "<cmd>--width</cmd>=<var>width</var>"
 msgstr "<cmd>--width</cmd>=<var>szerokość</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:133
+#: C/usage.page:125
 msgid "Specifies the width of the dialog."
 msgstr "Określa szerokość okna."
 
 #. (itstool) path: item/title
-#: C/usage.page:137
+#: C/usage.page:129
 msgid "<cmd>--height</cmd>=<var>height</var>"
 msgstr "<cmd>--height</cmd>=<var>wysokość</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:138
+#: C/usage.page:130
 msgid "Specifies the height of the dialog."
 msgstr "Określa wysokość okna."
 
 #. (itstool) path: item/title
-#: C/usage.page:142
+#: C/usage.page:134
 msgid "<cmd>--timeout</cmd>=<var>timeout</var>"
 msgstr "<cmd>--timeout</cmd>=<var>czas-oczekiwania</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:143
+#: C/usage.page:135
 msgid "Specifies the timeout in seconds after which the dialog is closed."
 msgstr ""
 "Określa czas oczekiwania w sekundach, po jakich okno zostanie zamknięte."
 
 #. (itstool) path: section/title
-#: C/usage.page:153
+#: C/usage.page:145
 msgid "Help Options"
 msgstr "Opcje pomocy"
 
 #. (itstool) path: section/p
-#: C/usage.page:155
+#: C/usage.page:147
 msgid "Zenity provides the following help options:"
 msgstr "Zenity dostarcza te opcje pomocy:"
 
 #. (itstool) path: item/title
-#: C/usage.page:162
+#: C/usage.page:154
 msgid "<cmd>--help</cmd>"
 msgstr "<cmd>--help</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:163
+#: C/usage.page:155
 msgid "Displays shortened help text."
 msgstr "Wyświetla skrócony tekst pomocy."
 
 #. (itstool) path: item/title
-#: C/usage.page:167
+#: C/usage.page:159
 msgid "<cmd>--help-all</cmd>"
 msgstr "<cmd>--help-all</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:168
+#: C/usage.page:160
 msgid "Displays full help text for all dialogs."
 msgstr "Wyświetla pełny tekst pomocy dla wszystkich okien."
 
 #. (itstool) path: item/title
-#: C/usage.page:172
+#: C/usage.page:164
 msgid "<cmd>--help-general</cmd>"
 msgstr "<cmd>--help-general</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:173
+#: C/usage.page:165
 msgid "Displays help text for general dialog options."
 msgstr "Wyświetla tekst pomocy dla ogólnych opcji okna."
 
 #. (itstool) path: item/title
-#: C/usage.page:177
+#: C/usage.page:169
 msgid "<cmd>--help-calendar</cmd>"
 msgstr "<cmd>--help-calendar</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:178
+#: C/usage.page:170
 msgid "Displays help text for calendar dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna kalendarza."
 
 #. (itstool) path: item/title
-#: C/usage.page:182
+#: C/usage.page:174
 msgid "<cmd>--help-entry</cmd>"
 msgstr "<cmd>--help-entry</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:183
+#: C/usage.page:175
 msgid "Displays help text for text entry dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna wpisywania tekstu."
 
 #. (itstool) path: item/title
-#: C/usage.page:187
+#: C/usage.page:179
 msgid "<cmd>--help-error</cmd>"
 msgstr "<cmd>--help-error</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:188
+#: C/usage.page:180
 msgid "Displays help text for error dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna z błędem."
 
 #. (itstool) path: item/title
-#: C/usage.page:192
+#: C/usage.page:184
 msgid "<cmd>--help-info</cmd>"
 msgstr "<cmd>--help-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:193
+#: C/usage.page:185
 msgid "Displays help text for information dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna z informacją."
 
 #. (itstool) path: item/title
-#: C/usage.page:197
+#: C/usage.page:189
 msgid "<cmd>--help-file-selection</cmd>"
 msgstr "<cmd>--help-file-selection</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:198
+#: C/usage.page:190
 msgid "Displays help text for file selection dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna wyboru pliku."
 
 #. (itstool) path: item/title
-#: C/usage.page:202
+#: C/usage.page:194
 msgid "<cmd>--help-list</cmd>"
 msgstr "<cmd>--help-list</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:203
+#: C/usage.page:195
 msgid "Displays help text for list dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna z listą."
 
 #. (itstool) path: item/title
-#: C/usage.page:207
+#: C/usage.page:199
 msgid "<cmd>--help-notification</cmd>"
 msgstr "<cmd>--help-notification</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:208
+#: C/usage.page:200
 msgid "Displays help text for notification icon options."
 msgstr "Wyświetla tekst pomocy dla opcji ikony powiadamiania."
 
 #. (itstool) path: item/title
-#: C/usage.page:212
+#: C/usage.page:204
 msgid "<cmd>--help-progress</cmd>"
 msgstr "<cmd>--help-progress</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:213
+#: C/usage.page:205
 msgid "Displays help text for progress dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna z postępem."
 
 #. (itstool) path: item/title
-#: C/usage.page:217
+#: C/usage.page:209
 msgid "<cmd>--help-question</cmd>"
 msgstr "<cmd>--help-question</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:218
+#: C/usage.page:210
 msgid "Displays help text for question dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna z pytaniem."
 
 #. (itstool) path: item/title
-#: C/usage.page:222
+#: C/usage.page:214
 msgid "<cmd>--help-warning</cmd>"
 msgstr "<cmd>--help-warning</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:223
+#: C/usage.page:215
 msgid "Displays help text for warning dialog options."
 msgstr "Wyświetla tekst pomocy dla opcji okna z ostrzeżeniem."
 
 #. (itstool) path: item/title
-#: C/usage.page:227
+#: C/usage.page:219
 msgid "<cmd>--help-text-info</cmd>"
 msgstr "<cmd>--help-text-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:228
+#: C/usage.page:220
 msgid "Displays help for text information dialog options."
 msgstr "Wyświetla pomoc dla opcji okna z informacją tekstową."
 
 #. (itstool) path: item/title
-#: C/usage.page:232
+#: C/usage.page:224
 msgid "<cmd>--help-misc</cmd>"
 msgstr "<cmd>--help-misc</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:233
+#: C/usage.page:225
 msgid "Displays help for miscellaneous options."
 msgstr "Wyświetla pomoc dla różnych opcji."
 
 #. (itstool) path: item/title
-#: C/usage.page:237
+#: C/usage.page:229
 msgid "<cmd>--help-gtk</cmd>"
 msgstr "<cmd>--help-gtk</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:238
+#: C/usage.page:230
 msgid "Displays help for GTK+ options."
 msgstr "Wyświetla pomoc dla opcji biblioteki GTK."
 
 #. (itstool) path: section/title
-#: C/usage.page:248
+#: C/usage.page:240
 msgid "Miscellaneous Options"
 msgstr "Różne opcje"
 
 #. (itstool) path: section/p
-#: C/usage.page:250
+#: C/usage.page:242
 msgid "Zenity also provides the following miscellaneous options:"
 msgstr "Zenity dostarcza także te różne opcje:"
 
 #. (itstool) path: item/title
-#: C/usage.page:257
+#: C/usage.page:249
 msgid "<cmd>--about</cmd>"
 msgstr "<cmd>--about</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:258
+#: C/usage.page:250
 msgid ""
 "Displays the <gui>About Zenity</gui> dialog, which contains Zenity version "
 "information, copyright information, and developer information."
@@ -2474,36 +2491,36 @@ msgstr ""
 "informacje o prawach autorskich i programistach."
 
 #. (itstool) path: item/title
-#: C/usage.page:262
+#: C/usage.page:254
 msgid "<cmd>--version</cmd>"
 msgstr "<cmd>--version</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:263
+#: C/usage.page:255
 msgid "Displays the version number of Zenity."
 msgstr "Wyświetla wersję Zenity."
 
 #. (itstool) path: section/title
-#: C/usage.page:273
+#: C/usage.page:265
 msgid "GTK+ Options"
 msgstr "Opcje biblioteki GTK"
 
 #. (itstool) path: section/p
-#: C/usage.page:275
+#: C/usage.page:267
 msgid ""
-"Zenity supports the standard GTK+ options. For more information about the GTK"
-"+ options, execute the <cmd>zenity --help-gtk</cmd> command."
+"Zenity supports the standard GTK+ options. For more information about the "
+"GTK+ options, execute the <cmd>zenity --help-gtk</cmd> command."
 msgstr ""
 "Zenity obsługuje standardowe opcje biblioteki GTK. Wykonanie polecenia "
 "<cmd>zenity --help-gtk</cmd> wyświetli więcej informacji."
 
 #. (itstool) path: section/title
-#: C/usage.page:284
+#: C/usage.page:276
 msgid "Environment Variables"
 msgstr "Zmienne środowiskowe"
 
 #. (itstool) path: section/p
-#: C/usage.page:286
+#: C/usage.page:278
 msgid ""
 "Normally, Zenity detects the terminal window from which it was launched and "
 "keeps itself above that window. This behavior can be disabled by unsetting "
diff --git a/help/ru/ru.po b/help/ru/ru.po
index d33095cc..4b1de849 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity help trunk\n"
-"POT-Creation-Date: 2022-07-29 08:30+0000\n"
-"PO-Revision-Date: 2023-01-02 15:50+1000\n"
+"POT-Creation-Date: 2023-03-08 22:07+0000\n"
+"PO-Revision-Date: 2023-04-05 17:33+1000\n"
 "Last-Translator: Ser82-png <asvmail.as@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -136,7 +136,10 @@ msgstr ""
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr "Deshko Yury <deshko@tut.by>, 2007"
+msgstr ""
+"Deshko Yury <deshko@tut.by>, 2007\n"
+"Yuri Kozlov <yuray@komyakino.ru>, 2011\n"
+"Ser82-png <asvmail.as@gmail.com>, 2023"
 
 #. (itstool) path: info/desc
 #: C/calendar.page:6
@@ -282,9 +285,6 @@ msgstr "Пример диалогового окна календаря Zenity"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/calendar.page:67
-#| msgid ""
-#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
-#| "md5=b739d32aad963be4415d34ec103baf26"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-calendar-screenshot.png' "
@@ -393,9 +393,6 @@ msgstr "Пример диалогового окна выбора цвета <ap
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/color-selection.page:53
-#| msgid ""
-#| "@@image: 'figures/zenity-fileselection-screenshot.png'; "
-#| "md5=2c903cba26fb40462deea0bb6b931ea7"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-colorselection-screenshot.png' "
@@ -451,7 +448,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/entry.page:30
-#| msgid "--hide-text"
 msgid "<cmd>--hide-text</cmd>"
 msgstr "<cmd>--hide-text</cmd>"
 
@@ -470,19 +466,6 @@ msgstr ""
 #. (itstool) path: page/code
 #: C/entry.page:40
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        if zenity --entry \\\n"
-#| "        --title=\"Add an Entry\" \\\n"
-#| "        --text=\"Enter your _password:\" \\\n"
-#| "        --entry-text \"password\" \\\n"
-#| "        --hide-text\n"
-#| "          then echo $?\n"
-#| "          else echo \"No password entered\"\n"
-#| "        fi\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -522,9 +505,6 @@ msgstr "Пример диалогового окна ввода текста <ap
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/entry.page:56
-#| msgid ""
-#| "@@image: 'figures/zenity-entry-screenshot.png'; "
-#| "md5=0fb790cbb6d13ec13a314b34f844ee80"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-entry-screenshot.png' "
@@ -589,9 +569,6 @@ msgstr "Пример диалогового окна ошибки <app>Zenity</a
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/error.page:29
-#| msgid ""
-#| "@@image: 'figures/zenity-error-screenshot.png'; "
-#| "md5=c0fae27dcfc45eb335fd6bbc5e7f29b5"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-error-screenshot.png' "
@@ -643,7 +620,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/file-selection.page:26
-#| msgid "--multiple"
 msgid "<cmd>--multiple</cmd>"
 msgstr "<cmd>--multiple</cmd>"
 
@@ -655,7 +631,6 @@ msgstr "Позволяет выбирать сразу несколько фай
 
 #. (itstool) path: item/title
 #: C/file-selection.page:31
-#| msgid "--directory"
 msgid "<cmd>--directory</cmd>"
 msgstr "<cmd>--directory</cmd>"
 
@@ -676,7 +651,6 @@ msgstr "Устанавливает диалоговое окно в режим 
 
 #. (itstool) path: item/title
 #: C/file-selection.page:41 C/list.page:53
-#| msgid "<option>--separator</option>=<replaceable>separator</replaceable>"
 msgid "<cmd>--separator</cmd>=<var>separator</var>"
 msgstr "<cmd>--separator</cmd>=<var>разделитель</var>"
 
@@ -699,21 +673,6 @@ msgstr ""
 #. (itstool) path: page/code
 #: C/file-selection.page:51
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        FILE=`zenity --file-selection --title=\"Select a File\"`\n"
-#| "\n"
-#| "        case $? in\n"
-#| "                 0)\n"
-#| "                        echo \"\\\"$FILE\\\" selected.\";;\n"
-#| "                 1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "                -1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "        esac\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -759,9 +718,6 @@ msgstr "Пример диалогового окна выбора файла <ap
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/file-selection.page:69
-#| msgid ""
-#| "@@image: 'figures/zenity-fileselection-screenshot.png'; "
-#| "md5=2c903cba26fb40462deea0bb6b931ea7"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-fileselection-screenshot.png' "
@@ -950,7 +906,6 @@ msgstr "Glynn Foster"
 
 #. (itstool) path: credit/name
 #: C/index.page:12
-#| msgid "Nicholas"
 msgid "Nicholas Curran"
 msgstr "Nicholas Curran"
 
@@ -1025,9 +980,6 @@ msgstr "Пример диалогового окна информации <app>Z
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/info.page:29
-#| msgid ""
-#| "@@image: 'figures/zenity-information-screenshot.png'; "
-#| "md5=5a9af4275678c8bfb9b48010860a45e5"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-information-screenshot.png' "
@@ -1201,7 +1153,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/list.page:35
-#| msgid "--checklist"
 msgid "<cmd>--checklist</cmd>"
 msgstr "<cmd>--checklist</cmd>"
 
@@ -1214,7 +1165,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/list.page:41
-#| msgid "--radiolist"
 msgid "<cmd>--radiolist</cmd>"
 msgstr "<cmd>--radiolist</cmd>"
 
@@ -1226,7 +1176,6 @@ msgstr "Указывает, что первый столбец в диалого
 
 #. (itstool) path: item/title
 #: C/list.page:47 C/text.page:26
-#| msgid "--editable"
 msgid "<cmd>--editable</cmd>"
 msgstr "<cmd>--editable</cmd>"
 
@@ -1246,7 +1195,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/list.page:59
-#| msgid "<option>--print-column</option>=<replaceable>column</replaceable>"
 msgid "<cmd>--print-column</cmd>=<var>column</var>"
 msgstr "<cmd>--print-column</cmd>=<var>столбец</var>"
 
@@ -1306,9 +1254,6 @@ msgstr "Пример диалогового окна списка <app>Zenity</a
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/list.page:85
-#| msgid ""
-#| "@@image: 'figures/zenity-list-screenshot.png'; "
-#| "md5=9c5a2704eb27e21a8e8739c49f77b3fc"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-list-screenshot.png' "
@@ -1343,7 +1288,6 @@ msgstr ""
 
 #. (itstool) path: info/desc
 #: C/notification.page:6
-#| msgid "Displays help text for notification icon options."
 msgid "Use the <cmd>--notification</cmd> option."
 msgstr "Использование параметра <cmd>--notification</cmd>."
 
@@ -1354,10 +1298,12 @@ msgstr "Значок уведомления"
 
 #. (itstool) path: page/p
 #: C/notification.page:10
-msgid "Use the <cmd>--notification</cmd> option to create a notification icon."
+msgid ""
+"Use the <cmd>--notification</cmd> option to create a passive desktop "
+"notification."
 msgstr ""
-"Используйте параметр <cmd>--notification</cmd>, чтобы создать значок "
-"уведомления."
+"Используйте параметр <cmd>--notification</cmd>, чтобы создать пассивное "
+"уведомление на рабочем столе."
 
 #. (itstool) path: item/p
 #: C/notification.page:15
@@ -1366,15 +1312,25 @@ msgstr "Указывает текст, который будет изображ
 
 #. (itstool) path: item/title
 #: C/notification.page:18
+msgid "<cmd>--icon</cmd>=<var>path</var>"
+msgstr "<cmd>--icon</cmd>=<var>путь</var>"
+
+#. (itstool) path: item/p
+#: C/notification.page:19
 msgid ""
-"<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
-"tooltip: '<var>text</var>', visible: '<var>text</var>',"
+"Set the notification icon using a string containing a path to a valid icon "
+"on the system."
 msgstr ""
-"<cmd>--listen</cmd>=icon: '<var>текст</var>', message: '<var>текст</var>', "
-"tooltip: '<var>текст</var>', visible: '<var>текст</var>',"
+"Устанавливает значок уведомления, указанный в строке, содержащей путь к "
+"имеющемуся в системе значку."
+
+#. (itstool) path: item/title
+#: C/notification.page:22
+msgid "<cmd>--listen</cmd>"
+msgstr "<cmd>--listen</cmd>"
 
 #. (itstool) path: item/p
-#: C/notification.page:19
+#: C/notification.page:23
 msgid ""
 "Listens for commands at standard input. At least one command must be "
 "specified. Commands are comma separated. A command must be followed by a "
@@ -1385,39 +1341,52 @@ msgstr ""
 "двоеточие и значение."
 
 #. (itstool) path: note/p
-#: C/notification.page:21
+#: C/notification.page:25
 msgid ""
-"The <cmd>icon</cmd> command also accepts four stock icon values such as "
-"<var>error</var>, <var>info</var>, <var>question</var> and <var>warning</"
+"The <cmd>icon</cmd> command also accepts icon theme name values in "
+"accordance with the FreeDesktop.org Icon Naming Specification such as "
+"<var>dialog-error</var>, <var>dialog-information</var> and <var>security-"
+"high</var>."
+msgstr ""
+"Команда <cmd>icon</cmd> также принимает значение названия темы значка в "
+"соответствии со спецификацией именования значков FreeDesktop.org, например "
+"<var>dialog-error</var>, <var>dialog-information</var> и <var>security-high</"
 "var>."
+
+#. (itstool) path: item/p
+#: C/notification.page:27
+msgid "Examples include:"
+msgstr "Примеры:"
+
+#. (itstool) path: item/code
+#: C/notification.page:28
+#, no-wrap
+msgid ""
+"\n"
+"      message: Hello, my name is Joe\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 msgstr ""
-"Команда <cmd>icon</cmd> также принимает значение четырёх стандартных "
-"значков, таких как <var>error</var>, <var>info</var>, <var>question</var> и "
-"<var>warning</var>."
+"\n"
+"      message: Привет, меня зовут Джо\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 
 #. (itstool) path: page/p
-#: C/notification.page:26
+#: C/notification.page:35
 msgid "The following example script shows how to create a notification icon:"
 msgstr ""
 "Следующий сценарий является примером того, как создавать значок уведомлений:"
 
 #. (itstool) path: page/code
-#: C/notification.page:27
+#: C/notification.page:36
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        zenity --notification\\\n"
-#| "          --window-icon=\"info\" \\\n"
-#| "          --text=\"There are system updates necessary!\"\n"
-#| "      "
 msgid ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"There are system updates necessary!\"\n"
 "  "
 msgstr ""
@@ -1425,17 +1394,17 @@ msgstr ""
 "  #!/bin/sh\n"
 "\n"
 "  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"Необходимо обновить систему!\"\n"
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:36
+#: C/notification.page:45
 msgid "Notification Icon Example"
 msgstr "Пример значка уведомления"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:37
+#: C/notification.page:46
 msgid "<app>Zenity</app> notification icon example"
 msgstr "Пример значка уведомления <app>Zenity</app>"
 
@@ -1444,10 +1413,7 @@ msgstr "Пример значка уведомления <app>Zenity</app>"
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:38
-#| msgid ""
-#| "@@image: 'figures/zenity-notification-screenshot.png'; "
-#| "md5=d7a119ced7cdf49b307013551d94e11e"
+#: C/notification.page:47
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-screenshot.png' "
@@ -1457,7 +1423,7 @@ msgstr ""
 "md5='723bd2d1283f5a888967815991cbe858'"
 
 #. (itstool) path: page/p
-#: C/notification.page:41
+#: C/notification.page:50
 msgid ""
 "The following example script shows how to create a notification icon along "
 "with <cmd>--listen</cmd>:"
@@ -1466,7 +1432,7 @@ msgstr ""
 "<cmd>--listen</cmd>:"
 
 #. (itstool) path: page/code
-#: C/notification.page:42
+#: C/notification.page:51
 #, no-wrap
 msgid ""
 "\n"
@@ -1484,12 +1450,12 @@ msgstr ""
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:50
+#: C/notification.page:59
 msgid "Notification Icon with <cmd>--listen</cmd> Example"
 msgstr "Пример значка уведомления с <cmd>--listen</cmd>"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:51
+#: C/notification.page:60
 msgid "<app>Zenity</app> notification with <cmd>--listen</cmd> example"
 msgstr "Пример значка уведомления <app>Zenity</app> с <cmd>--listen</cmd>"
 
@@ -1498,10 +1464,7 @@ msgstr "Пример значка уведомления <app>Zenity</app> с <c
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:52
-#| msgid ""
-#| "@@image: 'figures/zenity-notification-screenshot.png'; "
-#| "md5=d7a119ced7cdf49b307013551d94e11e"
+#: C/notification.page:61
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-listen-screenshot.png' "
@@ -1602,9 +1565,6 @@ msgstr "Пример диалогового окна ввода пароля <ap
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/password.page:48
-#| msgid ""
-#| "@@image: 'figures/zenity-progress-screenshot.png'; "
-#| "md5=706736240f396ada12044c23b708a6a6"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-password-screenshot.png' "
@@ -1655,7 +1615,6 @@ msgstr "Указывает текст, который будет изображ
 
 #. (itstool) path: item/title
 #: C/progress.page:30
-#| msgid "<option>--percentage</option>=<replaceable>percentage</replaceable>"
 msgid "<cmd>--percentage</cmd>=<var>percentage</var>"
 msgstr "<cmd>--percentage</cmd>=<var>процент</var>"
 
@@ -1666,7 +1625,6 @@ msgstr "Указывает начальное состояние индикат
 
 #. (itstool) path: item/title
 #: C/progress.page:35
-#| msgid "--auto-close"
 msgid "<cmd>--auto-close</cmd>"
 msgstr "<cmd>--auto-close</cmd>"
 
@@ -1677,7 +1635,6 @@ msgstr "Диалоговое окно закрывается, когда про
 
 #. (itstool) path: item/title
 #: C/progress.page:40
-#| msgid "--pulsate"
 msgid "<cmd>--pulsate</cmd>"
 msgstr "<cmd>--pulsate</cmd>"
 
@@ -1763,9 +1720,6 @@ msgstr "Пример диалогового окна индикатора ход
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/progress.page:78
-#| msgid ""
-#| "@@image: 'figures/zenity-progress-screenshot.png'; "
-#| "md5=706736240f396ada12044c23b708a6a6"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-progress-screenshot.png' "
@@ -1801,13 +1755,6 @@ msgstr ""
 #. (itstool) path: page/code
 #: C/question.page:18
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "          #!/bin/bash\n"
-#| "\n"
-#| "          zenity --question \\\n"
-#| "          --text=\"Are you sure you wish to proceed?\"\n"
-#| "        "
 msgid ""
 "\n"
 "#!/bin/bash\n"
@@ -1837,9 +1784,6 @@ msgstr "Пример диалогового окна вопроса <app>Zenity<
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/question.page:29
-#| msgid ""
-#| "@@image: 'figures/zenity-question-screenshot.png'; "
-#| "md5=df8414504f8c8ca946a3f1e63a460938"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-question-screenshot.png' "
@@ -1951,21 +1895,6 @@ msgstr ""
 #. (itstool) path: page/code
 #: C/scale.page:60
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        FILE=`zenity --file-selection --title=\"Select a File\"`\n"
-#| "\n"
-#| "        case $? in\n"
-#| "                 0)\n"
-#| "                        echo \"\\\"$FILE\\\" selected.\";;\n"
-#| "                 1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "                -1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "        esac\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -2011,9 +1940,6 @@ msgstr "Пример диалогового окна шкалы <app>Zenity</app
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/scale.page:78
-#| msgid ""
-#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
-#| "md5=b739d32aad963be4415d34ec103baf26"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-scale-screenshot.png' "
@@ -2181,9 +2107,6 @@ msgstr "Пример диалогового окна текстовой инфо
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/text.page:84
-#| msgid ""
-#| "@@image: 'figures/zenity-text-screenshot.png'; "
-#| "md5=55d2e2a0254f43ef3c7e9b3d0c4cde04"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-text-screenshot.png' "
@@ -2412,261 +2335,229 @@ msgstr "Указывает заголовок диалогового окна."
 
 #. (itstool) path: item/title
 #: C/usage.page:124
-#| msgid "<option>--window-icon</option>=<replaceable>icon_path</replaceable>"
-msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
-msgstr "<cmd>--window-icon</cmd>=<var>путь_к_значку</var>"
-
-#. (itstool) path: item/p
-#: C/usage.page:125
-msgid ""
-"Specifies the icon that is displayed in the window frame of the dialog. "
-"There are 4 stock icons also available by providing the following keywords - "
-"'info', 'warning', 'question' and 'error'."
-msgstr ""
-"Указывает значок, который изображается в рамке диалогового окна. Существуют "
-"4 запасных значка, доступных по следующим ключевым словам: 'info', "
-"'warning', 'question' и 'error'."
-
-#. (itstool) path: item/title
-#: C/usage.page:132
 msgid "<cmd>--width</cmd>=<var>width</var>"
 msgstr "<cmd>--width</cmd>=<var>ширина</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:133
+#: C/usage.page:125
 msgid "Specifies the width of the dialog."
 msgstr "Указывает ширину диалогового окна."
 
 #. (itstool) path: item/title
-#: C/usage.page:137
+#: C/usage.page:129
 msgid "<cmd>--height</cmd>=<var>height</var>"
 msgstr "<cmd>--height</cmd>=<var>высота</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:138
+#: C/usage.page:130
 msgid "Specifies the height of the dialog."
 msgstr "Указывает высоту диалогового окна."
 
 #. (itstool) path: item/title
-#: C/usage.page:142
+#: C/usage.page:134
 msgid "<cmd>--timeout</cmd>=<var>timeout</var>"
 msgstr "<cmd>--timeout</cmd>=<var>время_ожидания</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:143
+#: C/usage.page:135
 msgid "Specifies the timeout in seconds after which the dialog is closed."
 msgstr ""
 "Указывает время ожидания в секундах, по истечении которого диалоговое окно "
 "закрывается."
 
 #. (itstool) path: section/title
-#: C/usage.page:153
+#: C/usage.page:145
 msgid "Help Options"
 msgstr "Параметры вызова справки"
 
 #. (itstool) path: section/p
-#: C/usage.page:155
+#: C/usage.page:147
 msgid "Zenity provides the following help options:"
 msgstr "Zenity предоставляет следующие параметры справки:"
 
 #. (itstool) path: item/title
-#: C/usage.page:162
+#: C/usage.page:154
 msgid "<cmd>--help</cmd>"
 msgstr "<cmd>--help</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:163
+#: C/usage.page:155
 msgid "Displays shortened help text."
 msgstr "Показывает сокращённый текст справки."
 
 #. (itstool) path: item/title
-#: C/usage.page:167
-#| msgid "--help-all"
+#: C/usage.page:159
 msgid "<cmd>--help-all</cmd>"
 msgstr "<cmd>--help-all</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:168
+#: C/usage.page:160
 msgid "Displays full help text for all dialogs."
 msgstr "Показывает полный текст справки для всех диалоговых окон."
 
 #. (itstool) path: item/title
-#: C/usage.page:172
-#| msgid "--help-general"
+#: C/usage.page:164
 msgid "<cmd>--help-general</cmd>"
 msgstr "<cmd>--help-general</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:173
+#: C/usage.page:165
 msgid "Displays help text for general dialog options."
 msgstr "Показывает текст справки по общим параметрам диалоговых окон."
 
 #. (itstool) path: item/title
-#: C/usage.page:177
-#| msgid "--help-calendar"
+#: C/usage.page:169
 msgid "<cmd>--help-calendar</cmd>"
 msgstr "<cmd>--help-calendar</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:178
+#: C/usage.page:170
 msgid "Displays help text for calendar dialog options."
 msgstr "Показывает текст справки по параметрам диалогового окна календаря."
 
 #. (itstool) path: item/title
-#: C/usage.page:182
-#| msgid "--help-entry"
+#: C/usage.page:174
 msgid "<cmd>--help-entry</cmd>"
 msgstr "<cmd>--help-entry</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:183
+#: C/usage.page:175
 msgid "Displays help text for text entry dialog options."
 msgstr "Показывает текст справки по параметрам диалогового окна ввода текста."
 
 #. (itstool) path: item/title
-#: C/usage.page:187
-#| msgid "--help-error"
+#: C/usage.page:179
 msgid "<cmd>--help-error</cmd>"
 msgstr "<cmd>--help-error</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:188
+#: C/usage.page:180
 msgid "Displays help text for error dialog options."
 msgstr ""
 "Показывает текст справки по параметрам диалогового окна сообщения об ошибке."
 
 #. (itstool) path: item/title
-#: C/usage.page:192
-#| msgid "--help-info"
+#: C/usage.page:184
 msgid "<cmd>--help-info</cmd>"
 msgstr "<cmd>--help-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:193
+#: C/usage.page:185
 msgid "Displays help text for information dialog options."
 msgstr ""
 "Показывает текст справки по параметрам информационного диалогового окна."
 
 #. (itstool) path: item/title
-#: C/usage.page:197
-#| msgid "--help-file-selection"
+#: C/usage.page:189
 msgid "<cmd>--help-file-selection</cmd>"
 msgstr "<cmd>--help-file-selection</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:198
+#: C/usage.page:190
 msgid "Displays help text for file selection dialog options."
 msgstr "Показывает текст справки по параметрам диалогового окна выбора файла."
 
 #. (itstool) path: item/title
-#: C/usage.page:202
-#| msgid "--help-list"
+#: C/usage.page:194
 msgid "<cmd>--help-list</cmd>"
 msgstr "<cmd>--help-list</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:203
+#: C/usage.page:195
 msgid "Displays help text for list dialog options."
 msgstr "Показывает текст справки по параметрам диалогового окна списка."
 
 #. (itstool) path: item/title
-#: C/usage.page:207
-#| msgid "--help-notification"
+#: C/usage.page:199
 msgid "<cmd>--help-notification</cmd>"
 msgstr "<cmd>--help-notification</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:208
+#: C/usage.page:200
 msgid "Displays help text for notification icon options."
 msgstr "Показывает текст справки по параметрам значка уведомлений."
 
 #. (itstool) path: item/title
-#: C/usage.page:212
-#| msgid "--help-progress"
+#: C/usage.page:204
 msgid "<cmd>--help-progress</cmd>"
 msgstr "<cmd>--help-progress</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:213
+#: C/usage.page:205
 msgid "Displays help text for progress dialog options."
 msgstr ""
 "Показывает текст справки по параметрам диалогового окна хода выполнения."
 
 #. (itstool) path: item/title
-#: C/usage.page:217
-#| msgid "--help-question"
+#: C/usage.page:209
 msgid "<cmd>--help-question</cmd>"
 msgstr "<cmd>--help-question</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:218
+#: C/usage.page:210
 msgid "Displays help text for question dialog options."
 msgstr "Показывает текст справки по параметрам диалогового окна вопроса."
 
 #. (itstool) path: item/title
-#: C/usage.page:222
-#| msgid "--help-warning"
+#: C/usage.page:214
 msgid "<cmd>--help-warning</cmd>"
 msgstr "<cmd>--help-warning</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:223
+#: C/usage.page:215
 msgid "Displays help text for warning dialog options."
 msgstr ""
 "Показывает текст справки по параметрам диалогового окна предупреждения."
 
 #. (itstool) path: item/title
-#: C/usage.page:227
-#| msgid "--help-text-info"
+#: C/usage.page:219
 msgid "<cmd>--help-text-info</cmd>"
 msgstr "<cmd>--help-text-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:228
+#: C/usage.page:220
 msgid "Displays help for text information dialog options."
 msgstr ""
 "Показывает текст справки по параметрам диалогового окна текстовой информации."
 
 #. (itstool) path: item/title
-#: C/usage.page:232
-#| msgid "--help-misc"
+#: C/usage.page:224
 msgid "<cmd>--help-misc</cmd>"
 msgstr "<cmd>--help-misc</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:233
+#: C/usage.page:225
 msgid "Displays help for miscellaneous options."
 msgstr "Показывает справки по разнообразным параметрам."
 
 #. (itstool) path: item/title
-#: C/usage.page:237
-#| msgid "--help-gtk"
+#: C/usage.page:229
 msgid "<cmd>--help-gtk</cmd>"
 msgstr "<cmd>--help-gtk</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:238
+#: C/usage.page:230
 msgid "Displays help for GTK+ options."
 msgstr "Показывает справку по параметрам GTK+."
 
 #. (itstool) path: section/title
-#: C/usage.page:248
+#: C/usage.page:240
 msgid "Miscellaneous Options"
 msgstr "Прочие параметры"
 
 #. (itstool) path: section/p
-#: C/usage.page:250
+#: C/usage.page:242
 msgid "Zenity also provides the following miscellaneous options:"
 msgstr ""
 "Zenity также может запускаться со следующими дополнительными параметрами:"
 
 #. (itstool) path: item/title
-#: C/usage.page:257
+#: C/usage.page:249
 msgid "<cmd>--about</cmd>"
 msgstr "<cmd>--about</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:258
+#: C/usage.page:250
 msgid ""
 "Displays the <gui>About Zenity</gui> dialog, which contains Zenity version "
 "information, copyright information, and developer information."
@@ -2676,23 +2567,22 @@ msgstr ""
 "разработчике."
 
 #. (itstool) path: item/title
-#: C/usage.page:262
-#| msgid "--version"
+#: C/usage.page:254
 msgid "<cmd>--version</cmd>"
 msgstr "<cmd>--version</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:263
+#: C/usage.page:255
 msgid "Displays the version number of Zenity."
 msgstr "Отображает номер версии Zenity."
 
 #. (itstool) path: section/title
-#: C/usage.page:273
+#: C/usage.page:265
 msgid "GTK+ Options"
 msgstr "Параметры GTK+"
 
 #. (itstool) path: section/p
-#: C/usage.page:275
+#: C/usage.page:267
 msgid ""
 "Zenity supports the standard GTK+ options. For more information about the "
 "GTK+ options, execute the <cmd>zenity --help-gtk</cmd> command."
@@ -2702,12 +2592,12 @@ msgstr ""
 "help-gtk</cmd>."
 
 #. (itstool) path: section/title
-#: C/usage.page:284
+#: C/usage.page:276
 msgid "Environment Variables"
 msgstr "Переменные окружения"
 
 #. (itstool) path: section/p
-#: C/usage.page:286
+#: C/usage.page:278
 msgid ""
 "Normally, Zenity detects the terminal window from which it was launched and "
 "keeps itself above that window. This behavior can be disabled by unsetting "
@@ -2744,13 +2634,6 @@ msgstr ""
 #. (itstool) path: page/code
 #: C/warning.page:18
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "          #!/bin/bash\n"
-#| "        \n"
-#| "          zenity --warning \\\n"
-#| "          --text=\"Disconnect the power cable to avoid electrical shock.\"\n"
-#| "        "
 msgid ""
 "\n"
 "#!/bin/bash\n"
@@ -2780,9 +2663,6 @@ msgstr "Пример диалогового окна предупреждени
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/warning.page:28
-#| msgid ""
-#| "@@image: 'figures/zenity-warning-screenshot.png'; "
-#| "md5=cde1378d51f800a025b8c37ecdb60a20"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-warning-screenshot.png' "
@@ -2791,6 +2671,26 @@ msgstr ""
 "external ref='figures/zenity-warning-screenshot.png' "
 "md5='a2d07437efca06b775ceae24816d96a6'"
 
+#~ msgid ""
+#~ "<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
+#~ "tooltip: '<var>text</var>', visible: '<var>text</var>',"
+#~ msgstr ""
+#~ "<cmd>--listen</cmd>=icon: '<var>текст</var>', message: '<var>текст</"
+#~ "var>', tooltip: '<var>текст</var>', visible: '<var>текст</var>',"
+
+#~| msgid "<option>--window-icon</option>=<replaceable>icon_path</replaceable>"
+#~ msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
+#~ msgstr "<cmd>--window-icon</cmd>=<var>путь_к_значку</var>"
+
+#~ msgid ""
+#~ "Specifies the icon that is displayed in the window frame of the dialog. "
+#~ "There are 4 stock icons also available by providing the following "
+#~ "keywords - 'info', 'warning', 'question' and 'error'."
+#~ msgstr ""
+#~ "Указывает значок, который изображается в рамке диалогового окна. "
+#~ "Существуют 4 запасных значка, доступных по следующим ключевым словам: "
+#~ "'info', 'warning', 'question' и 'error'."
+
 #~ msgid "Zenity Desktop Application Manual V2.0"
 #~ msgstr "Руководство Zenity, версия 2.0"
 
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 23891d7a..09c665ba 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -1,17 +1,17 @@
 # Swedish messages for Zenity manual.
-# Copyright © 2006-2019 zenity's COPYRIGHT HOLDER
+# Copyright © 2006-2023 zenity's COPYRIGHT HOLDER
 # Daniel Nylander <po@danielnylander.se>, 2006, 2009.
 # Josef Andersson, <l10nl18nsweja@gmail.com>, 2015.
 # Sebastian Rasmussen <sebras@gmail.com>, 2016.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2017, 2019.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2017, 2019, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=zenity&keywords=I18N+L10N&component=docs\n"
-"POT-Creation-Date: 2020-04-03 07:50+0000\n"
-"PO-Revision-Date: 2020-04-06 22:02+0200\n"
+"POT-Creation-Date: 2023-03-06 19:55+0000\n"
+"PO-Revision-Date: 2023-03-06 21:24+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.2.2\n"
 
 #. (itstool) path: p/link
 #: C/legal.xml:5
@@ -150,7 +150,8 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>, 2006, 2009\n"
-"Sebastian Rasmussen <sebras@gmail.com>, 2016"
+"Sebastian Rasmussen <sebras@gmail.com>, 2016\n"
+"Anders Jonsson <anders.jonsson@norsjovallen.se>, 2023"
 
 #. (itstool) path: info/desc
 #: C/calendar.page:6
@@ -751,8 +752,8 @@ msgstr "Lägg till en ny inmatningsruta i formulärdialogen."
 
 #. (itstool) path: item/title
 #: C/forms.page:26
-msgid "--add-password<cmd/>=<var>FieldName</var>"
-msgstr "--add-password<cmd/>=<var>Fältnamn</var>"
+msgid "<cmd>--add-password</cmd>=<var>FieldName</var>"
+msgstr "<cmd>--add-password</cmd>=<var>Fältnamn</var>"
 
 #. (itstool) path: item/p
 #: C/forms.page:27
@@ -1244,8 +1245,8 @@ msgid ""
 "<link xref=\"error\">Error</link>, <link xref=\"info\">Info</link>, <link "
 "xref=\"question\">Question</link>, <link xref=\"warning\">Warning</link>"
 msgstr ""
-"<link xref=\"error\">Fel</link>, <link xref=\"info\">Info</link>, <link xref="
-"\"question\">Fråga</link>, <link xref=\"warning\">Varning</link>"
+"<link xref=\"error\">Fel</link>, <link xref=\"info\">Info</link>, <link "
+"xref=\"question\">Fråga</link>, <link xref=\"warning\">Varning</link>"
 
 #. (itstool) path: page/title
 #: C/message.page:14
@@ -1273,9 +1274,12 @@ msgstr "Aviseringsikon"
 
 #. (itstool) path: page/p
 #: C/notification.page:10
-msgid "Use the <cmd>--notification</cmd> option to create a notification icon."
+msgid ""
+"Use the <cmd>--notification</cmd> option to create a passive desktop "
+"notification."
 msgstr ""
-"Använd flaggan <cmd>--notification</cmd> för att skapa en aviseringsikon."
+"Använd flaggan <cmd>--notification</cmd> för att skapa en passiv "
+"skrivbordsavisering."
 
 #. (itstool) path: item/p
 #: C/notification.page:15
@@ -1284,15 +1288,25 @@ msgstr "Anger texten som visas i aviseringsytan."
 
 #. (itstool) path: item/title
 #: C/notification.page:18
+msgid "<cmd>--icon</cmd>=<var>path</var>"
+msgstr "<cmd>--icon</cmd>=<var>sökväg</var>"
+
+#. (itstool) path: item/p
+#: C/notification.page:19
 msgid ""
-"<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
-"tooltip: '<var>text</var>', visible: '<var>text</var>',"
+"Set the notification icon using a string containing a path to a valid icon "
+"on the system."
 msgstr ""
-"<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
-"tooltip: '<var>text</var>', visible: '<var>text</var>',"
+"Ställ in aviseringsikonen med en sträng som innehåller en sökväg till en "
+"giltig ikon i systemet."
+
+#. (itstool) path: item/title
+#: C/notification.page:22
+msgid "<cmd>--listen</cmd>"
+msgstr "<cmd>--listen</cmd>"
 
 #. (itstool) path: item/p
-#: C/notification.page:19
+#: C/notification.page:23
 msgid ""
 "Listens for commands at standard input. At least one command must be "
 "specified. Commands are comma separated. A command must be followed by a "
@@ -1303,48 +1317,68 @@ msgstr ""
 "värde."
 
 #. (itstool) path: note/p
-#: C/notification.page:21
+#: C/notification.page:25
 msgid ""
-"The <cmd>icon</cmd> command also accepts four stock icon values such as "
-"<var>error</var>, <var>info</var>, <var>question</var> and <var>warning</"
-"var>."
+"The <cmd>icon</cmd> command also accepts icon theme name values in "
+"accordance with the FreeDesktop.org Icon Naming Specification such as "
+"<var>dialog-error</var>, <var>dialog-information</var> and <var>security-"
+"high</var>."
 msgstr ""
-"Kommandot <cmd>icon</cmd> accepterar fyra standardikonvärden så som "
-"<var>error</var>, <var>info</var>, <var>question</var> och <var>warning</"
-"var>."
+"Kommandot <cmd>icon</cmd> accepterar också värden för ikontemanamn enligt "
+"Icon Naming Specification på FreeDesktop.org, såsom <var>dialog-error</var>, "
+"<var>dialog-information</var> och <var>security-high</var>."
+
+#. (itstool) path: item/p
+#: C/notification.page:27
+msgid "Examples include:"
+msgstr "Exempel:"
+
+#. (itstool) path: item/code
+#: C/notification.page:28
+#, no-wrap
+msgid ""
+"\n"
+"      message: Hello, my name is Joe\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
+msgstr ""
+"\n"
+"      message: Hej, jag heter Joel\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 
 #. (itstool) path: page/p
-#: C/notification.page:26
+#: C/notification.page:35
 msgid "The following example script shows how to create a notification icon:"
 msgstr "Följande exempelskript visar hur man skapar en aviseringsikon:"
 
 #. (itstool) path: page/code
-#: C/notification.page:27
+#: C/notification.page:36
 #, no-wrap
 msgid ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"There are system updates necessary!\"\n"
 "  "
 msgstr ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"Det finns nödvändiga systemuppdateringar!\"\n"
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:36
+#: C/notification.page:45
 msgid "Notification Icon Example"
 msgstr "Exempel på aviseringsikon"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:37
+#: C/notification.page:46
 msgid "<app>Zenity</app> notification icon example"
 msgstr "<app>Zenity</app>-exempel på aviseringsikon"
 
@@ -1353,7 +1387,7 @@ msgstr "<app>Zenity</app>-exempel på aviseringsikon"
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:38
+#: C/notification.page:47
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-screenshot.png' "
@@ -1363,7 +1397,7 @@ msgstr ""
 "md5='723bd2d1283f5a888967815991cbe858'"
 
 #. (itstool) path: page/p
-#: C/notification.page:41
+#: C/notification.page:50
 msgid ""
 "The following example script shows how to create a notification icon along "
 "with <cmd>--listen</cmd>:"
@@ -1372,7 +1406,7 @@ msgstr ""
 "med <cmd>--listen</cmd>:"
 
 #. (itstool) path: page/code
-#: C/notification.page:42
+#: C/notification.page:51
 #, no-wrap
 msgid ""
 "\n"
@@ -1390,12 +1424,12 @@ msgstr ""
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:50
+#: C/notification.page:59
 msgid "Notification Icon with <cmd>--listen</cmd> Example"
 msgstr "Exempel på aviseringsikon med <cmd>--listen</cmd>"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:51
+#: C/notification.page:60
 msgid "<app>Zenity</app> notification with <cmd>--listen</cmd> example"
 msgstr "<app>Zenity</app>-aviseringsexempel med <cmd>--listen</cmd>"
 
@@ -1404,7 +1438,7 @@ msgstr "<app>Zenity</app>-aviseringsexempel med <cmd>--listen</cmd>"
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:52
+#: C/notification.page:61
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-listen-screenshot.png' "
@@ -1949,7 +1983,7 @@ msgstr "<cmd>--url</cmd>=<var>URL</var>"
 #: C/text.page:47
 msgid "Sets an url instead of a file. Only works if you use --html option."
 msgstr ""
-"Ställer in en url istället för en fil. Fungerar endast om du använder "
+"Ställer in en url i stället för en fil. Fungerar endast om du använder "
 "flaggan --html."
 
 #. (itstool) path: page/p
@@ -2139,9 +2173,9 @@ msgid ""
 "dialog option."
 msgstr ""
 "En snabbtangent är en tangent som låter dig genomföra en åtgärd från "
-"tangentbordet istället för att använda musen för att välja ett kommando från "
-"en meny eller dialog. Varje snabbtangent identifieras av en understruken "
-"bokstav i en meny eller dialogflagga."
+"tangentbordet i stället för att använda musen för att välja ett kommando "
+"från en meny eller dialog. Varje snabbtangent identifieras av en "
+"understruken bokstav i en meny eller dialogflagga."
 
 #. (itstool) path: section/p
 #: C/usage.page:47
@@ -2190,8 +2224,8 @@ msgstr "<var>0</var>"
 #. (itstool) path: td/p
 #: C/usage.page:74
 msgid ""
-"The user has pressed either <gui style=\"button\">OK</gui> or <gui style="
-"\"button\">Close</gui>."
+"The user has pressed either <gui style=\"button\">OK</gui> or <gui "
+"style=\"button\">Close</gui>."
 msgstr ""
 "Användaren har antingen tryckt på <gui style=\"button\">OK</gui> eller <gui "
 "style=\"button\">Stäng</gui>."
@@ -2252,237 +2286,221 @@ msgstr "Anger titeln på en dialogruta."
 
 #. (itstool) path: item/title
 #: C/usage.page:124
-msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
-msgstr "<cmd>--window-icon</cmd>=<var>ikonsökväg</var>"
-
-#. (itstool) path: item/p
-#: C/usage.page:125
-msgid ""
-"Specifies the icon that is displayed in the window frame of the dialog. "
-"There are 4 stock icons also available by providing the following keywords - "
-"'info', 'warning', 'question' and 'error'."
-msgstr ""
-"Anger ikonen som visas i fönsterramen för dialogen. Det finns 4 "
-"standardikoner som finns tillgängliga genom att ange något av följande "
-"nyckelord - \"info\", \"warning\", \"question\" och \"error\"."
-
-#. (itstool) path: item/title
-#: C/usage.page:132
 msgid "<cmd>--width</cmd>=<var>width</var>"
 msgstr "<cmd>--width</cmd>=<var>bredd</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:133
+#: C/usage.page:125
 msgid "Specifies the width of the dialog."
 msgstr "Anger bredden på dialogrutan."
 
 #. (itstool) path: item/title
-#: C/usage.page:137
+#: C/usage.page:129
 msgid "<cmd>--height</cmd>=<var>height</var>"
 msgstr "<cmd>--height</cmd>=<var>höjd</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:138
+#: C/usage.page:130
 msgid "Specifies the height of the dialog."
 msgstr "Anger höjden på dialogrutan."
 
 #. (itstool) path: item/title
-#: C/usage.page:142
+#: C/usage.page:134
 msgid "<cmd>--timeout</cmd>=<var>timeout</var>"
 msgstr "<cmd>--timeout</cmd>=<var>tidsgräns</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:143
+#: C/usage.page:135
 msgid "Specifies the timeout in seconds after which the dialog is closed."
 msgstr "Anger tidsgränsen i sekunder efter vilken dialogrutan stängs."
 
 #. (itstool) path: section/title
-#: C/usage.page:153
+#: C/usage.page:145
 msgid "Help Options"
 msgstr "Hjälpflaggor"
 
 #. (itstool) path: section/p
-#: C/usage.page:155
+#: C/usage.page:147
 msgid "Zenity provides the following help options:"
 msgstr "Zenity tillhandahåller följande hjälpflaggor:"
 
 #. (itstool) path: item/title
-#: C/usage.page:162
+#: C/usage.page:154
 msgid "<cmd>--help</cmd>"
 msgstr "<cmd>--help</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:163
+#: C/usage.page:155
 msgid "Displays shortened help text."
 msgstr "Visar förkortad hjälptext."
 
 #. (itstool) path: item/title
-#: C/usage.page:167
+#: C/usage.page:159
 msgid "<cmd>--help-all</cmd>"
 msgstr "<cmd>--help-all</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:168
+#: C/usage.page:160
 msgid "Displays full help text for all dialogs."
 msgstr "Visar fullständig hjälptext för alla dialoger."
 
 #. (itstool) path: item/title
-#: C/usage.page:172
+#: C/usage.page:164
 msgid "<cmd>--help-general</cmd>"
 msgstr "<cmd>--help-general</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:173
+#: C/usage.page:165
 msgid "Displays help text for general dialog options."
 msgstr "Visar hjälptext för allmänna dialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:177
+#: C/usage.page:169
 msgid "<cmd>--help-calendar</cmd>"
 msgstr "<cmd>--help-calendar</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:178
+#: C/usage.page:170
 msgid "Displays help text for calendar dialog options."
 msgstr "Visar hjälptext för kalenderdialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:182
+#: C/usage.page:174
 msgid "<cmd>--help-entry</cmd>"
 msgstr "<cmd>--help-entry</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:183
+#: C/usage.page:175
 msgid "Displays help text for text entry dialog options."
 msgstr "Visar hjälptext för textinmatningsdialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:187
+#: C/usage.page:179
 msgid "<cmd>--help-error</cmd>"
 msgstr "<cmd>--help-error</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:188
+#: C/usage.page:180
 msgid "Displays help text for error dialog options."
 msgstr "Visar hjälptext för feldialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:192
+#: C/usage.page:184
 msgid "<cmd>--help-info</cmd>"
 msgstr "<cmd>--help-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:193
+#: C/usage.page:185
 msgid "Displays help text for information dialog options."
 msgstr "Visar hjälptext för informationsdialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:197
+#: C/usage.page:189
 msgid "<cmd>--help-file-selection</cmd>"
 msgstr "<cmd>--help-file-selection</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:198
+#: C/usage.page:190
 msgid "Displays help text for file selection dialog options."
 msgstr "Visar hjälptext för filväljardialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:202
+#: C/usage.page:194
 msgid "<cmd>--help-list</cmd>"
 msgstr "<cmd>--help-list</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:203
+#: C/usage.page:195
 msgid "Displays help text for list dialog options."
 msgstr "Visar hjälptext för listdialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:207
+#: C/usage.page:199
 msgid "<cmd>--help-notification</cmd>"
 msgstr "<cmd>--help-notification</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:208
+#: C/usage.page:200
 msgid "Displays help text for notification icon options."
 msgstr "Visar hjälptext för aviseringsikonflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:212
+#: C/usage.page:204
 msgid "<cmd>--help-progress</cmd>"
 msgstr "<cmd>--help-progress</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:213
+#: C/usage.page:205
 msgid "Displays help text for progress dialog options."
 msgstr "Visar hjälptext för förloppsdialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:217
+#: C/usage.page:209
 msgid "<cmd>--help-question</cmd>"
 msgstr "<cmd>--help-question</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:218
+#: C/usage.page:210
 msgid "Displays help text for question dialog options."
 msgstr "Visar hjälptext för frågedialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:222
+#: C/usage.page:214
 msgid "<cmd>--help-warning</cmd>"
 msgstr "<cmd>--help-warning</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:223
+#: C/usage.page:215
 msgid "Displays help text for warning dialog options."
 msgstr "Visar hjälptext för varningsdialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:227
+#: C/usage.page:219
 msgid "<cmd>--help-text-info</cmd>"
 msgstr "<cmd>--help-text-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:228
+#: C/usage.page:220
 msgid "Displays help for text information dialog options."
 msgstr "Visar hjälp för textinformationsdialogflaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:232
+#: C/usage.page:224
 msgid "<cmd>--help-misc</cmd>"
 msgstr "<cmd>--help-misc</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:233
+#: C/usage.page:225
 msgid "Displays help for miscellaneous options."
 msgstr "Visar hjälp för diverse flaggor."
 
 #. (itstool) path: item/title
-#: C/usage.page:237
+#: C/usage.page:229
 msgid "<cmd>--help-gtk</cmd>"
 msgstr "<cmd>--help-gtk</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:238
+#: C/usage.page:230
 msgid "Displays help for GTK+ options."
 msgstr "Visar hjälp för GTK+-flaggor."
 
 #. (itstool) path: section/title
-#: C/usage.page:248
+#: C/usage.page:240
 msgid "Miscellaneous Options"
 msgstr "Diverse flaggor"
 
 #. (itstool) path: section/p
-#: C/usage.page:250
+#: C/usage.page:242
 msgid "Zenity also provides the following miscellaneous options:"
 msgstr "Zenity tillhandahåller även följande flaggor för diverse saker:"
 
 #. (itstool) path: item/title
-#: C/usage.page:257
+#: C/usage.page:249
 msgid "<cmd>--about</cmd>"
 msgstr "<cmd>--about</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:258
+#: C/usage.page:250
 msgid ""
 "Displays the <gui>About Zenity</gui> dialog, which contains Zenity version "
 "information, copyright information, and developer information."
@@ -2492,36 +2510,36 @@ msgstr ""
 "utvecklarinformation."
 
 #. (itstool) path: item/title
-#: C/usage.page:262
+#: C/usage.page:254
 msgid "<cmd>--version</cmd>"
 msgstr "<cmd>--version</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:263
+#: C/usage.page:255
 msgid "Displays the version number of Zenity."
 msgstr "Visar versionsnumret för Zenity."
 
 #. (itstool) path: section/title
-#: C/usage.page:273
+#: C/usage.page:265
 msgid "GTK+ Options"
 msgstr "GTK+-flaggor"
 
 #. (itstool) path: section/p
-#: C/usage.page:275
+#: C/usage.page:267
 msgid ""
-"Zenity supports the standard GTK+ options. For more information about the GTK"
-"+ options, execute the <cmd>zenity --help-gtk</cmd> command."
+"Zenity supports the standard GTK+ options. For more information about the "
+"GTK+ options, execute the <cmd>zenity --help-gtk</cmd> command."
 msgstr ""
 "Zenity har stöd för standardflaggorna för GTK+. För mer information om GTK+-"
 "flaggorna, kör kommandot <cmd>zenity --help-gtk</cmd>."
 
 #. (itstool) path: section/title
-#: C/usage.page:284
+#: C/usage.page:276
 msgid "Environment Variables"
 msgstr "Miljövariabler"
 
 #. (itstool) path: section/p
-#: C/usage.page:286
+#: C/usage.page:278
 msgid ""
 "Normally, Zenity detects the terminal window from which it was launched and "
 "keeps itself above that window. This behavior can be disabled by unsetting "
@@ -2591,6 +2609,25 @@ msgstr ""
 "external ref='figures/zenity-warning-screenshot.png' "
 "md5='a2d07437efca06b775ceae24816d96a6'"
 
+#~ msgid ""
+#~ "<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
+#~ "tooltip: '<var>text</var>', visible: '<var>text</var>',"
+#~ msgstr ""
+#~ "<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
+#~ "tooltip: '<var>text</var>', visible: '<var>text</var>',"
+
+#~ msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
+#~ msgstr "<cmd>--window-icon</cmd>=<var>ikonsökväg</var>"
+
+#~ msgid ""
+#~ "Specifies the icon that is displayed in the window frame of the dialog. "
+#~ "There are 4 stock icons also available by providing the following "
+#~ "keywords - 'info', 'warning', 'question' and 'error'."
+#~ msgstr ""
+#~ "Anger ikonen som visas i fönsterramen för dialogen. Det finns 4 "
+#~ "standardikoner som finns tillgängliga genom att ange något av följande "
+#~ "nyckelord - \"info\", \"warning\", \"question\" och \"error\"."
+
 #~ msgctxt "_"
 #~ msgid ""
 #~ "external ref='figures/zenity-progress-screenshot.png' "
@@ -2673,8 +2710,8 @@ msgstr ""
 #~ msgstr "dialogskapare"
 
 #~ msgid ""
-#~ "For example, use: <screen><userinput><command>zenity --calendar --title="
-#~ "\"Holiday Planner\"</command></userinput></screen> Do not use: "
+#~ "For example, use: <screen><userinput><command>zenity --calendar --"
+#~ "title=\"Holiday Planner\"</command></userinput></screen> Do not use: "
 #~ "<screen><userinput><command>zenity --calendar --title=Holiday Planner</"
 #~ "command></userinput></screen>"
 #~ msgstr ""
diff --git a/help/uk/uk.po b/help/uk/uk.po
index 2fb62303..40f1b1bb 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -2,22 +2,22 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 #
 # Maxim Dziumanenko <dziumaneko@gmail.com>, 2005-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-03 07:50+0000\n"
-"PO-Revision-Date: 2020-04-12 10:53+0300\n"
+"POT-Creation-Date: 2023-03-06 19:55+0000\n"
+"PO-Revision-Date: 2023-03-07 21:01+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <linux@linux.org.ua>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Lokalize 20.07.70\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"
+"X-Generator: Lokalize 20.12.0\n"
 
 #. (itstool) path: p/link
 #: C/legal.xml:5
@@ -28,8 +28,8 @@ msgstr "GNU Free Documentation License, версії 1.1"
 #: C/legal.xml:4
 msgid "This work is licensed under a <_:link-1/> or any later version."
 msgstr ""
-"Ця робота розповсюджується за умов дотримання <_:link-1/> або будь-якої"
-" наступної версії."
+"Ця робота розповсюджується за умов дотримання <_:link-1/> або будь-якої "
+"наступної версії."
 
 #. (itstool) path: p/link
 #: C/legal.xml:15
@@ -38,13 +38,6 @@ msgstr "посиланням"
 
 #. (itstool) path: license/p
 #: C/legal.xml:8
-#| msgid ""
-#| "Permission is granted to copy, distribute and/or modify this document "
-#| "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 "
-#| "or any later version published by the Free Software Foundation with no "
-#| "Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You "
-#| "can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl"
-#| "\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
 msgid ""
 "Permission is granted to copy, distribute and/or modify this document under "
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
@@ -66,11 +59,10 @@ msgid ""
 "you can do so by adding a copy of the license to the manual, as described in "
 "section 6 of the license."
 msgstr ""
-"Цей підручник є частиною збірки документації з GNOME, що постачається на"
-" умовах ліцензії GFDL. Якщо ви бажаєте розповсюджувати цю довідку окремо від"
-" збірки, "
-"можете це зробити додавши до довідки копію ліцензії, як описано у пункті 6"
-" ліцензії."
+"Цей підручник є частиною збірки документації з GNOME, що постачається на "
+"умовах ліцензії GFDL. Якщо ви бажаєте розповсюджувати цю довідку окремо від "
+"збірки, можете це зробити додавши до довідки копію ліцензії, як описано у "
+"пункті 6 ліцензії."
 
 #. (itstool) path: license/p
 #: C/legal.xml:24
@@ -89,10 +81,6 @@ msgstr ""
 
 #. (itstool) path: license/p
 #: C/legal.xml:33
-#| msgid ""
-#| "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE "
-#| "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER "
-#| "UNDERSTANDING THAT: <placeholder-1/>"
 msgid ""
 "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
 "OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:"
@@ -154,7 +142,6 @@ msgstr ""
 "ПРО МОЖЛИВІСТЬ ТАКИХ ЗБИТКІВ."
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
-#| msgid "translator-credits"
 msgctxt "_"
 msgid "translator-credits"
 msgstr "Максим Дзюманенко <dziumanenko@gmail.com>"
@@ -171,20 +158,14 @@ msgstr "Вікно календаря"
 
 #. (itstool) path: page/p
 #: C/calendar.page:10
-#| msgid ""
-#| "Use the <option>--calendar</option> option to create a calendar dialog. "
-#| "<application>Zenity</application> returns the selected date to standard "
-#| "output. If no date is specified on the command line, the dialog uses the "
-#| "current date."
 msgid ""
 "Use the <cmd>--calendar</cmd> option to create a calendar dialog. Zenity "
 "returns the selected date to standard output. If no date is specified on the "
 "command line, the dialog uses the current date."
 msgstr ""
-"Для створення вікна календаря використовується параметр <cmd>--calendar</cmd"
-">. Zenity повертає вибрану дату у "
-"стандартний потік. Якщо дату не було вказано у командному рядку, "
-"використовується поточна дата."
+"Для створення вікна календаря використовується параметр <cmd>--calendar</"
+"cmd>. Zenity повертає вибрану дату у стандартний потік. Якщо дату не було "
+"вказано у командному рядку, використовується поточна дата."
 
 #. (itstool) path: page/p
 #: C/calendar.page:13
@@ -208,16 +189,12 @@ msgstr "<cmd>--day</cmd>=<var>день</var>"
 
 #. (itstool) path: item/p
 #: C/calendar.page:26
-#| msgid ""
-#| "Specifies the day that is selected in the calendar dialog. "
-#| "<replaceable>day</replaceable> must be a number between 1 and 31 "
-#| "inclusive."
 msgid ""
 "Specifies the day that is selected in the calendar dialog. day must be a "
 "number between 1 and 31 inclusive."
 msgstr ""
-"Вказує день, який виділяється у вікні календаря. День має бути числом від 1"
-" до 31."
+"Вказує день, який виділяється у вікні календаря. День має бути числом від 1 "
+"до 31."
 
 #. (itstool) path: item/title
 #: C/calendar.page:30
@@ -226,16 +203,12 @@ msgstr "<cmd>--month</cmd>=<var>місяць</var>"
 
 #. (itstool) path: item/p
 #: C/calendar.page:31
-#| msgid ""
-#| "Specifies the month that is selected in the calendar dialog. "
-#| "<replaceable>month</replaceable> must be a number between 1 and 12 "
-#| "inclusive."
 msgid ""
 "Specifies the month that is selected in the calendar dialog. month must be a "
 "number between 1 and 12 inclusive."
 msgstr ""
-"Вказує місяць, який виділяється у вікні календаря. Місяць має бути числом від"
-" 1 до 12."
+"Вказує місяць, який виділяється у вікні календаря. Місяць має бути числом "
+"від 1 до 12."
 
 #. (itstool) path: item/title
 #: C/calendar.page:35
@@ -249,18 +222,11 @@ msgstr "Вказує рік, який виділяється у вікні ка
 
 #. (itstool) path: item/title
 #: C/calendar.page:40
-#| msgid "<option>--date-format</option>=<replaceable>format</replaceable>"
 msgid "<cmd>--date-format</cmd>=<var>format</var>"
 msgstr "<cmd>--date-format</cmd>=<var>формат</var>"
 
 #. (itstool) path: item/p
 #: C/calendar.page:41
-#| msgid ""
-#| "Specifies the format that is returned from the calendar dialog after date "
-#| "selection. The default format depends on your locale. "
-#| "<replaceable>format</replaceable> must be a format that is acceptable to "
-#| "the <command>strftime</command> function, for example <literal>%A %d/%m/"
-#| "%y</literal>."
 msgid ""
 "Specifies the format that is returned from the calendar dialog after date "
 "selection. The default format depends on your locale. Format must be a "
@@ -268,34 +234,17 @@ msgid ""
 "<var>%A %d/%m/%y</var>."
 msgstr ""
 "Вказує формат дати, яку буде повернуто після вибору дати. Типовий формат "
-"залежить від локалі. Формат має бути допустимим "
-"виразом для функції <cmd>strftime</cmd>, наприклад <var>%A %d/%m/"
-"%y</var>."
+"залежить від локалі. Формат має бути допустимим виразом для функції "
+"<cmd>strftime</cmd>, наприклад <var>%A %d/%m/%y</var>."
 
 #. (itstool) path: page/p
 #: C/calendar.page:46
-#| msgid ""
-#| "The following example script shows how to create a calendar dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a calendar dialog:"
 msgstr "У наступному прикладі сценарію показано створення вікна календаря:"
 
 #. (itstool) path: page/code
 #: C/calendar.page:50
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "\n"
-#| "        if zenity --calendar \\\n"
-#| "        --title=\"Select a Date\" \\\n"
-#| "        --text=\"Click on a date to select that date.\" \\\n"
-#| "        --day=10 --month=8 --year=2004\n"
-#| "          then echo $?\n"
-#| "          else echo \"No date selected\"\n"
-#| "        fi\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -328,7 +277,6 @@ msgstr "Приклад вікна календаря"
 
 #. (itstool) path: figure/desc
 #: C/calendar.page:66
-#| msgid "Calendar Dialog Example"
 msgid "Zenity calendar dialog example"
 msgstr "Приклад вікна календаря Zenity"
 
@@ -338,9 +286,6 @@ msgstr "Приклад вікна календаря Zenity"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/calendar.page:67
-#| msgid ""
-#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
-#| "md5=b739d32aad963be4415d34ec103baf26"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-calendar-screenshot.png' "
@@ -356,24 +301,20 @@ msgstr "Використання параметра <cmd>--color-selection</cmd>
 
 #. (itstool) path: page/title
 #: C/color-selection.page:9
-#| msgid "File Selection Dialog"
 msgid "Color Selection Dialog"
 msgstr "Вікно вибору кольору"
 
 #. (itstool) path: page/p
 #: C/color-selection.page:10
-#| msgid ""
-#| "Use the <option>--question</option> option to create a question dialog."
 msgid ""
 "Use the <cmd>--color-selection</cmd> option to create a color selection "
 "dialog."
 msgstr ""
-"Використання параметра <cmd>--color-selection</cmd> для створення діалогового"
-" вікна вибору кольору."
+"Використання параметра <cmd>--color-selection</cmd> для створення "
+"діалогового вікна вибору кольору."
 
 #. (itstool) path: page/p
 #: C/color-selection.page:13
-#| msgid "The file selection dialog supports the following options:"
 msgid "The color selection dialog supports the following options:"
 msgstr "У вікні вибору кольору передбачено підтримку таких параметрів:"
 
@@ -399,9 +340,6 @@ msgstr "Показати палітру."
 
 #. (itstool) path: page/p
 #: C/color-selection.page:31
-#| msgid ""
-#| "The following example script shows how to create a file selection dialog: "
-#| "<placeholder-1/>"
 msgid ""
 "The following example script shows how to create a color selection dialog:"
 msgstr "У наступному прикладі показано створення вікна вибору кольору:"
@@ -409,21 +347,6 @@ msgstr "У наступному прикладі показано створен
 #. (itstool) path: page/code
 #: C/color-selection.page:35
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        FILE=`zenity --file-selection --title=\"Select a File\"`\n"
-#| "\n"
-#| "        case $? in\n"
-#| "                 0)\n"
-#| "                        echo \"\\\"$FILE\\\" selected.\";;\n"
-#| "                 1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "                -1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "        esac\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -455,13 +378,11 @@ msgstr ""
 
 #. (itstool) path: figure/title
 #: C/color-selection.page:51
-#| msgid "File Selection Dialog Example"
 msgid "Color Selection Dialog Example"
 msgstr "Приклад вікна вибору кольору"
 
 #. (itstool) path: figure/desc
 #: C/color-selection.page:52
-#| msgid "<placeholder-1/> file selection dialog example"
 msgid "<app>Zenity</app> color selection dialog example"
 msgstr "Приклад вікна вибору кольору <app>Zenity</app>"
 
@@ -471,9 +392,6 @@ msgstr "Приклад вікна вибору кольору <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/color-selection.page:53
-#| msgid ""
-#| "@@image: 'figures/zenity-fileselection-screenshot.png'; "
-#| "md5=2c903cba26fb40462deea0bb6b931ea7"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-colorselection-screenshot.png' "
@@ -494,17 +412,13 @@ msgstr "Вікно вводу тексту"
 
 #. (itstool) path: page/p
 #: C/entry.page:10
-#| msgid ""
-#| "Use the <option>-entry</option> option to create a text entry dialog. "
-#| "<application>Zenity</application> returns the contents of the text entry "
-#| "to standard output."
 msgid ""
 "Use the <cmd>--entry</cmd> option to create a text entry dialog. "
 "<app>Zenity</app> returns the contents of the text entry to standard output."
 msgstr ""
-"Для створення вікна вводу тексту використовується наступний параметр "
-"<cmd>--entry</cmd>. <app>Zenity</app> повертає вміст "
-"поля вводу тексту в стандартний потік виводу."
+"Для створення вікна вводу тексту використовується наступний параметр <cmd>--"
+"entry</cmd>. <app>Zenity</app> повертає вміст поля вводу тексту в "
+"стандартний потік виводу."
 
 #. (itstool) path: page/p
 #: C/entry.page:13
@@ -531,7 +445,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/entry.page:30
-#| msgid "--hide-text"
 msgid "<cmd>--hide-text</cmd>"
 msgstr "<cmd>--hide-text</cmd>"
 
@@ -542,9 +455,6 @@ msgstr "Текст у полі вводу тексту ховається."
 
 #. (itstool) path: page/p
 #: C/entry.page:36
-#| msgid ""
-#| "The following example script shows how to create a text entry dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a text entry dialog:"
 msgstr ""
 "У наступному сценарії продемонстровано створення вікна введення тексту:"
@@ -552,19 +462,6 @@ msgstr ""
 #. (itstool) path: page/code
 #: C/entry.page:40
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        if zenity --entry \\\n"
-#| "        --title=\"Add an Entry\" \\\n"
-#| "        --text=\"Enter your _password:\" \\\n"
-#| "        --entry-text \"password\" \\\n"
-#| "        --hide-text\n"
-#| "          then echo $?\n"
-#| "          else echo \"No password entered\"\n"
-#| "        fi\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -595,7 +492,6 @@ msgstr "Приклад вікна вводу тексту"
 
 #. (itstool) path: figure/desc
 #: C/entry.page:55
-#| msgid "<placeholder-1/> text entry dialog example"
 msgid "<app>Zenity</app> text entry dialog example"
 msgstr "Приклад вікна введення тексту <app>Zenity</app>"
 
@@ -605,9 +501,6 @@ msgstr "Приклад вікна введення тексту <app>Zenity</app
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/entry.page:56
-#| msgid ""
-#| "@@image: 'figures/zenity-entry-screenshot.png'; "
-#| "md5=0fb790cbb6d13ec13a314b34f844ee80"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-entry-screenshot.png' "
@@ -628,28 +521,17 @@ msgstr "Вікно помилки"
 
 #. (itstool) path: page/p
 #: C/error.page:10
-#| msgid "Use the <option>--error</option> option to create an error dialog."
 msgid "Use the <cmd>--error</cmd> option to create an error dialog."
 msgstr "Для створення вікна помилки скористайтеся <cmd>--error</cmd>."
 
 #. (itstool) path: page/p
 #: C/error.page:14
-#| msgid ""
-#| "The following example script shows how to create an error dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create an error dialog:"
 msgstr "У наступному сценарії продемонстровано створення вікна помилки:"
 
 #. (itstool) path: page/code
 #: C/error.page:18
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "          #!/bin/bash\n"
-#| "\n"
-#| "          zenity --error \\\n"
-#| "          --text=\"Could not find /var/log/syslog.\"\n"
-#| "        "
 msgid ""
 "\n"
 "#!/bin/bash\n"
@@ -670,7 +552,6 @@ msgstr "Приклад вікна помилки"
 
 #. (itstool) path: figure/desc
 #: C/error.page:28
-#| msgid "<placeholder-1/> error dialog example"
 msgid "<app>Zenity</app> error dialog example"
 msgstr "Приклад вікна помилки <app>Zenity</app>"
 
@@ -680,9 +561,6 @@ msgstr "Приклад вікна помилки <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/error.page:29
-#| msgid ""
-#| "@@image: 'figures/zenity-error-screenshot.png'; "
-#| "md5=c0fae27dcfc45eb335fd6bbc5e7f29b5"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-error-screenshot.png' "
@@ -703,20 +581,15 @@ msgstr "Вікно вибору файлів"
 
 #. (itstool) path: page/p
 #: C/file-selection.page:10
-#| msgid ""
-#| "Use the <option>--file-selection</option> option to create a file "
-#| "selection dialog. <application>Zenity</application> returns the selected "
-#| "files or directories to standard output. The default mode of the file "
-#| "selection dialog is open."
 msgid ""
 "Use the <cmd>--file-selection</cmd> option to create a file selection "
 "dialog. <app>Zenity</app> returns the selected files or directories to "
 "standard output. The default mode of the file selection dialog is open."
 msgstr ""
-"Для створення вікна вибору файлів використовується параметр <cmd"
-">--file-selection</cmd>. <app>Zenity</app> повертає вибрані файли чи каталоги"
-" у стандартному потоці виводу. Типовим режимом вікна вибору"
-" файлів є відкривання."
+"Для створення вікна вибору файлів використовується параметр <cmd>--file-"
+"selection</cmd>. <app>Zenity</app> повертає вибрані файли чи каталоги у "
+"стандартному потоці виводу. Типовим режимом вікна вибору файлів є "
+"відкривання."
 
 #. (itstool) path: page/p
 #: C/file-selection.page:14
@@ -739,7 +612,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/file-selection.page:26
-#| msgid "--multiple"
 msgid "<cmd>--multiple</cmd>"
 msgstr "<cmd>--multiple</cmd>"
 
@@ -751,7 +623,6 @@ msgstr "Уможливлює вибір кількох назв файлів у
 
 #. (itstool) path: item/title
 #: C/file-selection.page:31
-#| msgid "--directory"
 msgid "<cmd>--directory</cmd>"
 msgstr "<cmd>--directory</cmd>"
 
@@ -772,7 +643,6 @@ msgstr "Встановлює режим збереження у вікні ви
 
 #. (itstool) path: item/title
 #: C/file-selection.page:41 C/list.page:53
-#| msgid "<option>--separator</option>=<replaceable>separator</replaceable>"
 msgid "<cmd>--separator</cmd>=<var>separator</var>"
 msgstr "<cmd>--separator</cmd>=<var>роздільник</var>"
 
@@ -786,9 +656,6 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/file-selection.page:47
-#| msgid ""
-#| "The following example script shows how to create a file selection dialog: "
-#| "<placeholder-1/>"
 msgid ""
 "The following example script shows how to create a file selection dialog:"
 msgstr "У наступному прикладі показано створення вікна вибору файлів:"
@@ -796,21 +663,6 @@ msgstr "У наступному прикладі показано створен
 #. (itstool) path: page/code
 #: C/file-selection.page:51
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        FILE=`zenity --file-selection --title=\"Select a File\"`\n"
-#| "\n"
-#| "        case $? in\n"
-#| "                 0)\n"
-#| "                        echo \"\\\"$FILE\\\" selected.\";;\n"
-#| "                 1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "                -1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "        esac\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -847,7 +699,6 @@ msgstr "Приклад вікна вибору файлів"
 
 #. (itstool) path: figure/desc
 #: C/file-selection.page:68
-#| msgid "<placeholder-1/> file selection dialog example"
 msgid "<app>Zenity</app> file selection dialog example"
 msgstr "Приклад вікна вибору файла <app>Zenity</app>"
 
@@ -857,9 +708,6 @@ msgstr "Приклад вікна вибору файла <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/file-selection.page:69
-#| msgid ""
-#| "@@image: 'figures/zenity-fileselection-screenshot.png'; "
-#| "md5=2c903cba26fb40462deea0bb6b931ea7"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-fileselection-screenshot.png' "
@@ -875,22 +723,18 @@ msgstr "Використання параметра <cmd>--forms</cmd>."
 
 #. (itstool) path: page/title
 #: C/forms.page:9
-#| msgid "Error Dialog"
 msgid "Forms Dialog"
 msgstr "Вікно форм"
 
 #. (itstool) path: page/p
 #: C/forms.page:10
-#| msgid ""
-#| "Use the <option>--info</option> option to create an information dialog."
 msgid "Use the <cmd>--forms</cmd> option to create a forms dialog."
 msgstr ""
-"Для створення діалогового вікна форм скористайтеся параметром <cmd>--forms<"
-"/cmd>."
+"Для створення діалогового вікна форм скористайтеся параметром <cmd>--forms</"
+"cmd>."
 
 #. (itstool) path: page/p
 #: C/forms.page:14
-#| msgid "The progress dialog supports the following options:"
 msgid "The forms dialog supports the following options:"
 msgstr "У вікні форм передбачено підтримку таких параметрів:"
 
@@ -906,8 +750,8 @@ msgstr "Додати нове поле у вікно форм."
 
 #. (itstool) path: item/title
 #: C/forms.page:26
-msgid "--add-password<cmd/>=<var>FieldName</var>"
-msgstr "--add-password<cmd/>=<var>НАЗВА_ПОЛЯ</var>"
+msgid "<cmd>--add-password</cmd>=<var>FieldName</var>"
+msgstr "<cmd>--add-password</cmd>=<var>НАЗВА_ПОЛЯ</var>"
 
 #. (itstool) path: item/p
 #: C/forms.page:27
@@ -952,26 +796,17 @@ msgstr "<cmd>--forms-date-format</cmd>=<var>ВЗІРЕЦЬ</var>"
 
 #. (itstool) path: item/p
 #: C/forms.page:47
-#| msgid ""
-#| "Specifies the format that is returned from the calendar dialog after date "
-#| "selection. The default format depends on your locale. "
-#| "<replaceable>format</replaceable> must be a format that is acceptable to "
-#| "the <command>strftime</command> function, for example <literal>%A %d/%m/"
-#| "%y</literal>."
 msgid ""
 "Set the format for the returned date. The default format depends on your "
 "locale. format must be a Format that is acceptable to the <cmd>strftime</"
 "cmd> function, for example <var>%A %d/%m/%y</var>."
 msgstr ""
-"Встановити формат повернутої дати. Типовий формат залежить від локалі. Формат"
-" має бути допустимим виразом для функції <cmd>strftime</cmd>, наприклад <var>"
-"%A %d/%m/%y</var>."
+"Встановити формат повернутої дати. Типовий формат залежить від локалі. "
+"Формат має бути допустимим виразом для функції <cmd>strftime</cmd>, "
+"наприклад <var>%A %d/%m/%y</var>."
 
 #. (itstool) path: page/p
 #: C/forms.page:52
-#| msgid ""
-#| "The following example script shows how to create a progress dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a forms dialog:"
 msgstr "У наступному сценарії продемонстровано створення вікна форм:"
 
@@ -1025,13 +860,11 @@ msgstr ""
 
 #. (itstool) path: figure/title
 #: C/forms.page:80
-#| msgid "Error Dialog Example"
 msgid "Forms Dialog Example"
 msgstr "Приклад вікна форм"
 
 #. (itstool) path: figure/desc
 #: C/forms.page:81
-#| msgid "<placeholder-1/> information dialog example"
 msgid "<app>Zenity</app> forms dialog example"
 msgstr "Приклад вікна форм <app>Zenity</app>"
 
@@ -1061,7 +894,6 @@ msgstr "Glynn Foster"
 
 #. (itstool) path: credit/name
 #: C/index.page:12
-#| msgid "Nicholas"
 msgid "Nicholas Curran"
 msgstr "Nicholas Curran"
 
@@ -1077,7 +909,6 @@ msgstr "Довідка з програми Zenity"
 
 #. (itstool) path: section/title
 #: C/index.page:29
-#| msgid "List Dialog"
 msgid "Dialogs"
 msgstr "Вікна"
 
@@ -1088,36 +919,24 @@ msgstr "Використання параметра <cmd>--info</cmd>."
 
 #. (itstool) path: page/title
 #: C/info.page:9
-#| msgid "Information Dialog"
 msgid "Info Dialog"
 msgstr "Вікно інформації"
 
 #. (itstool) path: page/p
 #: C/info.page:10
-#| msgid ""
-#| "Use the <option>--info</option> option to create an information dialog."
 msgid "Use the <cmd>--info</cmd> option to create an information dialog."
 msgstr ""
 "Для створення вікна інформації скористайтеся параметром <cmd>--info</cmd>."
 
 #. (itstool) path: page/p
 #: C/info.page:14
-#| msgid ""
-#| "The following example script shows how to create an information dialog: "
-#| "<placeholder-1/>"
-msgid "The following example script shows how to create an information dialog:"
+msgid ""
+"The following example script shows how to create an information dialog:"
 msgstr "У наступному сценарії продемонстровано створення вікна інформації:"
 
 #. (itstool) path: page/code
 #: C/info.page:18
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "          #!/bin/bash\n"
-#| "\n"
-#| "          zenity --info \\\n"
-#| "          --text=\"Merge complete. Updated 3 of 10 files.\"\n"
-#| "        "
 msgid ""
 "\n"
 "#!/bin/bash\n"
@@ -1138,7 +957,6 @@ msgstr "Приклад вікна інформації"
 
 #. (itstool) path: figure/desc
 #: C/info.page:28
-#| msgid "<placeholder-1/> information dialog example"
 msgid "<app>Zenity</app> information dialog example"
 msgstr "Приклад вікна інформації <app>Zenity</app>"
 
@@ -1148,9 +966,6 @@ msgstr "Приклад вікна інформації <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/info.page:29
-#| msgid ""
-#| "@@image: 'figures/zenity-information-screenshot.png'; "
-#| "md5=5a9af4275678c8bfb9b48010860a45e5"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-information-screenshot.png' "
@@ -1161,9 +976,6 @@ msgstr ""
 
 #. (itstool) path: info/desc
 #: C/intro.page:6
-#| msgid ""
-#| "<application>Zenity</application> enables you to create the following "
-#| "types of simple dialog:"
 msgid ""
 "<app>Zenity</app> enables you to create the various types of simple dialog."
 msgstr "<app>Zenity</app> надає змогу створювати різні типи простих вікон."
@@ -1175,9 +987,6 @@ msgstr "Вступ"
 
 #. (itstool) path: page/p
 #: C/intro.page:10
-#| msgid ""
-#| "<application>Zenity</application> enables you to create the following "
-#| "types of simple dialog:"
 msgid ""
 "<app>Zenity</app> enables you to create the following types of simple dialog:"
 msgstr "<app>Zenity</app> надає змогу створювати наступні типи простих вікон:"
@@ -1259,7 +1068,6 @@ msgstr "Шкала"
 
 #. (itstool) path: item/p
 #: C/intro.page:33
-#| msgid "File selection"
 msgid "Color selection"
 msgstr "Вибір кольору"
 
@@ -1275,18 +1083,14 @@ msgstr "Вікно списку"
 
 #. (itstool) path: page/p
 #: C/list.page:10
-#| msgid ""
-#| "Use the <option>--list</option> option to create a list dialog. "
-#| "<application>Zenity</application> returns the entries in the first column "
-#| "of text of selected rows to standard output."
 msgid ""
 "Use the <cmd>--list</cmd> option to create a list dialog. <app>Zenity</app> "
 "returns the entries in the first column of text of selected rows to standard "
 "output."
 msgstr ""
-"Для створення вікна списку використовують параметр <cmd>--list</cmd>. <app"
-">Zenity</app> повертає елементи вибраних рядків у першому стовпчику тексту у"
-" стандартному потоці виводу."
+"Для створення вікна списку використовують параметр <cmd>--list</cmd>. "
+"<app>Zenity</app> повертає елементи вибраних рядків у першому стовпчику "
+"тексту у стандартному потоці виводу."
 
 #. (itstool) path: page/p
 #: C/list.page:14
@@ -1301,15 +1105,12 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/list.page:18
-#| msgid ""
-#| "If you use the <option>--checklist</option> or <option>--radiolist</"
-#| "option> options, each row must start with either 'TRUE' or 'FALSE'."
 msgid ""
 "If you use the <cmd>--checklist</cmd> or <cmd>--radiolist</cmd> options, "
 "each row must start with either 'TRUE' or 'FALSE'."
 msgstr ""
-"Якщо ви використовуєте параметри <cmd>--checklist</cmd> чи <cmd>--radiolist<"
-"/cmd>, кожен рядок має починатись з 'TRUE' чи 'FALSE'."
+"Якщо ви використовуєте параметри <cmd>--checklist</cmd> чи <cmd>--radiolist</"
+"cmd>, кожен рядок має починатись з 'TRUE' чи 'FALSE'."
 
 #. (itstool) path: page/p
 #: C/list.page:22
@@ -1323,22 +1124,17 @@ msgstr "<cmd>--column</cmd>=<var>стовпчик</var>"
 
 #. (itstool) path: item/p
 #: C/list.page:30
-#| msgid ""
-#| "Specifies the column headers that are displayed in the list dialog. You "
-#| "must specify a <option>--column</option> option for each column that you "
-#| "want to display in the dialog."
 msgid ""
 "Specifies the column headers that are displayed in the list dialog. You must "
 "specify a <cmd>--column</cmd> option for each column that you want to "
 "display in the dialog."
 msgstr ""
-"Вказує заголовки стовпчиків, які буде показано у вікні списку. Треба вказати"
-" параметр <cmd>--column</cmd> для кожного рядка, який ви хочете побачити у"
-" вікні."
+"Вказує заголовки стовпчиків, які буде показано у вікні списку. Треба вказати "
+"параметр <cmd>--column</cmd> для кожного рядка, який ви хочете побачити у "
+"вікні."
 
 #. (itstool) path: item/title
 #: C/list.page:35
-#| msgid "--checklist"
 msgid "<cmd>--checklist</cmd>"
 msgstr "<cmd>--checklist</cmd>"
 
@@ -1350,7 +1146,6 @@ msgstr "Вказує, що перший стовпчик списку місти
 
 #. (itstool) path: item/title
 #: C/list.page:41
-#| msgid "--radiolist"
 msgid "<cmd>--radiolist</cmd>"
 msgstr "<cmd>--radiolist</cmd>"
 
@@ -1362,7 +1157,6 @@ msgstr "Вказує, що перший стовпчик списку місти
 
 #. (itstool) path: item/title
 #: C/list.page:47 C/text.page:26
-#| msgid "--editable"
 msgid "<cmd>--editable</cmd>"
 msgstr "<cmd>--editable</cmd>"
 
@@ -1382,7 +1176,6 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/list.page:59
-#| msgid "<option>--print-column</option>=<replaceable>column</replaceable>"
 msgid "<cmd>--print-column</cmd>=<var>column</var>"
 msgstr "<cmd>--print-column</cmd>=<var>стовпчик</var>"
 
@@ -1397,9 +1190,6 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/list.page:67
-#| msgid ""
-#| "The following example script shows how to create a list dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a list dialog:"
 msgstr ""
 "У наступному прикладі продемонстровано сценарій створення вікна списку:"
@@ -1407,17 +1197,6 @@ msgstr ""
 #. (itstool) path: page/code
 #: C/list.page:70
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        zenity --list \\\n"
-#| "          --title=\"Choose the Bugs You Wish to View\" \\\n"
-#| "          --column=\"Bug Number\" --column=\"Severity\" --column=\"Description\" \\\n"
-#| "            992383 Normal \"GtkTreeView crashes on multiple selections\" \\\n"
-#| "            293823 High \"GNOME Dictionary does not handle proxy\" \\\n"
-#| "            393823 Critical \"Menu editing does not work in GNOME 2.0\"\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -1446,7 +1225,6 @@ msgstr "Приклад вікна списку"
 
 #. (itstool) path: figure/desc
 #: C/list.page:84
-#| msgid "<placeholder-1/> list dialog example"
 msgid "<app>Zenity</app> list dialog example"
 msgstr "Приклад вікна списку <app>Zenity</app>"
 
@@ -1456,9 +1234,6 @@ msgstr "Приклад вікна списку <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/list.page:85
-#| msgid ""
-#| "@@image: 'figures/zenity-list-screenshot.png'; "
-#| "md5=9c5a2704eb27e21a8e8739c49f77b3fc"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-list-screenshot.png' "
@@ -1473,31 +1248,26 @@ msgid ""
 "<link xref=\"error\">Error</link>, <link xref=\"info\">Info</link>, <link "
 "xref=\"question\">Question</link>, <link xref=\"warning\">Warning</link>"
 msgstr ""
-"<link xref=\"error\">Помилка</link>, <link xref=\"info\">Інформація</link>, <"
-"link xref=\"question\">Питання</link>, <link xref=\"warning\">Попередження<"
-"/link>"
+"<link xref=\"error\">Помилка</link>, <link xref=\"info\">Інформація</link>, "
+"<link xref=\"question\">Питання</link>, <link xref=\"warning\">Попередження</"
+"link>"
 
 #. (itstool) path: page/title
 #: C/message.page:14
-#| msgid "Message Dialogs"
 msgid "Message Dialog"
 msgstr "Вікно повідомлення"
 
 #. (itstool) path: page/p
 #: C/message.page:15
-#| msgid ""
-#| "For each type, use the <option>--text</option> option to specify the text "
-#| "that is displayed in the dialog."
 msgid ""
 "For each type, use the <cmd>--text</cmd> option to specify the text that is "
 "displayed in the dialog."
 msgstr ""
-"Для кожного типу параметр <cmd>--text</cmd> вказує текст, який буде показано"
-" у вікні."
+"Для кожного типу параметр <cmd>--text</cmd> вказує текст, який буде показано "
+"у вікні."
 
 #. (itstool) path: info/desc
 #: C/notification.page:6
-#| msgid "Displays help text for notification icon options."
 msgid "Use the <cmd>--notification</cmd> option."
 msgstr "Використання параметра <cmd>--notification</cmd>."
 
@@ -1508,12 +1278,12 @@ msgstr "Значок області сповіщення"
 
 #. (itstool) path: page/p
 #: C/notification.page:10
-#| msgid ""
-#| "Use the <option>--info</option> option to create an information dialog."
-msgid "Use the <cmd>--notification</cmd> option to create a notification icon."
+msgid ""
+"Use the <cmd>--notification</cmd> option to create a passive desktop "
+"notification."
 msgstr ""
-"Для створення піктограми області сповіщення скористайтеся параметром <cmd"
-">--notification</cmd>."
+"Для створення пасивного сповіщення стільниці скористайтеся параметром <cmd>--"
+"notification</cmd>."
 
 #. (itstool) path: item/p
 #: C/notification.page:15
@@ -1522,81 +1292,104 @@ msgstr "Вказує текст, який буде показано у обла
 
 #. (itstool) path: item/title
 #: C/notification.page:18
+msgid "<cmd>--icon</cmd>=<var>path</var>"
+msgstr "<cmd>--icon</cmd>=<var>шлях</var>"
+
+#. (itstool) path: item/p
+#: C/notification.page:19
 msgid ""
-"<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
-"tooltip: '<var>text</var>', visible: '<var>text</var>',"
+"Set the notification icon using a string containing a path to a valid icon "
+"on the system."
 msgstr ""
-"<cmd>--listen</cmd>=icon: '<var>текст</var>', message: '<var>текст</var>', "
-"tooltip: '<var>текст</var>', visible: '<var>текст</var>',"
+"Встановити піктограму сповіщення на основі рядка, що містить шлях до "
+"коректної піктограми у системі."
+
+#. (itstool) path: item/title
+#: C/notification.page:22
+msgid "<cmd>--listen</cmd>"
+msgstr "<cmd>--listen</cmd>"
 
 #. (itstool) path: item/p
-#: C/notification.page:19
+#: C/notification.page:23
 msgid ""
 "Listens for commands at standard input. At least one command must be "
 "specified. Commands are comma separated. A command must be followed by a "
 "colon and a value."
 msgstr ""
-"Очікує команди зі стандартного введення. Має бути вказано принаймні одну"
-" команду. Команди слід відокремлювати комами. Після команди слід вказувати"
-" двокрапку і значення."
+"Очікує команди зі стандартного введення. Має бути вказано принаймні одну "
+"команду. Команди слід відокремлювати комами. Після команди слід вказувати "
+"двокрапку і значення."
 
 #. (itstool) path: note/p
-#: C/notification.page:21
+#: C/notification.page:25
+#| msgid ""
+#| "The <cmd>icon</cmd> command also accepts icon theme name values in "
+#| "accordance with the FreeDesktop.org Icon Naming Specification such as "
+#| "<var>dialog-error</var>, <var>dialog-info</var>, <var>security-high</var> "
+#| "and <var>starred</var>."
 msgid ""
-"The <cmd>icon</cmd> command also accepts four stock icon values such as "
-"<var>error</var>, <var>info</var>, <var>question</var> and <var>warning</"
-"var>."
+"The <cmd>icon</cmd> command also accepts icon theme name values in "
+"accordance with the FreeDesktop.org Icon Naming Specification such as "
+"<var>dialog-error</var>, <var>dialog-information</var> and <var>security-"
+"high</var>."
 msgstr ""
-"Команда <cmd>icon</cmd> також приймає значення чотирьох типових піктограм,"
-" зокрема <var>error</var>, <var>info</var>, <var>question</var> and <var"
-">warning</"
-"var>."
+"Команда <cmd>icon</cmd> також приймає значення назви піктограми теми у "
+"відповідності до специфікації іменування піктограм FreeDesktop.org, зокрема "
+"<var>dialog-error</var>, <var>dialog-information</var> та <var>security-"
+"high</var>."
+
+#. (itstool) path: item/p
+#: C/notification.page:27
+msgid "Examples include:"
+msgstr "Приклади:"
+
+#. (itstool) path: item/code
+#: C/notification.page:28
+#, no-wrap
+msgid ""
+"\n"
+"      message: Hello, my name is Joe\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
+msgstr ""
+"\n"
+"      message: Привіт, мене звати Михайло\n"
+"      icon: /usr/share/pixmaps/monitor.xpm\n"
+"      "
 
 #. (itstool) path: page/p
-#: C/notification.page:26
-#| msgid ""
-#| "The following example script shows how to create a notification icon: "
-#| "<placeholder-1/>"
+#: C/notification.page:35
 msgid "The following example script shows how to create a notification icon:"
 msgstr ""
 "У наступному прикладі показано створення піктограми області сповіщення:"
 
 #. (itstool) path: page/code
-#: C/notification.page:27
+#: C/notification.page:36
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        zenity --notification\\\n"
-#| "          --window-icon=\"info\" \\\n"
-#| "          --text=\"There are system updates necessary!\"\n"
-#| "      "
 msgid ""
 "\n"
 "  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
 "    --text=\"There are system updates necessary!\"\n"
 "  "
 msgstr ""
 "\n"
-"#!/bin/sh\n"
+"  #!/bin/sh\n"
 "\n"
-"  zenity --notification\\\n"
-"    --window-icon=\"info\" \\\n"
-"    --text=\"Є необхідні оновлення для системи!\"\n"
+"  zenity --notification \\\n"
+"    --icon=\"/usr/share/pixmaps/monitor.xpm\" \\\n"
+"    --text=\"Слід виконати оновлення системи!\"\n"
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:36
+#: C/notification.page:45
 msgid "Notification Icon Example"
 msgstr "Приклад значка області сповіщення"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:37
-#| msgid "<placeholder-1/> notification icon example"
+#: C/notification.page:46
 msgid "<app>Zenity</app> notification icon example"
 msgstr "Приклад піктограми області сповіщення <app>Zenity</app>"
 
@@ -1605,10 +1398,7 @@ msgstr "Приклад піктограми області сповіщення
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:38
-#| msgid ""
-#| "@@image: 'figures/zenity-notification-screenshot.png'; "
-#| "md5=d7a119ced7cdf49b307013551d94e11e"
+#: C/notification.page:47
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-screenshot.png' "
@@ -1618,19 +1408,16 @@ msgstr ""
 "md5='723bd2d1283f5a888967815991cbe858'"
 
 #. (itstool) path: page/p
-#: C/notification.page:41
-#| msgid ""
-#| "The following example script shows how to create a notification icon: "
-#| "<placeholder-1/>"
+#: C/notification.page:50
 msgid ""
 "The following example script shows how to create a notification icon along "
 "with <cmd>--listen</cmd>:"
 msgstr ""
-"У наступному прикладі показано створення значка області сповіщення за"
-" допомогою параметра <cmd>--listen</cmd>:"
+"У наступному прикладі показано створення значка області сповіщення за "
+"допомогою параметра <cmd>--listen</cmd>:"
 
 #. (itstool) path: page/code
-#: C/notification.page:42
+#: C/notification.page:51
 #, no-wrap
 msgid ""
 "\n"
@@ -1648,14 +1435,13 @@ msgstr ""
 "  "
 
 #. (itstool) path: figure/title
-#: C/notification.page:50
-#| msgid "Notification Icon Example"
+#: C/notification.page:59
 msgid "Notification Icon with <cmd>--listen</cmd> Example"
 msgstr ""
 "Приклад створення значка області сповіщення за допомогою <cmd>--listen</cmd>"
 
 #. (itstool) path: figure/desc
-#: C/notification.page:51
+#: C/notification.page:60
 msgid "<app>Zenity</app> notification with <cmd>--listen</cmd> example"
 msgstr "Сповіщення <app>Zenity</app> із прикладом <cmd>--listen</cmd>"
 
@@ -1664,10 +1450,7 @@ msgstr "Сповіщення <app>Zenity</app> із прикладом <cmd>--li
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/notification.page:52
-#| msgid ""
-#| "@@image: 'figures/zenity-notification-screenshot.png'; "
-#| "md5=d7a119ced7cdf49b307013551d94e11e"
+#: C/notification.page:61
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-notification-listen-screenshot.png' "
@@ -1683,22 +1466,19 @@ msgstr "Використання параметра <cmd>--password</cmd>."
 
 #. (itstool) path: page/title
 #: C/password.page:9
-#| msgid "Error Dialog"
 msgid "Password Dialog"
 msgstr "Вікно введення пароля"
 
 #. (itstool) path: page/p
 #: C/password.page:10
-#| msgid ""
-#| "Use the <option>--progress</option> option to create a progress dialog."
-msgid "Use the <cmd>--password</cmd> option to create a password entry dialog."
+msgid ""
+"Use the <cmd>--password</cmd> option to create a password entry dialog."
 msgstr ""
-"Для створення вікна введення пароля скористайтеся параметром <cmd>--password<"
-"/cmd>."
+"Для створення вікна введення пароля скористайтеся параметром <cmd>--"
+"password</cmd>."
 
 #. (itstool) path: page/p
 #: C/password.page:13
-#| msgid "The text entry dialog supports the following options:"
 msgid "The password entry dialog supports the following options:"
 msgstr "У вікні введення пароля передбачено підтримку таких параметрів:"
 
@@ -1714,9 +1494,6 @@ msgstr "Показати поле імені користувача."
 
 #. (itstool) path: page/p
 #: C/password.page:24
-#| msgid ""
-#| "The following example script shows how to create a text entry dialog: "
-#| "<placeholder-1/>"
 msgid ""
 "The following example script shows how to create a password entry dialog:"
 msgstr ""
@@ -1760,13 +1537,11 @@ msgstr ""
 
 #. (itstool) path: figure/title
 #: C/password.page:46
-#| msgid "Text Entry Dialog Example"
 msgid "Password Entry Dialog Example"
 msgstr "Приклад вікна введення пароля"
 
 #. (itstool) path: figure/desc
 #: C/password.page:47
-#| msgid "<placeholder-1/> text entry dialog example"
 msgid "<app>Zenity</app> password entry dialog example"
 msgstr "Приклад вікна введення пароля <app>Zenity</app>"
 
@@ -1776,9 +1551,6 @@ msgstr "Приклад вікна введення пароля <app>Zenity</app
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/password.page:48
-#| msgid ""
-#| "@@image: 'figures/zenity-progress-screenshot.png'; "
-#| "md5=706736240f396ada12044c23b708a6a6"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-password-screenshot.png' "
@@ -1799,28 +1571,21 @@ msgstr "Вікно поступу"
 
 #. (itstool) path: page/p
 #: C/progress.page:10
-#| msgid ""
-#| "Use the <option>--progress</option> option to create a progress dialog."
 msgid "Use the <cmd>--progress</cmd> option to create a progress dialog."
 msgstr ""
-"Для створення діалогового вікна поступу скористайтеся параметром <cmd"
-">--progress</cmd>."
+"Для створення діалогового вікна поступу скористайтеся параметром <cmd>--"
+"progress</cmd>."
 
 #. (itstool) path: page/p
 #: C/progress.page:14
-#| msgid ""
-#| "<application>Zenity</application> reads data from standard input line by "
-#| "line. If a line is prefixed with #, the text is updated with the text on "
-#| "that line. If a line contains only a number, the percentage is updated "
-#| "with that number."
 msgid ""
 "<app>Zenity</app> reads data from standard input line by line. If a line is "
 "prefixed with #, the text is updated with the text on that line. If a line "
 "contains only a number, the percentage is updated with that number."
 msgstr ""
-"<app>Zenity</app> читає дані зі стандартного потоку введення "
-"рядок за рядком. Якщо рядок починається з #, текст оновлюється на текст "
-"цього рядка. Якщо рядок містить лише число, оновлюється відсоток поступу."
+"<app>Zenity</app> читає дані зі стандартного потоку введення рядок за "
+"рядком. Якщо рядок починається з #, текст оновлюється на текст цього рядка. "
+"Якщо рядок містить лише число, оновлюється відсоток поступу."
 
 #. (itstool) path: page/p
 #: C/progress.page:18
@@ -1834,7 +1599,6 @@ msgstr "Вказує текст, який буде показано у вікн
 
 #. (itstool) path: item/title
 #: C/progress.page:30
-#| msgid "<option>--percentage</option>=<replaceable>percentage</replaceable>"
 msgid "<cmd>--percentage</cmd>=<var>percentage</var>"
 msgstr "<cmd>--percentage</cmd>=<var>відсоток</var>"
 
@@ -1845,7 +1609,6 @@ msgstr "Вказує початковий відсоток, який виста
 
 #. (itstool) path: item/title
 #: C/progress.page:35
-#| msgid "--auto-close"
 msgid "<cmd>--auto-close</cmd>"
 msgstr "<cmd>--auto-close</cmd>"
 
@@ -1856,7 +1619,6 @@ msgstr "Закриває діалог поступу при досяганні 1
 
 #. (itstool) path: item/title
 #: C/progress.page:40
-#| msgid "--pulsate"
 msgid "<cmd>--pulsate</cmd>"
 msgstr "<cmd>--pulsate</cmd>"
 
@@ -1871,40 +1633,12 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/progress.page:46
-#| msgid ""
-#| "The following example script shows how to create a progress dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a progress dialog:"
 msgstr "У наступному сценарії продемонстровано створення вікна поступу:"
 
 #. (itstool) path: page/code
 #: C/progress.page:50
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "        (\n"
-#| "        echo \"10\" ; sleep 1\n"
-#| "        echo \"# Updating mail logs\" ; sleep 1\n"
-#| "        echo \"20\" ; sleep 1\n"
-#| "        echo \"# Resetting cron jobs\" ; sleep 1\n"
-#| "        echo \"50\" ; sleep 1\n"
-#| "        echo \"This line will just be ignored\" ; sleep 1\n"
-#| "        echo \"75\" ; sleep 1\n"
-#| "        echo \"# Rebooting system\" ; sleep 1\n"
-#| "        echo \"100\" ; sleep 1\n"
-#| "        ) |\n"
-#| "        zenity --progress \\\n"
-#| "          --title=\"Update System Logs\" \\\n"
-#| "          --text=\"Scanning mail logs...\" \\\n"
-#| "          --percentage=0\n"
-#| "\n"
-#| "        if [ \"$?\" = -1 ] ; then\n"
-#| "                zenity --error \\\n"
-#| "                  --text=\"Update canceled.\"\n"
-#| "        fi\n"
-#| "\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -1959,7 +1693,6 @@ msgstr "Приклад вікна поступу"
 
 #. (itstool) path: figure/desc
 #: C/progress.page:77
-#| msgid "<placeholder-1/> progress dialog example"
 msgid "<app>Zenity</app> progress dialog example"
 msgstr "Приклад вікна поступу <app>Zenity</app>"
 
@@ -1969,9 +1702,6 @@ msgstr "Приклад вікна поступу <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/progress.page:78
-#| msgid ""
-#| "@@image: 'figures/zenity-progress-screenshot.png'; "
-#| "md5=706736240f396ada12044c23b708a6a6"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-progress-screenshot.png' "
@@ -1992,30 +1722,18 @@ msgstr "Вікно запитання"
 
 #. (itstool) path: page/p
 #: C/question.page:10
-#| msgid ""
-#| "Use the <option>--question</option> option to create a question dialog."
 msgid "Use the <cmd>--question</cmd> option to create a question dialog."
 msgstr ""
 "Для створення вікна запитання скористайтеся параметром <cmd>--question</cmd>."
 
 #. (itstool) path: page/p
 #: C/question.page:14
-#| msgid ""
-#| "The following example script shows how to create a question dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a question dialog:"
 msgstr "У наступному сценарії продемонстровано створення вікна запитання:"
 
 #. (itstool) path: page/code
 #: C/question.page:18
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "          #!/bin/bash\n"
-#| "\n"
-#| "          zenity --question \\\n"
-#| "          --text=\"Are you sure you wish to proceed?\"\n"
-#| "        "
 msgid ""
 "\n"
 "#!/bin/bash\n"
@@ -2036,7 +1754,6 @@ msgstr "Приклад вікна запитання"
 
 #. (itstool) path: figure/desc
 #: C/question.page:28
-#| msgid "<placeholder-1/> question dialog example"
 msgid "<app>Zenity</app> question dialog example"
 msgstr "Приклад вікна запитання <app>Zenity</app>"
 
@@ -2046,9 +1763,6 @@ msgstr "Приклад вікна запитання <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/question.page:29
-#| msgid ""
-#| "@@image: 'figures/zenity-question-screenshot.png'; "
-#| "md5=df8414504f8c8ca946a3f1e63a460938"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-question-screenshot.png' "
@@ -2064,19 +1778,16 @@ msgstr "Використання параметра <cmd>--scale</cmd>."
 
 #. (itstool) path: page/title
 #: C/scale.page:9
-#| msgid "Calendar Dialog"
 msgid "Scale Dialog"
 msgstr "Вікно шкали"
 
 #. (itstool) path: page/p
 #: C/scale.page:10
-#| msgid "Use the <option>--error</option> option to create an error dialog."
 msgid "Use the <cmd>--scale</cmd> option to create a scale dialog."
 msgstr "Використання параметра <cmd>--scale</cmd> для створення вікна шкали."
 
 #. (itstool) path: page/p
 #: C/scale.page:13
-#| msgid "The calendar dialog supports the following options:"
 msgid "The scale dialog supports the following options:"
 msgstr "У вікні шкали передбачено підтримку таких параметрів:"
 
@@ -2097,8 +1808,8 @@ msgid ""
 "Set initial value. (Default: 0) You must specify value between minimum value "
 "to maximum value."
 msgstr ""
-"Встановити початкове значення (типовим є 0). Вам слід вказати значення між"
-" мінімальним і максимальним."
+"Встановити початкове значення (типовим є 0). Вам слід вказати значення між "
+"мінімальним і максимальним."
 
 #. (itstool) path: item/title
 #: C/scale.page:30
@@ -2139,8 +1850,8 @@ msgstr "<cmd>--print-partial</cmd>"
 #: C/scale.page:46
 msgid "Print value to standard output, whenever a value is changed."
 msgstr ""
-"Виводити значення до стандартного виведення кожного разу, коли значення"
-" змінюється."
+"Виводити значення до стандартного виведення кожного разу, коли значення "
+"змінюється."
 
 #. (itstool) path: item/title
 #: C/scale.page:50
@@ -2149,36 +1860,17 @@ msgstr "<cmd>--hide-value</cmd>"
 
 #. (itstool) path: item/p
 #: C/scale.page:51
-#| msgid "File Selection Dialog"
 msgid "Hide value on dialog."
 msgstr "Сховати значення у діалоговому вікні."
 
 #. (itstool) path: page/p
 #: C/scale.page:56
-#| msgid ""
-#| "The following example script shows how to create a calendar dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a scale dialog:"
 msgstr "У наступному прикладі сценарію показано створення вікна шкали:"
 
 #. (itstool) path: page/code
 #: C/scale.page:60
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "        #!/bin/sh\n"
-#| "\n"
-#| "        FILE=`zenity --file-selection --title=\"Select a File\"`\n"
-#| "\n"
-#| "        case $? in\n"
-#| "                 0)\n"
-#| "                        echo \"\\\"$FILE\\\" selected.\";;\n"
-#| "                 1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "                -1)\n"
-#| "                        echo \"No file selected.\";;\n"
-#| "        esac\n"
-#| "      "
 msgid ""
 "\n"
 "#!/bin/sh\n"
@@ -2210,13 +1902,11 @@ msgstr ""
 
 #. (itstool) path: figure/title
 #: C/scale.page:76
-#| msgid "Calendar Dialog Example"
 msgid "Scale Dialog Example"
 msgstr "Приклад вікна шкали"
 
 #. (itstool) path: figure/desc
 #: C/scale.page:77
-#| msgid "<placeholder-1/> calendar dialog example"
 msgid "<app>Zenity</app> scale dialog example"
 msgstr "Приклад вікна шкали <app>Zenity</app>"
 
@@ -2226,9 +1916,6 @@ msgstr "Приклад вікна шкали <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/scale.page:78
-#| msgid ""
-#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
-#| "md5=b739d32aad963be4415d34ec103baf26"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-scale-screenshot.png' "
@@ -2249,14 +1936,11 @@ msgstr "Текстовий інформаційний діалог"
 
 #. (itstool) path: page/p
 #: C/text.page:10
-#| msgid ""
-#| "Use the <option>--text-info</option> option to create a text information "
-#| "dialog."
 msgid ""
 "Use the <cmd>--text-info</cmd> option to create a text information dialog."
 msgstr ""
-"Для створення текстового інформаційного вікна використовується параметр <cmd"
-">--text-info</cmd>."
+"Для створення текстового інформаційного вікна використовується параметр "
+"<cmd>--text-info</cmd>."
 
 #. (itstool) path: page/p
 #: C/text.page:14
@@ -2284,7 +1968,6 @@ msgstr "<cmd>--font</cmd>=<var>ШРИФТ</var>"
 
 #. (itstool) path: item/p
 #: C/text.page:32
-#| msgid "Specifies the title of a dialog."
 msgid "Specifies the text font."
 msgstr "Вказує шрифт тексту."
 
@@ -2297,8 +1980,8 @@ msgstr "<cmd>--checkbox</cmd>=<var>ТЕКСТ</var>"
 #: C/text.page:37
 msgid "Enable a checkbox for use like a 'I read and accept the terms.'"
 msgstr ""
-"Увімкнути поле для позначки із міткою, подібною до «Мною прочитано умови. Я з"
-" ними погоджуюся.»"
+"Увімкнути поле для позначки із міткою, подібною до «Мною прочитано умови. Я "
+"з ними погоджуюся.»"
 
 #. (itstool) path: item/title
 #: C/text.page:41
@@ -2319,13 +2002,11 @@ msgstr "<cmd>--url</cmd>=<var>АДРЕСА</var>"
 #: C/text.page:47
 msgid "Sets an url instead of a file. Only works if you use --html option."
 msgstr ""
-"Встановлює адресу замість файла. Працює лише за використання параметра --html."
+"Встановлює адресу замість файла. Працює лише за використання параметра --"
+"html."
 
 #. (itstool) path: page/p
 #: C/text.page:52
-#| msgid ""
-#| "The following example script shows how to create a text information "
-#| "dialog: <placeholder-1/>"
 msgid ""
 "The following example script shows how to create a text information dialog:"
 msgstr ""
@@ -2391,7 +2072,6 @@ msgstr "Приклад текстового інформаційного вік
 
 #. (itstool) path: figure/desc
 #: C/text.page:83
-#| msgid "<placeholder-1/> text information dialog example"
 msgid "<app>Zenity</app> text information dialog example"
 msgstr "Приклад вікна інформації <app>Zenity</app>"
 
@@ -2401,9 +2081,6 @@ msgstr "Приклад вікна інформації <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/text.page:84
-#| msgid ""
-#| "@@image: 'figures/zenity-text-screenshot.png'; "
-#| "md5=55d2e2a0254f43ef3c7e9b3d0c4cde04"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-text-screenshot.png' "
@@ -2414,16 +2091,12 @@ msgstr ""
 
 #. (itstool) path: info/desc
 #: C/usage.page:6
-#| msgid ""
-#| "When you write scripts, you can use <application>Zenity</application> to "
-#| "create simple dialogs that interact graphically with the user, as follows:"
 msgid ""
 "You can use <app>Zenity</app> to create simple dialogs that interact "
 "graphically with the user."
 msgstr ""
-"Ви можете скористатися <app>Zenity</app> для створення простих діалогових"
-" вікон графічної взаємодії з "
-"користувачем."
+"Ви можете скористатися <app>Zenity</app> для створення простих діалогових "
+"вікон графічної взаємодії з користувачем."
 
 #. (itstool) path: page/title
 #: C/usage.page:9
@@ -2432,16 +2105,13 @@ msgstr "Використання"
 
 #. (itstool) path: page/p
 #: C/usage.page:10
-#| msgid ""
-#| "When you write scripts, you can use <application>Zenity</application> to "
-#| "create simple dialogs that interact graphically with the user, as follows:"
 msgid ""
 "When you write scripts, you can use <app>Zenity</app> to create simple "
 "dialogs that interact graphically with the user, as follows:"
 msgstr ""
-"Коли ви пишете сценарій, можете використовувати <app>Zenity</app> для"
-" створення простих діалогових вікон графічної взаємодії з "
-"користувачем, а саме:"
+"Коли ви пишете сценарій, можете використовувати <app>Zenity</app> для "
+"створення простих діалогових вікон графічної взаємодії з користувачем, а "
+"саме:"
 
 #. (itstool) path: item/p
 #: C/usage.page:15
@@ -2467,27 +2137,21 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/usage.page:25
-#| msgid ""
-#| "When the user closes the dialog, <application>Zenity</application> prints "
-#| "the text produced by the dialog to standard output."
 msgid ""
 "When the user closes the dialog, <app>Zenity</app> prints the text produced "
 "by the dialog to standard output."
 msgstr ""
-"Коли користувач закриває вікно, <app>Zenity</app> виводить створений"
-" діалоговим вікном текст у стандартний потік виводу."
+"Коли користувач закриває вікно, <app>Zenity</app> виводить створений "
+"діалоговим вікном текст у стандартний потік виводу."
 
 #. (itstool) path: note/p
 #: C/usage.page:30
-#| msgid ""
-#| "When you write <application>Zenity</application> commands, ensure that "
-#| "you place quotation marks around each argument."
 msgid ""
 "When you write <app>Zenity</app> commands, ensure that you place quotation "
 "marks around each argument."
 msgstr ""
-"Коли ви пишете команди <app>Zenity</app>, перевірте, що ви ставите лапки"
-" навколо кожного аргументу."
+"Коли ви пишете команди <app>Zenity</app>, перевірте, що ви ставите лапки "
+"навколо кожного аргументу."
 
 #. (itstool) path: note/p
 #: C/usage.page:33
@@ -2535,26 +2199,20 @@ msgstr ""
 
 #. (itstool) path: section/p
 #: C/usage.page:47
-#| msgid ""
-#| "Some <application>Zenity</application> dialogs support the use of access "
-#| "keys. To specify the character to use as the access key, place an "
-#| "underscore before that character in the text of the dialog. The following "
-#| "example shows how to specify the letter 'C' as the access key:"
 msgid ""
 "Some <app>Zenity</app> dialogs support the use of access keys. To specify "
 "the character to use as the access key, place an underscore before that "
 "character in the text of the dialog. The following example shows how to "
 "specify the letter 'C' as the access key:"
 msgstr ""
-"У деяких вікнах <app>Zenity</app> передбачено підтримку клавіатурних"
-" скорочень. Щоб вказати, що символ використовується для комбінації клавіш, "
-"вставте перед ним символ підкреслення. У наступному прикладі показано, як це"
-" зробити для літери «В»:"
+"У деяких вікнах <app>Zenity</app> передбачено підтримку клавіатурних "
+"скорочень. Щоб вказати, що символ використовується для комбінації клавіш, "
+"вставте перед ним символ підкреслення. У наступному прикладі показано, як це "
+"зробити для літери «В»:"
 
 #. (itstool) path: section/screen
 #: C/usage.page:50
 #, no-wrap
-#| msgid "\"_Choose a name\"."
 msgid "<input>\"_Choose a name\".</input>"
 msgstr "<input>\"_Виберіть ім'я\".</input>"
 
@@ -2565,7 +2223,6 @@ msgstr "Коди завершення"
 
 #. (itstool) path: section/p
 #: C/usage.page:55
-#| msgid "<application>Zenity</application> returns the following exit codes:"
 msgid "Zenity returns the following exit codes:"
 msgstr "Zenity повертає наступні коди завершення:"
 
@@ -2586,15 +2243,12 @@ msgstr "<var>0</var>"
 
 #. (itstool) path: td/p
 #: C/usage.page:74
-#| msgid ""
-#| "The user has pressed either <guibutton>OK</guibutton> or "
-#| "<guibutton>Close</guibutton>."
 msgid ""
-"The user has pressed either <gui style=\"button\">OK</gui> or <gui style="
-"\"button\">Close</gui>."
+"The user has pressed either <gui style=\"button\">OK</gui> or <gui "
+"style=\"button\">Close</gui>."
 msgstr ""
-"Користувач натиснув <gui style=\"button\">Гаразд</gui> або <gui"
-" style=\"button\">Закрити</gui>."
+"Користувач натиснув <gui style=\"button\">Гаразд</gui> або <gui "
+"style=\"button\">Закрити</gui>."
 
 #. (itstool) path: td/p
 #: C/usage.page:79
@@ -2603,15 +2257,12 @@ msgstr "<var>1</var>"
 
 #. (itstool) path: td/p
 #: C/usage.page:82
-#| msgid ""
-#| "The user has either pressed <guibutton>Cancel</guibutton>, or used the "
-#| "window functions to close the dialog."
 msgid ""
 "The user has either pressed <gui style=\"button\">Cancel</gui>, or used the "
 "window functions to close the dialog."
 msgstr ""
-"Користувач або натиснув <gui style=\"button\">Скасувати</gui>, або закрив"
-" вікно, використовуючи кнопку вікна."
+"Користувач або натиснув <gui style=\"button\">Скасувати</gui>, або закрив "
+"вікно, використовуючи кнопку вікна."
 
 #. (itstool) path: td/p
 #: C/usage.page:87
@@ -2640,11 +2291,9 @@ msgstr "Загальні параметри"
 
 #. (itstool) path: section/p
 #: C/usage.page:112
-#| msgid ""
-#| "All <application>Zenity</application> dialogs support the following "
-#| "general options:"
 msgid "All Zenity dialogs support the following general options:"
-msgstr "У всіх вікнах Zenity передбачено підтримку таких загальних параметрів:"
+msgstr ""
+"У всіх вікнах Zenity передбачено підтримку таких загальних параметрів:"
 
 #. (itstool) path: item/title
 #: C/usage.page:119
@@ -2658,321 +2307,268 @@ msgstr "Вказує заголовок діалогового вікна."
 
 #. (itstool) path: item/title
 #: C/usage.page:124
-#| msgid "<option>--window-icon</option>=<replaceable>icon_path</replaceable>"
-msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
-msgstr "<cmd>--window-icon</cmd>=<var>шлях_до_піктограми</var>"
-
-#. (itstool) path: item/p
-#: C/usage.page:125
-msgid ""
-"Specifies the icon that is displayed in the window frame of the dialog. "
-"There are 4 stock icons also available by providing the following keywords - "
-"'info', 'warning', 'question' and 'error'."
-msgstr ""
-"Вказує значок, який буде показано у рамці діалогового вікна. Є 4 вбудовані "
-"значки, які вказуються ключовими словами «info», «warning», «question» та"
-" «error»."
-
-#. (itstool) path: item/title
-#: C/usage.page:132
 msgid "<cmd>--width</cmd>=<var>width</var>"
 msgstr "<cmd>--width</cmd>=<var>ширина</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:133
+#: C/usage.page:125
 msgid "Specifies the width of the dialog."
 msgstr "Вказує ширину вікна."
 
 #. (itstool) path: item/title
-#: C/usage.page:137
+#: C/usage.page:129
 msgid "<cmd>--height</cmd>=<var>height</var>"
 msgstr "<cmd>--height</cmd>=<var>висота</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:138
+#: C/usage.page:130
 msgid "Specifies the height of the dialog."
 msgstr "Вказує висоту вікна."
 
 #. (itstool) path: item/title
-#: C/usage.page:142
+#: C/usage.page:134
 msgid "<cmd>--timeout</cmd>=<var>timeout</var>"
 msgstr "<cmd>--timeout</cmd>=<var>час_очікування</var>"
 
 #. (itstool) path: item/p
-#: C/usage.page:143
+#: C/usage.page:135
 msgid "Specifies the timeout in seconds after which the dialog is closed."
 msgstr ""
 "Вказує час очікування у секундах, після якого діалогове вікно буде закрите."
 
 #. (itstool) path: section/title
-#: C/usage.page:153
+#: C/usage.page:145
 msgid "Help Options"
 msgstr "Параметри довідки"
 
 #. (itstool) path: section/p
-#: C/usage.page:155
-#| msgid ""
-#| "<application>Zenity</application> provides the following help options:"
+#: C/usage.page:147
 msgid "Zenity provides the following help options:"
 msgstr "У Zenity передбачено такі параметри довідки:"
 
 #. (itstool) path: item/title
-#: C/usage.page:162
+#: C/usage.page:154
 msgid "<cmd>--help</cmd>"
 msgstr "<cmd>--help</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:163
+#: C/usage.page:155
 msgid "Displays shortened help text."
 msgstr "Показує коротку довідку."
 
 #. (itstool) path: item/title
-#: C/usage.page:167
-#| msgid "--help-all"
+#: C/usage.page:159
 msgid "<cmd>--help-all</cmd>"
 msgstr "<cmd>--help-all</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:168
+#: C/usage.page:160
 msgid "Displays full help text for all dialogs."
 msgstr "Показує повну довідку з усіх вікон."
 
 #. (itstool) path: item/title
-#: C/usage.page:172
-#| msgid "--help-general"
+#: C/usage.page:164
 msgid "<cmd>--help-general</cmd>"
 msgstr "<cmd>--help-general</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:173
+#: C/usage.page:165
 msgid "Displays help text for general dialog options."
 msgstr "Показує довідку із загальних параметрів вікон."
 
 #. (itstool) path: item/title
-#: C/usage.page:177
-#| msgid "--help-calendar"
+#: C/usage.page:169
 msgid "<cmd>--help-calendar</cmd>"
 msgstr "<cmd>--help-calendar</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:178
+#: C/usage.page:170
 msgid "Displays help text for calendar dialog options."
 msgstr "Показує довідку про параметри вікна календаря."
 
 #. (itstool) path: item/title
-#: C/usage.page:182
-#| msgid "--help-entry"
+#: C/usage.page:174
 msgid "<cmd>--help-entry</cmd>"
 msgstr "<cmd>--help-entry</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:183
+#: C/usage.page:175
 msgid "Displays help text for text entry dialog options."
 msgstr "Показує довідку про параметри вікна вводу тексту."
 
 #. (itstool) path: item/title
-#: C/usage.page:187
-#| msgid "--help-error"
+#: C/usage.page:179
 msgid "<cmd>--help-error</cmd>"
 msgstr "<cmd>--help-error</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:188
+#: C/usage.page:180
 msgid "Displays help text for error dialog options."
 msgstr "Показує довідку про параметри вікна сповіщення про помилку."
 
 #. (itstool) path: item/title
-#: C/usage.page:192
-#| msgid "--help-info"
+#: C/usage.page:184
 msgid "<cmd>--help-info</cmd>"
 msgstr "<cmd>--help-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:193
+#: C/usage.page:185
 msgid "Displays help text for information dialog options."
 msgstr "Показує довідку про параметри вікна з інформацією."
 
 #. (itstool) path: item/title
-#: C/usage.page:197
-#| msgid "--help-file-selection"
+#: C/usage.page:189
 msgid "<cmd>--help-file-selection</cmd>"
 msgstr "<cmd>--help-file-selection</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:198
+#: C/usage.page:190
 msgid "Displays help text for file selection dialog options."
 msgstr "Показує довідку про параметри вікна вибору файлів."
 
 #. (itstool) path: item/title
-#: C/usage.page:202
-#| msgid "--help-list"
+#: C/usage.page:194
 msgid "<cmd>--help-list</cmd>"
 msgstr "<cmd>--help-list</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:203
+#: C/usage.page:195
 msgid "Displays help text for list dialog options."
 msgstr "Показує довідку про параметри вікна списку."
 
 #. (itstool) path: item/title
-#: C/usage.page:207
-#| msgid "--help-notification"
+#: C/usage.page:199
 msgid "<cmd>--help-notification</cmd>"
 msgstr "<cmd>--help-notification</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:208
+#: C/usage.page:200
 msgid "Displays help text for notification icon options."
 msgstr "Показує довідку про параметри значка в області сповіщення."
 
 #. (itstool) path: item/title
-#: C/usage.page:212
-#| msgid "--help-progress"
+#: C/usage.page:204
 msgid "<cmd>--help-progress</cmd>"
 msgstr "<cmd>--help-progress</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:213
+#: C/usage.page:205
 msgid "Displays help text for progress dialog options."
 msgstr "Показує довідку про параметри вікна поступу."
 
 #. (itstool) path: item/title
-#: C/usage.page:217
-#| msgid "--help-question"
+#: C/usage.page:209
 msgid "<cmd>--help-question</cmd>"
 msgstr "<cmd>--help-question</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:218
+#: C/usage.page:210
 msgid "Displays help text for question dialog options."
 msgstr "Показує довідку про параметри вікна запитання."
 
 #. (itstool) path: item/title
-#: C/usage.page:222
-#| msgid "--help-warning"
+#: C/usage.page:214
 msgid "<cmd>--help-warning</cmd>"
 msgstr "<cmd>--help-warning</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:223
+#: C/usage.page:215
 msgid "Displays help text for warning dialog options."
 msgstr "Показує довідку про параметри вікна попередження."
 
 #. (itstool) path: item/title
-#: C/usage.page:227
-#| msgid "--help-text-info"
+#: C/usage.page:219
 msgid "<cmd>--help-text-info</cmd>"
 msgstr "<cmd>--help-text-info</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:228
+#: C/usage.page:220
 msgid "Displays help for text information dialog options."
 msgstr "Показує довідку про параметри вікна інформаційного тексту."
 
 #. (itstool) path: item/title
-#: C/usage.page:232
-#| msgid "--help-misc"
+#: C/usage.page:224
 msgid "<cmd>--help-misc</cmd>"
 msgstr "<cmd>--help-misc</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:233
+#: C/usage.page:225
 msgid "Displays help for miscellaneous options."
 msgstr "Показує довідку про різні параметри."
 
 #. (itstool) path: item/title
-#: C/usage.page:237
-#| msgid "--help-gtk"
+#: C/usage.page:229
 msgid "<cmd>--help-gtk</cmd>"
 msgstr "<cmd>--help-gtk</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:238
+#: C/usage.page:230
 msgid "Displays help for GTK+ options."
 msgstr "Показує довідку про параметри GTK+."
 
 #. (itstool) path: section/title
-#: C/usage.page:248
+#: C/usage.page:240
 msgid "Miscellaneous Options"
 msgstr "Інші параметри"
 
 #. (itstool) path: section/p
-#: C/usage.page:250
-#| msgid ""
-#| "<application>Zenity</application> also provides the following "
-#| "miscellaneous options:"
+#: C/usage.page:242
 msgid "Zenity also provides the following miscellaneous options:"
 msgstr "Крім того, Zenity має наступні інші параметри:"
 
 #. (itstool) path: item/title
-#: C/usage.page:257
+#: C/usage.page:249
 msgid "<cmd>--about</cmd>"
 msgstr "<cmd>--about</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:258
-#| msgid ""
-#| "Displays the <guilabel>About Zenity</guilabel> dialog, which contains "
-#| "<application>Zenity</application> version information, copyright "
-#| "information, and developer information."
+#: C/usage.page:250
 msgid ""
 "Displays the <gui>About Zenity</gui> dialog, which contains Zenity version "
 "information, copyright information, and developer information."
 msgstr ""
-"Показує діалогове вікно <gui>Про Zenity</gui>, яке містить "
-"інформацію про версію Zenity, авторські права та "
-"інформацію про розробників."
+"Показує діалогове вікно <gui>Про Zenity</gui>, яке містить інформацію про "
+"версію Zenity, авторські права та інформацію про розробників."
 
 #. (itstool) path: item/title
-#: C/usage.page:262
-#| msgid "--version"
+#: C/usage.page:254
 msgid "<cmd>--version</cmd>"
 msgstr "<cmd>--version</cmd>"
 
 #. (itstool) path: item/p
-#: C/usage.page:263
-#| msgid "Displays the version number of <application>Zenity</application>."
+#: C/usage.page:255
 msgid "Displays the version number of Zenity."
 msgstr "Показує номер версії програми Zenity."
 
 #. (itstool) path: section/title
-#: C/usage.page:273
+#: C/usage.page:265
 msgid "GTK+ Options"
 msgstr "Параметри GTK+"
 
 #. (itstool) path: section/p
-#: C/usage.page:275
-#| msgid ""
-#| "<application>Zenity</application> supports the standard GTK+ options. For "
-#| "more information about the GTK+ options, execute the <command>zenity -?</"
-#| "command> command."
+#: C/usage.page:267
 msgid ""
-"Zenity supports the standard GTK+ options. For more information about the GTK"
-"+ options, execute the <cmd>zenity --help-gtk</cmd> command."
+"Zenity supports the standard GTK+ options. For more information about the "
+"GTK+ options, execute the <cmd>zenity --help-gtk</cmd> command."
 msgstr ""
-"У Zenity передбачено підтримку стандартних параметрів GTK+. Докладніше про"
-" параметри GTK+, можна дізнатись виконавши <cmd>zenity --help-gtk</cmd>."
+"У Zenity передбачено підтримку стандартних параметрів GTK+. Докладніше про "
+"параметри GTK+, можна дізнатись виконавши <cmd>zenity --help-gtk</cmd>."
 
 #. (itstool) path: section/title
-#: C/usage.page:284
+#: C/usage.page:276
 msgid "Environment Variables"
 msgstr "Змінні оточення"
 
 #. (itstool) path: section/p
-#: C/usage.page:286
-#| msgid ""
-#| "Normally, <application>Zenity</application> detects the terminal window "
-#| "from which it was launched and keeps itself above that window. This "
-#| "behavior can be disabled by unsetting the <envar>WINDOWID</envar> "
-#| "environment variable."
+#: C/usage.page:278
 msgid ""
 "Normally, Zenity detects the terminal window from which it was launched and "
 "keeps itself above that window. This behavior can be disabled by unsetting "
 "the <var>WINDOWID</var> environment variable."
 msgstr ""
-"Звичайно, Zenity визначає вікно термінала, з якого її запущено та тримає своє"
-" вікно над вікном термінала. Цю поведінку можна "
-"вимкнути, знявши змінну оточення <var>WINDOWID</var>."
+"Звичайно, Zenity визначає вікно термінала, з якого її запущено та тримає "
+"своє вікно над вікном термінала. Цю поведінку можна вимкнути, знявши змінну "
+"оточення <var>WINDOWID</var>."
 
 #. (itstool) path: info/desc
 #: C/warning.page:6
@@ -2986,29 +2582,17 @@ msgstr "Вікно попередження"
 
 #. (itstool) path: page/p
 #: C/warning.page:10
-#| msgid ""
-#| "Use the <option>--warning</option> option to create a warning dialog."
 msgid "Use the <cmd>--warning</cmd> option to create a warning dialog."
 msgstr "Для створення вікна попередження використовуйте <cmd>--info</cmd>."
 
 #. (itstool) path: page/p
 #: C/warning.page:14
-#| msgid ""
-#| "The following example script shows how to create a warning dialog: "
-#| "<placeholder-1/>"
 msgid "The following example script shows how to create a warning dialog:"
 msgstr "У наступному сценарії продемонстровано створення вікна попередження:"
 
 #. (itstool) path: page/code
 #: C/warning.page:18
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "          #!/bin/bash\n"
-#| "        \n"
-#| "          zenity --warning \\\n"
-#| "          --text=\"Disconnect the power cable to avoid electrical shock.\"\n"
-#| "        "
 msgid ""
 "\n"
 "#!/bin/bash\n"
@@ -3030,7 +2614,6 @@ msgstr "Приклад вікна попередження"
 
 #. (itstool) path: figure/desc
 #: C/warning.page:27
-#| msgid "<placeholder-1/> warning dialog example"
 msgid "<app>Zenity</app> warning dialog example"
 msgstr "Приклад вікна попередження <app>Zenity</app>"
 
@@ -3040,9 +2623,6 @@ msgstr "Приклад вікна попередження <app>Zenity</app>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/warning.page:28
-#| msgid ""
-#| "@@image: 'figures/zenity-warning-screenshot.png'; "
-#| "md5=cde1378d51f800a025b8c37ecdb60a20"
 msgctxt "_"
 msgid ""
 "external ref='figures/zenity-warning-screenshot.png' "
@@ -3050,3 +2630,22 @@ msgid ""
 msgstr ""
 "external ref='figures/zenity-warning-screenshot.png' "
 "md5='a2d07437efca06b775ceae24816d96a6'"
+
+#~ msgid ""
+#~ "<cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', "
+#~ "tooltip: '<var>text</var>', visible: '<var>text</var>',"
+#~ msgstr ""
+#~ "<cmd>--listen</cmd>=icon: '<var>текст</var>', message: '<var>текст</"
+#~ "var>', tooltip: '<var>текст</var>', visible: '<var>текст</var>',"
+
+#~ msgid "<cmd>--window-icon</cmd>=<var>icon_path</var>"
+#~ msgstr "<cmd>--window-icon</cmd>=<var>шлях_до_піктограми</var>"
+
+#~ msgid ""
+#~ "Specifies the icon that is displayed in the window frame of the dialog. "
+#~ "There are 4 stock icons also available by providing the following "
+#~ "keywords - 'info', 'warning', 'question' and 'error'."
+#~ msgstr ""
+#~ "Вказує значок, який буде показано у рамці діалогового вікна. Є 4 "
+#~ "вбудовані значки, які вказуються ключовими словами «info», «warning», "
+#~ "«question» та «error»."
diff --git a/data/zenity.png b/icons/hicolor/48x48/apps/zenity.png
similarity index 100%
rename from data/zenity.png
rename to icons/hicolor/48x48/apps/zenity.png
diff --git a/icons/meson.build b/icons/meson.build
new file mode 100644
index 00000000..11fe0f69
--- /dev/null
+++ b/icons/meson.build
@@ -0,0 +1,4 @@
+install_subdir(
+  'hicolor',
+  install_dir: zenity_iconsdir
+)
diff --git a/meson.build b/meson.build
index 091e491c..531f8aef 100644
--- a/meson.build
+++ b/meson.build
@@ -1,19 +1,24 @@
 project('zenity', 'c',
-  version: '3.44.0',
+  version: '3.99.0',
   meson_version: '>=0.57.0',
   license: 'LGPL-2.1-or-later'
 )
 
+app_id = 'org.gnome.Zenity'
+resource_base_path = '/org/gnome/Zenity'
+
 version_arr = meson.project_version().split('.')
 zenity_version_major = version_arr[0].to_int()
-zenity_version_minor = version_arr[1]
+zenity_version_minor = version_arr[1].to_int()
 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_datadir = join_paths(zenity_prefix, get_option('datadir'))
 zenity_localedir = join_paths(zenity_prefix, get_option('localedir'))
+zenity_mandir = join_paths(zenity_prefix, get_option('mandir'))
+zenity_iconsdir = join_paths(zenity_datadir, 'icons')
 
 zenity_root_dir = include_directories('.')
 zenity_po_dir = join_paths(meson.project_source_root(), 'po')
@@ -24,17 +29,20 @@ 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',
+zenity_conf.set_quoted('PACKAGE_NAME', meson.project_name())
+zenity_conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+zenity_conf.set_quoted('PACKAGE_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_quoted('PACKAGE_DATADIR', zenity_datadir)
+zenity_conf.set_quoted('PACKAGE_LIBDIR', zenity_libdir)
+zenity_conf.set_quoted('PACKAGE_LOCALE_DIR', zenity_localedir)
+
+zenity_conf.set_quoted('APP_ID', app_id)
+zenity_conf.set_quoted('RESOURCE_BASE_PATH', resource_base_path)
 
-zenity_conf.set('VERSION', 'ZENITY_VERSION')
-zenity_conf.set('GETTEXT_PACKAGE', 'ZENITY_NAME')
-zenity_conf.set('LOCALEDIR', 'ZENITY_LOCALE_DIR')
+zenity_conf.set('VERSION', 'PACKAGE_VERSION')
+zenity_conf.set('GETTEXT_PACKAGE', 'PACKAGE_NAME')
+zenity_conf.set('LOCALEDIR', 'PACKAGE_LOCALE_DIR')
 
 zenity_conf.set('DEBUG', get_option('debug'))
 
@@ -49,11 +57,7 @@ foreach h : check_headers
   cc.has_header(h, required: true)
 endforeach
 
-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')
+adw_dep = dependency('libadwaita-1', version: '>= 1.2')
 
 # Optional dependencies
 
@@ -61,32 +65,15 @@ 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.1', required: false)
+webkitgtk_dep = dependency('webkitgtk-6.0', required: false)
 if get_option('webkitgtk')
-  if webkitgtk.found()
+  if webkitgtk_dep.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.full_path())
-endif
-
 configure_file(
   output: 'config.h',
   configuration: zenity_conf
@@ -98,15 +85,13 @@ summary({'prefix': zenity_prefix,
          'libdir': zenity_libdir,
          'datadir': zenity_datadir,
 	 'localedir': zenity_localedir,
+	 'mandir': zenity_mandir,
+	 'iconsdir': zenity_iconsdir,
         }, section: 'Directories')
 
-summary({'libnotify': get_option('libnotify'),
-         'webkitgtk': get_option('webkitgtk'),
-         'gdialog script': perl.found(),
-        }, section: 'Configuration')
-
 subdir('src')
 subdir('data')
+subdir('icons')
 subdir('po')
 subdir('help')
 
diff --git a/meson_options.txt b/meson_options.txt
index 7dd5b5a9..8509973b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1 @@
-option('libnotify', type : 'boolean', value : false,
-  description : 'enable libnotify for desktop notification support')
-
-option('webkitgtk', type : 'boolean', value : false,
-  description : 'enable webkitgtk support')
+option('webkitgtk', type: 'boolean', value: false, description : 'enable webkitgtk support')
diff --git a/po/ChangeLog b/po/ChangeLog.pre-git
similarity index 100%
rename from po/ChangeLog
rename to po/ChangeLog.pre-git
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3488a950..dbcb0613 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+data/org.gnome.Zenity.desktop.in
 src/about.c
 src/calendar.c
 src/color.c
diff --git a/po/ca.po b/po/ca.po
index d9bde300..ebbfd9c2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Catalan translation of zenity\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
-"POT-Creation-Date: 2018-09-07 11:06+0000\n"
-"PO-Revision-Date: 2017-09-01 20:02+0200\n"
+"POT-Creation-Date: 2023-04-28 19:28+0000\n"
+"PO-Revision-Date: 2023-05-28 16:24+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@@ -19,9 +19,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.4.2\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Mostra caixes de diàleg de la línia d'ordres"
+
+#: src/about.c:54
 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 "
@@ -33,7 +41,7 @@ msgstr ""
 "publicada per la Free Software Foundation; ja sigui la versió 2 de la "
 "Llicència o bé (si ho preferiu) qualsevol altra versió posterior.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -45,7 +53,7 @@ msgstr ""
 "ADEQUACIÓ PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General "
 "Menor GNU per a obtenir-ne més detalls.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -55,216 +63,182 @@ msgstr ""
 "juntament amb aquest programa; en cas contrari, escriviu a la Free Software "
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Jordi Mallach <jordi@sindominio.net>\n"
-"Joan Duran <jodufi@gmail.com>"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Mostra caixes de diàleg de scripts de l'intèrpret d'ordres"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:415 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_D'acord"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:411 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Heu d'especificar un tipus de diàleg. Vegeu «zenity --help» per a més "
 "detalls\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_No"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Sí"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "No s'ha pogut analitzar el missatge\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"El valor no és vàlid per una indicació de tipus booleà.\n"
-"Els valors admesos són «true» (cert) o «false» (fals).\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "No s'admet aquest tipus d'indicació. S'omet.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Es desconeix el tipus d'indicació. S'omet.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "No s'ha pogut analitzar l'ordre de l'entrada estàndard\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Notificació del Zenity"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "Estableix el títol del diàleg"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "TÍTOL"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Estableix la icona de la finestra"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "CAMÍ D'ICONA"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "Estableix l'amplada"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "AMPLADA"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "Estableix l'alçada"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "ALÇADA"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "Estableix el temps d'espera del diàleg (en segons)"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "TEMPS D'ESPERA"
 
-#: src/option.c:200
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "Estableix l'etiqueta del botó D'acord"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "TEXT"
 
-#: src/option.c:207
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "Estableix l'etiqueta del botó Cancel·la"
 
-#: src/option.c:214
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "Afegeix un botó extra"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "Estableix la indicació com a modal"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Estableix la finestra pare a la que adjuntar-se"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "ABANDONAT; no fa res"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "FINESTRA"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "ABANDONAT; useu «--icon»"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "NOM-ICONA"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "Mostra el diàleg de calendari"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "Estableix el text del diàleg"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "Estableix el dia del calendari"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "DIA"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "Estableix el mes del calendari"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "MES"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "Estableix l'any del calendari"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "ANY"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "Estableix el format de la data de tornada"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "PATRÓ"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Mostra el diàleg d'entrada de text"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "Estableix el text de l'entrada"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "Amaga el text de l'entrada"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "Mostra el diàleg d'error"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Estableix la icona del diàleg"
-
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "NOM-ICONA"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "Estableix el nom de la icona"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "No habilitis l'ajustament del text"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "No habilitis el marcatge de la Pango"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -272,89 +246,85 @@ msgstr ""
 "Habilita posar punts suspensius en el text del diàleg. Això permet arreglar "
 "el problema de la mida de la finestra en texts molt llargs"
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "Mostra el diàleg d'informació"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "Mostra el diàleg de selecció de fitxers"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "Estableix el nom del fitxer"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "NOM DE FITXER"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "Permet la selecció de múltiples fitxers"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "Activa la selecció de només directoris"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "Activa el mode d'estalvi"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "Estableix el caràcter de separació de la sortida"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "SEPARADOR"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Confirmeu la selecció del fitxer si el nom del fitxer ja existeix"
-
-#: src/option.c:448
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "Estableix un filtre per al nom de fitxer"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NOM | PATRÓ1 PATRÓ2 ..."
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "Mostra el diàleg de llista"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "Estableix la capçalera de la columna"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "COLUMNA"
 
-#: src/option.c:481
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "Utilitza caselles de selecció per a la primera columna"
 
-#: src/option.c:488
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "Utilitza botons de grup per a la primera columna"
 
-#: src/option.c:495
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "Utilitza una imatge per a la primera columna"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "Permet la selecció de múltiples files"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "Permet canvis al text"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -363,109 +333,97 @@ msgstr ""
 "«ALL» per a imprimir totes les columnes)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "NOMBRE"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "Amaga una columna específica"
 
-#: src/option.c:539
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "Oculta les capçaleres de la columna"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Canvia la funció de cerca per defecte a la llista cercant text al mig, no al "
-"principi"
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "Mostra una notificació"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "Estableix el text de la notificació"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "Espera ordres de l'entrada estàndard"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Estableix les indicacions de la notificació"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "Mostra el diàleg d'indicació de progrés"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "Estableix el percentatge inicial"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "PERCENTATGE"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "Barra de progrés parpellejant"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Tanca el diàleg quan s'arribi al 100%"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Mata el procés pare si es prem el botó de cancel·lar"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "Oculta el botó de cancel·lar"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Estima quan el progrés arribarà al 100%"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "Mostra el diàleg de pregunta"
 
-#: src/option.c:684
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "Per defecte, posa el focus al botó Cancel·la"
 
-#: src/option.c:698
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "Suprimeix els botons D'acord i Cancel·la"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "Mostra el diàleg de text informatiu"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "Estableix el tipus de lletra del text"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "Habilita una casella de selecció tipus «Ho he llegit i accepto»"
 
-#: src/option.c:744
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "Habilita la compatibilitat amb l'HTML"
 
-#: src/option.c:751
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -473,317 +431,355 @@ msgstr ""
 "No habilitis la interacció de l'usuari amb WebView. Només funciona si "
 "utilitzeu l'opció «--html»"
 
-#: src/option.c:759
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Estableix un URL en lloc d'un fitxer. Només funciona si utilitzeu l'opció «--"
 "html»"
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Desplaça automàticament el text al final. Només en capturar el text des de "
 "l'entrada estàndard"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "Mostra el diàleg d'avís"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "Mostra el diàleg d'escala"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "Estableix un valor inicial"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "VALOR"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "Estableix el valor mínim"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "Estableix el valor màxim"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "Estableix el valor dels augments"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "Imprimeix valors parcials"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "Amaga el valor"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
 msgstr "Mostra el diàleg de formularis"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
 msgstr "Afegeix una entrada nova en el diàleg de formularis"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "Nom del camp"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Afegeix una contrasenya nova en el diàleg de formularis"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
 msgstr "Afegeix un calendari nou en el diàleg de formularis"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "Nom del camp del calendari"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
 msgstr "Afegeix una llista nova en el diàleg de formularis"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "Camp de la llista i el nom de la capçalera"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "Llista de valors per a la llista"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "Llista de valors separats per |"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "Llista de valors per les columnes"
 
-#: src/option.c:928
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
 msgstr "Afegeix un quadre combinat nou al diàleg de formularis"
 
-#: src/option.c:929
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "Nom del camp de quadre combinat"
 
-#: src/option.c:935
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "Llista de valors pel quadre combinat"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "Mostra la capçalera de les columnes"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "Mostra el diàleg de contrasenya"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "Mostra l'opció de nom d'usuari"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "Mostra el diàleg de selecció de colors"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "Estableix el color"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
 msgstr "Mostra la paleta"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
 msgstr "Quant al Zenity"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "Imprimeix la versió"
 
-#: src/option.c:1913
+#: src/option.c:1080
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Avís: --icon-name està abandonat i s'eliminarà en una versió futura de "
+"zenity; es tractarà com a --icon.\n"
+
+#: src/option.c:1087
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Avís: --window-icon està abandonat i s'eliminarà en una versió futura de "
+"zenity; es tractarà com a --icon.\n"
+
+#: src/option.c:1094
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"Avís: --confirm-overwrite està abandonat i s'eliminarà en una versió futura "
+"de zenity. S'ignora.\n"
+
+#: src/option.c:1101
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Avís: --attach està abandonat i s'eliminarà en una versió futura de zenity. "
+"S'ignora.\n"
+
+#: src/option.c:1108
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Avís: --hint està abandonat i s'eliminarà en una versió futura de zenity. "
+"S'ignora.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "Opcions generals"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "Mostra les opcions generals"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "Opcions del calendari"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "Mostra les opcions del calendari"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "Opcions de l'entrada de text"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "Mostra les opcions de l'entrada de text"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "Opcions d'error"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "Mostra les opcions d'error"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "Opcions d'informació"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "Mostra les opcions d'informació"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "Opcions del selector de fitxers"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "Mostra les opcions del selector de fitxers"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "Opcions de llistes"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "Mostra les opcions de llistes"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Opcions de la icona de notificació"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "Opcions de notificació"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Mostra les opcions de la icona de notificació"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "Mostra opcions de notificació"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "Opcions del progrés"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "Mostra les opcions del progrés"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "Opcions de preguntes"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "Mostra les opcions de preguntes"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "Opcions d'avisos"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "Mostra les opcions d'avisos"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "Opcions d'escala"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "Mostra les opcions de l'escala"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "Mostra les opcions de text informatiu"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "Mostra les opcions de text informatiu"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "Opcions de selecció del color"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "Mostra les opcions de selecció del color"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "Opcions del diàleg de contrasenya"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "Mostra les opcions del diàleg de contrasenya"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
 msgstr "Opcions del diàleg de formularis"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
 msgstr "Mostra les opcions del diàleg de formularis"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "Opcions diverses"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "Mostra les opcions diverses"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Aquesta opció no és disponible. Vegeu «--help» per a una llista de tots els "
 "usos possibles.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s no està implementat per a aquest diàleg\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 msgid "Two or more dialog options specified\n"
 msgstr "S'han especificat dues o més opcions de diàleg\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Teclegeu la contrasenya"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Teclegeu l'usuari i la contrasenya"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Temps restant: %lu:%02lu:%02lu"
@@ -792,102 +788,173 @@ msgstr "Temps restant: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "El valor màxim ha de ser major que el valor mínim.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "El valor està fora de l'abast.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Avís: --mid-search està abandonat i s'eliminarà en una versió futura de "
+"zenity. S'ignora.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr ""
 "No s'han especificat els títols de les columnes per al diàleg de llista.\n"
 
-#: src/tree.c:399
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "Només hauríeu d'usar un tipus de diàleg de llista.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr ""
+"No s'ha trobat el fitxer de la icona %s; s'intenta amb la icona del tema."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Ajusta el valor de l'escala"
 
-#: 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 "Cancel·la"
-
-#: 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 "D'acord"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Vista de text"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Selecció del calendari"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Seleccioneu una data d'aquí sota."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "C_alendari:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "C_alendari"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Afegeix una entrada nova"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Introduïu text nou:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Error"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "S'ha produït un error."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Diàleg de formularis"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Informació"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Totes les actualitzacions estan completes."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Progrés"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "S'està executant..."
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Pregunta"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_No"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Sí"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Esteu segur que voleu continuar?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Seleccioneu elements de la llista"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Seleccioneu elements de la llista d'aquí sota."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Avís"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Teclegeu la contrasenya"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Jordi Mallach <jordi@sindominio.net>\n"
+#~ "Joan Duran <jodufi@gmail.com>"
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "El valor no és vàlid per una indicació de tipus booleà.\n"
+#~ "Els valors admesos són «true» (cert) o «false» (fals).\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "No s'admet aquest tipus d'indicació. S'omet.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "Es desconeix el tipus d'indicació. S'omet.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "Notificació del Zenity"
+
+#~ msgid "Set the window icon"
+#~ msgstr "Estableix la icona de la finestra"
+
+#~ msgid "ICONPATH"
+#~ msgstr "CAMÍ D'ICONA"
+
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "Estableix la finestra pare a la que adjuntar-se"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "Estableix la icona del diàleg"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr "Confirmeu la selecció del fitxer si el nom del fitxer ja existeix"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr ""
+#~ "Canvia la funció de cerca per defecte a la llista cercant text al mig, no "
+#~ "al principi"
+
+#~ msgid "Set the notification hints"
+#~ msgstr "Estableix les indicacions de la notificació"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
+#~ msgid "OK"
+#~ msgstr "D'acord"
diff --git a/po/de.po b/po/de.po
index 1b4ffaa4..54932c2b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,24 +9,32 @@
 # Christian Kirbach <christian.kirbach@gmail.com>, 2010, 2013.
 # Benjamin Steinwender <b@stbe.at>, 2014.
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2015.
+# Jürgen Benvenuti <gastornis@posteo.org>, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-26 20:40+0000\n"
-"PO-Revision-Date: 2017-11-29 20:35+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: Deutsch <gnome-de@gnome.org>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2023-02-04 17:46+0000\n"
+"PO-Revision-Date: 2023-02-06 20:51+0100\n"
+"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 3.1.1\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Dialogfenster aus der Befehlszeile heraus aufrufen"
+
+#: src/about.c:54
 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 "
@@ -38,7 +46,7 @@ msgstr ""
 "veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 "
 "der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -51,7 +59,7 @@ msgstr ""
 "BESTIMMTEN ZWECK. Details finden Sie in der GNU Lesser General Public "
 "License.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -62,312 +70,263 @@ msgstr ""
 "Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, "
 "USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Christian Neumair <chris@gnome-de.org>\n"
-"Hendrik Richter <hendrikr@gnome.org>\n"
-"Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Christian Kirbach <Christian.Kirbach@gmail.com>\n"
-"Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>\n"
-"Benjamin Steinwender <b@stbe.at>\n"
-"Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Dialogfenster aus Shell-Skripten heraus aufrufen"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:408 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_OK"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:404 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Sie müssen einen Dialogtypen angeben. Siehe »zenity --help« für weitere "
-"Details.\n"
-
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Nein"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Ja"
+"Details\n"
 
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Nachricht konnte nicht interpretiert werden\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Ungültiger Wert für einen booleschen Hinweis.\n"
-"Unterstützte Werte sind »true« oder »false«.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Unbekannter Hinweis. Wird übersprungen.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Unbekannter Hinweisname. Wird übersprungen.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Befehl von Standardeingabe konnte nicht interpretiert werden\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Zenity-Benachrichtigung"
-
-#: src/option.c:164
+#: src/option.c:166
 msgid "Set the dialog title"
 msgstr "Den Dialogtitel festlegen"
 
-#: src/option.c:165
+#: src/option.c:167
 msgid "TITLE"
 msgstr "TITEL"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Das Fenstersymbol festlegen"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "SYMBOLPFAD"
-
-#: src/option.c:178
+#: src/option.c:173
 msgid "Set the width"
 msgstr "Die Breite festlegen"
 
-#: src/option.c:179
+#: src/option.c:174
 msgid "WIDTH"
 msgstr "BREITE"
 
-#: src/option.c:185
+#: src/option.c:180
 msgid "Set the height"
 msgstr "Die Höhe festlegen"
 
-#: src/option.c:186
+#: src/option.c:181
 msgid "HEIGHT"
 msgstr "HÖHE"
 
-#: src/option.c:192
+#: src/option.c:187
 msgid "Set dialog timeout in seconds"
 msgstr "Die Wartezeit des Dialogs in Sekunden festlegen"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:189
 msgid "TIMEOUT"
 msgstr "WARTEZEIT"
 
-#: src/option.c:200
+#: src/option.c:195
 msgid "Set the label of the OK button"
 msgstr "Legt die Beschriftung des OK-Knopfes fest"
 
-#: 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
+#: src/option.c:196 src/option.c:203 src/option.c:210 src/option.c:234
+#: src/option.c:279 src/option.c:286 src/option.c:310 src/option.c:364
+#: src/option.c:473 src/option.c:569 src/option.c:607 src/option.c:668
+#: src/option.c:750 src/option.c:757 src/option.c:807 src/option.c:861
+#: src/option.c:993
 msgid "TEXT"
 msgstr "TEXT"
 
-#: src/option.c:207
+#: src/option.c:202
 msgid "Set the label of the Cancel button"
 msgstr "Die Beschriftung des Abbrechen-Knopfes festlegen"
 
-#: src/option.c:214
+#: src/option.c:209
 msgid "Add an extra button"
 msgstr "Einen zusätzlichen Knopf hinzufügen"
 
-#: src/option.c:221
+#: src/option.c:216
 msgid "Set the modal hint"
 msgstr "Den modalen Hinweis festlegen"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Das übergeordnete Fenster zum Anhängen festlegen"
-
-#: src/option.c:229
-msgid "WINDOW"
-msgstr "FENSTER"
-
-#: src/option.c:237
+#: src/option.c:226
 msgid "Display calendar dialog"
 msgstr "Kalenderdialog anzeigen"
 
-#: 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
+#: src/option.c:233 src/option.c:278 src/option.c:309 src/option.c:363
+#: src/option.c:472 src/option.c:606 src/option.c:667 src/option.c:806
+#: src/option.c:860 src/option.c:992
 msgid "Set the dialog text"
 msgstr "Den Dialogtext festlegen"
 
-#: src/option.c:251
+#: src/option.c:240
 msgid "Set the calendar day"
 msgstr "Den Kalendertag festlegen"
 
-#: src/option.c:252
+#: src/option.c:241
 msgid "DAY"
 msgstr "TAG"
 
-#: src/option.c:258
+#: src/option.c:247
 msgid "Set the calendar month"
 msgstr "Den Kalendermonat festlegen"
 
-#: src/option.c:259
+#: src/option.c:248
 msgid "MONTH"
 msgstr "MONAT"
 
-#: src/option.c:265
+#: src/option.c:254
 msgid "Set the calendar year"
 msgstr "Das Kalenderjahr festlegen"
 
-#: src/option.c:266
+#: src/option.c:255
 msgid "YEAR"
 msgstr "JAHR"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:261 src/option.c:1006
 msgid "Set the format for the returned date"
 msgstr "Das Format für das zurückgegebene Datum festlegen"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:262 src/option.c:1007
 msgid "PATTERN"
 msgstr "MUSTER"
 
-#: src/option.c:281
+#: src/option.c:271
 msgid "Display text entry dialog"
 msgstr "Texteingabe-Dialog anzeigen"
 
-#: src/option.c:295
+#: src/option.c:285
 msgid "Set the entry text"
 msgstr "Den Eingabetext festlegen"
 
-#: src/option.c:302
+#: src/option.c:292
 msgid "Hide the entry text"
 msgstr "Den Eingabetext verbergen"
 
-#: src/option.c:311
+#: src/option.c:302
 msgid "Display error dialog"
 msgstr "Fehlerdialog anzeigen"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Das Dialogsymbol festlegen"
+#: src/option.c:316 src/option.c:370 src/option.c:575 src/option.c:674
+#: src/option.c:813
+msgid "Set the icon name"
+msgstr "Den Symbolnamen festlegen"
 
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
+#: src/option.c:317 src/option.c:324 src/option.c:371 src/option.c:378
+#: src/option.c:576 src/option.c:583 src/option.c:675 src/option.c:682
+#: src/option.c:814 src/option.c:821
 msgid "ICON-NAME"
 msgstr "SYMBOL-NAME"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:323 src/option.c:377 src/option.c:582 src/option.c:681
+#: src/option.c:820
+msgid "DEPRECATED; use `--icon`"
+msgstr "VERALTET; verwenden Sie »--icon«"
+
+#: src/option.c:330 src/option.c:384 src/option.c:688 src/option.c:827
 msgid "Do not enable text wrapping"
 msgstr "Zeilenumbrüche nicht aktivieren"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:337 src/option.c:391 src/option.c:695 src/option.c:834
 msgid "Do not enable Pango markup"
 msgstr "Pango-Markup nicht aktivieren"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:344 src/option.c:398 src/option.c:709 src/option.c:841
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
 msgstr ""
 "Aktiviert Auslassungen im Dialogtext. Dadurch wird die Fenstergröße bei "
-"langen Texten korrigiert."
+"langen Texten korrigiert"
 
-#: src/option.c:354
+#: src/option.c:356
 msgid "Display info dialog"
 msgstr "Info-Dialog anzeigen"
 
-#: src/option.c:398
+#: src/option.c:410
 msgid "Display file selection dialog"
 msgstr "Dateiwähler-Dialog anzeigen"
 
-#: src/option.c:405
+#: src/option.c:417
 msgid "Set the filename"
 msgstr "Den Dateinamen festlegen"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:418 src/option.c:736
 msgid "FILENAME"
 msgstr "DATEINAME"
 
-#: src/option.c:412
+#: src/option.c:424
 msgid "Allow multiple files to be selected"
 msgstr "Auswahl mehrerer Dateien zulassen"
 
 # CHECK
-#: src/option.c:419
+#: src/option.c:431
 msgid "Activate directory-only selection"
 msgstr "Nur Verzeichnisse auswählen"
 
-#: src/option.c:426
+#: src/option.c:438
 msgid "Activate save mode"
 msgstr "Speichermodus aktivieren"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:445 src/option.c:507 src/option.c:999
 msgid "Set output separator character"
 msgstr "Das Trennzeichen für die Ausgabe festlegen"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:446 src/option.c:508 src/option.c:1000
 msgid "SEPARATOR"
 msgstr "TRENNZEICHEN"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Dateiauswahl bestätigen, falls ein Dateiname bereits existiert"
-
-#: src/option.c:448
+#: src/option.c:452
 msgid "Set a filename filter"
 msgstr "Einen Filter für den Dateinamen festlegen"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:455
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAME | PATTERN1 PATTERN2 ..."
 
-#: src/option.c:460
+#: src/option.c:465
 msgid "Display list dialog"
 msgstr "Listendialog anzeigen"
 
-#: src/option.c:474
+#: src/option.c:479
 msgid "Set the column header"
 msgstr "Den Spaltentitel festlegen"
 
-#: src/option.c:475
+#: src/option.c:480
 msgid "COLUMN"
 msgstr "SPALTE"
 
-#: src/option.c:481
+#: src/option.c:486
 msgid "Use check boxes for the first column"
 msgstr "Ankreuzfelder für die erste Spalte verwenden"
 
-#: src/option.c:488
+#: src/option.c:493
 msgid "Use radio buttons for the first column"
 msgstr "Auswahlknöpfe für die erste Spalte verwenden"
 
-#: src/option.c:495
+#: src/option.c:500
 msgid "Use an image for the first column"
 msgstr "Ein Bild für die erste Spalte verwenden"
 
-#: src/option.c:509
+#: src/option.c:514
 msgid "Allow multiple rows to be selected"
 msgstr "Auswahl mehrerer Reihen zulassen"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:521 src/option.c:742
 msgid "Allow changes to text"
 msgstr "Änderungen am Text zulassen"
 
-#: src/option.c:523
+#: src/option.c:528
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -376,109 +335,101 @@ msgstr ""
 "alle Spalten zu drucken)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:531 src/option.c:538
 msgid "NUMBER"
 msgstr "NUMMER"
 
-#: src/option.c:532
+#: src/option.c:537
 msgid "Hide a specific column"
-msgstr "Eine bestimmte Spalte verbergen."
+msgstr "Eine bestimmte Spalte verbergen"
 
-#: src/option.c:539
+#: src/option.c:544
 msgid "Hide the column headers"
 msgstr "Die Spaltentitel verbergen"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Ändern der Standardsuchfunktion für Listen auf Suche nach Text in der Mitte, "
-"nicht am Anfang"
+#: src/option.c:551
+msgid "DEPRECATED; does nothing"
+msgstr "VERALTET; bewirkt nichts"
 
-#: src/option.c:557
+#: src/option.c:561
 msgid "Display notification"
 msgstr "Benachrichtigung anzeigen"
 
-#: src/option.c:564
+#: src/option.c:568
 msgid "Set the notification text"
 msgstr "Den Benachrichtigungstext festlegen"
 
-#: src/option.c:571
+#: src/option.c:589
 msgid "Listen for commands on stdin"
 msgstr "Auf der Standardeingabe nach Befehlen horchen"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Den Benachrichtigungshinweis festlegen"
-
-#: src/option.c:590
+#: src/option.c:599
 msgid "Display progress indication dialog"
 msgstr "Fortschrittsanzeige-Dialog anzeigen"
 
-#: src/option.c:604
+#: src/option.c:613
 msgid "Set initial percentage"
 msgstr "Den anfänglichen Prozentsatz festlegen"
 
-#: src/option.c:605
+#: src/option.c:614
 msgid "PERCENTAGE"
 msgstr "PROZENT"
 
-#: src/option.c:611
+#: src/option.c:620
 msgid "Pulsate progress bar"
 msgstr "Pulsierende Fortschrittsleiste"
 
-#: src/option.c:619
+#: src/option.c:628
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Den Dialog beenden, wenn 100% erreicht sind"
 
-#: src/option.c:626
+#: src/option.c:635
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Elternprozess beenden, wenn der Abbrechen-Knopf angeklickt wird"
 
-#: src/option.c:633
+#: src/option.c:642
 msgid "Hide Cancel button"
 msgstr "Abbrechen-Knopf verbergen"
 
-#: src/option.c:641
+#: src/option.c:650
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Fortschritt zum Erreichen von 100% schätzen"
 
-#: src/option.c:650
+#: src/option.c:660
 msgid "Display question dialog"
 msgstr "Fragedialog anzeigen"
 
-#: src/option.c:684
+#: src/option.c:702
 msgid "Give Cancel button focus by default"
 msgstr "Vorgabe fokussiert den Abbrechen-Knopf"
 
-#: src/option.c:698
+#: src/option.c:718
 msgid "Suppress OK and Cancel buttons"
 msgstr "OK- und Abbrechen-Knöpfe unterdrücken"
 
-#: src/option.c:708
+#: src/option.c:728
 msgid "Display text information dialog"
 msgstr "Text-Informationsdialog anzeigen"
 
-#: src/option.c:715
+#: src/option.c:735
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: src/option.c:729
+#: src/option.c:749
 msgid "Set the text font"
 msgstr "Schriftart für Text festlegen"
 
-#: src/option.c:736
+#: src/option.c:756
 msgid "Enable an I read and agree checkbox"
 msgstr "Ankreuzfeld zum »Lesen und Bestätigen« aktivieren"
 
-#: src/option.c:744
+#: src/option.c:764
 msgid "Enable HTML support"
 msgstr "HTML-Unterstützung aktivieren"
 
-#: src/option.c:751
+#: src/option.c:771
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -486,317 +437,323 @@ msgstr ""
 "Benutzerinteraktion mit WebView nicht einschalten. Funktioniert nur zusammen "
 "mit der Option »--html«"
 
-#: src/option.c:759
+#: src/option.c:779
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Legt eine Adresse anstelle einer Datei fest. Funktioniert nur zusammen mit "
-"der Option --html."
+"der Option --html"
 
-#: src/option.c:761
+#: src/option.c:781
 msgid "URL"
 msgstr "Adresse"
 
-#: src/option.c:768
+#: src/option.c:788
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Automatisch an das Textende springen. Nur wenn Text von Standardeingabe "
 "aufgenommen wird"
 
-#: src/option.c:778
+#: src/option.c:799
 msgid "Display warning dialog"
 msgstr "Warndialog anzeigen"
 
-#: src/option.c:821
+#: src/option.c:853
 msgid "Display scale dialog"
 msgstr "Schieberegler-Dialog anzeigen"
 
-#: src/option.c:835
+#: src/option.c:867
 msgid "Set initial value"
 msgstr "Den anfänglichen Wert festlegen"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:868 src/option.c:875 src/option.c:882 src/option.c:889
+#: src/option.c:1041
 msgid "VALUE"
 msgstr "WERT"
 
-#: src/option.c:842
+#: src/option.c:874
 msgid "Set minimum value"
 msgstr "Den minimalen Wert festlegen"
 
-#: src/option.c:849
+#: src/option.c:881
 msgid "Set maximum value"
 msgstr "Den maximalen Wert festlegen"
 
-#: src/option.c:856
+#: src/option.c:888
 msgid "Set step size"
 msgstr "Die Schrittgröße festlegen"
 
-#: src/option.c:863
+#: src/option.c:895
 msgid "Print partial values"
 msgstr "Zwischenwerte anzeigen"
 
-#: src/option.c:870
+#: src/option.c:902
 msgid "Hide value"
 msgstr "Den Wert ausblenden"
 
-#: src/option.c:879
+#: src/option.c:912
 msgid "Display forms dialog"
 msgstr "Formulardialog anzeigen"
 
-#: src/option.c:886
+#: src/option.c:919
 msgid "Add a new Entry in forms dialog"
 msgstr "Einen neuen Eintrag im Formulardialog hinzufügen"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:920 src/option.c:927
 msgid "Field name"
 msgstr "Feldname"
 
-#: src/option.c:893
+#: src/option.c:926
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Neues Passworteingabefeld im Formulardialog hinzufügen"
 
-#: src/option.c:900
+#: src/option.c:933
 msgid "Add a new Calendar in forms dialog"
 msgstr "Neuen Kalender im Formulardialog hinzufügen"
 
-#: src/option.c:901
+#: src/option.c:934
 msgid "Calendar field name"
 msgstr "Kalenderfeldname"
 
-#: src/option.c:907
+#: src/option.c:940
 msgid "Add a new List in forms dialog"
 msgstr "Eine neue Liste im Formulardialog hinzufügen"
 
-#: src/option.c:908
+#: src/option.c:941
 msgid "List field and header name"
 msgstr "Listenfeld und Kopfzeilenname"
 
-#: src/option.c:914
+#: src/option.c:947
 msgid "List of values for List"
 msgstr "Liste der Werte für die Liste"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:948 src/option.c:955 src/option.c:969
 msgid "List of values separated by |"
 msgstr "Liste der Werte, mit | getrennt"
 
-#: src/option.c:921
+#: src/option.c:954
 msgid "List of values for columns"
 msgstr "Liste der Werte für Spalten"
 
-#: src/option.c:928
+#: src/option.c:961
 msgid "Add a new combo box in forms dialog"
 msgstr "Eine neues Auswahlfeld im Formulardialog hinzufügen"
 
-#: src/option.c:929
+#: src/option.c:962
 msgid "Combo box field name"
 msgstr "Feldname des Auswahlfelds"
 
-#: src/option.c:935
+#: src/option.c:968
 msgid "List of values for combo box"
 msgstr "Liste der Werte für das Auswahlfeld"
 
-#: src/option.c:952
+#: src/option.c:985
 msgid "Show the columns header"
 msgstr "Den Spaltentitel anzeigen"
 
-#: src/option.c:983
+#: src/option.c:1016
 msgid "Display password dialog"
 msgstr "Passwortdialog anzeigen"
 
-#: src/option.c:990
+#: src/option.c:1023
 msgid "Display the username option"
 msgstr "Benutzername-Option anzeigen"
 
-#: src/option.c:1000
+#: src/option.c:1033
 msgid "Display color selection dialog"
 msgstr "Farbwahldialog anzeigen"
 
-#: src/option.c:1007
+#: src/option.c:1040
 msgid "Set the color"
 msgstr "Die Farbe festlegen"
 
-#: src/option.c:1014
+#: src/option.c:1047
 msgid "Show the palette"
 msgstr "Die Palette anzeigen"
 
-#: src/option.c:1023
+#: src/option.c:1057
 msgid "About zenity"
 msgstr "Info zu zenity"
 
-#: src/option.c:1030
+#: src/option.c:1064
 msgid "Print version"
 msgstr "Druckversion"
 
-#: src/option.c:1913
+#: src/option.c:1478
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Warnung: »--window-icon« ist veraltet und wird in einer zukünftigen Version "
+"von Zenity entfernt. Wird ignoriert.\n"
+
+#: src/option.c:2000
 msgid "General options"
 msgstr "Allgemeine Einstellungen"
 
-#: src/option.c:1914
+#: src/option.c:2001
 msgid "Show general options"
 msgstr "Allgemeine Einstellungen anzeigen"
 
-#: src/option.c:1926
+#: src/option.c:2013
 msgid "Calendar options"
 msgstr "Kalendereinstellungen"
 
-#: src/option.c:1927
+#: src/option.c:2014
 msgid "Show calendar options"
 msgstr "Kalendereinstellungen anzeigen"
 
-#: src/option.c:1939
+#: src/option.c:2026
 msgid "Text entry options"
 msgstr "Einstellungen der Texteingabe"
 
-#: src/option.c:1940
+#: src/option.c:2027
 msgid "Show text entry options"
 msgstr "Einstellungen der Texteingabe anzeigen"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Error options"
 msgstr "Fehlereinstellungen"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Show error options"
 msgstr "Fehlereinstellungen"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Info options"
 msgstr "Info-Einstellungen"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Show info options"
 msgstr "Info-Einstellungen anzeigen"
 
-#: src/option.c:1972
+#: src/option.c:2059
 msgid "File selection options"
 msgstr "Einstellungen des Dateiwählers"
 
-#: src/option.c:1973
+#: src/option.c:2060
 msgid "Show file selection options"
 msgstr "Einstellungen des Dateiwählers anzeigen"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "List options"
 msgstr "Listeneinstellungen"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "Show list options"
 msgstr "Listeneinstellungen anzeigen"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Benachrichtigungssymbol-Einstellungen"
+#: src/option.c:2082
+msgid "Notification options"
+msgstr "Benachrichtigungseinstellungen"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Benachrichtigungssymbol-Einstellungen anzeigen"
+#: src/option.c:2083
+msgid "Show notification options"
+msgstr "Benachrichtigungseinstellungen anzeigen"
 
-#: src/option.c:2011
+#: src/option.c:2096
 msgid "Progress options"
 msgstr "Fortschrittseinstellungen"
 
-#: src/option.c:2012
+#: src/option.c:2097
 msgid "Show progress options"
 msgstr "Fortschrittseinstellungen anzeigen"
 
-#: src/option.c:2024
+#: src/option.c:2109
 msgid "Question options"
 msgstr "Frageeinstellungen"
 
-#: src/option.c:2025
+#: src/option.c:2110
 msgid "Show question options"
 msgstr "Frageeinstellungen anzeigen"
 
-#: src/option.c:2037
+#: src/option.c:2122
 msgid "Warning options"
 msgstr "Warneinstellungen"
 
-#: src/option.c:2038
+#: src/option.c:2123
 msgid "Show warning options"
 msgstr "Warneinstellungen anzeigen"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Scale options"
 msgstr "Schiebereglereinstellungen"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Show scale options"
 msgstr "Schiebereglereinstellungen anzeigen"
 
-#: src/option.c:2060
+#: src/option.c:2145
 msgid "Text information options"
 msgstr "Textinformationseinstellungen"
 
-#: src/option.c:2061
+#: src/option.c:2146
 msgid "Show text information options"
 msgstr "Textinformationseinstellungen anzeigen"
 
-#: src/option.c:2073
+#: src/option.c:2158
 msgid "Color selection options"
 msgstr "Einstellungen des Farbwählers"
 
-#: src/option.c:2074
+#: src/option.c:2159
 msgid "Show color selection options"
 msgstr "Einstellungen des Farbwählers anzeigen"
 
-#: src/option.c:2086
+#: src/option.c:2171
 msgid "Password dialog options"
 msgstr "Optionen für Passwortdialog"
 
-#: src/option.c:2087
+#: src/option.c:2172
 msgid "Show password dialog options"
 msgstr "Optionen für Passwortdialog anzeigen"
 
-#: src/option.c:2099
+#: src/option.c:2184
 msgid "Forms dialog options"
 msgstr "Optionen für Formulardialog"
 
-#: src/option.c:2100
+#: src/option.c:2185
 msgid "Show forms dialog options"
 msgstr "Optionen für Formulardialog anzeigen"
 
-#: src/option.c:2112
+#: src/option.c:2197
 msgid "Miscellaneous options"
 msgstr "Verschiedene Einstellungen"
 
-#: src/option.c:2113
+#: src/option.c:2198
 msgid "Show miscellaneous options"
 msgstr "Verschiedene Einstellungen anzeigen"
 
-#: src/option.c:2139
+#: src/option.c:2221
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Diese Option steht nicht zur Verfügung. Bitte verwenden Sie »--help« für "
 "alle Anwendungsmöglichkeiten.\n"
 
-#: src/option.c:2144
+#: src/option.c:2226
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s wird von diesem Dialog nicht unterstützt\n"
 
-#: src/option.c:2148
+#: src/option.c:2230
 msgid "Two or more dialog options specified\n"
 msgstr "Dialog-Option mehrfach übergeben\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Geben Sie Ihr Passwort ein"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Geben Sie Ihren Benutzernamen und Ihr Passwort ein"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Verbleibende Zeit: %lu:%02lu:%02lu"
@@ -805,101 +762,179 @@ msgstr "Verbleibende Zeit: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Der maximale Wert muss größer als der minimale sein.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Wert außerhalb des gültigen Bereichs.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Warnung: »--mid-search« ist veraltet und wird in einer zukünftigen Version "
+"von Zenity entfernt. Wird ignoriert.\n"
+
+#: src/tree.c:278
 msgid "No column titles specified for List dialog.\n"
 msgstr "Keine Spaltentitel für Listendialog angegeben\n"
 
-#: src/tree.c:399
+#: src/tree.c:285
 msgid "You should use only one List dialog type.\n"
 msgstr "Sie können nur einen Listendialogtyp verwenden.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "Symbol-Dateiname %s nicht gefunden; Themen-Symbol wird ausprobiert."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Wert des Schiebereglers anpassen"
 
-#: 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 "Abbrechen"
-
-#: 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 "Ok"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Textansicht"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Wählen Sie ein Datum"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
-msgstr "Wählen Sie ein Datum."
+msgstr "Wählen Sie ein Datum von unten aus."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "_Kalender:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Kalender"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Einen neuen Eintrag hinzufügen"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Geben Sie den neuen Text ein:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Fehler"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Ein Fehler ist aufgetreten."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Formulardialog"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Informationen"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Alle Aktualisierungen wurden fertiggestellt."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Läuft …"
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Frage"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Nein"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Wollen Sie fortfahren?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Wählen Sie Objekte aus der Liste"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
-msgstr "Wählen Sie Objekte aus der Liste."
+msgstr "Wählen Sie Objekte aus der nachstehenden Liste."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Warnung"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Geben Sie Ihr Passwort ein"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Christian Neumair <chris@gnome-de.org>\n"
+#~ "Hendrik Richter <hendrikr@gnome.org>\n"
+#~ "Mario Blättermann <mario.blaettermann@gmail.com>\n"
+#~ "Christian Kirbach <Christian.Kirbach@gmail.com>\n"
+#~ "Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>\n"
+#~ "Benjamin Steinwender <b@stbe.at>\n"
+#~ "Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>"
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "Ungültiger Wert für einen booleschen Hinweis.\n"
+#~ "Unterstützte Werte sind »true« oder »false«.\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "Unbekannter Hinweis. Wird übersprungen.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "Unbekannter Hinweisname. Wird übersprungen.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "Zenity-Benachrichtigung"
+
+#~ msgid "Set the window icon"
+#~ msgstr "Das Fenstersymbol festlegen"
+
+#~ msgid "ICONPATH"
+#~ msgstr "SYMBOLPFAD"
+
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "Das übergeordnete Fenster zum Anhängen festlegen"
+
+#~ msgid "WINDOW"
+#~ msgstr "FENSTER"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "Das Dialogsymbol festlegen"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr "Dateiauswahl bestätigen, falls ein Dateiname bereits existiert"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr ""
+#~ "Ändern der Standardsuchfunktion für Listen auf Suche nach Text in der "
+#~ "Mitte, nicht am Anfang"
+
+#~ msgid "Set the notification hints"
+#~ msgstr "Den Benachrichtigungshinweis festlegen"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "OK"
+#~ msgstr "Ok"
diff --git a/po/en_CA.po b/po/en_CA.po
index 825ade2a..9ba24116 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,351 +1,336 @@
 # English/Canada translation of zenity.
 # Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
+# Copyright © 2021 Logan Rathbone
 # This file is distributed under the same licence as the zenity package.
-# Adam Weinberger <adamw@gnome.org>, 2004, 2005.
-# 
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-15 18:03-0400\n"
+"POT-Creation-Date: 2021-02-15 15:49-0500\n"
 "PO-Revision-Date: 2005-07-03 13:39-0400\n"
-"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
+"Last-Translator: Logan Rathbone <poprocks@gmail.com>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "Language: en_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/about.c:65
+#: src/about.c:54
 msgid ""
 "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.\n"
+"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.\n"
 msgstr ""
 "This program is free software; you can redistribute it and/or modify it "
-"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.\n"
+"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.\n"
 
-#: ../src/about.c:69
+#: src/about.c:59
 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 "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
+"for more details.\n"
 msgstr ""
 "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 Licence for "
-"more details.\n"
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
+"for more details.\n"
 
-#: ../src/about.c:73
+#: src/about.c:63
 msgid ""
-"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."
+"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, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"You should have received a copy of the GNU General Public Licence along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"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, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/about.c:264
-msgid "translator-credits"
-msgstr ""
-"Maintainer: Adam Weinberger <adamw@gnome.org>\n"
-"Alexander Winston <alexander.winston@comcast.net>"
-
-#: ../src/about.c:276
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Display dialogue boxes from shell scripts"
 
-#: ../src/main.c:94
+#: src/fileselection.c:57 src/zenity.ui:65 src/zenity.ui:129 src/zenity.ui:203
+#: src/zenity.ui:265 src/zenity.ui:322 src/zenity.ui:405 src/zenity.ui:458
+#: src/zenity.ui:521 src/zenity.ui:625 src/zenity.ui:679 src/zenity.ui:740
+msgid "_OK"
+msgstr "_OK"
+
+#: src/fileselection.c:58 src/zenity.ui:59 src/zenity.ui:123 src/zenity.ui:197
+#: src/zenity.ui:259 src/zenity.ui:399 src/zenity.ui:515 src/zenity.ui:619
+#: src/zenity.ui:746
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: src/main.c:121
 #, c-format
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "You must specify a dialogue type. See 'zenity --help' for details\n"
 
-#: ../src/notification.c:139
-#, c-format
-msgid "could not parse command from stdin\n"
-msgstr "Could not parse command from stdin\n"
+#: src/msg.c:42
+msgid "_No"
+msgstr "_No"
 
-#: ../src/notification.c:252 ../src/notification.c:269
-msgid "Zenity notification"
-msgstr "Zenity notification"
+#: src/msg.c:44
+msgid "_Yes"
+msgstr "_Yes"
 
-#: ../src/scale.c:56
-#, c-format
-msgid "Maximum value must be greater than minimum value.\n"
-msgstr "Maximum value must be greater than minimum value.\n"
+#: src/notification.c:55
+msgid "Could not parse message\n"
+msgstr "Could not parse message\n"
 
-#: ../src/scale.c:63
+#: src/notification.c:142
 #, c-format
-msgid "Value out of range.\n"
-msgstr "Value out of range.\n"
+msgid ""
+"Invalid value for a boolean typed hint.\n"
+"Supported values are 'true' or 'false'.\n"
+msgstr ""
+"Invalid value for a boolean typed hint.\n"
+"Supported values are 'true' or 'false'.\n"
 
-#: ../src/tree.c:320
+#. (iibiiay)
+#: src/notification.c:163
 #, c-format
-msgid "No column titles specified for List dialog.\n"
-msgstr "No column titles specified for List dialogue.\n"
+msgid "Unsupported hint. Skipping.\n"
+msgstr "Unsupported hint. Skipping.\n"
 
-#: ../src/tree.c:326
+#. unknown hints
+#: src/notification.c:186
 #, c-format
-msgid "You should use only one List dialog type.\n"
-msgstr "You should use only one List dialogue type.\n"
-
-#: ../src/zenity.glade.h:1
-msgid "Add a new entry"
-msgstr "Add a new entry"
+msgid "Unknown hint name. Skipping.\n"
+msgstr "Unknown hint name. Skipping.\n"
 
-#: ../src/zenity.glade.h:2
-msgid "Adjust the scale value"
-msgstr "Adjust the scale value"
-
-#: ../src/zenity.glade.h:3
-msgid "All updates are complete."
-msgstr "All updates are complete."
-
-#: ../src/zenity.glade.h:4
-msgid "An error has occurred."
-msgstr "An error has occurred."
-
-#: ../src/zenity.glade.h:5
-msgid "Are you sure you want to proceed?"
-msgstr "Are you sure you want to proceed?"
-
-#: ../src/zenity.glade.h:6
-msgid "C_alendar:"
-msgstr "C_alendar:"
-
-#: ../src/zenity.glade.h:7
-msgid "Calendar selection"
-msgstr "Calendar selection"
-
-#: ../src/zenity.glade.h:8
-msgid "Error"
-msgstr "Error"
-
-#: ../src/zenity.glade.h:9
-msgid "Information"
-msgstr "Information"
-
-#: ../src/zenity.glade.h:10
-msgid "Progress"
-msgstr "Progress"
-
-#: ../src/zenity.glade.h:11
-msgid "Question"
-msgstr "Question"
-
-#: ../src/zenity.glade.h:12
-msgid "Running..."
-msgstr "Running..."
-
-#: ../src/zenity.glade.h:13
-msgid "Select a date from below."
-msgstr "Select a date from below."
-
-#: ../src/zenity.glade.h:14
-msgid "Select a file"
-msgstr "Select a file"
-
-#: ../src/zenity.glade.h:15
-msgid "Select items from the list"
-msgstr "Select items from the list"
-
-#: ../src/zenity.glade.h:16
-msgid "Select items from the list below."
-msgstr "Select items from the list below."
-
-#: ../src/zenity.glade.h:17
-msgid "Text View"
-msgstr "Text View"
-
-#: ../src/zenity.glade.h:18
-msgid "Warning"
-msgstr "Warning"
+#: src/notification.c:247
+#, c-format
+msgid "Could not parse command from stdin\n"
+msgstr "Could not parse command from stdin\n"
 
-#: ../src/zenity.glade.h:19
-msgid "_Enter new text:"
-msgstr "_Enter new text:"
+#: src/notification.c:374
+msgid "Zenity notification"
+msgstr "Zenity notification"
 
-#: ../src/option.c:117
+#: src/option.c:166
 msgid "Set the dialog title"
 msgstr "Set the dialogue title"
 
-#: ../src/option.c:118
+#: src/option.c:167
 msgid "TITLE"
 msgstr "TITLE"
 
-#: ../src/option.c:126
-msgid "Set the window icon"
-msgstr "Set the window icon"
-
-#: ../src/option.c:127
-msgid "ICONPATH"
-msgstr "ICONPATH"
-
-#: ../src/option.c:135
+#: src/option.c:173
 msgid "Set the width"
 msgstr "Set the width"
 
-#: ../src/option.c:136
+#: src/option.c:174
 msgid "WIDTH"
 msgstr "WIDTH"
 
-#: ../src/option.c:144
+#: src/option.c:180
 msgid "Set the height"
 msgstr "Set the height"
 
-#: ../src/option.c:145
+#: src/option.c:181
 msgid "HEIGHT"
 msgstr "HEIGHT"
 
-#: ../src/option.c:153
+#: src/option.c:187
 msgid "Set dialog timeout in seconds"
 msgstr "Set dialogue timeout in seconds"
 
-#: ../src/option.c:168
+#. Timeout for closing the dialog
+#: src/option.c:189
+msgid "TIMEOUT"
+msgstr "TIMEOUT"
+
+#: src/option.c:195
+msgid "Set the label of the OK button"
+msgstr "Set the label of the OK button"
+
+#: src/option.c:196 src/option.c:203 src/option.c:210 src/option.c:234
+#: src/option.c:279 src/option.c:286 src/option.c:310 src/option.c:357
+#: src/option.c:459 src/option.c:557 src/option.c:578 src/option.c:597
+#: src/option.c:658 src/option.c:733 src/option.c:740 src/option.c:790
+#: src/option.c:837 src/option.c:969
+msgid "TEXT"
+msgstr "TEXT"
+
+#: src/option.c:202
+msgid "Set the label of the Cancel button"
+msgstr "Set the label of the Cancel button"
+
+#: src/option.c:209
+msgid "Add an extra button"
+msgstr "Add an extra button"
+
+#: src/option.c:216
+msgid "Set the modal hint"
+msgstr "Set the modal hint"
+
+#: src/option.c:226
 msgid "Display calendar dialog"
 msgstr "Display calendar dialogue"
 
-#: ../src/option.c:177 ../src/option.c:237 ../src/option.c:280
-#: ../src/option.c:313 ../src/option.c:415 ../src/option.c:544
-#: ../src/option.c:606 ../src/option.c:672 ../src/option.c:705
+#: src/option.c:233 src/option.c:278 src/option.c:309 src/option.c:356
+#: src/option.c:458 src/option.c:596 src/option.c:657 src/option.c:789
+#: src/option.c:836 src/option.c:968
 msgid "Set the dialog text"
 msgstr "Set the dialogue text"
 
-#: ../src/option.c:178 ../src/option.c:238 ../src/option.c:247
-#: ../src/option.c:256 ../src/option.c:281 ../src/option.c:314
-#: ../src/option.c:416 ../src/option.c:512 ../src/option.c:545
-#: ../src/option.c:607 ../src/option.c:673 ../src/option.c:706
-msgid "TEXT"
-msgstr "TEXT"
-
-#: ../src/option.c:186
+#: src/option.c:240
 msgid "Set the calendar day"
 msgstr "Set the calendar day"
 
-#: ../src/option.c:187
+#: src/option.c:241
 msgid "DAY"
 msgstr "DAY"
 
-#: ../src/option.c:195
+#: src/option.c:247
 msgid "Set the calendar month"
 msgstr "Set the calendar month"
 
-#: ../src/option.c:196
+#: src/option.c:248
 msgid "MONTH"
 msgstr "MONTH"
 
-#: ../src/option.c:204
+#: src/option.c:254
 msgid "Set the calendar year"
 msgstr "Set the calendar year"
 
-#: ../src/option.c:205
+#: src/option.c:255
 msgid "YEAR"
 msgstr "YEAR"
 
-#: ../src/option.c:213
+#: src/option.c:261 src/option.c:982
 msgid "Set the format for the returned date"
 msgstr "Set the format for the returned date"
 
-#: ../src/option.c:214
+#: src/option.c:262 src/option.c:983
 msgid "PATTERN"
 msgstr "PATTERN"
 
-#: ../src/option.c:228
+#: src/option.c:271
 msgid "Display text entry dialog"
 msgstr "Display text entry dialogue"
 
-#: ../src/option.c:246
+#: src/option.c:285
 msgid "Set the entry text"
 msgstr "Set the entry text"
 
-#: ../src/option.c:255
+#: src/option.c:292
 msgid "Hide the entry text"
 msgstr "Hide the entry text"
 
-#: ../src/option.c:271
+#: src/option.c:302
 msgid "Display error dialog"
 msgstr "Display error dialogue"
 
-#: ../src/option.c:289 ../src/option.c:322 ../src/option.c:615
-#: ../src/option.c:681
+#: src/option.c:316 src/option.c:363 src/option.c:664 src/option.c:796
+msgid "Set the dialog icon"
+msgstr "Set the dialog icon"
+
+#: src/option.c:317 src/option.c:364 src/option.c:665 src/option.c:797
+msgid "ICON-NAME"
+msgstr "ICON-NAME"
+
+#: src/option.c:323 src/option.c:370 src/option.c:671 src/option.c:803
 msgid "Do not enable text wrapping"
 msgstr "Do not enable text wrapping"
 
-#: ../src/option.c:304
+#: src/option.c:330 src/option.c:377 src/option.c:678 src/option.c:810
+msgid "Do not enable Pango markup"
+msgstr "Do not enable Pango markup"
+
+#: src/option.c:337 src/option.c:384 src/option.c:692 src/option.c:817
+msgid ""
+"Enable ellipsizing in the dialog text. This fixes the high window size with "
+"long texts"
+msgstr ""
+"Enable ellipsizing in the dialog text. This fixes the high window size with "
+"long texts"
+
+#: src/option.c:349
 msgid "Display info dialog"
 msgstr "Display info dialogue"
 
-#: ../src/option.c:337
+#: src/option.c:396
 msgid "Display file selection dialog"
 msgstr "Display file selection dialogue"
 
-#: ../src/option.c:346
+#: src/option.c:403
 msgid "Set the filename"
 msgstr "Set the filename"
 
-#: ../src/option.c:347 ../src/option.c:640
+#: src/option.c:404 src/option.c:719
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: ../src/option.c:355
+#: src/option.c:410
 msgid "Allow multiple files to be selected"
 msgstr "Allow multiple files to be selected"
 
-#: ../src/option.c:364
+#: src/option.c:417
 msgid "Activate directory-only selection"
 msgstr "Activate directory-only selection"
 
-#: ../src/option.c:373
+#: src/option.c:424
 msgid "Activate save mode"
 msgstr "Activate save mode"
 
-#: ../src/option.c:382 ../src/option.c:451
+#: src/option.c:431 src/option.c:493 src/option.c:975
 msgid "Set output separator character"
 msgstr "Set output separator character"
 
-#: ../src/option.c:383 ../src/option.c:452
+#: src/option.c:432 src/option.c:494 src/option.c:976
 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 
-#: ../src/option.c:391
-msgid "Confirm file selection if filename already exists"
-msgstr "Confirm file selection if filename already exists"
+#: src/option.c:438
+msgid "Set a filename filter"
+msgstr "Set a filename filter"
+
+#. Help for file-filter argument (name and patterns for file
+#. selection)
+#: src/option.c:441
+msgid "NAME | PATTERN1 PATTERN2 ..."
+msgstr "NAME | PATTERN1 PATTERN2 ..."
 
-#: ../src/option.c:406
+#: src/option.c:451
 msgid "Display list dialog"
 msgstr "Display list dialogue"
 
-#: ../src/option.c:424
+#: src/option.c:465
 msgid "Set the column header"
 msgstr "Set the column header"
 
-#: ../src/option.c:425
+#: src/option.c:466
 msgid "COLUMN"
 msgstr "COLUMN"
 
-#: ../src/option.c:433
-msgid "Use check boxes for first column"
-msgstr "Use check boxes for first column"
+#: src/option.c:472
+msgid "Use check boxes for the first column"
+msgstr "Use check boxes for the first column"
+
+#: src/option.c:479
+msgid "Use radio buttons for the first column"
+msgstr "Use radio buttons for the first column"
 
-#: ../src/option.c:442
-msgid "Use radio buttons for first column"
-msgstr "Use radio buttons for first column"
+#: src/option.c:486
+msgid "Use an image for the first column"
+msgstr "Use an image for the first column"
 
-#: ../src/option.c:460
+#: src/option.c:500
 msgid "Allow multiple rows to be selected"
 msgstr "Allow multiple rows to be selected"
 
-#: ../src/option.c:469 ../src/option.c:648
+#: src/option.c:507 src/option.c:725
 msgid "Allow changes to text"
 msgstr "Allow changes to text"
 
-#: ../src/option.c:478
+#: src/option.c:514
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -353,234 +338,535 @@ msgstr ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
 
-#: ../src/option.c:479 ../src/option.c:488
+#. Column index number to print out on a list dialog
+#: src/option.c:517 src/option.c:524
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../src/option.c:487
+#: src/option.c:523
 msgid "Hide a specific column"
 msgstr "Hide a specific column"
 
-#: ../src/option.c:502
+#: src/option.c:530
+msgid "Hide the column headers"
+msgstr "Hide the column headers"
+
+#: src/option.c:537
+msgid ""
+"Change list default search function searching for text in the middle, not on "
+"the beginning"
+msgstr ""
+"Change list default search function searching for text in the middle, not on "
+"the beginning"
+
+#: src/option.c:549
 msgid "Display notification"
 msgstr "Display notification"
 
-#: ../src/option.c:511
+#: src/option.c:556
 msgid "Set the notification text"
 msgstr "Set the notification text"
 
-#: ../src/option.c:520
+#: src/option.c:563
+msgid "Set the notification icon"
+msgstr "Set the notification icon"
+
+#: src/option.c:564
+msgid "ICONPATH"
+msgstr "ICONPATH"
+
+#: src/option.c:570
 msgid "Listen for commands on stdin"
 msgstr "Listen for commands on stdin"
 
-#: ../src/option.c:535
+#: src/option.c:577
+msgid "Set the notification hints"
+msgstr "Set the notification hints"
+
+#: src/option.c:589
 msgid "Display progress indication dialog"
 msgstr "Display progress indication dialogue"
 
-#: ../src/option.c:553
+#: src/option.c:603
 msgid "Set initial percentage"
 msgstr "Set initial percentage"
 
-#: ../src/option.c:554
+#: src/option.c:604
 msgid "PERCENTAGE"
 msgstr "PERCENTAGE"
 
-#: ../src/option.c:562
+#: src/option.c:610
 msgid "Pulsate progress bar"
 msgstr "Pulsate progress bar"
 
-#: ../src/option.c:572
+#: src/option.c:618
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Dismiss the dialogue when 100% has been reached"
 
-#: ../src/option.c:582
+#: src/option.c:625
+msgid "Kill parent process if Cancel button is pressed"
+msgstr "Kill parent process if Cancel button is pressed"
+
+#: src/option.c:632
+msgid "Hide Cancel button"
+msgstr "Hide Cancel button"
+
+#: src/option.c:640
 #, no-c-format
-msgid "Kill parent process if cancel button is pressed"
-msgstr "Kill parent process if cancel button is pressed"
+msgid "Estimate when progress will reach 100%"
+msgstr "Estimate when progress will reach 100%"
 
-#: ../src/option.c:597
+#: src/option.c:650
 msgid "Display question dialog"
 msgstr "Display question dialogue"
 
-#: ../src/option.c:630
+#: src/option.c:685
+msgid "Give Cancel button focus by default"
+msgstr "Give Cancel button focus by default"
+
+#: src/option.c:701
+msgid "Suppress OK and Cancel buttons"
+msgstr "Suppress OK and Cancel buttons"
+
+#: src/option.c:711
 msgid "Display text information dialog"
 msgstr "Display text information dialogue"
 
-#: ../src/option.c:639
+#: src/option.c:718
 msgid "Open file"
 msgstr "Open file"
 
-#: ../src/option.c:663
+#: src/option.c:732
+msgid "Set the text font"
+msgstr "Set the text font"
+
+#: src/option.c:739
+msgid "Enable an I read and agree checkbox"
+msgstr "Enable an I read and agree checkbox"
+
+#: src/option.c:747
+msgid "Enable HTML support"
+msgstr "Enable HTML support"
+
+#: src/option.c:754
+msgid ""
+"Do not enable user interaction with the WebView. Only works if you use --"
+"html option"
+msgstr ""
+"Do not enable user interaction with the WebView. Only works if you use --"
+"html option"
+
+#: src/option.c:762
+msgid "Set an URL instead of a file. Only works if you use --html option"
+msgstr "Set an URL instead of a file. Only works if you use --html option"
+
+#: src/option.c:764
+msgid "URL"
+msgstr "URL"
+
+#: src/option.c:771
+msgid "Auto scroll the text to the end. Only when text is captured from stdin"
+msgstr "Auto scroll the text to the end. Only when text is captured from stdin"
+
+#: src/option.c:782
 msgid "Display warning dialog"
 msgstr "Display warning dialogue"
 
-#: ../src/option.c:696
+#: src/option.c:829
 msgid "Display scale dialog"
 msgstr "Display scale dialogue"
 
-#: ../src/option.c:714
+#: src/option.c:843
 msgid "Set initial value"
 msgstr "Set initial value"
 
-#: ../src/option.c:715 ../src/option.c:724 ../src/option.c:733
-#: ../src/option.c:742
+#: src/option.c:844 src/option.c:851 src/option.c:858 src/option.c:865
+#: src/option.c:1017
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/option.c:723
+#: src/option.c:850
 msgid "Set minimum value"
 msgstr "Set minimum value"
 
-#: ../src/option.c:732
+#: src/option.c:857
 msgid "Set maximum value"
 msgstr "Set maximum value"
 
-#: ../src/option.c:741
+#: src/option.c:864
 msgid "Set step size"
 msgstr "Set step size"
 
-#: ../src/option.c:750
+#: src/option.c:871
 msgid "Print partial values"
 msgstr "Print partial values"
 
-#: ../src/option.c:759
+#: src/option.c:878
 msgid "Hide value"
 msgstr "Hide value"
 
-#: ../src/option.c:774
+#: src/option.c:888
+msgid "Display forms dialog"
+msgstr "Display forms dialogue"
+
+#: src/option.c:895
+msgid "Add a new Entry in forms dialog"
+msgstr "Add a new Entry in forms dialogue"
+
+#: src/option.c:896 src/option.c:903
+msgid "Field name"
+msgstr "Field name"
+
+#: src/option.c:902
+msgid "Add a new Password Entry in forms dialog"
+msgstr "Add a new Password Entry in forms dialogue"
+
+#: src/option.c:909
+msgid "Add a new Calendar in forms dialog"
+msgstr "Add a new Calendar in forms dialogue"
+
+#: src/option.c:910
+msgid "Calendar field name"
+msgstr "Calendar field name"
+
+#: src/option.c:916
+msgid "Add a new List in forms dialog"
+msgstr "Add a new List in forms dialog"
+
+#: src/option.c:917
+msgid "List field and header name"
+msgstr "List field and header name"
+
+#: src/option.c:923
+msgid "List of values for List"
+msgstr "List of values for List"
+
+#: src/option.c:924 src/option.c:931 src/option.c:945
+msgid "List of values separated by |"
+msgstr "List of values separated by |"
+
+#: src/option.c:930
+msgid "List of values for columns"
+msgstr "List of values for columns"
+
+#: src/option.c:937
+msgid "Add a new combo box in forms dialog"
+msgstr "Add a new combo box in forms dialogue"
+
+#: src/option.c:938
+msgid "Combo box field name"
+msgstr "Combo box field name"
+
+#: src/option.c:944
+msgid "List of values for combo box"
+msgstr "List of values for combo box"
+
+#: src/option.c:961
+msgid "Show the columns header"
+msgstr "Show the columns header"
+
+#: src/option.c:992
+msgid "Display password dialog"
+msgstr "Display password dialogue"
+
+#: src/option.c:999
+msgid "Display the username option"
+msgstr "Display the username option"
+
+#: src/option.c:1009
+msgid "Display color selection dialog"
+msgstr "Display colour selection dialog"
+
+#: src/option.c:1016
+msgid "Set the color"
+msgstr "Set the colour"
+
+#: src/option.c:1023
+msgid "Show the palette"
+msgstr "Show the palette"
+
+#: src/option.c:1033
 msgid "About zenity"
 msgstr "About zenity"
 
-#: ../src/option.c:783
+#: src/option.c:1040
 msgid "Print version"
 msgstr "Print version"
 
-#: ../src/option.c:1425
+#: src/option.c:2007
 msgid "General options"
 msgstr "General options"
 
-#: ../src/option.c:1426
+#: src/option.c:2008
 msgid "Show general options"
 msgstr "Show general options"
 
-#: ../src/option.c:1436
+#: src/option.c:2020
 msgid "Calendar options"
 msgstr "Calendar options"
 
-#: ../src/option.c:1437
+#: src/option.c:2021
 msgid "Show calendar options"
 msgstr "Show calendar options"
 
-#: ../src/option.c:1447
+#: src/option.c:2033
 msgid "Text entry options"
 msgstr "Text entry options"
 
-#: ../src/option.c:1448
+#: src/option.c:2034
 msgid "Show text entry options"
 msgstr "Show text entry options"
 
-#: ../src/option.c:1458
+#: src/option.c:2046
 msgid "Error options"
 msgstr "Error options"
 
-#: ../src/option.c:1459
+#: src/option.c:2046
 msgid "Show error options"
 msgstr "Show error options"
 
-#: ../src/option.c:1469
+#: src/option.c:2056
 msgid "Info options"
 msgstr "Info options"
 
-#: ../src/option.c:1470
+#: src/option.c:2056
 msgid "Show info options"
 msgstr "Show info options"
 
-#: ../src/option.c:1480
+#: src/option.c:2066
 msgid "File selection options"
 msgstr "File selection options"
 
-#: ../src/option.c:1481
+#: src/option.c:2067
 msgid "Show file selection options"
 msgstr "Show file selection options"
 
-#: ../src/option.c:1491
+#: src/option.c:2079
 msgid "List options"
 msgstr "List options"
 
-#: ../src/option.c:1492
+#: src/option.c:2079
 msgid "Show list options"
 msgstr "Show list options"
 
-#: ../src/option.c:1502
+#: src/option.c:2090
 msgid "Notification icon options"
 msgstr "Notification icon options"
 
-#: ../src/option.c:1503
+#: src/option.c:2091
 msgid "Show notification icon options"
 msgstr "Show notification icon options"
 
-#: ../src/option.c:1513
+#: src/option.c:2105
 msgid "Progress options"
 msgstr "Progress options"
 
-#: ../src/option.c:1514
+#: src/option.c:2106
 msgid "Show progress options"
 msgstr "Show progress options"
 
-#: ../src/option.c:1524
+#: src/option.c:2118
 msgid "Question options"
 msgstr "Question options"
 
-#: ../src/option.c:1525
+#: src/option.c:2119
 msgid "Show question options"
 msgstr "Show question options"
 
-#: ../src/option.c:1535
+#: src/option.c:2131
 msgid "Warning options"
 msgstr "Warning options"
 
-#: ../src/option.c:1536
+#: src/option.c:2132
 msgid "Show warning options"
 msgstr "Show warning options"
 
-#: ../src/option.c:1546
+#: src/option.c:2144
 msgid "Scale options"
 msgstr "Scale options"
 
-#: ../src/option.c:1547
+#: src/option.c:2144
 msgid "Show scale options"
 msgstr "Show scale options"
 
-#: ../src/option.c:1557
+#: src/option.c:2154
 msgid "Text information options"
 msgstr "Text information options"
 
-#: ../src/option.c:1558
+#: src/option.c:2155
 msgid "Show text information options"
 msgstr "Show text information options"
 
-#: ../src/option.c:1568
+#: src/option.c:2167
+msgid "Color selection options"
+msgstr "Colour selection options"
+
+#: src/option.c:2168
+msgid "Show color selection options"
+msgstr "Show colour selection options"
+
+#: src/option.c:2180
+msgid "Password dialog options"
+msgstr "Password dialogue options"
+
+#: src/option.c:2181
+msgid "Show password dialog options"
+msgstr "Show password dialogue options"
+
+#: src/option.c:2193
+msgid "Forms dialog options"
+msgstr "Forms dialogue options"
+
+#: src/option.c:2194
+msgid "Show forms dialog options"
+msgstr "Show forms dialogue options"
+
+#: src/option.c:2206
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-#: ../src/option.c:1569
+#: src/option.c:2207
 msgid "Show miscellaneous options"
 msgstr "Show miscellaneous options"
 
-#: ../src/option.c:1594
+#: src/option.c:2230
 #, c-format
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "This option is not available. Please see --help for all possible usages.\n"
 
-#: ../src/option.c:1598
+#: src/option.c:2236
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s is not supported for this dialogue\n"
 
-#: ../src/option.c:1602
+#: src/option.c:2241
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "Two or more dialogue options specified\n"
+
+#: src/password.c:96
+msgid "Type your username and password"
+msgstr "Type your username and password"
+
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:101
+msgid "Username:"
+msgstr "Username:"
+
+#: src/password.c:116
+msgid "Password:"
+msgstr "Password:"
+
+#: src/progress.c:116
+#, c-format
+msgid "Time remaining: %lu:%02lu:%02lu"
+msgstr "Time remaining: %lu:%02lu:%02lu"
+
+#: src/scale.c:66
+#, c-format
+msgid "Maximum value must be greater than minimum value.\n"
+msgstr "Maximum value must be greater than minimum value.\n"
+
+#: src/scale.c:74
+#, c-format
+msgid "Value out of range.\n"
+msgstr "Value out of range.\n"
+
+#: src/tree.c:405
+#, c-format
+msgid "No column titles specified for List dialog.\n"
+msgstr "No column titles specified for List dialogue.\n"
+
+#: src/tree.c:412
+#, c-format
+msgid "You should use only one List dialog type.\n"
+msgstr "You should use only one List dialogue type.\n"
+
+#: src/zenity.ui:16 src/zenity.ui:31
+msgid "Adjust the scale value"
+msgstr "Adjust the scale value"
+
+#: src/zenity.ui:74
+msgid "Text View"
+msgstr "Text View"
+
+#: src/zenity.ui:137
+msgid "Calendar selection"
+msgstr "Calendar selection"
+
+#: src/zenity.ui:156
+msgid "Select a date from below."
+msgstr "Select a date from below."
+
+#: src/zenity.ui:167
+msgid "C_alendar:"
+msgstr "C_alendar:"
+
+#: src/zenity.ui:172
+msgid "Calendar"
+msgstr "Calendar"
+
+#: src/zenity.ui:211
+msgid "Add a new entry"
+msgstr "Add a new entry"
+
+#: src/zenity.ui:234
+msgid "_Enter new text:"
+msgstr "_Enter new text:"
+
+#: src/zenity.ui:273
+msgid "Error"
+msgstr "Error"
+
+#: src/zenity.ui:301
+msgid "An error has occurred."
+msgstr "An error has occurred."
+
+#: src/zenity.ui:378
+msgid "Forms dialog"
+msgstr "Forms dialogue"
+
+#: src/zenity.ui:413
+msgid "Information"
+msgstr "Information"
+
+#: src/zenity.ui:438
+msgid "All updates are complete."
+msgstr "All updates are complete."
+
+#: src/zenity.ui:466
+msgid "Progress"
+msgstr "Progress"
+
+#: src/zenity.ui:481
+msgid "Running..."
+msgstr "Running..."
+
+#: src/zenity.ui:530
+msgid "Question"
+msgstr "Question"
+
+#: src/zenity.ui:553 src/zenity.ui:660
+msgid "Are you sure you want to proceed?"
+msgstr "Are you sure you want to proceed?"
+
+#: src/zenity.ui:573
+msgid "Select items from the list"
+msgstr "Select items from the list"
+
+#: src/zenity.ui:588
+msgid "Select items from the list below."
+msgstr "Select items from the list below."
+
+#: src/zenity.ui:633 src/zenity.ui:693
+msgid "Warning"
+msgstr "Warning"
+
+#: src/zenity.ui:716
+msgid "Type your password"
+msgstr "Type your password"
diff --git a/po/eu.po b/po/eu.po
index ce98069a..9946fa1e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,25 +2,33 @@
 # Copyright (C) 2003, 2004, 2006, 2007, 2008, 2010, 2011 the Free Software Foundation, Inc.
 # This file is distributed under the same license as the zenity package.
 #
-#
 # Alberto Fernández Benito <afernn@euskalnet.net>, 2003.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2003, 2004, 2005, 2006, 2007, 2008, 2010.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2018.
+# Asier Sarasua Garmendia <asiersarasua@ni.eus>, 2023.
+#
 msgid ""
 msgstr "Project-Id-Version: zenity master\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: 2018-11-17 17:58+0100\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"POT-Creation-Date: 2023-02-04 17:46+0000\n"
+"PO-Revision-Date: 2023-04-05 17:58+0100\n"
+"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Bistaratu elkarrizketa-koadroak komando-lerrotik"
+
+#: src/about.c:54
 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 "
@@ -28,7 +36,7 @@ msgid ""
 "option) any later version.\n"
 msgstr "Programa hau software librea da; birbana eta/edo alda dezakezu Software Foundation-ek argitaratutako GNU Hedadura Txikiagoko Lizentzia Publiko Orokorraren 2. bertsioan, edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -36,724 +44,680 @@ msgid ""
 "for more details.\n"
 msgstr "Programa hau erabilgarria izango delakoan banatzen da, baina, INOLAKO BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago nahi izanez gero, ikus GNU Hedadura Txikiagoko Lizentzia Publiko Orokorra.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr "Programa honekin batera GNU Hedadura Txikiagoko Lizentzia Publiko Orokorraren kopia bat jasoko zenuen; hala ez bada, idatzi hona: Free SoftwareFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr "Alberto Fernández <afernn@euskalnet.net> \n"
-"Iñaki Larrañaga Murgotio <dooteo@euskalgnu.org>"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Bistaratu elkarrizketa-koadroak shell-eko script-etatik"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:408 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_Ados"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:404 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "Elkarrizketa-koadro mota bat zehaztu behar duzu. Ikusi 'zenity --help' xehetasun gehiagorako\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Ez"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Bai"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Ezin izan da mezua aztertu\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr "Idatzitako argibide boolearraren baliogabeko balioa.\n"
-"Onartutako balioak 'true' edo 'false'.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Onartu gabeko argibidea. Baztertzen.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Argibidearen izena ezezaguna. Baztertzen.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Ezin izan da stdin-eko komandoa analizatu\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Zenity-ren jakinarazpena"
-
-#: src/option.c:164
+#: src/option.c:166
 msgid "Set the dialog title"
 msgstr "Ezarri elkarrizketa-koadroaren izenburua"
 
-#: src/option.c:165
+#: src/option.c:167
 msgid "TITLE"
 msgstr "IZENBURUA"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Ezarri leihoaren ikonoa"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "IKONOBIDEA"
-
-#: src/option.c:178
+#: src/option.c:173
 msgid "Set the width"
 msgstr "Ezarri zabalera"
 
-#: src/option.c:179
+#: src/option.c:174
 msgid "WIDTH"
 msgstr "ZABALERA"
 
-#: src/option.c:185
+#: src/option.c:180
 msgid "Set the height"
 msgstr "Ezarri altuera"
 
-#: src/option.c:186
+#: src/option.c:181
 msgid "HEIGHT"
 msgstr "ALTUERA"
 
-#: src/option.c:192
+#: src/option.c:187
 msgid "Set dialog timeout in seconds"
 msgstr "Ezarri elkarrizketa-koadroaren denbora-muga (segundotan)"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:189
 msgid "TIMEOUT"
 msgstr "DENBORA-MUGA"
 
-#: src/option.c:200
+#: src/option.c:195
 msgid "Set the label of the OK button"
 msgstr "Ezarri 'Ados' botoiaren etiketa"
 
-#: 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
+#: src/option.c:196 src/option.c:203 src/option.c:210 src/option.c:234
+#: src/option.c:279 src/option.c:286 src/option.c:310 src/option.c:364
+#: src/option.c:473 src/option.c:569 src/option.c:607 src/option.c:668
+#: src/option.c:750 src/option.c:757 src/option.c:807 src/option.c:861
+#: src/option.c:993
 msgid "TEXT"
 msgstr "TESTUA"
 
-#: src/option.c:207
+#: src/option.c:202
 msgid "Set the label of the Cancel button"
 msgstr "Ezarri 'Utzi' botoiaren etiketa"
 
-#: src/option.c:214
+#: src/option.c:209
 msgid "Add an extra button"
 msgstr "Gehitu botoi gehigarri bat"
 
-#: src/option.c:221
+#: src/option.c:216
 msgid "Set the modal hint"
 msgstr "Ezarri argibidearen modua"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Ezarri leiho gurasoa (honi atxikitzeko)"
-
-#: src/option.c:229
-msgid "WINDOW"
-msgstr "LEIHOA"
-
-#: src/option.c:237
+#: src/option.c:226
 msgid "Display calendar dialog"
 msgstr "Bistaratu egutegiaren elkarrizketa-koadroa"
 
-#: 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
+#: src/option.c:233 src/option.c:278 src/option.c:309 src/option.c:363
+#: src/option.c:472 src/option.c:606 src/option.c:667 src/option.c:806
+#: src/option.c:860 src/option.c:992
 msgid "Set the dialog text"
 msgstr "Ezarri elkarrizketa-koadroaren testua"
 
-#: src/option.c:251
+#: src/option.c:240
 msgid "Set the calendar day"
 msgstr "Ezarri egutegiaren eguna"
 
-#: src/option.c:252
+#: src/option.c:241
 msgid "DAY"
 msgstr "EGUNA"
 
-#: src/option.c:258
+#: src/option.c:247
 msgid "Set the calendar month"
 msgstr "Ezarri egutegiaren hilabetea"
 
-#: src/option.c:259
+#: src/option.c:248
 msgid "MONTH"
 msgstr "HILABETEA"
 
-#: src/option.c:265
+#: src/option.c:254
 msgid "Set the calendar year"
 msgstr "Ezarri egutegiaren urtea"
 
-#: src/option.c:266
+#: src/option.c:255
 msgid "YEAR"
 msgstr "URTEA"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:261 src/option.c:1006
 msgid "Set the format for the returned date"
 msgstr "Ezarri itzulerako dataren formatua"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:262 src/option.c:1007
 msgid "PATTERN"
 msgstr "EREDUA"
 
-#: src/option.c:281
+#: src/option.c:271
 msgid "Display text entry dialog"
 msgstr "Bistaratu testua sartzeko elkarrizketa-koadroa"
 
-#: src/option.c:295
+#: src/option.c:285
 msgid "Set the entry text"
 msgstr "Ezarri sarreraren testua"
 
-#: src/option.c:302
+#: src/option.c:292
 msgid "Hide the entry text"
 msgstr "Ezkutatu sarreraren testua"
 
-#: src/option.c:311
+#: src/option.c:302
 msgid "Display error dialog"
 msgstr "Bistaratu errorearen elkarrizketa-koadroa"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Ezarri elkarrizketa-koadroaren ikonoa"
+#: src/option.c:316 src/option.c:370 src/option.c:575 src/option.c:674
+#: src/option.c:813
+msgid "Set the icon name"
+msgstr "Ezarri ikono-izena"
 
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
+#: src/option.c:317 src/option.c:324 src/option.c:371 src/option.c:378
+#: src/option.c:576 src/option.c:583 src/option.c:675 src/option.c:682
+#: src/option.c:814 src/option.c:821
 msgid "ICON-NAME"
 msgstr "IKONO-IZENA"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:323 src/option.c:377 src/option.c:582 src/option.c:681
+#: src/option.c:820
+msgid "DEPRECATED; use `--icon`"
+msgstr "ZAHARKITUA; erabili `--icon`"
+
+#: src/option.c:330 src/option.c:384 src/option.c:688 src/option.c:827
 msgid "Do not enable text wrapping"
 msgstr "Ez gaitu testua egokitzea"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:337 src/option.c:391 src/option.c:695 src/option.c:834
 msgid "Do not enable Pango markup"
 msgstr "Ez gaitu Pango-ren markatzea"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:344 src/option.c:398 src/option.c:709 src/option.c:841
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
 msgstr "Gaitu elipsia testuaren elkarrizketa-koadroan. Testu luzeko leihoen altuera zuzentzen du honek."
 
-#: src/option.c:354
+#: src/option.c:356
 msgid "Display info dialog"
 msgstr "Bistaratu informazioaren elkarrizketa-koadroa"
 
-#: src/option.c:398
+#: src/option.c:410
 msgid "Display file selection dialog"
 msgstr "Bistaratu fitxategiak hautatzeko elkarrizketa-koadroa"
 
-#: src/option.c:405
+#: src/option.c:417
 msgid "Set the filename"
 msgstr "Ezarri fitxategiaren izena"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:418 src/option.c:736
 msgid "FILENAME"
 msgstr "FITXATEGI-IZENA"
 
-#: src/option.c:412
+#: src/option.c:424
 msgid "Allow multiple files to be selected"
 msgstr "Baimendu fitxategi anitzen hautapena"
 
-#: src/option.c:419
+#: src/option.c:431
 msgid "Activate directory-only selection"
 msgstr "Aktibatu 'direktorioa soilik' hautapena"
 
-#: src/option.c:426
+#: src/option.c:438
 msgid "Activate save mode"
 msgstr "Aktibatu babes modua"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:445 src/option.c:507 src/option.c:999
 msgid "Set output separator character"
 msgstr "Ezarri irteerako karaktere bereizlea"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:446 src/option.c:508 src/option.c:1000
 msgid "SEPARATOR"
 msgstr "BEREIZLEA"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Baieztatu fitxategiaren hautapena fitxategia jadanik existitzen bada"
-
-#: src/option.c:448
+#: src/option.c:452
 msgid "Set a filename filter"
 msgstr "Ezarri fitxategi-izenaren iragazkia"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:455
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "IZENA | EREDUA1 EREDUA2 ..."
 
-#: src/option.c:460
+#: src/option.c:465
 msgid "Display list dialog"
 msgstr "Bistaratu zerrendaren elkarrizketa-koadroa"
 
-#: src/option.c:474
+#: src/option.c:479
 msgid "Set the column header"
 msgstr "Ezarri zutabearen goiburua"
 
-#: src/option.c:475
+#: src/option.c:480
 msgid "COLUMN"
 msgstr "ZUTABEA"
 
-#: src/option.c:481
+#: src/option.c:486
 msgid "Use check boxes for the first column"
 msgstr "Erabili kontrol-laukiak lehenengo zutabean"
 
-#: src/option.c:488
+#: src/option.c:493
 msgid "Use radio buttons for the first column"
 msgstr "Erabili irrati-botoiak lehenengo zutabean"
 
-#: src/option.c:495
+#: src/option.c:500
 msgid "Use an image for the first column"
 msgstr "Erabili irudi bat lehenengo zutabean"
 
-#: src/option.c:509
+#: src/option.c:514
 msgid "Allow multiple rows to be selected"
 msgstr "Baimendu errenkada anitzen hautapena"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:521 src/option.c:742
 msgid "Allow changes to text"
 msgstr "Baimendu aldaketak testuan"
 
-#: src/option.c:523
+#: src/option.c:528
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
 msgstr "Inprimatu zutabe zehatz bat (lehenetsia 1 da. Erabili 'ALL' zutabe guztiak inprimatzeko)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:531 src/option.c:538
 msgid "NUMBER"
 msgstr "ZENBAKIA"
 
-#: src/option.c:532
+#: src/option.c:537
 msgid "Hide a specific column"
 msgstr "Ezkutatu zutabe zehatz bat"
 
-#: src/option.c:539
+#: src/option.c:544
 msgid "Hide the column headers"
 msgstr "Ezkutatu zutabearen goiburuak"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr "Aldatu zerrendaren bilaketa funtzio lehenetsia, testuaren bilaketa erdian (ez hasieran) bilatzeko."
+#: src/option.c:551
+msgid "DEPRECATED; does nothing"
+msgstr "ZAHARKITUA; ez du ezer egiten"
 
-#: src/option.c:557
+#: src/option.c:561
 msgid "Display notification"
 msgstr "Bistaratu jakinarazpena"
 
-#: src/option.c:564
+#: src/option.c:568
 msgid "Set the notification text"
 msgstr "Ezarri jakinarazpenaren testua"
 
-#: src/option.c:571
+#: src/option.c:589
 msgid "Listen for commands on stdin"
 msgstr "Entzun 'stdin'eko komandoei"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Ezarri jakinarazpenaren argibideak"
-
-#: src/option.c:590
+#: src/option.c:599
 msgid "Display progress indication dialog"
 msgstr "Bistaratu progresioaren elkarrizketa-koadroa"
 
-#: src/option.c:604
+#: src/option.c:613
 msgid "Set initial percentage"
 msgstr "Ezarri hasierako ehunekoa"
 
-#: src/option.c:605
+#: src/option.c:614
 msgid "PERCENTAGE"
 msgstr "EHUNEKOA"
 
-#: src/option.c:611
+#: src/option.c:620
 msgid "Pulsate progress bar"
 msgstr "Progresio-barra keinukaria"
 
-#: src/option.c:619
+#: src/option.c:628
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Itxi elkarrizketa-koadroa %100 lortzean"
 
-#: src/option.c:626
+#: src/option.c:635
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Hil prozesu-gurasoa 'Utzi' botoia sakatzean"
 
-#: src/option.c:633
+#: src/option.c:642
 msgid "Hide Cancel button"
 msgstr "Ezkutatu 'Utzi' botoia"
 
-#: src/option.c:641
+#: src/option.c:650
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Aurreikusi aurrerapena noiz iritsiko den %100era"
 
-#: src/option.c:650
+#: src/option.c:660
 msgid "Display question dialog"
 msgstr "Bistaratu galderen elkarrizketa-koadroa"
 
-#: src/option.c:684
+#: src/option.c:702
 msgid "Give Cancel button focus by default"
 msgstr "Eman fokua 'Utzi' botoiari lehenetsi gisa"
 
-#: src/option.c:698
+#: src/option.c:718
 msgid "Suppress OK and Cancel buttons"
 msgstr "Kendu 'Ados' eta 'Utzi' botoiak"
 
-#: src/option.c:708
+#: src/option.c:728
 msgid "Display text information dialog"
 msgstr "Bistaratu testu-informazioaren elkarrizketa-koadroa"
 
-#: src/option.c:715
+#: src/option.c:735
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: src/option.c:729
+#: src/option.c:749
 msgid "Set the text font"
 msgstr "Ezarri testuaren letra-tipoa"
 
-#: src/option.c:736
+#: src/option.c:756
 msgid "Enable an I read and agree checkbox"
 msgstr "Gaitu 'Irakurri eta onartzen dut' kontrol-koadroa"
 
-#: src/option.c:744
+#: src/option.c:764
 msgid "Enable HTML support"
 msgstr "Gaitu HTML euskarria"
 
-#: src/option.c:751
+#: src/option.c:771
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
 msgstr "Ez gaitu erabiltzailearen WebView-rekin elkarreragiketa. Soilik --html aukerarekin funtzionatzen du"
 
-#: src/option.c:759
+#: src/option.c:779
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr "Ezarri URL bat fitxategi baten ordez. Soilik --html aukerarekin funtzionatzen du"
 
-#: src/option.c:761
+#: src/option.c:781
 msgid "URL"
 msgstr "URLa"
 
-#: src/option.c:768
+#: src/option.c:788
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr "Korritu automatikoki testua amaierara. Soilik testua sarrera estandarretik jasotzen denean"
 
-#: src/option.c:778
+#: src/option.c:799
 msgid "Display warning dialog"
 msgstr "Bistaratu abisuaren elkarrizketa-koadroa"
 
-#: src/option.c:821
+#: src/option.c:853
 msgid "Display scale dialog"
 msgstr "Bistaratu eskalaren elkarrizketa-koadroa"
 
-#: src/option.c:835
+#: src/option.c:867
 msgid "Set initial value"
 msgstr "Ezarri hasierako balioa"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:868 src/option.c:875 src/option.c:882 src/option.c:889
+#: src/option.c:1041
 msgid "VALUE"
 msgstr "BALIOA"
 
-#: src/option.c:842
+#: src/option.c:874
 msgid "Set minimum value"
 msgstr "Ezarri gutxieneko balioa"
 
-#: src/option.c:849
+#: src/option.c:881
 msgid "Set maximum value"
 msgstr "Ezarri gehienezko balioa"
 
-#: src/option.c:856
+#: src/option.c:888
 msgid "Set step size"
 msgstr "Ezarri urratsaren tamaina"
 
-#: src/option.c:863
+#: src/option.c:895
 msgid "Print partial values"
 msgstr "Inprimatu balio partzialak"
 
-#: src/option.c:870
+#: src/option.c:902
 msgid "Hide value"
 msgstr "Ezkutatu balioa"
 
-#: src/option.c:879
+#: src/option.c:912
 msgid "Display forms dialog"
 msgstr "Bistaratu inprimakien elkarrizketa-koadroa"
 
-#: src/option.c:886
+#: src/option.c:919
 msgid "Add a new Entry in forms dialog"
 msgstr "Gehitu sarrera berria inprimakien elkarrizketa-koadroari"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:920 src/option.c:927
 msgid "Field name"
 msgstr "Eremuaren izena"
 
-#: src/option.c:893
+#: src/option.c:926
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Gehitu pasahitzaren sarrera berri bat inprimakien elkarrizketa-koadroari"
 
-#: src/option.c:900
+#: src/option.c:933
 msgid "Add a new Calendar in forms dialog"
 msgstr "Gehitu egutegi berria inprimakien elkarrizketa-koadroari"
 
-#: src/option.c:901
+#: src/option.c:934
 msgid "Calendar field name"
 msgstr "Egutegia eremuaren izena"
 
-#: src/option.c:907
+#: src/option.c:940
 msgid "Add a new List in forms dialog"
 msgstr "Gehitu zerrenda sarrera berria inprimakien elkarrizketa-koadroan"
 
-#: src/option.c:908
+#: src/option.c:941
 msgid "List field and header name"
 msgstr "Zerrendatu eremu eta goiburuaren izena"
 
-#: src/option.c:914
+#: src/option.c:947
 msgid "List of values for List"
 msgstr "Zerrendaren balioak zerrendarentzako"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:948 src/option.c:955 src/option.c:969
 msgid "List of values separated by |"
 msgstr "Zerrendako balioak |-rekin bereiztuta"
 
-#: src/option.c:921
+#: src/option.c:954
 msgid "List of values for columns"
 msgstr "Balioen zerrenda zutabeentzako"
 
-#: src/option.c:928
+#: src/option.c:961
 msgid "Add a new combo box in forms dialog"
 msgstr "Gehitu konbinazio-koadro berria inprimakien elkarrizketa-koadroan"
 
-#: src/option.c:929
+#: src/option.c:962
 msgid "Combo box field name"
 msgstr "Konbinazio-koadroaren eremuaren izena"
 
-#: src/option.c:935
+#: src/option.c:968
 msgid "List of values for combo box"
 msgstr "Balioen zerrenda konbinazio-koadroarentzako"
 
-#: src/option.c:952
+#: src/option.c:985
 msgid "Show the columns header"
 msgstr "Erakutsi zutabearen goiburua"
 
-#: src/option.c:983
+#: src/option.c:1016
 msgid "Display password dialog"
 msgstr "Bistaratu pasahitzaren elkarrizketa-koadroa"
 
-#: src/option.c:990
+#: src/option.c:1023
 msgid "Display the username option"
 msgstr "Bistaratu erabiltzaile-izenaren elkarrizketa-koadroa"
 
-#: src/option.c:1000
+#: src/option.c:1033
 msgid "Display color selection dialog"
 msgstr "Bistaratu kolorea hautatzeko elkarrizketa-koadroa"
 
-#: src/option.c:1007
+#: src/option.c:1040
 msgid "Set the color"
 msgstr "Ezarri kolorea"
 
-#: src/option.c:1014
+#: src/option.c:1047
 msgid "Show the palette"
 msgstr "Erakutsi paleta"
 
-#: src/option.c:1023
+#: src/option.c:1057
 msgid "About zenity"
 msgstr "Zenity-ri buruz"
 
-#: src/option.c:1030
+#: src/option.c:1064
 msgid "Print version"
 msgstr "Inprimatu bertsioa"
 
-#: src/option.c:1913
+#: src/option.c:1478
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr "Abisua: --window-icon zaharkitua dago eta kendu egingo da zenity aplikazioaren bertsio berrietan. Ez ikusiarena egiten.\n"
+
+#: src/option.c:2000
 msgid "General options"
 msgstr "Aukera orokorrak"
 
-#: src/option.c:1914
+#: src/option.c:2001
 msgid "Show general options"
 msgstr "Erakutsi aukera orokorrak"
 
-#: src/option.c:1926
+#: src/option.c:2013
 msgid "Calendar options"
 msgstr "Egutegiaren aukerak"
 
-#: src/option.c:1927
+#: src/option.c:2014
 msgid "Show calendar options"
 msgstr "Erakutsi egutegiaren aukerak"
 
-#: src/option.c:1939
+#: src/option.c:2026
 msgid "Text entry options"
 msgstr "Testu-sarreraren aukerak"
 
-#: src/option.c:1940
+#: src/option.c:2027
 msgid "Show text entry options"
 msgstr "Erakutsi testu-sarreraren aukerak"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Error options"
 msgstr "Errore-aukerak"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Show error options"
 msgstr "Erakutsi errore-aukerak"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Info options"
 msgstr "Informazioaren aukerak"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Show info options"
 msgstr "Erakutsi informazioaren aukerak"
 
-#: src/option.c:1972
+#: src/option.c:2059
 msgid "File selection options"
 msgstr "Fitxategiak hautatzeko aukerak"
 
-#: src/option.c:1973
+#: src/option.c:2060
 msgid "Show file selection options"
 msgstr "Erakutsi fitxategiak hautatzeko aukerak"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "List options"
 msgstr "Zerrendaren aukerak"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "Show list options"
 msgstr "Erakutsi zerrendaren aukerak"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Jakinarazpen-ikonoaren aukerak"
+#: src/option.c:2082
+msgid "Notification options"
+msgstr "Jakinarazpenen aukerak"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Erakutsi jakinarazpen-ikonoaren aukerak"
+#: src/option.c:2083
+msgid "Show notification options"
+msgstr "Erakutsi jakinarazpenen aukerak"
 
-#: src/option.c:2011
+#: src/option.c:2096
 msgid "Progress options"
 msgstr "Progresioaren aukerak"
 
-#: src/option.c:2012
+#: src/option.c:2097
 msgid "Show progress options"
 msgstr "Erakutsi progresioaren aukerak"
 
-#: src/option.c:2024
+#: src/option.c:2109
 msgid "Question options"
 msgstr "Galderaren aukerak"
 
-#: src/option.c:2025
+#: src/option.c:2110
 msgid "Show question options"
 msgstr "Erakutsi galderaren aukerak"
 
-#: src/option.c:2037
+#: src/option.c:2122
 msgid "Warning options"
 msgstr "Abisuaren aukerak"
 
-#: src/option.c:2038
+#: src/option.c:2123
 msgid "Show warning options"
 msgstr "Erakutsi abisuaren aukerak"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Scale options"
 msgstr "Eskalaren aukerak"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Show scale options"
 msgstr "Erakutsi eskalaren aukerak"
 
-#: src/option.c:2060
+#: src/option.c:2145
 msgid "Text information options"
 msgstr "Testu-informazioaren aukerak"
 
-#: src/option.c:2061
+#: src/option.c:2146
 msgid "Show text information options"
 msgstr "Erakutsi testu-informazioaren aukerak"
 
-#: src/option.c:2073
+#: src/option.c:2158
 msgid "Color selection options"
 msgstr "Kolorea hautatzeko aukerak"
 
-#: src/option.c:2074
+#: src/option.c:2159
 msgid "Show color selection options"
 msgstr "Erakutsi kolorea hautatzeko aukerak"
 
-#: src/option.c:2086
+#: src/option.c:2171
 msgid "Password dialog options"
 msgstr "Pasahitzaren elkarrizketa-koadroaren aukerak"
 
-#: src/option.c:2087
+#: src/option.c:2172
 msgid "Show password dialog options"
 msgstr "Erakutsi pasahitzaren elkarrizketa-koadroaren aukerak"
 
-#: src/option.c:2099
+#: src/option.c:2184
 msgid "Forms dialog options"
 msgstr "Inprimakien elkarrizketa-koadroaren aukerak"
 
-#: src/option.c:2100
+#: src/option.c:2185
 msgid "Show forms dialog options"
 msgstr "Erakutsi inprimakien elkarrizketa-koadroaren aukerak"
 
-#: src/option.c:2112
+#: src/option.c:2197
 msgid "Miscellaneous options"
 msgstr "Hainbat aukera"
 
-#: src/option.c:2113
+#: src/option.c:2198
 msgid "Show miscellaneous options"
 msgstr "Erakutsi hainbat aukera"
 
-#: src/option.c:2139
+#: src/option.c:2221
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr "Aukera hau ez dago erabilgarri. Ikusi --help erabilera guztiak ezagutzeko.\n"
 
-#: src/option.c:2144
+#: src/option.c:2226
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s ez da onartzen elkarrizketa-koadro honetan\n"
 
-#: src/option.c:2148
+#: src/option.c:2230
 msgid "Two or more dialog options specified\n"
 msgstr "Elkarrizketa-koadroaren bi aukera edo gehiago zehaztu dira\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Idatzi zure pasahitza"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Idatzi zure erabiltzaile-izena eta pasahitza"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Geratzen den denbora: %lu:%02lu:%02lu"
@@ -762,101 +726,173 @@ msgstr "Geratzen den denbora: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Gehienezko balioak gutxieneko balioa baino handiagoa izan behar du.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Balioa barrutitik kanpo.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr "Abisua: --mid-search zaharkitua dago eta kendu egingo da zenity aplikazioaren bertsio berrietan. Ez ikusiarena egiten.\n"
+
+#: src/tree.c:278
 msgid "No column titles specified for List dialog.\n"
 msgstr "Ez da zutabe izenbururik zehaztu zerrendaren elkarrizketa-koadroan\n"
 
-#: src/tree.c:399
+#: src/tree.c:285
 msgid "You should use only one List dialog type.\n"
 msgstr "'Zerrenda' motako elkarrizketa-koadroan bakarrik erabili beharko zenuke.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "Ez da %s ikono-izena aurkitu; gaiaren ikonoa probatzen."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Doitu eskalaren balioa"
 
-#: 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 "Utzi"
-
-#: 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 "Ados"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Testu-ikuspegia"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Egutegiaren hautapena"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Hautatu beheko data bat."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "_Egutegia:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Egutegia"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Gehitu sarrera berria"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "Sartu _testu berria:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Errorea"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Errorea gertatu da."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Inprimakien elkarrizketa-koadroa"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Informazioa"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Eguneraketa guztiak burutu dira."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Aurrerapena"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Exekutatzen..."
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Galdera"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Ez"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Bai"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Ziur zaude jarraitu nahi duzula?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Hautatu elementuak zerrendatik"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Hautatu elementuak beheko zerrendatik."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Abisua"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Idatzi zure pasahitza"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Alberto Fernández <afernn@euskalnet.net> \n"
+#~ "Iñaki Larrañaga Murgotio <dooteo@euskalgnu.org>"
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "Idatzitako argibide boolearraren baliogabeko balioa.\n"
+#~ "Onartutako balioak 'true' edo 'false'.\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "Onartu gabeko argibidea. Baztertzen.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "Argibidearen izena ezezaguna. Baztertzen.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "Zenity-ren jakinarazpena"
+
+#~ msgid "Set the window icon"
+#~ msgstr "Ezarri leihoaren ikonoa"
+
+#~ msgid "ICONPATH"
+#~ msgstr "IKONOBIDEA"
+
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "Ezarri leiho gurasoa (honi atxikitzeko)"
+
+#~ msgid "WINDOW"
+#~ msgstr "LEIHOA"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "Ezarri elkarrizketa-koadroaren ikonoa"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr ""
+#~ "Baieztatu fitxategiaren hautapena fitxategia jadanik existitzen bada"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr ""
+#~ "Aldatu zerrendaren bilaketa funtzio lehenetsia, testuaren bilaketa erdian "
+#~ "(ez hasieran) bilatzeko."
+
+#~ msgid "Set the notification hints"
+#~ msgstr "Ezarri jakinarazpenaren argibideak"
+
+#~ msgid "Cancel"
+#~ msgstr "Utzi"
+
+#~ msgid "OK"
+#~ msgstr "Ados"
diff --git a/po/hu.po b/po/hu.po
index 49fcbace..328c9446 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,5 +1,5 @@
 # Hungarian translation of zenity.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012, 2023 Free Software Foundation, Inc.
 # This file is distributed under the same license as the zenity package.
 #
 # Andras Timar <timar at gnome dot hu>, 2003, 2004.
@@ -7,24 +7,32 @@
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2010, 2011, 2012.
 # Kéménczy Kálmán <kkemenczy at novell dot com>, 2006. .
 # Nyitrai István <sianis at gmail dot com>, 2009.
-# Balázs Úr <urbalazs at gmail dot com>, 2012, 2013, 2014, 2015.
+# Balázs Úr <ur.balazs at fsf dot hu>, 2012, 2013, 2014, 2015, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-26 20:40+0000\n"
-"PO-Revision-Date: 2018-01-24 21:03+0100\n"
-"Last-Translator: Meskó Balázs <meskobalazs@fedoraproject.org>\n"
-"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2023-02-04 17:46+0000\n"
+"PO-Revision-Date: 2023-03-11 01:23+0100\n"
+"Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
+"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Lokalize 22.08.2\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+#| msgid "Display dialog boxes from shell scripts"
+msgid "Display dialog boxes from the command line"
+msgstr "Párbeszédablakok megjelenítése a parancssorból"
+
+#: src/about.c:54
 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 "
@@ -35,7 +43,7 @@ msgstr ""
 "Software Foundation által kiadott GNU Lesser General Public License második "
 "(vagy bármely későbbi) változatában foglaltak alapján.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -47,7 +55,7 @@ msgstr ""
 "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További "
 "részletekért tanulmányozza a GNU LGPL licencet.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -57,219 +65,177 @@ msgstr ""
 "kapta meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Dvornik László <dvornik at gnome dot hu>\n"
-"Kéménczy Kálmán <kkemenczy at novell dot com>\n"
-"Kelemen Gábor <kelemeng at gnome dot hu>\n"
-"Tímár András <timar at gnome dot hu>\n"
-"Meskó Balázs <mesko.balazs at fsf dot hu>"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Párbeszédablakok megjelenítése héjprogramokból"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:408 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_OK"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:404 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Meg kell adni a párbeszédablak típusát. A részletekért lásd a „zenity --"
 "help” parancsot\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Nem"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Igen"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Nem sikerült feldolgozni az üzenetet\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Érvénytelen érték a logikai típusú tipphez.\n"
-"A támogatott érték „true” vagy „false”.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Nem támogatott tipp. Kihagyás.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Ismeretlen tipp név. Kihagyás.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Nem sikerült feldolgozni a parancsot a szabványos bemenetről\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Zenity értesítés"
-
-#: src/option.c:164
+#: src/option.c:166
 msgid "Set the dialog title"
 msgstr "Párbeszédablak címsorának beállítása"
 
-#: src/option.c:165
+#: src/option.c:167
 msgid "TITLE"
 msgstr "CÍM"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Ablak ikonjának beállítása"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "IKONÚTVONAL"
-
-#: src/option.c:178
+#: src/option.c:173
 msgid "Set the width"
 msgstr "Szélesség beállítása"
 
-#: src/option.c:179
+#: src/option.c:174
 msgid "WIDTH"
 msgstr "SZÉLESSÉG"
 
-#: src/option.c:185
+#: src/option.c:180
 msgid "Set the height"
 msgstr "Magasság beállítása"
 
-#: src/option.c:186
+#: src/option.c:181
 msgid "HEIGHT"
 msgstr "MAGASSÁG"
 
-#: src/option.c:192
+#: src/option.c:187
 msgid "Set dialog timeout in seconds"
 msgstr "Párbeszédablak időtúllépésének beállítása"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:189
 msgid "TIMEOUT"
 msgstr "IDŐKORLÁT"
 
-#: src/option.c:200
+#: src/option.c:195
 msgid "Set the label of the OK button"
 msgstr "Az OK gomb feliratának beállítása"
 
-#: 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
+#: src/option.c:196 src/option.c:203 src/option.c:210 src/option.c:234
+#: src/option.c:279 src/option.c:286 src/option.c:310 src/option.c:364
+#: src/option.c:473 src/option.c:569 src/option.c:607 src/option.c:668
+#: src/option.c:750 src/option.c:757 src/option.c:807 src/option.c:861
+#: src/option.c:993
 msgid "TEXT"
 msgstr "SZÖVEG"
 
-#: src/option.c:207
+#: src/option.c:202
 msgid "Set the label of the Cancel button"
 msgstr "A Mégse gomb feliratának beállítása"
 
-#: src/option.c:214
+#: src/option.c:209
 msgid "Add an extra button"
 msgstr "További gomb hozzáadása"
 
-#: src/option.c:221
+#: src/option.c:216
 msgid "Set the modal hint"
 msgstr "A kizárólagos tipp beállítása"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "A szülőablak beállítása csatoláshoz"
-
-#: src/option.c:229
-msgid "WINDOW"
-msgstr "ABLAK"
-
-#: src/option.c:237
+#: src/option.c:226
 msgid "Display calendar dialog"
 msgstr "Naptár párbeszédablak megjelenítése"
 
-#: 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
+#: src/option.c:233 src/option.c:278 src/option.c:309 src/option.c:363
+#: src/option.c:472 src/option.c:606 src/option.c:667 src/option.c:806
+#: src/option.c:860 src/option.c:992
 msgid "Set the dialog text"
 msgstr "Párbeszédablak szövegének beállítása"
 
-#: src/option.c:251
+#: src/option.c:240
 msgid "Set the calendar day"
 msgstr "Naptár napjának beállítása"
 
-#: src/option.c:252
+#: src/option.c:241
 msgid "DAY"
 msgstr "NAP"
 
-#: src/option.c:258
+#: src/option.c:247
 msgid "Set the calendar month"
 msgstr "Naptár hónapjának beállítása"
 
-#: src/option.c:259
+#: src/option.c:248
 msgid "MONTH"
 msgstr "HÓNAP"
 
-#: src/option.c:265
+#: src/option.c:254
 msgid "Set the calendar year"
 msgstr "Naptár évének beállítása"
 
-#: src/option.c:266
+#: src/option.c:255
 msgid "YEAR"
 msgstr "ÉV"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:261 src/option.c:1006
 msgid "Set the format for the returned date"
 msgstr "A visszaadott dátum formátumának beállítása"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:262 src/option.c:1007
 msgid "PATTERN"
 msgstr "MINTA"
 
-#: src/option.c:281
+#: src/option.c:271
 msgid "Display text entry dialog"
 msgstr "Szövegbeviteli párbeszédablak megjelenítése"
 
-#: src/option.c:295
+#: src/option.c:285
 msgid "Set the entry text"
 msgstr "A szövegbeviteli mező tartalmának beállítása"
 
-#: src/option.c:302
+#: src/option.c:292
 msgid "Hide the entry text"
 msgstr "A szövegbeviteli mező tartalmának elrejtése"
 
-#: src/option.c:311
+#: src/option.c:302
 msgid "Display error dialog"
 msgstr "Hibára figyelmeztető párbeszédablak megjelenítése"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Párbeszédablak ikonjának beállítása"
+#: src/option.c:316 src/option.c:370 src/option.c:575 src/option.c:674
+#: src/option.c:813
+#| msgid "Set the filename"
+msgid "Set the icon name"
+msgstr "Az ikon nevének beállítása"
 
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
+#: src/option.c:317 src/option.c:324 src/option.c:371 src/option.c:378
+#: src/option.c:576 src/option.c:583 src/option.c:675 src/option.c:682
+#: src/option.c:814 src/option.c:821
 msgid "ICON-NAME"
 msgstr "IKONNÉV"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:323 src/option.c:377 src/option.c:582 src/option.c:681
+#: src/option.c:820
+msgid "DEPRECATED; use `--icon`"
+msgstr "ELAVULT, használja az „--icon” kapcsolót"
+
+#: src/option.c:330 src/option.c:384 src/option.c:688 src/option.c:827
 msgid "Do not enable text wrapping"
 msgstr "Ne engedélyezze a szöveg tördelését"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:337 src/option.c:391 src/option.c:695 src/option.c:834
 msgid "Do not enable Pango markup"
 msgstr "Ne engedélyezze a Pango jelölést"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:344 src/option.c:398 src/option.c:709 src/option.c:841
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -277,89 +243,85 @@ msgstr ""
 "Elliptikus méretezés engedélyezése a párbeszédablak szövegében. Ez javítja a "
 "hosszú szöveggel rendelkező nagy ablakméretet."
 
-#: src/option.c:354
+#: src/option.c:356
 msgid "Display info dialog"
 msgstr "Információs párbeszédablak megjelenítése"
 
-#: src/option.c:398
+#: src/option.c:410
 msgid "Display file selection dialog"
 msgstr "Fájlválasztó párbeszédablak megjelenítése"
 
-#: src/option.c:405
+#: src/option.c:417
 msgid "Set the filename"
 msgstr "Fájlnév beállítása"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:418 src/option.c:736
 msgid "FILENAME"
 msgstr "FÁJLNÉV"
 
-#: src/option.c:412
+#: src/option.c:424
 msgid "Allow multiple files to be selected"
 msgstr "Többszörös fájlkijelölés engedélyezése"
 
-#: src/option.c:419
+#: src/option.c:431
 msgid "Activate directory-only selection"
 msgstr "„Csak könyvtár” kiválasztás aktiválása"
 
-#: src/option.c:426
+#: src/option.c:438
 msgid "Activate save mode"
 msgstr "Mentés mód aktiválása"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:445 src/option.c:507 src/option.c:999
 msgid "Set output separator character"
 msgstr "A kimenet elválasztókarakterének beállítása"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:446 src/option.c:508 src/option.c:1000
 msgid "SEPARATOR"
 msgstr "ELVÁLASZTÓ"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Megadott fájlnév jóváhagyása, amennyiben az már létezik"
-
-#: src/option.c:448
+#: src/option.c:452
 msgid "Set a filename filter"
 msgstr "Fájlnévszűrő beállítása"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:455
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NÉV | MINTA1 MINTA2 …"
 
-#: src/option.c:460
+#: src/option.c:465
 msgid "Display list dialog"
 msgstr "Lista párbeszédablak megjelenítése"
 
-#: src/option.c:474
+#: src/option.c:479
 msgid "Set the column header"
 msgstr "Oszlopfejléc beállítása"
 
-#: src/option.c:475
+#: src/option.c:480
 msgid "COLUMN"
 msgstr "OSZLOP"
 
-#: src/option.c:481
+#: src/option.c:486
 msgid "Use check boxes for the first column"
 msgstr "Jelölőnégyzetek az első oszlopban"
 
-#: src/option.c:488
+#: src/option.c:493
 msgid "Use radio buttons for the first column"
 msgstr "Választógombok az első oszlopban"
 
-#: src/option.c:495
+#: src/option.c:500
 msgid "Use an image for the first column"
 msgstr "Kép használata az első oszlophoz"
 
-#: src/option.c:509
+#: src/option.c:514
 msgid "Allow multiple rows to be selected"
 msgstr "Több sor kijelölésének engedélyezése"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:521 src/option.c:742
 msgid "Allow changes to text"
 msgstr "Szöveg változtatható"
 
-#: src/option.c:523
+#: src/option.c:528
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -368,109 +330,101 @@ msgstr ""
 "nyomtatásához az „ALL” használható)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:531 src/option.c:538
 msgid "NUMBER"
 msgstr "SZÁM"
 
-#: src/option.c:532
+#: src/option.c:537
 msgid "Hide a specific column"
 msgstr "Egy bizonyos oszlop elrejtése"
 
-#: src/option.c:539
+#: src/option.c:544
 msgid "Hide the column headers"
 msgstr "Oszlopfejléc elrejtése"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"A módosításlista alapértelmezett keresési funkciója középen keresse a "
-"szöveget, ne az elején"
+#: src/option.c:551
+msgid "DEPRECATED; does nothing"
+msgstr "ELAVULT, semmit sem csinál"
 
-#: src/option.c:557
+#: src/option.c:561
 msgid "Display notification"
 msgstr "Értesítés megjelenítése"
 
-#: src/option.c:564
+#: src/option.c:568
 msgid "Set the notification text"
 msgstr "Az értesítési szöveg beállítása"
 
-#: src/option.c:571
+#: src/option.c:589
 msgid "Listen for commands on stdin"
 msgstr "Parancsok figyelése a szabványos bemeneten"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Az értesítési tippek beállítása"
-
-#: src/option.c:590
+#: src/option.c:599
 msgid "Display progress indication dialog"
 msgstr "Folyamatkijelző párbeszédablak megjelenítése"
 
-#: src/option.c:604
+#: src/option.c:613
 msgid "Set initial percentage"
 msgstr "Kezdeti százalék beállítása"
 
-#: src/option.c:605
+#: src/option.c:614
 msgid "PERCENTAGE"
 msgstr "SZÁZALÉK"
 
-#: src/option.c:611
+#: src/option.c:620
 msgid "Pulsate progress bar"
 msgstr "Folyamatjelző pulzálása"
 
-#: src/option.c:619
+#: src/option.c:628
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Párbeszédablak eltüntetése, ha a 100%-ot elérte"
 
-#: src/option.c:626
+#: src/option.c:635
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Szülőfolyamat kilövése a Mégse gomb megnyomásakor"
 
-#: src/option.c:633
+#: src/option.c:642
 msgid "Hide Cancel button"
 msgstr "Mégse gomb elrejtése"
 
-#: src/option.c:641
+#: src/option.c:650
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Annak becslése, hogy a folyamat mikor éri el a 100%-ot"
 
-#: src/option.c:650
+#: src/option.c:660
 msgid "Display question dialog"
 msgstr "Kérdező párbeszédablak megjelenítése"
 
-#: src/option.c:684
+#: src/option.c:702
 msgid "Give Cancel button focus by default"
 msgstr "Alapértelmezetten adjon fókuszt a Mégse gombnak"
 
-#: src/option.c:698
+#: src/option.c:718
 msgid "Suppress OK and Cancel buttons"
 msgstr "Az OK és Mégse gombok elnyomása"
 
-#: src/option.c:708
+#: src/option.c:728
 msgid "Display text information dialog"
 msgstr "Szöveges információs párbeszédablak megjelenítése"
 
-#: src/option.c:715
+#: src/option.c:735
 msgid "Open file"
 msgstr "Fájl megnyitása"
 
-#: src/option.c:729
+#: src/option.c:749
 msgid "Set the text font"
 msgstr "A szöveg betűkészletének beállítása"
 
-#: src/option.c:736
+#: src/option.c:756
 msgid "Enable an I read and agree checkbox"
 msgstr "„Elolvastam és egyetértek” jelölőnégyzet engedélyezése"
 
-#: src/option.c:744
+#: src/option.c:764
 msgid "Enable HTML support"
 msgstr "HTML-támogatás engedélyezése"
 
-#: src/option.c:751
+#: src/option.c:771
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -478,316 +432,324 @@ msgstr ""
 "Ne engedélyezze a felhasználói interakciót a webnézettel. Csak akkor "
 "működik, ha a --html kapcsolót használja"
 
-#: src/option.c:759
+#: src/option.c:779
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "URL-cím beállítása fájl helyett. Csak a --html kapcsolóval együtt működik"
 
-#: src/option.c:761
+#: src/option.c:781
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:788
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "A szöveg automatikus görgetése a végére. Csak akkor, ha a szöveg a "
 "szabványos bemenetről lett rögzítve"
 
-#: src/option.c:778
+#: src/option.c:799
 msgid "Display warning dialog"
 msgstr "Figyelmeztető párbeszédablak megjelenítése"
 
-#: src/option.c:821
+#: src/option.c:853
 msgid "Display scale dialog"
 msgstr "Nagyítás párbeszédablak megjelenítése"
 
-#: src/option.c:835
+#: src/option.c:867
 msgid "Set initial value"
 msgstr "Kezdeti érték beállítása"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:868 src/option.c:875 src/option.c:882 src/option.c:889
+#: src/option.c:1041
 msgid "VALUE"
 msgstr "ÉRTÉK"
 
-#: src/option.c:842
+#: src/option.c:874
 msgid "Set minimum value"
 msgstr "Minimális érték beállítása"
 
-#: src/option.c:849
+#: src/option.c:881
 msgid "Set maximum value"
 msgstr "Maximális érték beállítása"
 
-#: src/option.c:856
+#: src/option.c:888
 msgid "Set step size"
 msgstr "Lépés értékének beállítása"
 
-#: src/option.c:863
+#: src/option.c:895
 msgid "Print partial values"
 msgstr "Részleges értékek kiírása"
 
-#: src/option.c:870
+#: src/option.c:902
 msgid "Hide value"
 msgstr "Érték elrejtése"
 
-#: src/option.c:879
+#: src/option.c:912
 msgid "Display forms dialog"
 msgstr "Űrlapok párbeszédablak megjelenítése"
 
-#: src/option.c:886
+#: src/option.c:919
 msgid "Add a new Entry in forms dialog"
 msgstr "Új bejegyzés hozzáadása az Űrlapok ablakhoz"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:920 src/option.c:927
 msgid "Field name"
 msgstr "Mezőnév"
 
-#: src/option.c:893
+#: src/option.c:926
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Új jelszóbeviteli mező hozzáadása az Űrlapok ablakhoz"
 
-#: src/option.c:900
+#: src/option.c:933
 msgid "Add a new Calendar in forms dialog"
 msgstr "Új naptár hozzáadása az Űrlapok ablakhoz"
 
-#: src/option.c:901
+#: src/option.c:934
 msgid "Calendar field name"
 msgstr "Naptármező neve"
 
-#: src/option.c:907
+#: src/option.c:940
 msgid "Add a new List in forms dialog"
 msgstr "Új lista hozzáadása az Űrlapok ablakhoz"
 
-#: src/option.c:908
+#: src/option.c:941
 msgid "List field and header name"
 msgstr "Listamező és fejléc neve"
 
-#: src/option.c:914
+#: src/option.c:947
 msgid "List of values for List"
 msgstr "Értékek listája a listához"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:948 src/option.c:955 src/option.c:969
 msgid "List of values separated by |"
 msgstr "Értékek | jellel elválasztott listája"
 
-#: src/option.c:921
+#: src/option.c:954
 msgid "List of values for columns"
 msgstr "Az oszlopok értékeinek listája"
 
-#: src/option.c:928
+#: src/option.c:961
 msgid "Add a new combo box in forms dialog"
 msgstr "Új legördülő menü hozzáadása az űrlapok ablakhoz"
 
-#: src/option.c:929
+#: src/option.c:962
 msgid "Combo box field name"
 msgstr "Legördülő menü mező neve"
 
-#: src/option.c:935
+#: src/option.c:968
 msgid "List of values for combo box"
 msgstr "A legördülő menü értékeinek listája"
 
-#: src/option.c:952
+#: src/option.c:985
 msgid "Show the columns header"
 msgstr "Oszlopfejlécek megjelenítése"
 
-#: src/option.c:983
+#: src/option.c:1016
 msgid "Display password dialog"
 msgstr "Jelszó párbeszédablak megjelenítése"
 
-#: src/option.c:990
+#: src/option.c:1023
 msgid "Display the username option"
-msgstr "A felhasználónév lehetőség megjelenítése"
+msgstr "A felhasználónév kapcsoló megjelenítése"
 
-#: src/option.c:1000
+#: src/option.c:1033
 msgid "Display color selection dialog"
 msgstr "Színválasztó párbeszédablak megjelenítése"
 
-#: src/option.c:1007
+#: src/option.c:1040
 msgid "Set the color"
 msgstr "Szín beállítása"
 
-#: src/option.c:1014
+#: src/option.c:1047
 msgid "Show the palette"
 msgstr "A paletta megjelenítése"
 
-#: src/option.c:1023
+#: src/option.c:1057
 msgid "About zenity"
 msgstr "A Zenity névjegye"
 
-#: src/option.c:1030
+#: src/option.c:1064
 msgid "Print version"
 msgstr "Verziószám nyomtatása"
 
-#: src/option.c:1913
+#: src/option.c:1478
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Figyelmeztetés: a --window-icon kapcsoló elavult, és eltávolításra kerül a"
+" Zenity későbbi verziójából. Mellőzés.\n"
+
+#: src/option.c:2000
 msgid "General options"
-msgstr "Általános beállítások"
+msgstr "Általános kapcsolók"
 
-#: src/option.c:1914
+#: src/option.c:2001
 msgid "Show general options"
-msgstr "Általános beállítások megjelenítése"
+msgstr "Általános kapcsolók megjelenítése"
 
-#: src/option.c:1926
+#: src/option.c:2013
 msgid "Calendar options"
-msgstr "Naptár beállításai"
+msgstr "Naptár kapcsolók"
 
-#: src/option.c:1927
+#: src/option.c:2014
 msgid "Show calendar options"
-msgstr "Naptár beállításainak megjelenítése"
+msgstr "Naptár kapcsolók megjelenítése"
 
-#: src/option.c:1939
+#: src/option.c:2026
 msgid "Text entry options"
-msgstr "Szövegbeviteli mező beállításai"
+msgstr "Szövegbeviteli mező kapcsolók"
 
-#: src/option.c:1940
+#: src/option.c:2027
 msgid "Show text entry options"
-msgstr "Szövegbeviteli mező beállításainak megjelenítése"
+msgstr "Szövegbeviteli mező kapcsolók megjelenítése"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Error options"
-msgstr "Hibajelzés beállításai"
+msgstr "Hibajelzés kapcsolók"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Show error options"
-msgstr "Hibajelzés beállításainak megjelenítése"
+msgstr "Hibajelzés kapcsolók megjelenítése"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Info options"
-msgstr "Tájékoztató üzenetek beállításai"
+msgstr "Tájékoztató üzenet kapcsolók"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Show info options"
-msgstr "Tájékoztató üzenetek beállításainak megjelenítése"
+msgstr "Tájékoztató üzenet kapcsolók megjelenítése"
 
-#: src/option.c:1972
+#: src/option.c:2059
 msgid "File selection options"
-msgstr "Fájlválasztó beállításai"
+msgstr "Fájlválasztó kapcsolók"
 
-#: src/option.c:1973
+#: src/option.c:2060
 msgid "Show file selection options"
-msgstr "Fájlválasztó beállításainak megjelenítése"
+msgstr "Fájlválasztó kapcsolók megjelenítése"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "List options"
-msgstr "Lista beállításai"
+msgstr "Lista kapcsolók"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "Show list options"
-msgstr "Lista beállításainak megjelenítése"
+msgstr "Lista kapcsolók megjelenítése"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Értesítési ikon beállításai"
+#: src/option.c:2082
+#| msgid "Notification icon options"
+msgid "Notification options"
+msgstr "Értesítés kapcsolók"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Értesítési ikon beállításainak megjelenítése"
+#: src/option.c:2083
+#| msgid "Show notification icon options"
+msgid "Show notification options"
+msgstr "Értesítés kapcsolók megjelenítése"
 
-#: src/option.c:2011
+#: src/option.c:2096
 msgid "Progress options"
-msgstr "Folyamatjelző beállításai"
+msgstr "Folyamatjelző kapcsolók"
 
-#: src/option.c:2012
+#: src/option.c:2097
 msgid "Show progress options"
-msgstr "Folyamatjelző beállításainak megjelenítése"
+msgstr "Folyamatjelző kapcsolók megjelenítése"
 
-#: src/option.c:2024
+#: src/option.c:2109
 msgid "Question options"
-msgstr "Kérdések beállításai"
+msgstr "Kérdés kapcsolók"
 
-#: src/option.c:2025
+#: src/option.c:2110
 msgid "Show question options"
-msgstr "Kérdések beállításainak megjelenítése"
+msgstr "Kérdés kapcsolók megjelenítése"
 
-#: src/option.c:2037
+#: src/option.c:2122
 msgid "Warning options"
-msgstr "Figyelmeztetések beállításai"
+msgstr "Figyelmeztetés kapcsolók"
 
-#: src/option.c:2038
+#: src/option.c:2123
 msgid "Show warning options"
-msgstr "Figyelmeztetések beállításainak megjelenítése"
+msgstr "Figyelmeztetés kapcsolók megjelenítése"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Scale options"
-msgstr "Nagyítás beállításai"
+msgstr "Nagyítás kapcsolók"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Show scale options"
-msgstr "Nagyítás beállításainak megjelenítése"
+msgstr "Nagyítás kapcsolók megjelenítése"
 
-#: src/option.c:2060
+#: src/option.c:2145
 msgid "Text information options"
-msgstr "Szöveges információk beállításai"
+msgstr "Szöveges információ kapcsolók"
 
-#: src/option.c:2061
+#: src/option.c:2146
 msgid "Show text information options"
-msgstr "Szöveges információk beállításainak megjelenítése"
+msgstr "Szöveges információ kapcsolók megjelenítése"
 
-#: src/option.c:2073
+#: src/option.c:2158
 msgid "Color selection options"
-msgstr "Színválasztó beállításai"
+msgstr "Színválasztó kapcsolók"
 
-#: src/option.c:2074
+#: src/option.c:2159
 msgid "Show color selection options"
-msgstr "Színválasztó beállításainak megjelenítése"
+msgstr "Színválasztó kapcsolók megjelenítése"
 
-#: src/option.c:2086
+#: src/option.c:2171
 msgid "Password dialog options"
-msgstr "Jelszó párbeszédablak beállításai"
+msgstr "Jelszó párbeszédablak kapcsolók"
 
-#: src/option.c:2087
+#: src/option.c:2172
 msgid "Show password dialog options"
-msgstr "Jelszó párbeszédablak beállításainak megjelenítése"
+msgstr "Jelszó párbeszédablak kapcsolók megjelenítése"
 
-#: src/option.c:2099
+#: src/option.c:2184
 msgid "Forms dialog options"
-msgstr "Űrlapok párbeszédablak beállításai"
+msgstr "Űrlapok párbeszédablak kapcsolók"
 
-#: src/option.c:2100
+#: src/option.c:2185
 msgid "Show forms dialog options"
-msgstr "Űrlapok párbeszédablak beállításainak megjelenítése"
+msgstr "Űrlapok párbeszédablak kapcsolók megjelenítése"
 
-#: src/option.c:2112
+#: src/option.c:2197
 msgid "Miscellaneous options"
-msgstr "Egyéb beállítások"
+msgstr "Egyéb kapcsolók"
 
-#: src/option.c:2113
+#: src/option.c:2198
 msgid "Show miscellaneous options"
-msgstr "Egyéb beállítások megjelenítése"
+msgstr "Egyéb kapcsolók megjelenítése"
 
-#: src/option.c:2139
+#: src/option.c:2221
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
-"Ez a lehetőség nem érhető el. Nézze meg a --help kapcsoló kimenetét a "
+"Ez a kapcsoló nem érhető el. Nézze meg a --help kapcsoló kimenetét a "
 "lehetséges használati módokért.\n"
 
-#: src/option.c:2144
+#: src/option.c:2226
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s nincs támogatva ezen a párbeszédablakon.\n"
 
-#: src/option.c:2148
+#: src/option.c:2230
 msgid "Two or more dialog options specified\n"
-msgstr "Kettő vagy több párbeszédablak-beállítás lett megadva.\n"
+msgstr "Kettő vagy több párbeszédablak-kapcsoló lett megadva.\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Adja meg jelszavát"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Írja be a felhasználónevét és jelszavát"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Hátralévő idő: %lu:%02lu:%02lu"
@@ -796,101 +758,120 @@ msgstr "Hátralévő idő: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "A maximális érték nagyobb kell legyen, mint a minimális.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Az érték kívül esik a tartományon.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Figyelmeztetés: a --mid-search kapcsoló elavult, és eltávolításra kerül a"
+" Zenity későbbi verziójából. Mellőzés.\n"
+
+#: src/tree.c:278
 msgid "No column titles specified for List dialog.\n"
 msgstr "A lista párbeszédablakhoz nincsenek megadva oszlopcímek.\n"
 
-#: src/tree.c:399
+#: src/tree.c:285
 msgid "You should use only one List dialog type.\n"
 msgstr "Csak egy Lista párbeszédablak-típust használjon.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "A(z) %s ikonfájlnév nem található. Próbálkozás a témaikonnal."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "A nagyítás értékének beállítása"
 
-#: 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 "Mégse"
-
-#: 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 "OK"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Szövegnézet"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Kiválasztás naptárból"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Dátum kiválasztása a naptárból."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "_Naptár:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+#| msgid "C_alendar:"
+msgid "Calendar"
+msgstr "Naptár"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Új elem hozzáadása"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "Í_rja be az új szöveget:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Hiba"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Hiba történt."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Űrlapok ablak"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Információ"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Minden frissítés kész."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Folyamatjelző"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Fut…"
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Kérdés"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Nem"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Igen"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Biztos folytatja?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Válasszon ki elemeket a listából"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Válasszon ki elemeket az alábbi listából."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Figyelmeztetés"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Adja meg jelszavát"
diff --git a/po/id.po b/po/id.po
index 0ccc283a..78e22033 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,24 +6,32 @@
 # Mohammad DAMT <mdamt@bisnisweb.com>, 2005.
 # Dirgita <dirgitadevina@yahoo.co.id>, 2010, 2011, 2012.
 # Dirgita <dirgitadevina@gmail.com>, 2010.
-# Andika Triwidada <andika@gmail.com>, 2010, 2012, 2013, 2015.
+# Andika Triwidada <andika@gmail.com>, 2010, 2012, 2013, 2015, 2023.
+# Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-26 20:40+0000\n"
-"PO-Revision-Date: 2017-11-28 16:04+0700\n"
-"Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2023-04-28 19:28+0000\n"
+"PO-Revision-Date: 2023-05-10 14:21+0700\n"
+"Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.2.2\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Menampilkan kotak dialog dari baris perintah"
+
+#: src/about.c:54
 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 "
@@ -35,7 +43,7 @@ msgstr ""
 "sebagaimana dipublikasikan oleh Free Software Foundation; baik versi 2 dari "
 "Lisensi, atau (terserah pilihan Anda) versi setelahnya.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -47,7 +55,7 @@ msgstr ""
 "TERTENTU. Lihat GNU Lesser General Public License untuk rincian lebih "
 "lanjut.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -58,217 +66,181 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Mohammad DAMT <mdamt@bisnisweb.com>, 2005.\n"
-"Ahmad Riza H Nst <ari@160c.afraid.org>, 2004.\n"
-"Dirgita <dirgitadevina@yahoo.co.id>, 2010, 2011, 2012.\n"
-"Andika Triwidada <andika@gmail.com>, 2010, 2012, 2013."
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Menampilkan kotak dialog dari skrip shell"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:415 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_OK"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:411 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Anda harus menentukan jenis dialog. Lihat 'zenity --help' untuk lebih jelas\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Tidak"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Ya"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Tidak dapat mengurai pesan\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Nilai yang tak valid bagi arahan bertipe boolean.\n"
-"Nilai yang didukung adalah 'true' atau 'false'.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Arahan yang tak didukung. Dilewati.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Nama arahan tak dikenal. Dilewati.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Tidak dapat mengurai perintah dari stdin\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Notifikasi Zenity"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "Menentukan judul dialog"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "JUDUL"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Menentukan icon jendela"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "PATH_IKON"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "Menentukan lebar"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "LEBAR"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "Menentukan tinggi"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "TINGGI"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "Menentukan waktu tunggu dalam detik"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "WAKTU_HABIS"
 
-#: src/option.c:200
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "Menata label untuk tombol OK"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "TEKS"
 
-#: src/option.c:207
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "Menata label untuk tombol Batal"
 
-#: src/option.c:214
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "Menambah sebuah tombol ekstra"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "Atur petunjuk modal"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Menentukan jendela induk tempat mencantol"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "USANG; tidak melakukan apa-apa"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "JENDELA"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "USANG; gunakan '--icon'"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "NAMA-IKON"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "Menampilkan dialog kalender"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "Menentukan teks dialog"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "Menentukan hari kalender"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "HARI"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "Menentukan bulan kalender"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "BULAN"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "Menentukan tahun kalender"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "TAHUN"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "Menentukan format untuk tanggal yang dihasilkan"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "POLA"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Menampilkan dialog entri teks"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "Menentukan teks entri"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "Menyembunyikan teks entri"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "Menampilkan dialog galat"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Atur ikon dialog"
-
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "NAMA-IKON"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "Atur nama ikon"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "Tanpa pembengkokan teks"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "Jangan fungsikan markup Pango"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -276,89 +248,85 @@ msgstr ""
 "Fungsikan penyingkatan dalam teks dialog. Ini memperbaikai ukuran jendela "
 "yang tinggi dengan teks panjang"
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "Menampilkan dialog informasi"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "Menampilkan dialog seleksi berkas"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "Menentukan nama berkas"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "NAMA_BERKAS"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "Memperbolehkan seleksi multiberkas"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "Mengaktifkan seleksi hanya direktori"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "Mengaktifkan mode menyimpan"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "Menentukan karakter pemisah keluaran"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "PEMISAH"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Konfirmasi seleksi berkas apabila nama berkas tersebut sudah ada"
-
-#: src/option.c:448
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "Menata penyaring nama berkas"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAMA | POLA1 POLA2 ..."
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "Menampilkan dialog senarai"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "Menentukan tajuk kolom"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "KOLOM"
 
-#: src/option.c:481
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "Menggunakan kotak cek untuk kolom pertama"
 
-#: src/option.c:488
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "Menggunakan tombol radio untuk kolom pertama"
 
-#: src/option.c:495
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "Menggunakan gambar untuk kolom pertama"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "Memperbolehkan seleksi multibaris"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "Memperbolehkan mengubah teks"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -367,108 +335,97 @@ msgstr ""
 "kolom)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "NOMOR"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "Menyembunyikan kolom tertentu"
 
-#: src/option.c:539
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "Menyembunyikan tajuk kolom"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Ubah fungsi pencarian baku daftar mencari teks di tengah, bukan di awal"
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "Menampilkan notifikasi"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "Menentukan teks notifikasi"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "Membaca perintah dari stdin"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Menentukan arahan notifikasi"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "Menampilkan dialog indikator proses"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "Menentukan persentase awal"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "PERSENTASE"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "Indikator proses berpulsa"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Menutup dialog setelah mencapai 100%"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Mematikan proses induk bila tombol Batal ditekan"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "Menyembunyikan tombol Batal"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Estimasikan kapan kemajuan akan mencapai 100%"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "Menampilkan dialog pertanyaan"
 
-#: src/option.c:684
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "Berikan fokus ke tombol Batal secara baku"
 
-#: src/option.c:698
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "Menyembunyikan tombol OK dan Batal"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "Menampilkan dialog informasi teks"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "Membuka berkas"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "Menentukan fonta teks"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "Aktifkan ckeckbox 'Saya telah baca dan setuju'"
 
-#: src/option.c:744
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "Fungsikan dukungan HTML"
 
-#: src/option.c:751
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -476,315 +433,353 @@ msgstr ""
 "Jangan fungsikan interaksi pengguna dengan WebView. Hanya bekerja bila Anda "
 "memakai opsi --html"
 
-#: src/option.c:759
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Tata suatu URL sebagai pengganti berkas. Hanya bekerja bila Anda memakai "
 "opsi --html"
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr "Gulir otomatis teks ke akhir. Hanya ketika teks ditangkap dari stdin"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "Menampilkan dialog peringatan"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "Menampilkan dialog skala"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "Menentukan nilai awal"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "NILAI"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "Menentukan nilai terendah"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "Menentukan nilai tertinggi"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "Menentukan ukuran langkah"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "Mencetak nilai parsial"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "Menyembunyikan nilai"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
 msgstr "Menampilkan dialog formulir"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
 msgstr "Menambahkan Entri baru pada dialog formulir"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "Nama kolom isian"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Menambahkan Entri Sandi baru pada dialog formulir"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
 msgstr "Menambahkan Kalender baru pada dialog formulir"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "Kolom isian nama kalender"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
 msgstr "Menambahkan Daftar baru pada dialog formulir"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "Daftar nama ruas dan tajuk"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "Daftar nilai bagi Daftar"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "Daftar nilai dipisahkan oleh |"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "Daftar nilai bagi kolom"
 
-#: src/option.c:928
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
 msgstr "Menambahkan kotak kombo baru pada dialog formulir"
 
-#: src/option.c:929
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "Nama ruas kotak kombo"
 
-#: src/option.c:935
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "Daftar nilai bagi kotak kombo"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "Tampilkan tajuk kolom"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "Menampilkan dialog sandi"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "Menampilkan opsi nama pengguna"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "Menampilkan dialog seleksi warna"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "Menyetel warna"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
 msgstr "Menampilkan palet"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
 msgstr "Tentang zenity"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "Menampilkan versi"
 
-#: src/option.c:1913
+#: src/option.c:1080
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Peringatan: --icon-name tidak digunakan lagi dan akan dihapus di zenity "
+"versi mendatang; Memperlakukan sebagai --icon.\n"
+
+#: src/option.c:1087
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Peringatan: --window-icon tidak digunakan lagi dan akan dihapus di zenity "
+"versi mendatang; Memperlakukan sebagai --icon.\n"
+
+#: src/option.c:1094
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"Peringatan: --confirm-overwrite tidak digunakan lagi dan akan dihapus dalam "
+"versi zenity mendatang. Mengabaikan.\n"
+
+#: src/option.c:1101
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Peringatan: --attach tidak digunakan lagi dan akan dihapus dalam versi "
+"zenity yang akan datang. Mengabaikan.\n"
+
+#: src/option.c:1108
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Peringatan: --hint tidak digunakan lagi dan akan dihapus dalam versi zenity "
+"mendatang. Mengabaikan.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "Opsi umum"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "Menampilkan opsi umum"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "Opsi kalender"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "Menampilkan opsi kalender"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "Opsi entri teks"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "Menampilkan opsi entri teks"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "Opsi galat"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "Menampilkan opsi galat"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "Opsi info"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "Menampilkan opsi info"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "Opsi seleksi berkas"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "Menampilkan opsi seleksi berkas"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "Opsi senarai"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "Menampilkan opsi senarai"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Opsi ikon notifikasi"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "Opsi notifikasi"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Menampilkan opsi ikon notifikasi"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "Tampilkan opsi pemberitahuan"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "Opsi indikator proses"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "Menampilkan opsi indikator proses"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "Opsi pertanyaan"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "Menampilkan opsi pertanyaan"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "Opsi peringatan"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "Menampilkan opsi peringatan"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "Opsi skala"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "Menampilkan opsi skala"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "Opsi informasi teks"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "Menampilkan opsi informasi teks"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "Opsi seleksi warna"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "Menampilkan opsi seleksi warna"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "Opsi dialog sandi"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "Menampilkan opsi dialog sandi"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
 msgstr "Opsi dialog formulir"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
 msgstr "Menampilkan opsi dialog formulir"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "Opsi lain-lain"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "Menampilkan opsi yang lainnya"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Opsi ini tidak tersedia. Silahkan lihat --help untuk penggunaan yang "
 "mungkin.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s tidak didukung untuk dialog ini\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 msgid "Two or more dialog options specified\n"
 msgstr "Dua atau lebih opsi dialog telah ditentukan\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Ketik sandi Anda"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Ketik nama pengguna dan sandi Anda"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Nama Pengguna:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Sandi:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Sisa waktu: %lu:%02lu:%02lu"
@@ -793,101 +788,119 @@ msgstr "Sisa waktu: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Nilai maksimal harus lebih besar dari nilai minimal.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Nilai berada di luar jangkauan.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Peringatan: --mid-search tidak digunakan lagi dan akan dihapus di versi "
+"zenity mendatang. Mengabaikan.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr "Judul kolom belum ditentukan untuk dialog Senarai\n"
 
-#: src/tree.c:399
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "Anda hanya boleh menggunakan satu jenis dialog Senarai.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "Nama berkas ikon tidak %s ditemukan; mencoba ikon tema."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Setel nilai skala"
 
-#: 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 "Batal"
-
-#: 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 "OK"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Tilikan Teks"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Pemilihan kalender"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Pilih tanggal dari yang di bawah."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "K_alender:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Kalender"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Tambahkan entri baru"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "Masukkan t_eks baru:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Galat"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Telah terjadi galat."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Dialog formulir"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Informasi"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Semua pemutakhiran lengkap."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Kemajuan"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Berjalan..."
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Pertanyaan"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Tidak"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Ya"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Anda yakin ingin melanjutkan?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Pilih butir dari daftar"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Pilih butir dari daftar di bawah."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Peringatan"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Ketik sandi Anda"
diff --git a/po/ka.po b/po/ka.po
index 40c3e379..399d74d6 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,24 +1,33 @@
-# translation of zenity.gnome-2-14.po to Georgian
-# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# translation of Zenity to Georgian
+# Copyright (C) 2023 Zenity authors.
 # This file is distributed under the same license as the PACKAGE package.
 # Vladimer Sichinava <alinux@siena.linux.it>, 2006.
+# Ekaterine Papava <papava.e@gtu.ge>, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity.gnome-2-14\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
-"POT-Creation-Date: 2022-04-27 01:30+0000\n"
-"PO-Revision-Date: 2022-04-28 07:01+0200\n"
-"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
+"POT-Creation-Date: 2023-04-28 19:28+0000\n"
+"PO-Revision-Date: 2023-04-30 04:02+0200\n"
+"Last-Translator: Ekaterine Papava <papava.e@gtu.ge>\n"
 "Language-Team: Georgian <gnome@inet.ge>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.2.2\n"
 
-#: src/about.c:56
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "ფანჯრების ჩვენება ბრძანების სტრიქონიდან"
+
+#: src/about.c:54
 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 "
@@ -30,7 +39,7 @@ msgstr ""
 "Free Software Foundation; either version 2 of the License, or (at your "
 "option) any later version.\n"
 
-#: src/about.c:61
+#: src/about.c:59
 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 "
@@ -42,7 +51,7 @@ msgstr ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
 "for more details.\n"
 
-#: src/about.c:65
+#: src/about.c:63
 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, "
@@ -52,301 +61,265 @@ msgstr ""
 "along with this program; if not, write to the Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/about.c:76
-msgid "translator-credits"
-msgstr "თემური დოღონაძე"
-
-#: src/about.c:93
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "ფანჯრების სკრიპტებიდან ჩვენება"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:415 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_დიახ"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:411 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_გაუქმება"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "მიუთითეთ დიალოგის ტიპი. დაწვრილებით იხ. \"zenity --help\"\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_არა"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "დიახ"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "შეტყობინების დამუშავების შეცდომა\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"ბულევის მინიშნების არასწორი მნიშვნელობა\n"
-"მხარდაჭერილი მნიშვნელობებია 'true' და 'false'.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "მხარდაუჭერელი მინიშნება. გამოტოვება.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "მინიშნების უცნობი სახელი. გამოტოვება.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "ბრძანებების სტრიქონის stdin-იდან დამუშავება შეუძლებელია\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "ზენიტის შეტყობინება"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "ფანჯრის სათაურის დაყენება"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "სათაური"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "ფანჯარის ხატულის დაყენება"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "ხატულას მდებარეობა"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "სიგანე"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "სიგანე"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "სიმაღლე"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "სიმაღლე"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "ფანჯრის ვადა, წამებში"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "ლოდინის ვადა"
 
-#: src/option.c:200
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "OK ღილაკის ჭდის დაყენება"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "ტექსტი"
 
-#: src/option.c:207
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "გაუქმების ღილაკის ჭდის დაყენება"
 
-#: src/option.c:214
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "დამატებითი ღილაკის დამატება"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "მოდალური მინიშნების დაყენება"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "მიუთითეთ მშობელი ფანჯარა, მისაბმელად"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "მოძველებულია: არაფერს აკეთებს"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "ფანჯარა"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "მოძველებულია; გამოიყენეთ '--icon'"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "ხატულის სახელი"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "კალენდრის ფანჯრის ჩვენება"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "ფანჯრის ტექსტის დაყენება"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "კალენდრის დღის დაყენება"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "დღე"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "კალენდრის თვის დაყენება"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "თვე"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "კალენდრის წლის დაყენება"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "წელი"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "დაბრუნებული თარიღის ფორმატის დაყენება"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "შაბლონი"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "ტექსტის შეყვანის ფანჯარა"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "ჩანაწერის ტექსტის დაყენება"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "ჩანაწერის ტესტის დამალვა"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "შეცდომის ფანჯრის ჩვენება"
 
-#: 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:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "ხატულის სახელი"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "ხატულას სახელის დაყენება"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "ტექსტის გადატანის აკრძალვა"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "Pango-ის ნიშნების გამორთვა"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
 msgstr ""
 "ფანჯრის ტექსტის ოვალურობის ჩართვა. ამით გრძელტექსტიანი ფანჯრები გასწორდება"
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "საინფორმაციო ფანჯრის ჩვენება"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "ფაილის არჩევის ფანჯრის ჩვენება"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "ფაილის სახელის დაყენება"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "ფაილის სახელი"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "რამდენიმე ფაილის მონიშვნის დაშვება"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "მხოლოდ საქაღალდის არჩევა"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "ნახვის რეჟიმის გააქტიურება"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "გამყოფი სიმბოლოს არჩევა"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "გამყოფი"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "ფაილის არჩევის დადასტურება, თუ ის უკვე არსებობს"
-
-#: src/option.c:448
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "ფაილის სახელის ფილტრის დაყენება"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "სახელი | ნიმუში1 ნიმუში2 .."
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "სიის ფანჯარა"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "სვეტის თავსართი"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "სვეტი"
 
-#: src/option.c:481
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "პირველ სვეტში ჩასართველების გამოყენება"
 
-#: src/option.c:488
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "პირველ სვეტში გადასართველების გამოყენება"
 
-#: src/option.c:495
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "პირველ სვეტში გამოსახულების გამოყენება"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "რამდენიმე სტრიქონის მონიშვნის დაშვება"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "ტექსტის შეცვლის დაშვება"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -354,107 +327,97 @@ msgstr ""
 "მითითებული სვეტის ბეჭდვა (ნაგულისხმები: 1. 'ყველა' -დაბეჭდავს ყველა სვეტს)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "რიცხვი"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "მითითებული სვეტის დამალვა"
 
-#: src/option.c:539
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "სვეტის თავსართების დამალვა"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr "სიაში ძებნისას ტექსტის შუიდან და არა დასაწყისიდან ძებნის ჩართვა"
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "შეტყობინების ჩვენება"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "შეტყობინების ტექსტის დაყენება"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "ბრძანებების stdin-იდან მიღებისთვის მზაობა"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "შეტყობინების მინიშნებების მორგება"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "მიმდინარეობის ჩვენება"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "საწყისი პროცენტული მაჩვენებლის დაყენება"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "პროცენტულობა"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "პულსირებადი მიმდინარეობის მაჩვენებელი"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "ფანჯრის დახურვა 100%-ის მიღწევისას"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "გაუქმების ღილაკის დაჭერისას მშობელი პროცესის მოკვლა"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "გაუქმების ღილაკის დამალვა"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "დაახლოებით განსაზღვრა, როდის დასრულდება ოპერაცია"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "კითხვის ფანჯრის ჩვენება"
 
-#: src/option.c:684
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "ფოკუსის ნაგულისხმებად გაუქმების ღილაკზე დაყენება"
 
-#: src/option.c:698
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "'დიახ' და 'გაუქმების' ღილაკების ჩახშბა"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "ტექსტური ინფორმაციის ფანჯრის ჩვენება"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "ფაილის გახსნა"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "ტექსტის ფონტის დაყენება"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "\"მე წავიკითხე და ვეთანხმები\" გადასართველის ჩართვა"
 
-#: src/option.c:744
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "HTML-ის მხარდაჭერის ჩართვა"
 
-#: src/option.c:751
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -462,316 +425,354 @@ msgstr ""
 "WebView-თან ურთიერთობისას მომხმარებელთან ურთიერთობა არ სცადოთ. ის მხოლოდ --"
 "html პარამეტრის მითითებისას მუშაობს"
 
-#: src/option.c:759
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "დააყენეთ URL ფაილის მაგიერ. მუშაობს მხოლოდ --html პარამეტრის მითითების "
 "შემთხვევაში"
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "ტექსტის ავტომატური გადახვევა ბოლომდე. მუშაობს მხოლოდ მაშინ, როდესაც ტექსტის "
 "აღება stdin-დან ხდება"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "გაფრთხილების ფანჯრის ჩვენება"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "მასშტაბირების ფანჯრის ჩვენება"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "საწყისი მნიშვნელობის დაყენება"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "მნიშვნელობა"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "მინიმალური მნიშვნელობა"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "მაქსიმალური მნიშვნელობა"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "ბიჯის ზომა"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "ნაწილობრივი მნიშვნელობების ბეჭდვა"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "მნიშვნელობის დამალვა"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
 msgstr "ფორმების ფანჯრის ჩვენება"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
 msgstr "ფორმების ფანჯარაში ახალი ჩანაწერის დამატება"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "ველის სახელი"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "ფორმების ფანჯარაში პაროლის ახალი ველის დამატება"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
 msgstr "ფორმების ფანჯარაში ახალი კალენდრის დამატება"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "კალენდრის ველის სახელი"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
 msgstr "ფორმების ფანჯარაში ახალი სიის დამატება"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "თავსართებისა და ველების სახელების სია"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "შეიყვანეთ სიის მნიშვნელობები"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "შეიყვანეთ ერთმანეთისგან |-ით დაშორებული მნიშვნელობები"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "სვეტების მნიშვნელობების სია"
 
-#: src/option.c:928
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
 msgstr "ფორმების ფანჯარაში ჩამოშლადი სიის დამატება"
 
-#: src/option.c:929
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "ჩამოშლადი სიის ველის სახელი"
 
-#: src/option.c:935
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "ჩამოშლადი სიის მნიშვნელობები"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "სვეტის თავსართების ჩვენება"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "პაროლის ფანჯრის ჩვენება"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "მომხმარებლის შეყვანის ფანჯარა"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "ფერის ასარჩევი ფანჯრის ჩვენება"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "ფერის დაყენება"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
 msgstr "პალიტრის ჩვენება"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
 msgstr "Zenity-ის შესახებ"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "ვერსიის ბეჭდვა"
 
-#: src/option.c:1913
+#: src/option.c:1080
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"გაფრთხილება: --icon-name მოძველებულია და Zenity-ის მომავალი ვერსიებიდან "
+"ამოღებული იქნება. ის აღიქმება, როგორც --icon.\n"
+
+#: src/option.c:1087
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"გაფრთხილება: --window-icon მოძველებულია და Zenity-ის მომავალი ვერსიებიდან "
+"ამოღებული იქნება. ის აღიქმება, როგორც --icon.\n"
+
+#: src/option.c:1094
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"გაფრთხილება: --confirm-overwrite მოძველებულია და Zenity-ის მომავალი "
+"ვერსიებიდან ამოღებული იქნება. გამოტოვება.\n"
+
+#: src/option.c:1101
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"გაფრთხილება: ---attach მოძველებულია და Zenity-ის მომავალი ვერსიებიდან "
+"ამოღებული იქნება. გამოტოვება.\n"
+
+#: src/option.c:1108
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"გაფრთხილება: --hint მოძველებულია და Zenity-ის მომავალი ვერსიებიდან ამოღებული "
+"იქნება. გამოტოვება.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "საერთო პარამეტრები"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "საერთო პარამეტრების ჩვენება"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "კალენდრის მორგება"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "კალენდრის პარამეტრების ჩვენება"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "ტექსტური ელემენტის პარამეტრები"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "ტექსტური ელემენტის პარამეტრების ჩვენება"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "შეცდომის პარამეტრები"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "შეცდომის პარამეტრების ჩვენება"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "ინფორმაციის პარამეტრები"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "ინფორმაციის პარამეტრების ჩვენება"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "ფაილის არჩევის პარამეტრები"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "ფაილის არჩევის პარამეტრების ჩვენება"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "სიის პარამეტრები"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "სიის პარამეტრების ჩვენება"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "გაფრთხილების ხატულების პარამეტრები"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "გაფრთხილებების მორგება"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "გაფრთხილების ხატულების პარამეტრების ჩვენება"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "გაფრთხილების პარამეტრების ჩვენება"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "მიმდინარეობის პარამეტრები"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "მიმდინარეობის პარამეტრების ჩვენება"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "კითხვის პარამეტრები"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "კითხვის პარამეტრების ჩვენება"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "გაფრთხილების მორგება"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "გაფრთხილების პარამეტრების ჩვენება"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "მასშტაბირების პარამეტრები"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "მასშტაბირების პარამეტრების ჩვენება"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "ტექსტური ინფორმაციის პარამეტრები"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "ტექსტური ინფორმაციის პარამეტრების ჩვენება"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "ფერის არჩევის პარამეტრები"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "ფერის არჩევის პარამეტრების ჩვენება"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "პაროლის ფანჯრის მორგება"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "პაროლის ფანჯრის პარამეტრების ჩვენება"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
 msgstr "ფორმის ფანჯრის მორგება"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
 msgstr "ფორმის ფანჯრის მასშტაბირების ჩვენება"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "სხვადასხვა პარამეტრები"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "სხვადასხვა პარამეტრების ჩვენება"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "პარამეტრი ხელმიუწვდომელია. დაშვებული მნიშვნელობებისათვის იხ '--help'.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s მხარდაუჭერელია ამ ფანჯრისთვის\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 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
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "შეიყვანეთ მომხმარებელი და პაროლი"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "მომხმარებელი:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "პაროლი:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "დარჩენილი დრო: %lu:%02lu:%02lu"
@@ -780,105 +781,171 @@ msgstr "დარჩენილი დრო: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "მაქსიმალური მნიშვნელობა მინიმალურზე მეტი უნდა იყოს.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "დაუშვებელი მნიშვნელობა.\n"
 
-#: src/tree.c:389
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"გაფრთხილება: --mid-search მოძველებულია და Zenity-ის მომავალი ვერსიებიდან "
+"ამოღებული იქნება. გამოტოვება.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr "არ არის მითითებული სვეტის სათაური.\n"
 
-#: src/tree.c:395
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "გამოიყენეთ სიის ფანჯრის მხოლოდ ერთი ტიპი\n"
 
-#: src/zenity.ui:14 src/zenity.ui:77
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "ხატულის სახელი %s ვერ ვიპოვე; ვცდი თემის ხატულას."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "მასშტაბის კოეფიციენტის შერჩევა"
 
-#: src/zenity.ui:30 src/zenity.ui:136 src/zenity.ui:248 src/zenity.ui:379
-#: src/zenity.ui:580 src/zenity.ui:787 src/zenity.ui:974
-msgid "Cancel"
-msgstr "გაუქმება"
-
-#: src/zenity.ui:44 src/zenity.ui:149 src/zenity.ui:262 src/zenity.ui:393
-#: src/zenity.ui:483 src/zenity.ui:593 src/zenity.ui:700 src/zenity.ui:801
-#: src/zenity.ui:988 src/zenity.ui:1085
-msgid "OK"
-msgstr "დიახ"
-
-#: src/zenity.ui:118
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "ტექსტის ხედი"
 
-#: src/zenity.ui:232
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "კალენდრის არჩევა"
 
-#: src/zenity.ui:299
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "თარიღის არჩევა."
 
-#: src/zenity.ui:320
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "_კალენდარი:"
 
-#: src/zenity.ui:362
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "კალენდერი"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "ახალი ჩანაწერის დამატება"
 
-#: src/zenity.ui:429
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_შეიყვანეთ ახალი ტექსტი:"
 
-#: src/zenity.ui:466
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "შეცდომა"
 
-#: src/zenity.ui:532
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "შეცდომა ოპერაციის შესრულებისას."
 
-#: src/zenity.ui:660
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "ფორმების ფანჯარა"
 
-#: src/zenity.ui:683
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "ინფორმაცია"
 
-#: src/zenity.ui:744
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "განახლება დამთავრებულია."
 
-#: src/zenity.ui:771
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "მიმდინარეობა"
 
-#: src/zenity.ui:834
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "გაშვებულია..."
 
-#: src/zenity.ui:885
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "კითხვა"
 
-#: src/zenity.ui:933 src/zenity.ui:1131
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_არა"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "დიახ"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "დარწმუნებული ბრძანდებით?"
 
-#: src/zenity.ui:957
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "ელემენტის არჩევა სიიდან"
 
-#: src/zenity.ui:1019
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "ელემენტის არჩევა სიიდან."
 
-#: src/zenity.ui:1068
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "გაფრთხილება"
 
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "შეიყვანეთ პაროლი"
+
+#~ msgid "translator-credits"
+#~ msgstr "თემური დოღონაძე"
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "ბულევის მინიშნების არასწორი მნიშვნელობა\n"
+#~ "მხარდაჭერილი მნიშვნელობებია 'true' და 'false'.\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "მხარდაუჭერელი მინიშნება. გამოტოვება.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "მინიშნების უცნობი სახელი. გამოტოვება.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "ზენიტის შეტყობინება"
+
+#~ msgid "Set the window icon"
+#~ msgstr "ფანჯარის ხატულის დაყენება"
+
+#~ msgid "ICONPATH"
+#~ msgstr "ხატულას მდებარეობა"
+
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "მიუთითეთ მშობელი ფანჯარა, მისაბმელად"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "ფანჯრის ხატულის დაყენება"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr "ფაილის არჩევის დადასტურება, თუ ის უკვე არსებობს"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr "სიაში ძებნისას ტექსტის შუიდან და არა დასაწყისიდან ძებნის ჩართვა"
+
+#~ msgid "Set the notification hints"
+#~ msgstr "შეტყობინების მინიშნებების მორგება"
+
+#~ msgid "Cancel"
+#~ msgstr "გაუქმება"
+
+#~ msgid "OK"
+#~ msgstr "დიახ"
+
 #~ msgid "Adjust the scale value."
 #~ msgstr "მასშტაბის კოეფიციენტის შერჩევა."
 
diff --git a/po/lt.po b/po/lt.po
index 5afd2829..8b5aed0e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,26 +8,33 @@
 # Justina Klingaitė <justina.klingaite@gmail.com>, 2005.
 # Gintautas Miliauskas <gintas@akl.lt>, 2006, 2007.
 # Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2012.
-# Aurimas Černius <aurisc4@gmail.com>, 2013, 2014, 2015, 2017.
+# Aurimas Černius <aurisc4@gmail.com>, 2013-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-26 20:40+0000\n"
-"PO-Revision-Date: 2017-12-30 20:22+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2023-02-04 17:46+0000\n"
+"PO-Revision-Date: 2023-02-26 22:58+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.7\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Gtranslator 42.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Parodo dialogo langus iš komandų eilutės"
+
+#: src/about.c:54
 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 +46,7 @@ msgstr ""
 "Bendrosios Viešosios licenzijos sąlygomis : arba 2 licenzijos versija, arba "
 "(savo nuožiūra) bet kuria vėlesne versija.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -51,7 +58,7 @@ msgstr ""
 "garantijos. žiūrėkite GNU Nuosaikiąją Bendrąją Viešąją licenziją norėdami "
 "sužinoti smulkmenas\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -62,311 +69,261 @@ msgstr ""
 "organizacijai, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Paskutinysis vertėjas:\n"
-"Aurimas Černius <aurisc4@gmail.com>,\n"
-"\n"
-"Ankstesnieji vertėjai:\n"
-"Gintautas Miliauskas <gintas@akl.lt>,\n"
-"Žygimantas Beručka <uid0@akl.lt>,\n"
-"Tomas Kuliavas <tokul@users.sourceforge.net>,\n"
-"Justina Klingaitė <justina.klingaite@gmail.com>"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Parodo dialogo langus dirbant su tekstinės aplinkos scenarijais"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:408 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_Gerai"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:404 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Jūs turite nurodyti dialogo tipą. Paleiskite 'zenity --help' norėdami gauti "
 "informaciją apie tinkamus raktus\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Ne"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Taip"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Nepavyko perskaityti pranešimo\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Netinkama vertė loginio tipo patarimui.\n"
-"Galimos vertės yra „true“ ir „false“.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Nepalaikomas patarimas. Praleidžiama.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Nežinomas patarimo pavadinimas. Praleidžiama.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Nepavyko perskaityti komandos iš stdin\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Zenity pranešimas"
-
-#: src/option.c:164
+#: src/option.c:166
 msgid "Set the dialog title"
 msgstr "Nustatyti lango antraštę"
 
-#: src/option.c:165
+#: src/option.c:167
 msgid "TITLE"
 msgstr "ANTRAŠTĖ"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Nustatyti lango piktogramą"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "KELIAS-IKI-PIKTOGRAMOS"
-
-#: src/option.c:178
+#: src/option.c:173
 msgid "Set the width"
 msgstr "Nustatyti plotį"
 
-#: src/option.c:179
+#: src/option.c:174
 msgid "WIDTH"
 msgstr "PLOTIS"
 
-#: src/option.c:185
+#: src/option.c:180
 msgid "Set the height"
 msgstr "Nustatyti aukštį"
 
-#: src/option.c:186
+#: src/option.c:181
 msgid "HEIGHT"
 msgstr "AUKŠTIS"
 
-#: src/option.c:192
+#: src/option.c:187
 msgid "Set dialog timeout in seconds"
 msgstr "Nustatyti dialogo laiko limitą sekundėmis"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:189
 msgid "TIMEOUT"
 msgstr "LIMITAS"
 
-#: src/option.c:200
+#: src/option.c:195
 msgid "Set the label of the OK button"
 msgstr "Nustatyti mygtuko „Gerai“ tekstą"
 
-#: 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
+#: src/option.c:196 src/option.c:203 src/option.c:210 src/option.c:234
+#: src/option.c:279 src/option.c:286 src/option.c:310 src/option.c:364
+#: src/option.c:473 src/option.c:569 src/option.c:607 src/option.c:668
+#: src/option.c:750 src/option.c:757 src/option.c:807 src/option.c:861
+#: src/option.c:993
 msgid "TEXT"
 msgstr "TEKSTAS"
 
-#: src/option.c:207
+#: src/option.c:202
 msgid "Set the label of the Cancel button"
 msgstr "Nustatyti mygtuko „Atsisakyti“ tekstą"
 
-#: src/option.c:214
+#: src/option.c:209
 msgid "Add an extra button"
 msgstr "Pridėti papildomą mygtuką"
 
-#: src/option.c:221
+#: src/option.c:216
 msgid "Set the modal hint"
 msgstr "Nustatyti modalinio lango patarimą"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Nustatyti tėvinį langą, prie kurio prikabinti"
-
-#: src/option.c:229
-msgid "WINDOW"
-msgstr "LANGAS"
-
-#: src/option.c:237
+#: src/option.c:226
 msgid "Display calendar dialog"
 msgstr "Parodyti kalendoriaus dialogą"
 
-#: 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
+#: src/option.c:233 src/option.c:278 src/option.c:309 src/option.c:363
+#: src/option.c:472 src/option.c:606 src/option.c:667 src/option.c:806
+#: src/option.c:860 src/option.c:992
 msgid "Set the dialog text"
 msgstr "Nustatyti dialogo tekstą"
 
-#: src/option.c:251
+#: src/option.c:240
 msgid "Set the calendar day"
 msgstr "Nustatyti kalendoriaus dieną"
 
-#: src/option.c:252
+#: src/option.c:241
 msgid "DAY"
 msgstr "DIENA"
 
-#: src/option.c:258
+#: src/option.c:247
 msgid "Set the calendar month"
 msgstr "Nustatyti kalendoriaus mėnesį"
 
-#: src/option.c:259
+#: src/option.c:248
 msgid "MONTH"
 msgstr "MĖNUO"
 
-#: src/option.c:265
+#: src/option.c:254
 msgid "Set the calendar year"
 msgstr "Nustatyti kalendoriaus metus"
 
-#: src/option.c:266
+#: src/option.c:255
 msgid "YEAR"
 msgstr "METAI"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:261 src/option.c:1006
 msgid "Set the format for the returned date"
 msgstr "Nustatyti grąžinamos datos formatą"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:262 src/option.c:1007
 msgid "PATTERN"
 msgstr "ŠABLONAS"
 
-#: src/option.c:281
+#: src/option.c:271
 msgid "Display text entry dialog"
 msgstr "Parodyti teksto įvedimo dialogą"
 
-#: src/option.c:295
+#: src/option.c:285
 msgid "Set the entry text"
 msgstr "Nustatyti įvedamą tekstą"
 
-#: src/option.c:302
+#: src/option.c:292
 msgid "Hide the entry text"
 msgstr "Paslėpti įvedamą tekstą"
 
-#: src/option.c:311
+#: src/option.c:302
 msgid "Display error dialog"
 msgstr "Parodyti klaidos dialogą"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Nustatyti dialogo piktogramą"
+#: src/option.c:316 src/option.c:370 src/option.c:575 src/option.c:674
+#: src/option.c:813
+msgid "Set the icon name"
+msgstr "Nustatyti piktogramos pavadinimą"
 
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
+#: src/option.c:317 src/option.c:324 src/option.c:371 src/option.c:378
+#: src/option.c:576 src/option.c:583 src/option.c:675 src/option.c:682
+#: src/option.c:814 src/option.c:821
 msgid "ICON-NAME"
 msgstr "PIKTOGRAMOS-PAVADINIMAS"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:323 src/option.c:377 src/option.c:582 src/option.c:681
+#: src/option.c:820
+msgid "DEPRECATED; use `--icon`"
+msgstr "PASENĘS; naudokite `--icon`"
+
+#: src/option.c:330 src/option.c:384 src/option.c:688 src/option.c:827
 msgid "Do not enable text wrapping"
 msgstr "Neįjungti teksto laužymo"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:337 src/option.c:391 src/option.c:695 src/option.c:834
 msgid "Do not enable Pango markup"
 msgstr "Neįjungti Pango ženklinimo"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:344 src/option.c:398 src/option.c:709 src/option.c:841
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
 msgstr ""
 "Įjungti teksto sutrumpinimą. Tai pataiso didelį lango dydį su ilgais tekstais"
 
-#: src/option.c:354
+#: src/option.c:356
 msgid "Display info dialog"
 msgstr "Parodyti informacinį langą"
 
-#: src/option.c:398
+#: src/option.c:410
 msgid "Display file selection dialog"
 msgstr "Parodyti failo pasirinkimo langą"
 
-#: src/option.c:405
+#: src/option.c:417
 msgid "Set the filename"
 msgstr "Nustatyti failo pavadinimą"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:418 src/option.c:736
 msgid "FILENAME"
 msgstr "FAILO-PAVADINIMAS"
 
-#: src/option.c:412
+#: src/option.c:424
 msgid "Allow multiple files to be selected"
 msgstr "Leisti parinkti kelis failus"
 
-#: src/option.c:419
+#: src/option.c:431
 msgid "Activate directory-only selection"
 msgstr "Įjungti tik-aplankų pasirinkimą"
 
-#: src/option.c:426
+#: src/option.c:438
 msgid "Activate save mode"
 msgstr "Įjungti saugų režimą"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:445 src/option.c:507 src/option.c:999
 msgid "Set output separator character"
 msgstr "Nustatyti išvedimo skiriamąjį simbolį"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:446 src/option.c:508 src/option.c:1000
 msgid "SEPARATOR"
 msgstr "SKIRTUKAS"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Patvirtinti failo pavadinimo pasirinkimą, jei toks jau egzistuoja"
-
-#: src/option.c:448
+#: src/option.c:452
 msgid "Set a filename filter"
 msgstr "Nustatyti failo pavadinimo filtrą"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:455
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "PAVADINIMAS | ŠABLONAS1 ŠABLONAS2 ..."
 
-#: src/option.c:460
+#: src/option.c:465
 msgid "Display list dialog"
 msgstr "Parodyti sąrašo dialogą"
 
-#: src/option.c:474
+#: src/option.c:479
 msgid "Set the column header"
 msgstr "Nustatyti stulpelio antraštę"
 
-#: src/option.c:475
+#: src/option.c:480
 msgid "COLUMN"
 msgstr "STULPELIS"
 
-#: src/option.c:481
+#: src/option.c:486
 msgid "Use check boxes for the first column"
 msgstr "Naudoti žymimuosius langelius pirmame stulpelyje"
 
-#: src/option.c:488
+#: src/option.c:493
 msgid "Use radio buttons for the first column"
 msgstr "Naudoti radio mygtukus pirmame stulpelyje"
 
-#: src/option.c:495
+#: src/option.c:500
 msgid "Use an image for the first column"
 msgstr "Pirmam stulpeliui naudoti paveikslėlį"
 
-#: src/option.c:509
+#: src/option.c:514
 msgid "Allow multiple rows to be selected"
 msgstr "Leisti parinkti kelias eilutes"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:521 src/option.c:742
 msgid "Allow changes to text"
 msgstr "Leisti keisti tekstą"
 
-#: src/option.c:523
+#: src/option.c:528
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -375,109 +332,101 @@ msgstr ""
 "stulpeliams gali būti naudojama „ALL“)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:531 src/option.c:538
 msgid "NUMBER"
 msgstr "SKAIČIUS"
 
-#: src/option.c:532
+#: src/option.c:537
 msgid "Hide a specific column"
 msgstr "Paslėpti specifinį stulpelį"
 
-#: src/option.c:539
+#: src/option.c:544
 msgid "Hide the column headers"
 msgstr "Slėpti stulpelių antraštes"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Pakeisti numatytąją teksto paieškos funkciją į paiešką viduryje, o ne "
-"pradžioje"
+#: src/option.c:551
+msgid "DEPRECATED; does nothing"
+msgstr "PASENĘS; nieko nedaro"
 
-#: src/option.c:557
+#: src/option.c:561
 msgid "Display notification"
 msgstr "Parodyti pranešimą"
 
-#: src/option.c:564
+#: src/option.c:568
 msgid "Set the notification text"
 msgstr "Nustatyti pranešimo tekstą"
 
-#: src/option.c:571
+#: src/option.c:589
 msgid "Listen for commands on stdin"
 msgstr "Laukti komandų iš stdin"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Nustatyti pranešimo patarimus"
-
-#: src/option.c:590
+#: src/option.c:599
 msgid "Display progress indication dialog"
 msgstr "Parodyti proceso eigos dialogą"
 
-#: src/option.c:604
+#: src/option.c:613
 msgid "Set initial percentage"
 msgstr "Nustatyti pradinę procentinę vertę"
 
-#: src/option.c:605
+#: src/option.c:614
 msgid "PERCENTAGE"
 msgstr "PROCENTAS"
 
-#: src/option.c:611
+#: src/option.c:620
 msgid "Pulsate progress bar"
 msgstr "Keisti progreso juostą"
 
-#: src/option.c:619
+#: src/option.c:628
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Pašalinti dialogą pasiekus 100%"
 
-#: src/option.c:626
+#: src/option.c:635
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Užbaigti tėvinį procesą, jei paspaudžiamas  mygtukas „Atsisakyti“"
 
-#: src/option.c:633
+#: src/option.c:642
 msgid "Hide Cancel button"
 msgstr "Slėpti mygtuką „Atsisakyti“"
 
-#: src/option.c:641
+#: src/option.c:650
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Įvertinimas, kada eiga pasieks 100%"
 
-#: src/option.c:650
+#: src/option.c:660
 msgid "Display question dialog"
 msgstr "Parodyti užklausimo dialogą"
 
-#: src/option.c:684
+#: src/option.c:702
 msgid "Give Cancel button focus by default"
 msgstr "Numatytai aktyvinti atsisakymo mygtuką"
 
-#: src/option.c:698
+#: src/option.c:718
 msgid "Suppress OK and Cancel buttons"
 msgstr "Slėpti mygtukus „Gerai“ ir „Atsisakyti“"
 
-#: src/option.c:708
+#: src/option.c:728
 msgid "Display text information dialog"
 msgstr "Parodyti tekstinės informacijos dialogą"
 
-#: src/option.c:715
+#: src/option.c:735
 msgid "Open file"
 msgstr "Atverti failą"
 
-#: src/option.c:729
+#: src/option.c:749
 msgid "Set the text font"
 msgstr "Nustatyti teksto šriftą"
 
-#: src/option.c:736
+#: src/option.c:756
 msgid "Enable an I read and agree checkbox"
 msgstr "Įjungti perskaitymo ir sutikimo langelį"
 
-#: src/option.c:744
+#: src/option.c:764
 msgid "Enable HTML support"
 msgstr "Įjungti HTML palaikymą"
 
-#: src/option.c:751
+#: src/option.c:771
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -485,313 +434,319 @@ msgstr ""
 "Neįjungti naudotojo darbo su WebView. Veikia tik jei naudojamas --html "
 "parametras"
 
-#: src/option.c:759
+#: src/option.c:779
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Nustatyti URL vietoj failo. Veikia tik jei naudojamas parametras --html"
 
-#: src/option.c:761
+#: src/option.c:781
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:788
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Automatiškai slinkti tekstą į pabaigą. Tik kai tekstas gaunamas iš stdin"
 
-#: src/option.c:778
+#: src/option.c:799
 msgid "Display warning dialog"
 msgstr "Parodyti perspėjimo langą"
 
-#: src/option.c:821
+#: src/option.c:853
 msgid "Display scale dialog"
 msgstr "Parodyti skalės dialogą"
 
-#: src/option.c:835
+#: src/option.c:867
 msgid "Set initial value"
 msgstr "Nustatyti pradinę reikšmę"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:868 src/option.c:875 src/option.c:882 src/option.c:889
+#: src/option.c:1041
 msgid "VALUE"
 msgstr "REIKŠMĖ"
 
-#: src/option.c:842
+#: src/option.c:874
 msgid "Set minimum value"
 msgstr "Nustatyti minimalią reikšmę"
 
-#: src/option.c:849
+#: src/option.c:881
 msgid "Set maximum value"
 msgstr "Nustatyti maksimalią reikšmę"
 
-#: src/option.c:856
+#: src/option.c:888
 msgid "Set step size"
 msgstr "Nustatyti žingsnelio dydį"
 
-#: src/option.c:863
+#: src/option.c:895
 msgid "Print partial values"
 msgstr "Spaudinti dalines reikšmes"
 
-#: src/option.c:870
+#: src/option.c:902
 msgid "Hide value"
 msgstr "Paslėpti reikšmę"
 
-#: src/option.c:879
+#: src/option.c:912
 msgid "Display forms dialog"
 msgstr "Parodyti formų dialogą"
 
-#: src/option.c:886
+#: src/option.c:919
 msgid "Add a new Entry in forms dialog"
 msgstr "Pridėti naują įvedimo elementą formų dialoge"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:920 src/option.c:927
 msgid "Field name"
 msgstr "Lauko reikšmė"
 
-#: src/option.c:893
+#: src/option.c:926
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Pridėti naują slaptažodžio lauką formų dialoge"
 
-#: src/option.c:900
+#: src/option.c:933
 msgid "Add a new Calendar in forms dialog"
 msgstr "Pridėti naują kalendorių formų dialoge"
 
-#: src/option.c:901
+#: src/option.c:934
 msgid "Calendar field name"
 msgstr "Kalendoriaus lauko pavadinimas"
 
-#: src/option.c:907
+#: src/option.c:940
 msgid "Add a new List in forms dialog"
 msgstr "Formų dialoge pridėti naują sąrašą"
 
-#: src/option.c:908
+#: src/option.c:941
 msgid "List field and header name"
 msgstr "Parodyti laukelių ir antraščių sąrašą"
 
-#: src/option.c:914
+#: src/option.c:947
 msgid "List of values for List"
 msgstr "Sąrašo reikšmių sąrašas"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:948 src/option.c:955 src/option.c:969
 msgid "List of values separated by |"
 msgstr "Reikšmių sąrašas atskirtas „|“"
 
-#: src/option.c:921
+#: src/option.c:954
 msgid "List of values for columns"
 msgstr "Stulpelių reikšmių sąrašas"
 
-#: src/option.c:928
+#: src/option.c:961
 msgid "Add a new combo box in forms dialog"
 msgstr "Formų dialoge pridėti naują sąrašo elementą"
 
-#: src/option.c:929
+#: src/option.c:962
 msgid "Combo box field name"
 msgstr "Sąrašo elemento lauko pavadinimas"
 
-#: src/option.c:935
+#: src/option.c:968
 msgid "List of values for combo box"
 msgstr "Verčių sąrašas sąrašo elemento"
 
-#: src/option.c:952
+#: src/option.c:985
 msgid "Show the columns header"
 msgstr "Rodyti stulpelių antraštes"
 
-#: src/option.c:983
+#: src/option.c:1016
 msgid "Display password dialog"
 msgstr "Parodyti slaptažodžio pranešimą"
 
-#: src/option.c:990
+#: src/option.c:1023
 msgid "Display the username option"
 msgstr "Parodyti naudotojo vardo parametrą"
 
-#: src/option.c:1000
+#: src/option.c:1033
 msgid "Display color selection dialog"
 msgstr "Parodyti spalvos pasirinkimo dialogą"
 
-#: src/option.c:1007
+#: src/option.c:1040
 msgid "Set the color"
 msgstr "Nustatyti spalvą"
 
-#: src/option.c:1014
+#: src/option.c:1047
 msgid "Show the palette"
 msgstr "Rodyti paletę"
 
-#: src/option.c:1023
+#: src/option.c:1057
 msgid "About zenity"
 msgstr "Apie zenity"
 
-#: src/option.c:1030
+#: src/option.c:1064
 msgid "Print version"
 msgstr "Parodyti versiją"
 
-#: src/option.c:1913
+#: src/option.c:1478
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Įspėjimas: --window-icon yra pasenęs ir bus pašalintas ateities zeniti "
+"versijose. Nepaisoma.\n"
+
+#: src/option.c:2000
 msgid "General options"
 msgstr "Bendriniai parametrai"
 
-#: src/option.c:1914
+#: src/option.c:2001
 msgid "Show general options"
 msgstr "Rodyti bendrus parametrus"
 
-#: src/option.c:1926
+#: src/option.c:2013
 msgid "Calendar options"
 msgstr "Kalendoriaus parametrai"
 
-#: src/option.c:1927
+#: src/option.c:2014
 msgid "Show calendar options"
 msgstr "Rodyti kalendoriaus parametrus"
 
-#: src/option.c:1939
+#: src/option.c:2026
 msgid "Text entry options"
 msgstr "Teksto įvedimo parametrai"
 
-#: src/option.c:1940
+#: src/option.c:2027
 msgid "Show text entry options"
 msgstr "Rodyti teksto įvedimo parametrus"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Error options"
 msgstr "Klaidų parametrai"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Show error options"
 msgstr "Rodyti klaidų parametrus"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Info options"
 msgstr "Informacijos parametrai"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Show info options"
 msgstr "Rodyti informacijos parametrus"
 
-#: src/option.c:1972
+#: src/option.c:2059
 msgid "File selection options"
 msgstr "Failų parinkimo parametrai"
 
-#: src/option.c:1973
+#: src/option.c:2060
 msgid "Show file selection options"
 msgstr "Rodyti failų parinkimo parametrus"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "List options"
 msgstr "Sąrašų parametrai"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "Show list options"
 msgstr "Rodyti sąrašų parametrus"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Pranešimų piktogramos parametrai"
+#: src/option.c:2082
+msgid "Notification options"
+msgstr "Pranešimo parametrai"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Rodyti pranešimų piktogramos parametrus"
+#: src/option.c:2083
+msgid "Show notification options"
+msgstr "Rodyti pranešimų parametrus"
 
-#: src/option.c:2011
+#: src/option.c:2096
 msgid "Progress options"
 msgstr "Progreso būklės parametrai"
 
-#: src/option.c:2012
+#: src/option.c:2097
 msgid "Show progress options"
 msgstr "Rodyti progreso būklės parametrus"
 
-#: src/option.c:2024
+#: src/option.c:2109
 msgid "Question options"
 msgstr "Užklausų parametrai"
 
-#: src/option.c:2025
+#: src/option.c:2110
 msgid "Show question options"
 msgstr "Rodyti užklausų parametrus"
 
-#: src/option.c:2037
+#: src/option.c:2122
 msgid "Warning options"
 msgstr "Perspėjimų parametrai"
 
-#: src/option.c:2038
+#: src/option.c:2123
 msgid "Show warning options"
 msgstr "Rodyti perspėjimų parametrus"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Scale options"
 msgstr "Skalės parametrai"
 
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Show scale options"
 msgstr "Rodyti skalės parametrus"
 
-#: src/option.c:2060
+#: src/option.c:2145
 msgid "Text information options"
 msgstr "Teksto informacijos parametrai"
 
-#: src/option.c:2061
+#: src/option.c:2146
 msgid "Show text information options"
 msgstr "Rodyti teksto informacijos parametrus"
 
-#: src/option.c:2073
+#: src/option.c:2158
 msgid "Color selection options"
 msgstr "Spalvų parinkimo parametrai"
 
-#: src/option.c:2074
+#: src/option.c:2159
 msgid "Show color selection options"
 msgstr "Rodyti spalvų parinkimo parametrus"
 
-#: src/option.c:2086
+#: src/option.c:2171
 msgid "Password dialog options"
 msgstr "Slaptažodžių dialogo parametrai"
 
-#: src/option.c:2087
+#: src/option.c:2172
 msgid "Show password dialog options"
 msgstr "Rodyti slaptažodžių dialogo parametrus"
 
-#: src/option.c:2099
+#: src/option.c:2184
 msgid "Forms dialog options"
 msgstr "Formų dialogo parametrai"
 
-#: src/option.c:2100
+#: src/option.c:2185
 msgid "Show forms dialog options"
 msgstr "Rodyti formų dialogo parametrus"
 
-#: src/option.c:2112
+#: src/option.c:2197
 msgid "Miscellaneous options"
 msgstr "Kiti parametrai"
 
-#: src/option.c:2113
+#: src/option.c:2198
 msgid "Show miscellaneous options"
 msgstr "Rodyti kitus parametrus"
 
-#: src/option.c:2139
+#: src/option.c:2221
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr "Šis parametras negalimas. Pažiūrėkite --help panaudojimo variantus.\n"
 
-#: src/option.c:2144
+#: src/option.c:2226
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s nepalaikomas šiam dialogui\n"
 
-#: src/option.c:2148
+#: src/option.c:2230
 msgid "Two or more dialog options specified\n"
 msgstr "Nurodytas daugiau nei vienas dialogo parametras\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Įveskite savo slaptažodį"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Įveskite savo naudotojo vardą ir slaptažodį"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Liko: %lu:%02lu:%02lu"
@@ -800,101 +755,180 @@ msgstr "Liko: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Maksimali reikšmė turi būti didesnė už minimalią reikšmę.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Reikšmė yra už ribų.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Įspėjimas: --mid-search yra pasenęs ir bus pašalintas ateities zeniti "
+"versijose. Nepaisoma.\n"
+
+#: src/tree.c:278
 msgid "No column titles specified for List dialog.\n"
 msgstr "Sąrašo dialoge nenurodytos stulpelių antraštės.\n"
 
-#: src/tree.c:399
+#: src/tree.c:285
 msgid "You should use only one List dialog type.\n"
 msgstr "Jūs turėtumėte naudoti tik vieną sąrašo dialogo tipą.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "Piktogramos failo pavadinimas %s nerastas; bandoma temos piktograma."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Koreguoti skalės reikšmę"
 
-#: 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 "Atsisakyti"
-
-#: 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 "Gerai"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Tekstinė peržiūra"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Kalendoriaus pasirinkimas"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Pasirinkite datą žemiau esančiuose laukuose."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "K_alendorius:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Kalendorius"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Pridėti naują įrašą"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "Įveskite _naują tekstą:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Klaida"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Įvyko klaida."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Formų dialogas"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Informacija"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Visi atnaujinimai užbaigti."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Progresas"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Dirbama..."
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Klausimas"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Ne"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Taip"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Ar Jūs tikrai norite tęsti?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Pasirinkite sąrašo elementus"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Pasirinkite elementus iš žemiau esančio sąrašo."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Perspėjimas"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Įveskite savo slaptažodį"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Paskutinysis vertėjas:\n"
+#~ "Aurimas Černius <aurisc4@gmail.com>,\n"
+#~ "\n"
+#~ "Ankstesnieji vertėjai:\n"
+#~ "Gintautas Miliauskas <gintas@akl.lt>,\n"
+#~ "Žygimantas Beručka <uid0@akl.lt>,\n"
+#~ "Tomas Kuliavas <tokul@users.sourceforge.net>,\n"
+#~ "Justina Klingaitė <justina.klingaite@gmail.com>"
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "Netinkama vertė loginio tipo patarimui.\n"
+#~ "Galimos vertės yra „true“ ir „false“.\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "Nepalaikomas patarimas. Praleidžiama.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "Nežinomas patarimo pavadinimas. Praleidžiama.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "Zenity pranešimas"
+
+#~ msgid "Set the window icon"
+#~ msgstr "Nustatyti lango piktogramą"
+
+#~ msgid "ICONPATH"
+#~ msgstr "KELIAS-IKI-PIKTOGRAMOS"
+
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "Nustatyti tėvinį langą, prie kurio prikabinti"
+
+#~ msgid "WINDOW"
+#~ msgstr "LANGAS"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "Nustatyti dialogo piktogramą"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr "Patvirtinti failo pavadinimo pasirinkimą, jei toks jau egzistuoja"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr ""
+#~ "Pakeisti numatytąją teksto paieškos funkciją į paiešką viduryje, o ne "
+#~ "pradžioje"
+
+#~ msgid "Set the notification hints"
+#~ msgstr "Nustatyti pranešimo patarimus"
+
+#~ msgid "Cancel"
+#~ msgstr "Atsisakyti"
+
+#~ msgid "OK"
+#~ msgstr "Gerai"
diff --git a/po/pl.po b/po/pl.po
index 90debd30..ca096a15 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,19 +1,18 @@
 # Polish translation for zenity.
-# Copyright © 2003-2017 the zenity authors.
+# Copyright © 2003-2023 the zenity authors.
 # This file is distributed under the same license as the zenity package.
 # Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 2003.
 # Artur Flinta <aflinta@at.kernel.pl>, 2003-2007.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2017.
-# Aviary.pl <community-poland@mozilla.org>, 2008-2017.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2023.
+# Aviary.pl <community-poland@mozilla.org>, 2008-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-26 20:40+0000\n"
-"PO-Revision-Date: 2017-11-26 21:45+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2023-04-28 19:28+0000\n"
+"PO-Revision-Date: 2023-04-30 12:35+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -23,7 +22,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Wyświetlanie okien dialogowych z wiersza poleceń"
+
+#: src/about.c:54
 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 "
@@ -36,7 +43,7 @@ msgstr ""
 "Foundation) — według wersji drugiej tej Licencji lub którejś z późniejszych "
 "wersji.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -49,7 +56,7 @@ msgstr ""
 "bliższych informacji należy zapoznać się z Pomniejszą Powszechną Licencją "
 "Publiczną GNU.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -60,219 +67,182 @@ msgstr ""
 "License); jeśli nie — proszę napisać do Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 2003\n"
-"Artur Flinta <aflinta@at.kernel.pl>, 2003-2007\n"
-"Tomasz Dominikowski <dominikowski@gmail.com>, 2008\n"
-"Piotr Drąg <piotrdrag@gmail.com>, 2010-2017\n"
-"Aviary.pl <community-poland@mozilla.org>, 2008-2017"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Wyświetla okna dialogowe z poziomu skryptów powłoki"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:415 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_OK"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:411 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Należy podać typ okna dialogowego. Polecenie „zenity --help” wyświetli "
 "więcej informacji\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Nie"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Tak"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Nie można przetworzyć wiadomości\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Nieprawidłowa wartość dla wskazówki w formie zmiennej logicznej.\n"
-"Obsługiwane wartości to „true” lub „false”.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Nieobsługiwana wskazówka. Pomijanie.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Nieznana nazwa wskazówki. Pomijanie.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Nie można przetworzyć polecenia ze standardowego wejścia\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Powiadomienie zenity"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "Ustawia tytuł okna dialogowego"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "TYTUŁ"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Ustawia ikonę okna"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "ŚCIEŻKA-IKONY"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "Ustawia szerokość"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "SZEROKOŚĆ"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "Ustawia wysokość"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "WYSOKOŚĆ"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "Ustawia czas wygasania okna dialogowego (w sekundach)"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "OGRANICZENIE-CZASU"
 
-#: src/option.c:200
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "Ustawia etykietę przycisku OK"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "TEKST"
 
-#: src/option.c:207
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "Ustawia etykietę przycisku Anuluj"
 
-#: src/option.c:214
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "Dodaje dodatkowy przycisk"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "Ustawia okno jako modalne"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Ustawia, do którego okna nadrzędnego dołączyć"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "PRZESTARZAŁE, nic nie robi"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "OKNO"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "PRZESTARZAŁE, należy używać „--icon”"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "NAZWA-IKONY"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "Wyświetla okno dialogowe kalendarza"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "Ustawia tekst w oknie dialogowym"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "Ustawia dzień w kalendarzu"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "DZIEŃ"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "Ustawia miesiąc w kalendarzu"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "MIESIĄC"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "Ustawia rok w kalendarzu"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "ROK"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "Ustawia format zwracanej daty"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "WZÓR"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Wyświetla okno dialogowe z polem wprowadzania tekstu"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "Ustawia tekst w polu tekstowym"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "Ukrywa tekst wprowadzany w polu"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "Wyświetla okno dialogowe błędu"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Ustawia ikonę okna dialogowego"
-
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "NAZWA-IKONY"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "Ustawia nazwę ikony"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "Bez włączania zawijania tekstu"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "Bez włączania znaczników biblioteki Pango"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -280,89 +250,85 @@ msgstr ""
 "Włącza skracanie tekstu okna dialogowego. Naprawia to duży rozmiar okna "
 "z długim tekstem"
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "Wyświetla informacyjne okno dialogowe"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "Wyświetla okno dialogowe wyboru pliku"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "Ustawia nazwę pliku"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "NAZWA-PLIKU"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "Zezwala na wybieranie wielu plików"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "Aktywuje wybór tylko katalogów"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "Aktywuje tryb awaryjny"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "Ustawia znak odstępu danych wyjściowych"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Potwierdzenie wyboru pliku, jeśli plik już istnieje"
-
-#: src/option.c:448
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "Ustawia filtr na nazwy plików"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAZWA | WZÓR1 WZÓR2…"
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "Wyświetla okno dialogowe listy"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "Ustawia nagłówek kolumny"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "KOLUMNA"
 
-#: src/option.c:481
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "Umieszcza przełączniki w pierwszej kolumnie"
 
-#: src/option.c:488
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "Umieszcza przyciski radiowe w pierwszej kolumnie"
 
-#: src/option.c:495
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "Umieszcza obraz w pierwszej kolumnie"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "Zezwala na wybieranie wielu wierszy"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "Zezwala na wprowadzanie zmian w tekście"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -371,109 +337,97 @@ msgstr ""
 "wszystkie kolumny)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "NUMER"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "Ukrywa podaną kolumnę"
 
-#: src/option.c:539
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "Ukrywa nagłówki kolumn"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Zmienia domyślną funkcję wyszukiwania listy na wyszukiwanie tekstu na "
-"środku, nie na początku"
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "Wyświetla powiadomienie"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "Ustawia tekst powiadomienia"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "Oczekuje na polecenia ze standardowego wejścia"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Ustawia wskazówki powiadomienia"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "Wyświetla okno dialogowe z paskiem postępu"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "Ustawia początkową wartość w procentach"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "PROCENT"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "Odbijający się prostokąt w pasku stanu"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Zamknięcie okna po osiągnięciu 100%"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Kończy proces nadrzędny w przypadku naciśnięcia przycisku Anuluj"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "Ukrywa przycisk Anuluj"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Szacuje, kiedy postęp osiągnie 100%"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "Wyświetla okno dialogowe z pytaniem"
 
-#: src/option.c:684
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "Domyślnie aktywuje przycisk Anuluj"
 
-#: src/option.c:698
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "Bez przycisków OK i Anuluj"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "Wyświetla okno dialogowe z ramką tekstową"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "Otwiera plik"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "Ustawia czcionkę tekstu"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "Włącza pole wyboru „Przeczytałam i zgadzam się”"
 
-#: src/option.c:744
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "Włącza obsługę HTML"
 
-#: src/option.c:751
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -481,315 +435,353 @@ msgstr ""
 "Nie włącza interakcji użytkownika za pomocą WebView. Działa tylko, jeśli "
 "użyto opcji --html"
 
-#: src/option.c:759
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Ustawia adres URL zamiast pliku. Działa tylko, jeśli użyto opcji --html"
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "Adres URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Automatyczne przewijanie tekstu do końca. Tylko, kiedy tekst jest "
 "przechwytywany ze standardowego wejścia"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "Wyświetla okno dialogowe z ostrzeżeniem"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "Wyświetla okno dialogowe z podziałką"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "Ustawia wartość początkową"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "WARTOŚĆ"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "Ustawia wartość minimalną"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "Ustawia wartość maksymalną"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "Ustawia rozmiar kroku"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "Wyświetla wartości częściowe"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "Ukrywa wartość"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
 msgstr "Wyświetla okno formularzy"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
 msgstr "Dodanie nowego wpisu w oknie formularzy"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "Nazwa pola"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Dodanie nowego wpisu hasła w oknie formularzy"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
 msgstr "Dodanie nowego kalendarza w oknie formularzy"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "Nazwa pola kalendarza"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
 msgstr "Dodanie nowej listy w oknie formularzy"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "Nazwa pola i nagłówka listy"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "Lista wartości dla listy"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "Lista wartości oddzielanych |"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "Lista wartości dla kolumn"
 
-#: src/option.c:928
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
 msgstr "Dodanie nowego pola rozwijanego w oknie formularzy"
 
-#: src/option.c:929
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "Nazwa pola rozwijanego"
 
-#: src/option.c:935
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "Lista wartości dla pola rozwijanego"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "Wyświetla nagłówek kolumny"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "Wyświetla okno dialogowe hasła"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "Wyświetla opcję nazwy użytkownika"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "Wyświetla okno dialogowe wyboru koloru"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "Ustawia kolor"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
 msgstr "Wyświetla paletę"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
 msgstr "O programie Zenity"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "Wyświetla wersję programu"
 
-#: src/option.c:1913
+#: src/option.c:1080
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Ostrzeżenie: --icon-name jest przestarzałe i zostanie usunięte w przyszłej "
+"wersji Zenity, traktowanie jako --icon.\n"
+
+#: src/option.c:1087
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Ostrzeżenie: --window-icon jest przestarzałe i zostanie usunięte w przyszłej "
+"wersji Zenity, traktowanie jako --icon.\n"
+
+#: src/option.c:1094
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"Ostrzeżenie: --confirm-overwrite jest przestarzałe i zostanie usunięte "
+"w przyszłej wersji Zenity. Ignorowanie.\n"
+
+#: src/option.c:1101
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Ostrzeżenie: --attach jest przestarzałe i zostanie usunięte w przyszłej "
+"wersji Zenity. Ignorowanie.\n"
+
+#: src/option.c:1108
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Ostrzeżenie: --hint jest przestarzałe i zostanie usunięte w przyszłej wersji "
+"Zenity. Ignorowanie.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "Opcje ogólne"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "Wyświetla opcje ogólne"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "Opcje okna kalendarza"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "Wyświetla opcje okna kalendarza"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "Opcje okna wprowadzania tekstu"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "Wyświetla opcje okna wprowadzania tekstu"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "Opcje okna z komunikatem o błędzie"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "Wyświetla opcje okna z komunikatem o błędzie"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "Opcje okna informacyjnego"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "Wyświetla opcje okna informacyjnego"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "Opcje okna wyboru pliku"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "Wyświetla opcje okna wyboru pliku"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "Opcje okna listy"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "Wyświetla opcje okna listy"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Opcje ikony powiadomień"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "Opcje powiadomienia"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Wyświetla opcje ikony powiadomień"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "Wyświetla opcje powiadomienia"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "Opcje okna paska postępu"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "Wyświetla opcje okna paska postępu"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "Opcje okna pytania"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "Wyświetla opcje okna pytania"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "Opcje okna ostrzeżeń"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "Wyświetla opcje okna ostrzeżeń"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "Opcje podziałki"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "Wyświetla opcje podziałki"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "Opcje okna informacji tekstowych"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "Wyświetla opcje okna informacji tekstowych"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "Opcje wyboru koloru"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "Wyświetla opcje wyboru koloru"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "Opcje okna dialogowego hasła"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "Wyświetla opcje okna dialogowego hasła"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
 msgstr "Opcje okna formularzy"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
 msgstr "Wyświetla opcje okna formularzy"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "Różne opcje"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "Wyświetla różne opcje"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Ta opcja nie jest dostępna. Opcja --help wyświetli wszystkie możliwości.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "Opcja --%s nie jest obsługiwana przez to okno dialogowe\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 msgid "Two or more dialog options specified\n"
 msgstr "Podano więcej niż jedną opcję okna dialogowego\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Proszę wprowadzić hasło"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Proszę wprowadzić nazwę użytkownika i hasło"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Pozostały czas: %lu∶%02lu∶%02lu"
@@ -798,101 +790,119 @@ msgstr "Pozostały czas: %lu∶%02lu∶%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Wartość maksymalna musi być większa od minimalnej.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Wartość poza zakresem.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Ostrzeżenie: --mid-search jest przestarzałe i zostanie usunięte w przyszłej "
+"wersji Zenity. Ignorowanie.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr "Nie podano tytułów kolumn dla okna dialogowego listy.\n"
 
-#: src/tree.c:399
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "Należy używać tylko jednego rodzaju okna dialogowego listy.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "Nie odnaleziono nazwy pliku ikony %s, próbowanie ikony motywu."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Dopasowanie wartości podziałki"
 
-#: 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 "Anuluj"
-
-#: 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 "OK"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Okno tekstowe"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Wybór daty z kalendarza"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Proszę wybrać datę poniżej."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "_Kalendarz:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Kalendarz"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Dodanie nowego wpisu"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Nowy tekst:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Błąd"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Wystąpił błąd."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Okno formularzy"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Informacja"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Ukończono wszystkie aktualizacje."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Postęp"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Uruchamianie…"
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Pytanie"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Nie"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Tak"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Na pewno kontynuować?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Wybór elementów z listy"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Proszę wybrać elementy z poniższej listy."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Ostrzeżenie"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Proszę wprowadzić hasło"
diff --git a/po/ru.po b/po/ru.po
index 9ebad1f9..8133985f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
-"POT-Creation-Date: 2022-07-29 08:30+0000\n"
-"PO-Revision-Date: 2023-01-02 01:26+1000\n"
+"POT-Creation-Date: 2023-04-28 19:28+0000\n"
+"PO-Revision-Date: 2023-04-29 07:52+1000\n"
 "Last-Translator: Ser82-png <asvmail.as@gmail.com>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -26,7 +26,15 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: src/about.c:56
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Отображение диалоговых окон из командной строки"
+
+#: src/about.c:54
 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 "
@@ -38,240 +46,205 @@ msgstr ""
 "Foundation; либо версии 2 этой лицензии, либо (на ваш выбор) любой более "
 "поздней версии.\n"
 
-#: src/about.c:61
+#: src/about.c:59
 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 "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
 "for more details.\n"
 msgstr ""
-"Данная программа распространяется в надежде, что он может быть полезен, но "
+"Данное приложение распространяется в надежде, что он может быть полезен, но "
 "БЕЗ КАКОГО-ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, "
 "НО НЕ ОГРАНИЧИВАЯСЬ ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И "
 "ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений "
 "обратитесь к универсальной общественной лицензии GNU.\n"
 
-#: src/about.c:65
+#: src/about.c:63
 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, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Вы должны получить копию лицензии GNU вместе c программой. Если лицензия не "
+"Вы должны получить копию лицензии GNU вместе c приложением. Если лицензия не "
 "была получена, известите об этом Фонд свободного программного обеспечения по "
 "адресу Free Software Foundation, Inc.: Franklin Street, Fifth Floor, Boston, "
 "MA 02110-1301, США."
 
-#: src/about.c:76
-msgid "translator-credits"
-msgstr ""
-"Станислав Соловей <whats_up@tut.by>, 2013-2019.\n"
-"Юрий Мясоедов <ymyasoedov@yandex.ru>, 2014.\n"
-"Alexey Rubtsov <rushills@gmail.com>, 2021"
-
-#: src/about.c:93
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
-msgstr "Программа для создания диалоговых окон из сценариев оболочки"
+msgstr "Отображение диалоговых окон из сценариев оболочки"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:415 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_ОК"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:411 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Укажите тип диалога. См. «zenity --help» для получения подробной информации\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Нет"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Да"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Не удалось разобрать сообщение\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Некорректное значение свойства логического типа.\n"
-"Возможные значения: «true» или «false».\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Неподдерживаемое свойство, пропускается.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Неизвестное имя свойства, пропускается.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Не удалось разобрать команду из стандартного ввода\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Уведомление Zenity"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "Установить заголовок диалога"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "ЗАГОЛОВОК"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Установить значок диалога"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "ПУТЬ_К_ЗНАЧКУ"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "Установить ширину"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "ШИРИНА"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "Установить высоту"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "ВЫСОТА"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "Установить задержку диалога в секундах"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "ЗАДЕРЖКА"
 
-#: src/option.c:200
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "Устанавливает метку для кнопки «ОК»"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "ТЕКСТ"
 
-#: src/option.c:207
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "Устанавливает метку для кнопки «Отменить»"
 
-#: src/option.c:214
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "Добавляет дополнительную кнопку"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "Установить модальное свойство"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Установить родительское окно для прикрепления"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "Устаревшее; ничего не делает"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "ОКНО"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "Устаревшее; используйте `--icon`"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "ИМЯ_ЗНАЧКА"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "Показать диалог выбора даты"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "Установить текст диалога"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "Установить день в календаре"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "ДЕНЬ"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "Установить месяц в календаре"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "МЕСЯЦ"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "Установить год в календаре"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "ГОД"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "Установить формат возвращаемой даты"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "ШАБЛОН"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Показать диалог с полем ввода"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "Установить текст для поля ввода"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "Скрывать текст в поле ввода"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "Показать диалог для вывода ошибки"
 
-#: 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:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "ИМЯ_ЗНАЧКА"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "Установить имя значка"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "Запретить перенос текста"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "Не включать разметку Pango"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -279,89 +252,85 @@ msgstr ""
 "Включить усечение текста в диалогах. Это функция уменьшает размер окна с "
 "длинным текстом"
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "Показать диалог для вывода информации"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "Показать диалог выбора файлов"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "Установить имя файла"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "ИМЯ_ФАЙЛА"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "Разрешить выбор нескольких файлов"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "Включить выделение только по каталогам"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "Включить безопасный режим"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "Установить выходной разделяющий символ"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "РАЗДЕЛИТЕЛЬ"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Подтверждать выбор файла, если имя файла уже существует"
-
-#: src/option.c:448
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "Устанавливает фильтр имён файлов"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "ИМЯ или ШАБЛОН1 ШАБЛОН2 …"
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "Показать диалог со списком"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "Установить заголовок столбца"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "СТОЛБЕЦ"
 
-#: src/option.c:481
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "Использовать флажки для первого столбца"
 
-#: src/option.c:488
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "Использовать переключатели для первого столбца"
 
-#: src/option.c:495
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "Использовать изображение для первого столбца"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "Разрешить выбор нескольких строк"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "Разрешить изменять текст"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -369,109 +338,97 @@ msgstr ""
 "Показать указанный столбец (по умолчанию — 1-й; «ALL» — показать все столбцы)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "ЧИСЛО"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "Скрыть указанный столбец"
 
-#: src/option.c:539
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "Скрыть заголовки столбцов"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Изменить функцию поисковой системы списка для поиска текста в середине, а не "
-"в начале"
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "Показать диалог уведомления"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "Установить текст уведомления"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "Выполнять команды со стандартного ввода"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Установить свойства уведомления"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "Показать диалог выполнения процесса"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "Указать начальный процент"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "ПРОЦЕНТЫ"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "Пульсирующий индикатор выполнения"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Закрыть диалог при достижении 100%"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Завершить родительский процесс, если нажата кнопка «Отменить»"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "Скрыть кнопку «Отменить»"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Расчётное время, когда прогресс достигнет 100%"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "Показать диалог с вопросом"
 
-#: src/option.c:684
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "Фокус по умолчанию находится на кнопке «Отменить»"
 
-#: src/option.c:698
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "Скрыть кнопки «ОК» и «Отменить»"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "Показать диалог с текстовой информацией"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "Установить шрифт текста"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "Включить кнопку с флагом «Я прочитал(а) и согласен(на)»"
 
-#: src/option.c:744
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "Включить поддержку HTML"
 
-#: src/option.c:751
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -479,315 +436,353 @@ msgstr ""
 "Запретить взаимодействие пользователя с WebView. Работает только с "
 "параметром --html"
 
-#: src/option.c:759
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr "Устанавливает вместо файла URL. Работает только с параметром --html"
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Автоматически прокручивать текст до конца. Только когда текст захвачен из "
 "стандартного ввода"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "Показать диалог с предупреждением"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "Показать диалоговое окно шкалы"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "Установить начальное значение"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "ЗНАЧЕНИЕ"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "Установить минимальное значение"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "Установить максимальное значение"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "Установить шаг"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "Печатать частичные значения"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "Скрыть величину"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
 msgstr "Показать диалог форм"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
 msgstr "Добавить новое поле в диалог форм"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "Название поля"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Добавить новое поле с паролем в диалог форм"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
 msgstr "Добавить новый календарь в диалог форм"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "Название поле календаря"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
 msgstr "Добавить новый список в диалог форм"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "Поле списка и название заголовка"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "Список значений для списка"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "Список значений, разделённых «|»"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "Список значений для столбцов"
 
-#: src/option.c:928
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
 msgstr "Добавить новый выпадающий список в диалог форм"
 
-#: src/option.c:929
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "Название поле выпадающего списка"
 
-#: src/option.c:935
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "Список значений для выпадающего списка"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "Показать заголовок столбцов"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "Показать диалог пароля"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "Показать параметр имени пользователя"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "Показать диалог выбора цвета"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "Установить цвет"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
 msgstr "Показать палитру цветов"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
-msgstr "О приложении Zenity"
+msgstr "О приложении"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "Вывести версию"
 
-#: src/option.c:1913
+#: src/option.c:1080
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Предупреждение: параметр --icon-name устарел и будет удален в будущей версии "
+"zenity. Обрабатывается как --icon.\n"
+
+#: src/option.c:1087
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Предупреждение: параметр --window-icon устарел и будет удален в будущей "
+"версии zenity. Обрабатывается как --icon.\n"
+
+#: src/option.c:1094
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"Предупреждение: параметр --confirm-overwrite устарел и будет удален в "
+"будущей версии zenity. Игнорирование.\n"
+
+#: src/option.c:1101
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Предупреждение: параметр --attach устарел и будет удален в будущей версии "
+"zenity. Игнорирование.\n"
+
+#: src/option.c:1108
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Предупреждение: параметр --hint устарел и будет удален в будущей версии "
+"zenity. Игнорирование.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "Общие параметры"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "Показать общие параметры"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "Параметры календаря"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "Показать параметры календаря"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "Параметры ввода текста"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "Показать параметры ввода текста"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "Параметры диалога вывода ошибки"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "Показать параметры диалога вывода ошибки"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "Параметры диалога вывода информации"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "Показать параметры диалога вывода информации"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "Параметры диалога выбора файла"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "Показать параметры диалога выбора файлов"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "Параметры списка"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "Показать параметры списка"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Параметры значка уведомления"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "Параметры уведомления"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Показать параметры значка уведомления"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "Показать параметры уведомления"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "Параметры хода процесса"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "Показать параметры хода процесса"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "Параметры запроса"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "Показать параметры запроса"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "Параметры диалога для вывода предупреждения"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "Показать параметры диалога для вывода предупреждения"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "Параметры шкалы"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "Показать параметры шкалы"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "Параметры текстовой информации"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "Показать параметры текстовой информации"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "Параметры выбора цвета"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "Показать параметры диалога выбора файлов"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "Параметры диалога ввода пароля"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "Показать параметры диалога ввода пароля"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
 msgstr "Параметры диалога форм"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
 msgstr "Показать параметры диалога форм"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "Прочие параметры"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "Показать прочие параметры"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Этот параметр недоступен. Используйте --help для просмотра всех возможных "
 "параметров.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s не поддерживается данным диалогом\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 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
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Введите имя пользователя и пароль"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Оставшееся время: %lu:%02lu:%02lu"
@@ -796,101 +791,172 @@ msgstr "Оставшееся время: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Максимальное значение должно быть больше, чем минимальное.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Значение за пределами диапазона.\n"
 
-#: src/tree.c:389
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Предупреждение: параметр --mid-search устарел и будет удален в будущей "
+"версии zenity. Игнорирование.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr "Для диалога со списком не указаны заголовки столбцов.\n"
 
-#: src/tree.c:395
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "Необходимо использовать только один тип диалога «Список».\n"
 
-#: src/zenity.ui:14 src/zenity.ui:77
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "Имя файла значка %s не найдено; пробуем значок темы."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Изменение значения шкалы"
 
-#: src/zenity.ui:30 src/zenity.ui:136 src/zenity.ui:248 src/zenity.ui:379
-#: src/zenity.ui:580 src/zenity.ui:787 src/zenity.ui:974
-msgid "Cancel"
-msgstr "Отменить"
-
-#: src/zenity.ui:44 src/zenity.ui:149 src/zenity.ui:262 src/zenity.ui:393
-#: src/zenity.ui:483 src/zenity.ui:593 src/zenity.ui:700 src/zenity.ui:801
-#: src/zenity.ui:988 src/zenity.ui:1085
-msgid "OK"
-msgstr "ОК"
-
-#: src/zenity.ui:118
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Текстовая область"
 
-#: src/zenity.ui:232
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Выбор даты"
 
-#: src/zenity.ui:299
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Выберите дату."
 
-#: src/zenity.ui:320
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "_Календарь:"
 
-#: src/zenity.ui:362
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Календарь"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Добавление нового поля"
 
-#: src/zenity.ui:429
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Введите новый текст:"
 
-#: src/zenity.ui:466
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/zenity.ui:532
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Произошла ошибка."
 
-#: src/zenity.ui:660
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Диалог форм"
 
-#: src/zenity.ui:683
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Информация"
 
-#: src/zenity.ui:744
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Все обновления завершены."
 
-#: src/zenity.ui:771
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Индикатор выполнения"
 
-#: src/zenity.ui:834
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Выполняется…"
 
-#: src/zenity.ui:885
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Вопрос"
 
-#: src/zenity.ui:933 src/zenity.ui:1131
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Нет"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Да"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Уверены, что хотите продолжить?"
 
-#: src/zenity.ui:957
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Выберите элементы из списка"
 
-#: src/zenity.ui:1019
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Выберите элементы из списка."
 
-#: src/zenity.ui:1068
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Предупреждение"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Введите пароль"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Станислав Соловей <whats_up@tut.by>, 2013-2019.\n"
+#~ "Юрий Мясоедов <ymyasoedov@yandex.ru>, 2014.\n"
+#~ "Alexey Rubtsov <rushills@gmail.com>, 2021"
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "Некорректное значение свойства логического типа.\n"
+#~ "Возможные значения: «true» или «false».\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "Неподдерживаемое свойство, пропускается.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "Неизвестное имя свойства, пропускается.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "Уведомление Zenity"
+
+#~ msgid "Set the window icon"
+#~ msgstr "Установить значок диалога"
+
+#~ msgid "ICONPATH"
+#~ msgstr "ПУТЬ_К_ЗНАЧКУ"
+
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "Установить родительское окно для прикрепления"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "Установить значок диалога"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr "Подтверждать выбор файла, если имя файла уже существует"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr ""
+#~ "Изменить функцию поисковой системы списка для поиска текста в середине, а "
+#~ "не в начале"
+
+#~ msgid "Set the notification hints"
+#~ msgstr "Установить свойства уведомления"
+
+#~ msgid "Cancel"
+#~ msgstr "Отменить"
+
+#~ msgid "OK"
+#~ msgstr "ОК"
diff --git a/po/sl.po b/po/sl.po
index 6678dcdd..79c34508 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,26 +6,35 @@
 # Matjaž Horvat <m@owca.info>, 2006.
 # Matic Žgur <mr.zgur@gmail.com>, 2007.
 # Matej Urbančič <mateju@svn.gnome.org>, 2008–2017.
+# Martin Srebotnjak <miles@filmsi.net>, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-12-30 18:24+0000\n"
-"PO-Revision-Date: 2017-12-31 11:11+0100\n"
-"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2023-02-04 17:46+0000\n"
+"PO-Revision-Date: 2023-02-12 18:19+0100\n"
+"Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 3.2.2\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+#, fuzzy
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Pokaži pogovorna okna iz ukazne vrstice"
+
+#: src/about.c:54
 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 "
@@ -37,7 +46,7 @@ msgstr ""
 "Free Software Foundation; bodisi različice 2 ali (po vaši izbiri) katerekoli "
 "poznejše različice.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -49,7 +58,7 @@ msgstr ""
 "UPORABO. Za več podrobnosti si glejte besedilo Splošnega javnega dovoljenja "
 "(GNU GPL).\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -59,218 +68,176 @@ msgstr ""
 "(GNU LGPL); v primeru, da ga niste, pišite na Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Matej Urbančič <mateju@svn.gnome.org>\n"
-"Matjaž Horvat\n"
-"Tilen Travnik\n"
-"Matic Žgur"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Pokaži pogovorna okna lupinskih skript"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:408 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "V _redu"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:404 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "Pre_kliči"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Določiti je treba vrsto pogovornega okna. Za podrobnosti si oglejte pomoč "
 "»zenity --help«\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Ne"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Da"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Sporočila ni mogoče razčleniti\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Neveljavna logična vrednost namiga.\n"
-"Dovoljeni vrednosti sta »prav« in »napak«.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Nepodprta vrsta namiga. Namig bo preskočen.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Neznano ime namiga. Namig bo preskočen.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Ukaza iz standardnega vhoda ni mogoče razčleniti.\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Obvestila Zenity"
-
-#: src/option.c:164
+#: src/option.c:166
 msgid "Set the dialog title"
 msgstr "Nastavi naziv pogovornega okna"
 
-#: src/option.c:165
+#: src/option.c:167
 msgid "TITLE"
 msgstr "NAZIV"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Nastavi ikono okna"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "POTIKONE"
-
-#: src/option.c:178
+#: src/option.c:173
 msgid "Set the width"
 msgstr "Nastavi širino"
 
-#: src/option.c:179
+#: src/option.c:174
 msgid "WIDTH"
 msgstr "ŠIRINA"
 
-#: src/option.c:185
+#: src/option.c:180
 msgid "Set the height"
 msgstr "Nastavi višino"
 
-#: src/option.c:186
+#: src/option.c:181
 msgid "HEIGHT"
 msgstr "VIŠINA"
 
-#: src/option.c:192
+#: src/option.c:187
 msgid "Set dialog timeout in seconds"
 msgstr "Nastavitev časovnega zamika pogovornega okna v sekundah"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:189
 msgid "TIMEOUT"
 msgstr "ZAKASNITEV"
 
-#: src/option.c:200
+#: src/option.c:195
 msgid "Set the label of the OK button"
 msgstr "Nastavi naziv gumba V redu"
 
-#: 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
+#: src/option.c:196 src/option.c:203 src/option.c:210 src/option.c:234
+#: src/option.c:279 src/option.c:286 src/option.c:310 src/option.c:364
+#: src/option.c:473 src/option.c:569 src/option.c:607 src/option.c:668
+#: src/option.c:750 src/option.c:757 src/option.c:807 src/option.c:861
+#: src/option.c:993
 msgid "TEXT"
 msgstr "BESEDILO"
 
-#: src/option.c:207
+#: src/option.c:202
 msgid "Set the label of the Cancel button"
 msgstr "Nastavi naziv gumba Prekliči"
 
-#: src/option.c:214
+#: src/option.c:209
 msgid "Add an extra button"
 msgstr "Dodaj dodatni gumb"
 
-#: src/option.c:221
+#: src/option.c:216
 msgid "Set the modal hint"
 msgstr "Nastavi splošni namig"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Nastavi nadrejeno okno za pripenjanje"
-
-#: src/option.c:229
-msgid "WINDOW"
-msgstr "OKNO"
-
-#: src/option.c:237
+#: src/option.c:226
 msgid "Display calendar dialog"
 msgstr "Pokaži pogovorno okno koledarja"
 
-#: 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
+#: src/option.c:233 src/option.c:278 src/option.c:309 src/option.c:363
+#: src/option.c:472 src/option.c:606 src/option.c:667 src/option.c:806
+#: src/option.c:860 src/option.c:992
 msgid "Set the dialog text"
 msgstr "Nastavi besedilo pogovornega okna"
 
-#: src/option.c:251
+#: src/option.c:240
 msgid "Set the calendar day"
 msgstr "Nastavi dan na koledarju"
 
-#: src/option.c:252
+#: src/option.c:241
 msgid "DAY"
 msgstr "DAN"
 
-#: src/option.c:258
+#: src/option.c:247
 msgid "Set the calendar month"
 msgstr "Nastavi mesec na koledarju"
 
-#: src/option.c:259
+#: src/option.c:248
 msgid "MONTH"
 msgstr "MESEC"
 
-#: src/option.c:265
+#: src/option.c:254
 msgid "Set the calendar year"
 msgstr "Nastavi leto na koledarju"
 
-#: src/option.c:266
+#: src/option.c:255
 msgid "YEAR"
 msgstr "LETO"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:261 src/option.c:1006
 msgid "Set the format for the returned date"
 msgstr "Nastavi oblikovanje vrnjenega datuma"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:262 src/option.c:1007
 msgid "PATTERN"
 msgstr "VZOREC"
 
-#: src/option.c:281
+#: src/option.c:271
 msgid "Display text entry dialog"
 msgstr "Pokaži pogovorno okno vnos besedila"
 
-#: src/option.c:295
+#: src/option.c:285
 msgid "Set the entry text"
 msgstr "Nastavi začetno besedilo"
 
-#: src/option.c:302
+#: src/option.c:292
 msgid "Hide the entry text"
 msgstr "Skrij začetno besedilo"
 
-#: src/option.c:311
+#: src/option.c:302
 msgid "Display error dialog"
 msgstr "Pokaži pogovorno okno napake"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Nastavi ikono pogovornega okna"
+#: src/option.c:316 src/option.c:370 src/option.c:575 src/option.c:674
+#: src/option.c:813
+msgid "Set the icon name"
+msgstr "Določite ime ikone"
 
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
+#: src/option.c:317 src/option.c:324 src/option.c:371 src/option.c:378
+#: src/option.c:576 src/option.c:583 src/option.c:675 src/option.c:682
+#: src/option.c:814 src/option.c:821
 msgid "ICON-NAME"
 msgstr "Ime ikone"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:323 src/option.c:377 src/option.c:582 src/option.c:681
+#: src/option.c:820
+msgid "DEPRECATED; use `--icon`"
+msgstr "OPUŠČENO; uporabite »--icon«"
+
+#: src/option.c:330 src/option.c:384 src/option.c:688 src/option.c:827
 msgid "Do not enable text wrapping"
 msgstr "Ne omogoči preloma besedila"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:337 src/option.c:391 src/option.c:695 src/option.c:834
 msgid "Do not enable Pango markup"
 msgstr "Ne omogoči oblikovanja Pango"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:344 src/option.c:398 src/option.c:709 src/option.c:841
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -278,89 +245,85 @@ msgstr ""
 "Omogoči okrajševanje besedil pogovornih oken. Možnost razreši velikosti oken "
 "z veliko besedila."
 
-#: src/option.c:354
+#: src/option.c:356
 msgid "Display info dialog"
 msgstr "Pokaži pogovorno okno podatkov"
 
-#: src/option.c:398
+#: src/option.c:410
 msgid "Display file selection dialog"
 msgstr "Pokaži pogovorno okno izbire datoteke"
 
-#: src/option.c:405
+#: src/option.c:417
 msgid "Set the filename"
 msgstr "Nastavi ime datoteke"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:418 src/option.c:736
 msgid "FILENAME"
 msgstr "Ime datoteke"
 
-#: src/option.c:412
+#: src/option.c:424
 msgid "Allow multiple files to be selected"
 msgstr "Dovoli izbrati več datotek"
 
-#: src/option.c:419
+#: src/option.c:431
 msgid "Activate directory-only selection"
 msgstr "Omogoči izbor le map"
 
-#: src/option.c:426
+#: src/option.c:438
 msgid "Activate save mode"
 msgstr "Omogoči način shranjevanja"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:445 src/option.c:507 src/option.c:999
 msgid "Set output separator character"
 msgstr "Nastavi znak za ločevanje izhoda"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:446 src/option.c:508 src/option.c:1000
 msgid "SEPARATOR"
 msgstr "LOČILNIK"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Potrdi izbor datotek, v kolikor ime datoteke že obstaja"
-
-#: src/option.c:448
+#: src/option.c:452
 msgid "Set a filename filter"
 msgstr "Nastavi filter imen datotek"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:455
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "IME | VZOREC1 VZOREC2 ..."
 
-#: src/option.c:460
+#: src/option.c:465
 msgid "Display list dialog"
 msgstr "Pokaži pogovorno okno seznama"
 
-#: src/option.c:474
+#: src/option.c:479
 msgid "Set the column header"
 msgstr "Nastavi glavo stolpca"
 
-#: src/option.c:475
+#: src/option.c:480
 msgid "COLUMN"
 msgstr "STOLPEC"
 
-#: src/option.c:481
+#: src/option.c:486
 msgid "Use check boxes for the first column"
 msgstr "Uporabi označna polja za prvi stolpec"
 
-#: src/option.c:488
+#: src/option.c:493
 msgid "Use radio buttons for the first column"
 msgstr "Uporabi izbirne gumbe za prvi stolpec"
 
-#: src/option.c:495
+#: src/option.c:500
 msgid "Use an image for the first column"
 msgstr "Uporabi sliko za prvi stolpec"
 
-#: src/option.c:509
+#: src/option.c:514
 msgid "Allow multiple rows to be selected"
 msgstr "Dovoli izbor več vrstic"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:521 src/option.c:742
 msgid "Allow changes to text"
 msgstr "Dovoli spremembe v besedilu"
 
-#: src/option.c:523
+#: src/option.c:528
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -369,109 +332,101 @@ msgstr ""
 "stolpcev lahko uporabite 'ALL')"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:531 src/option.c:538
 msgid "NUMBER"
 msgstr "ŠTEVILKA"
 
-#: src/option.c:532
+#: src/option.c:537
 msgid "Hide a specific column"
 msgstr "Skrij določen stolpec"
 
-#: src/option.c:539
+#: src/option.c:544
 msgid "Hide the column headers"
 msgstr "Skrij glave stolpcev"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Spremeni seznam privzetih iskalnih funkcij za besedilo na sredini in ne na "
-"začetku."
+#: src/option.c:551
+msgid "DEPRECATED; does nothing"
+msgstr "OPUŠČENO; ne stori ničesar"
 
-#: src/option.c:557
+#: src/option.c:561
 msgid "Display notification"
 msgstr "Pokaži obvestilo"
 
-#: src/option.c:564
+#: src/option.c:568
 msgid "Set the notification text"
 msgstr "Nastavi besedilo obvestila"
 
-#: src/option.c:571
+#: src/option.c:589
 msgid "Listen for commands on stdin"
 msgstr "Poslušaj ukaze na stdin"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Nastavi besedila namigov obvestil"
-
-#: src/option.c:590
+#: src/option.c:599
 msgid "Display progress indication dialog"
 msgstr "Pokaži pogovorno okno napredka opravila"
 
-#: src/option.c:604
+#: src/option.c:613
 msgid "Set initial percentage"
 msgstr "Nastavi začetni odstotek"
 
-#: src/option.c:605
+#: src/option.c:614
 msgid "PERCENTAGE"
 msgstr "ODSTOTEK"
 
-#: src/option.c:611
+#: src/option.c:620
 msgid "Pulsate progress bar"
 msgstr "Vrstica napredka naj utripa"
 
-#: src/option.c:619
+#: src/option.c:628
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Opusti pogovorno okno, ko je doseženih 100%"
 
-#: src/option.c:626
+#: src/option.c:635
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Uniči nadrejeno opravilo, kadar je pritisnjen gumb za preklic"
 
-#: src/option.c:633
+#: src/option.c:642
 msgid "Hide Cancel button"
 msgstr "Skrij gumb za preklic"
 
-#: src/option.c:641
+#: src/option.c:650
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Oceni, kdaj bo napredek dosegel vrednost 100 %."
 
-#: src/option.c:650
+#: src/option.c:660
 msgid "Display question dialog"
 msgstr "Pokaži pogovorno okno vprašanja"
 
-#: src/option.c:684
+#: src/option.c:702
 msgid "Give Cancel button focus by default"
 msgstr "Gumb Prekliči naj bo privzeto v žarišču"
 
-#: src/option.c:698
+#: src/option.c:718
 msgid "Suppress OK and Cancel buttons"
 msgstr "Prepreči delovanje gumbov V redu in Prekliči"
 
-#: src/option.c:708
+#: src/option.c:728
 msgid "Display text information dialog"
 msgstr "Pokaži pogovorno okno podatkov o besedilu"
 
-#: src/option.c:715
+#: src/option.c:735
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: src/option.c:729
+#: src/option.c:749
 msgid "Set the text font"
 msgstr "Določitev pisave besedila"
 
-#: src/option.c:736
+#: src/option.c:756
 msgid "Enable an I read and agree checkbox"
 msgstr "Omogoči označna polja potrditve strinjanja in branja"
 
-#: src/option.c:744
+#: src/option.c:764
 msgid "Enable HTML support"
 msgstr "Omogoči podporo HTML"
 
-#: src/option.c:751
+#: src/option.c:771
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -479,322 +434,329 @@ msgstr ""
 "Ne omogoči interakcije uporabnika z WebView. Možnost deluje le, če je "
 "izbrana možnost --html."
 
-#: src/option.c:759
+#: src/option.c:779
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Nastavi naslov URL namesto datoteke. Deluje le z uporabo možnosti --html"
 
-#: src/option.c:761
+#: src/option.c:781
 msgid "URL"
 msgstr "Naslov URL"
 
-#: src/option.c:768
+#: src/option.c:788
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Samodejno zdrsi besedilo do konca. Le kadar je besedilo zajeto preko "
 "standardnega vhoda"
 
-#: src/option.c:778
+#: src/option.c:799
 msgid "Display warning dialog"
 msgstr "Pokaži pogovorno okno opozorila"
 
-#: src/option.c:821
+#: src/option.c:853
 msgid "Display scale dialog"
 msgstr "Pokaži pogovorno okno merila"
 
-#: src/option.c:835
+#: src/option.c:867
 msgid "Set initial value"
 msgstr "Nastavi začetno vrednost"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:868 src/option.c:875 src/option.c:882 src/option.c:889
+#: src/option.c:1041
 msgid "VALUE"
 msgstr "VREDNOST"
 
-#: src/option.c:842
+#: src/option.c:874
 msgid "Set minimum value"
 msgstr "Nastavi najmanjšo vrednost"
 
-#: src/option.c:849
+#: src/option.c:881
 msgid "Set maximum value"
 msgstr "Nastavi največjo vrednost"
 
-#: src/option.c:856
+#: src/option.c:888
 msgid "Set step size"
 msgstr "Nastavi velikost koraka"
 
-#: src/option.c:863
+#: src/option.c:895
 msgid "Print partial values"
 msgstr "Natisni delne vrednosti"
 
-#: src/option.c:870
+#: src/option.c:902
 msgid "Hide value"
 msgstr "Skrij vrednost"
 
-#: src/option.c:879
+#: src/option.c:912
 msgid "Display forms dialog"
 msgstr "Pokaži pogovorno okno obrazca"
 
-#: src/option.c:886
+#: src/option.c:919
 msgid "Add a new Entry in forms dialog"
 msgstr "Dodaj nov vnos v pogovorno okno obrazca"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:920 src/option.c:927
 msgid "Field name"
 msgstr "Ime polja"
 
-#: src/option.c:893
+#: src/option.c:926
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Dodaj nov vnos gesla v pogovorno okno obrazca"
 
-#: src/option.c:900
+#: src/option.c:933
 msgid "Add a new Calendar in forms dialog"
 msgstr "Dodaj nov koledar v pogovorno okno obrazca"
 
 # G:7 K:2 O:4
-#: src/option.c:901
+#: src/option.c:934
 msgid "Calendar field name"
 msgstr "Ime polja koledarja"
 
-#: src/option.c:907
+#: src/option.c:940
 msgid "Add a new List in forms dialog"
 msgstr "Dodaj nov seznam v pogovorno okno obrazca"
 
-#: src/option.c:908
+#: src/option.c:941
 msgid "List field and header name"
 msgstr "Polje seznama in ime glave"
 
-#: src/option.c:914
+#: src/option.c:947
 msgid "List of values for List"
 msgstr "Seznam vrednosti za seznam"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:948 src/option.c:955 src/option.c:969
 msgid "List of values separated by |"
 msgstr "Seznam vrednosti ločen z znakom |"
 
-#: src/option.c:921
+#: src/option.c:954
 msgid "List of values for columns"
 msgstr "Seznam vrednosti za stolpce"
 
-#: src/option.c:928
+#: src/option.c:961
 msgid "Add a new combo box in forms dialog"
 msgstr "Dodaj novo spustno polje v pogovorno okno obrazca"
 
 # G:7 K:2 O:4
-#: src/option.c:929
+#: src/option.c:962
 msgid "Combo box field name"
 msgstr "Ime spustnega polja"
 
-#: src/option.c:935
+#: src/option.c:968
 msgid "List of values for combo box"
 msgstr "Seznam vrednosti spustnega polja"
 
-#: src/option.c:952
+#: src/option.c:985
 msgid "Show the columns header"
 msgstr "Pokaži glave stolpcev"
 
-#: src/option.c:983
+#: src/option.c:1016
 msgid "Display password dialog"
 msgstr "Prikaži pogovorno okno gesla"
 
-#: src/option.c:990
+#: src/option.c:1023
 msgid "Display the username option"
 msgstr "Prikaži možnost uporabniškega imena"
 
-#: src/option.c:1000
+#: src/option.c:1033
 msgid "Display color selection dialog"
 msgstr "Pokaži pogovorno okno izbire barv"
 
-#: src/option.c:1007
+#: src/option.c:1040
 msgid "Set the color"
 msgstr "Nastavi barvo"
 
-#: src/option.c:1014
+#: src/option.c:1047
 msgid "Show the palette"
 msgstr "Pokaži paleto"
 
 # G:2 K:0 O:0
-#: src/option.c:1023
+#: src/option.c:1057
 msgid "About zenity"
 msgstr "O programu"
 
-#: src/option.c:1030
+#: src/option.c:1064
 msgid "Print version"
 msgstr "Izpiši različico"
 
-#: src/option.c:1913
+#: src/option.c:1478
+#, fuzzy
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Opozorilo: možnost --window-icon je opuščena in bo odstranjena v prihodnji "
+"različici zenity. Prezrto.\n"
+
+#: src/option.c:2000
 msgid "General options"
 msgstr "Splošne možnosti"
 
-#: src/option.c:1914
+#: src/option.c:2001
 msgid "Show general options"
 msgstr "Pokaži splošne možnosti"
 
 # G:0 K:7 O:1
-#: src/option.c:1926
+#: src/option.c:2013
 msgid "Calendar options"
 msgstr "Možnosti koledarja"
 
 # G:0 K:7 O:1
-#: src/option.c:1927
+#: src/option.c:2014
 msgid "Show calendar options"
 msgstr "Pokaži možnosti koledarja"
 
-#: src/option.c:1939
+#: src/option.c:2026
 msgid "Text entry options"
 msgstr "Možnosti vnosa besedila"
 
-#: src/option.c:1940
+#: src/option.c:2027
 msgid "Show text entry options"
 msgstr "Pokaži možnosti vnosa besedila"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Error options"
 msgstr "Možnosti napak"
 
-#: src/option.c:1952
+#: src/option.c:2039
 msgid "Show error options"
 msgstr "Pokaži možnosti napak"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Info options"
 msgstr "Možnosti info"
 
-#: src/option.c:1962
+#: src/option.c:2049
 msgid "Show info options"
 msgstr "Pokaži možnosti info"
 
-#: src/option.c:1972
+#: src/option.c:2059
 msgid "File selection options"
 msgstr "Možnosti izbire datoteke"
 
-#: src/option.c:1973
+#: src/option.c:2060
 msgid "Show file selection options"
 msgstr "Pokaži možnosti izbire datotek"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "List options"
 msgstr "Možnosti seznama"
 
-#: src/option.c:1985
+#: src/option.c:2072
 msgid "Show list options"
 msgstr "Pokaži možnosti seznama"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Možnosti ikone obvestil"
+#: src/option.c:2082
+msgid "Notification options"
+msgstr "Možnosti obvestil"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Pokaži možnosti ikone obvestil"
+#: src/option.c:2083
+msgid "Show notification options"
+msgstr "Pokaži možnosti obvestil"
 
-#: src/option.c:2011
+#: src/option.c:2096
 msgid "Progress options"
 msgstr "Možnosti prikaza napredka"
 
-#: src/option.c:2012
+#: src/option.c:2097
 msgid "Show progress options"
 msgstr "Pokaži možnosti prikaza napredka"
 
-#: src/option.c:2024
+#: src/option.c:2109
 msgid "Question options"
 msgstr "Možnosti vprašanja"
 
-#: src/option.c:2025
+#: src/option.c:2110
 msgid "Show question options"
 msgstr "Pokaži možnosti vprašanja"
 
-#: src/option.c:2037
+#: src/option.c:2122
 msgid "Warning options"
 msgstr "Možnosti opozorila"
 
-#: src/option.c:2038
+#: src/option.c:2123
 msgid "Show warning options"
 msgstr "Pokaži možnosti opozorila"
 
 # G:0 K:7 O:1
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Scale options"
 msgstr "Možnosti merila"
 
 # G:0 K:7 O:1
-#: src/option.c:2050
+#: src/option.c:2135
 msgid "Show scale options"
 msgstr "Pokaži možnosti merila"
 
-#: src/option.c:2060
+#: src/option.c:2145
 msgid "Text information options"
 msgstr "Možnosti podatkov besedila"
 
-#: src/option.c:2061
+#: src/option.c:2146
 msgid "Show text information options"
 msgstr "Pokaži možnosti podatkov besedila"
 
-#: src/option.c:2073
+#: src/option.c:2158
 msgid "Color selection options"
 msgstr "Možnosti izbire barv"
 
-#: src/option.c:2074
+#: src/option.c:2159
 msgid "Show color selection options"
 msgstr "Pokaži možnosti izbire barv"
 
-#: src/option.c:2086
+#: src/option.c:2171
 msgid "Password dialog options"
 msgstr "Možnosti pogovornega okna gesla"
 
-#: src/option.c:2087
+#: src/option.c:2172
 msgid "Show password dialog options"
 msgstr "Pokaži možnosti pogovornega okna gesla"
 
-#: src/option.c:2099
+#: src/option.c:2184
 msgid "Forms dialog options"
 msgstr "Možnosti pogovornega okna obrazca"
 
-#: src/option.c:2100
+#: src/option.c:2185
 msgid "Show forms dialog options"
 msgstr "Pokaži možnosti pogovornega okna obrazca"
 
-#: src/option.c:2112
+#: src/option.c:2197
 msgid "Miscellaneous options"
 msgstr "Razne možnosti"
 
-#: src/option.c:2113
+#: src/option.c:2198
 msgid "Show miscellaneous options"
 msgstr "Pokaži razne možnosti"
 
-#: src/option.c:2139
+#: src/option.c:2221
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Ta možnost ni na voljo. Za pregled vseh mogočih uporab si oglejte --help.\n"
 
-#: src/option.c:2144
+#: src/option.c:2226
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s ni podprt v tem pogovornem oknu\n"
 
-#: src/option.c:2148
+#: src/option.c:2230
 msgid "Two or more dialog options specified\n"
 msgstr "Določeni sta dve ali več možnosti pogovornega okna\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Vpišite geslo."
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Vpišite uporabniško ime in geslo"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Geslo:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Preostal čas: %lu:%02lu:%02lu"
@@ -803,147 +765,124 @@ msgstr "Preostal čas: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Največja vrednost mora biti večja od najmanjše.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Vrednost je izven območja.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+#, fuzzy
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Opozorilo: možnost --mid-search je opuščena in bo odstranjena v prihodnji "
+"različici zenity. Prezrto.\n"
+
+#: src/tree.c:278
 msgid "No column titles specified for List dialog.\n"
 msgstr "Za pogovorno okno seznama ni določenih naslovov stolpcev.\n"
 
-#: src/tree.c:399
+#: src/tree.c:285
 msgid "You should use only one List dialog type.\n"
 msgstr "Uporabiti bi morali le eno vrsto pogovornega okna seznama.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, fuzzy, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr ""
+"Imena datoteke ikone %s ni mogoče najti; sledi poskus uporabe ikone teme."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Prilagodi vrednost merila"
 
-#: 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 "Prekliči"
-
-#: 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 "V redu"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Besedilni pogled"
 
 # G:0 K:7 O:1
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Izbor koledarja"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Spodaj izberite datum."
 
 # G:0 K:7 O:1
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "Koled_ar:"
 
-#: src/zenity.ui:361
+# G:0 K:7 O:1
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Koledar"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Dodaj nov vnos"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Vpišite novo besedilo:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Napaka"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Prišlo je do napake!"
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Pogovorno okno obrazca"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Podrobnosti"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Vse posodobitve so končane."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Napredek"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Zagnano ..."
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Vprašanje"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Ne"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Da"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Ali ste prepričani, da želite nadaljevati?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Izberite predmete iz seznama."
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Izberite predmete iz spodnjega seznama."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Opozorilo"
 
-#~ msgid "Could not parse message from stdin\n"
-#~ msgstr "Ni mogoče razčleniti sporočila stdin\n"
-
-#~ msgid "Sets the label of the Ok button"
-#~ msgstr "Nastavi besedilo gumba V redu"
-
-#~ msgid "Sets the label of the Cancel button"
-#~ msgstr "Nastavi besedilo gumba Prekliči"
-
-#~ msgid "Add extra-button"
-#~ msgstr "Dodaj dodaten gumb"
-
-#~ msgid "Do not enable pango markup"
-#~ msgstr "Ne omogoči označevanja Pango"
-
-#~ msgid "Sets a filename filter"
-#~ msgstr "Določi filter imena datotek"
-
-#~ msgid "Use check boxes for first column"
-#~ msgstr "Uporabi potrditvena polja za prvi stolpec"
-
-#~ msgid "Use radio buttons for first column"
-#~ msgstr "Uporabi radijske gumbe za prvi stolpec"
-
-#~ msgid "Use an image for first column"
-#~ msgstr "Uporabi sliko za prvi stolpec"
-
-#~ msgid "Hides the column headers"
-#~ msgstr "Skrije glavo stolpca"
-
-#~ msgid "Give cancel button focus by default"
-#~ msgstr "Privzeto postavi pozornost na gumb Prekliči"
-
-#~ msgid "Suppress ok and cancel buttons"
-#~ msgstr "Skrij gumba V redu in Prekliči"
-
-#~ msgid "Enable html support"
-#~ msgstr "Omogoči podporo za HTML"
-
-#~ msgid "Sets an url instead of a file. Only works if you use --html option"
-#~ msgstr ""
-#~ "Določite naslov URL namesto datoteke. Možnost deluje le, če je izbrana "
-#~ "možnost —html."
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Vpišite geslo."
diff --git a/po/sv.po b/po/sv.po
index 6672dce3..1a300a59 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,18 +1,17 @@
 # Swedish messages for zenity.
-# Copyright © 2003-2016 Free Software Foundation, Inc.
+# Copyright © 2003-2023 Free Software Foundation, Inc.
 # This file is distributed under the same license as the zenity package.
 # Christian Rose <menthos@menthos.com>, 2003, 2004, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Sebastian Rasmussen <sebras@gmail.com>, 2014.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-26 20:40+0000\n"
-"PO-Revision-Date: 2017-12-04 21:34+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2023-04-29 16:30+0000\n"
+"PO-Revision-Date: 2023-05-04 19:26+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -20,9 +19,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 3.2.2\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Visa dialogrutor från kommandoraden"
+
+#: src/about.c:54
 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 "
@@ -34,7 +41,7 @@ msgstr ""
 "Software Foundation, antingen version 2 eller (om du så vill) någon senare "
 "version.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -46,7 +53,7 @@ msgstr ""
 "LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU Lesser General Public License "
 "för ytterligare information.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -56,218 +63,180 @@ msgstr ""
 "detta program. Om inte, skriv till Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Daniel Nylander <po@danielnylander.se>\n"
-"Christian Rose\n"
-"Sebastian Rasmussen <sebras@gmail.com>\n"
-"\n"
-"Skicka synpunkter på översättningen till\n"
-"<tp-sv@listor.tp-sv.se>."
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Visa dialogrutor från skalskript"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:415 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_OK"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:411 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "A_vbryt"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "Du måste ange en dialogtyp. Se \"zenity --help\" för detaljer\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Nej"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Ja"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Kunde inte tolka meddelande\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Ogiltigt värde för ett booleskt tips.\n"
-"Värden som stöds är ”true” eller ”false”.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Tips saknar stöd. Hoppar över.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Okänt tipsnamn. Hoppar över.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Kunde inte tolka kommando från standard in\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Zenity-avisering"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "Ställ in dialogtiteln"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "TITEL"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Ställ in fönsterikonen"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "IKONSÖKVÄG"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "Ställ in bredden"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "BREDD"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "Ställ in höjden"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "HÖJD"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "Ställ in tidsgräns för dialogrutan i sekunder"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "TIDSGRÄNS"
 
-#: src/option.c:200
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "Ställ in etiketten för knappen OK"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "TEXT"
 
-#: src/option.c:207
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "Ställ in etiketten för knappen Avbryt"
 
-#: src/option.c:214
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "Lägg till en extra knapp"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "Ställ in modalt tips"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Ställ in föräldrafönster att fästa vid"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "FÖRÅLDRAD; gör ingenting"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "FÖNSTER"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "FÖRÅLDRAD; använd ”--icon”"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "IKONNAMN"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "Visa kalenderdialog"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "Ställ in dialogtexten"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "Ställ in kalenderdagen"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "DAG"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "Ställ in kalendermånaden"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "MÅNAD"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "Ställ in kalenderåret"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "ÅR"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "Ställ in formatet på det returnerade datumet"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "MÖNSTER"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Visa textinmatningsdialog"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "Ställ in fälttexten"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "Dölj fälttexten"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "Visa feldialog"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "Ställ in dialogikonen"
-
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "IKONNAMN"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "Ställ in ikonnamnet"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "Aktivera inte textradbrytning"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "Aktivera inte Pango-markup"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -275,89 +244,85 @@ msgstr ""
 "Aktivera elliptisering i dialogrutetexten. Detta fixar den höga "
 "fönsterstorleken med långa texter"
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "Visa informationsdialog"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "Visa filväljardialog"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "Ställ in filnamnet"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "FILNAMN"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "Tillåt att flera filer väljs"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "Aktivera markering av endast kataloger"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "Aktivera sparläge"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "Ställ in åtskiljartecken för utdata"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "AVGRÄNSARE"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Bekräfta filval om filnamnet redan finns"
-
-#: src/option.c:448
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "Ställ in ett filnamnsfilter"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAMN | MÖNSTER1 MÖNSTER2 ..."
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "Visa listdialog"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "Ställ in kolumnhuvudet"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "KOLUMN"
 
-#: src/option.c:481
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "Använd kryssrutor i första kolumnen"
 
-#: src/option.c:488
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "Använd radioknappar i första kolumnen"
 
-#: src/option.c:495
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "Använd en bild i första kolumnen"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "Tillåt att flera rader väljs"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "Tillåt ändringar av text"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -366,109 +331,97 @@ msgstr ""
 "att skriva ut alla kolumner)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "NUMMER"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "Dölj en specifik kolumn"
 
-#: src/option.c:539
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "Dölj kolumnhuvudena"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Ändra standardsökfunktion för listor till att söka text i mitten, inte i "
-"början"
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "Visa avisering"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "Ställ in aviseringstexten"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "Lyssna efter kommandon på standard in"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Ställ in aviseringstipsen"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "Visa förloppsindikatordialog"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "Ställ in initialt procenttal"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "PROCENTTAL"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "Pulsera förloppsindikatorn"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Stäng dialogfönstret då 100% har nåtts"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Döda föräldraprocessen om avbrytsknappen trycks"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "Dölj avbrytsknapp"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Beräkna när förloppet kommer att nå 100%"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "Visa frågedialog"
 
-#: src/option.c:684
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "Ge avbryt-knappen fokus som standard"
 
-#: src/option.c:698
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "Visa inte knapparna OK och Avbryt"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "Visa textinformationsdialog"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "Ställ in texttypsnittet"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "Aktivera en \"Jag har läst och godkänner\"-kryssruta"
 
-#: src/option.c:744
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "Aktivera HTML-stöd"
 
-#: src/option.c:751
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -476,316 +429,354 @@ msgstr ""
 "Aktivera inte användarinteraktion med WebView. Fungerar endast om du "
 "använder flaggan --html"
 
-#: src/option.c:759
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Ange en URL istället för en fil. Fungerar endast om du använder flaggan --"
 "html"
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Rulla texten automatiskt till slutet. Bara när text matas från standard in"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "Visa varningsdialog"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "Visa skaldialog"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "Ställ in initialt värde"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "VÄRDE"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "Ställ in minimivärde"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "Ställ in maximivärde"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "Ställ in stegstorlek"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "Skriv ut partiella värden"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "Dölj värde"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
 msgstr "Visa formulärdialog"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
 msgstr "Lägg till en ny post i formulärdialog"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "Fältnamn"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Lägg till en ny lösenordsinmatning i formulärdialog"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
 msgstr "Lägg till en ny kalender i formulärdialog"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "Namn på kalenderfält"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
 msgstr "Lägg till en ny lista i formulärdialog"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "Lista fält- och rubriknamn"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "Lista med värden för lista"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "Lista med värden separerade med |"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "Lista med värden för kolumner"
 
-#: src/option.c:928
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
 msgstr "Lägg till en ny listbox i formulärdialog"
 
-#: src/option.c:929
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "Fältnamn på listbox"
 
-#: src/option.c:935
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "Lista med värden för listbox"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "Visa kolumnhuvudet"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "Visa lösenordsdialog"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "Visa flagga för användarnamnet"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "Visa färgväljardialog"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "Ställ in färgen"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
 msgstr "Visa paletten"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
 msgstr "Om zenity"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "Skriv ut versionsnummer"
 
-#: src/option.c:1913
+#: src/option.c:1080
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Varning: --icon-name är föråldrad och kommer tas bort i en framtida version "
+"av zenity, behandlar som --icon.\n"
+
+#: src/option.c:1087
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Varning: --window-icon är föråldrad och kommer tas bort i en framtida "
+"version av zenity, behandlar som --icon.\n"
+
+#: src/option.c:1094
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"Varning: --confirm-overwrite är föråldrad och kommer tas bort i en framtida "
+"version av zenity. Ignorerar.\n"
+
+#: src/option.c:1101
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Varning: --attach är föråldrad och kommer tas bort i en framtida version av "
+"zenity. Ignorerar.\n"
+
+#: src/option.c:1108
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Varning: --hint är föråldrad och kommer tas bort i en framtida version av "
+"zenity. Ignorerar.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "Allmänna flaggor"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "Visa allmänna flaggor"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "Kalenderflaggor"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "Visa kalenderflaggor"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "Flaggor för textinmatning"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "Visa flaggor för textinmatning"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "Felflaggor"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "Visa felflaggor"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "Informationsflaggor"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "Visa informationsflaggor"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "Flaggor för filväljare"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "Visa flaggor för filväljare"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "Listflaggor"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "Visa listflaggor"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Flaggor för aviseringsikon"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "Aviseringsflaggor"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Visa flaggor för aviseringsikon"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "Visa aviseringsflaggor"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "Förloppsflaggor"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "Visa förloppsflaggor"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "Frågeflaggor"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "Visa frågeflaggor"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "Varningsflaggor"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "Visa varningsflaggor"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "Skalflaggor"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "Visa skalflaggor"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "Textinformationsflaggor"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "Visa textinformationsflaggor"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "Flaggor för färgväljare"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "Visa flaggor för färgväljare"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "Flaggor för lösenordsdialog"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "Visa flaggor för lösenordsdialog"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
 msgstr "Flaggor för formulärdialog"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
 msgstr "Visa flaggor för formulärdialog"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "Diverse flaggor"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "Visa diverse flaggor"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Denna flagga är inte tillgänglig. Se --help för alla möjliga\n"
 "användningsfall.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s stöds inte för denna dialog\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 msgid "Two or more dialog options specified\n"
 msgstr "Två eller fler dialogflaggor angavs\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Ange ditt lösenord"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Ange ditt användarnamn och lösenord"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Kvarstående tid: %lu:%02lu:%02lu"
@@ -794,101 +785,175 @@ msgstr "Kvarstående tid: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Maximalt värde måste vara större än minimalt värde.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Värde utanför intervall.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Varning: --mid-search är föråldrad och kommer tas bort i en framtida version "
+"av zenity. Ignorerar.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr "Inga kolumntitlar angavs för listdialogfönstret.\n"
 
-#: src/tree.c:399
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "Du bör endast använda en listdialogtyp.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "Ikonfilnamnet %s hittades inte, försöker med temaikon."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Justera skalvärdet"
 
-#: 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 "Avbryt"
-
-#: 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 "OK"
-
-#: src/zenity.ui:117
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Textvy"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Kalendermarkering"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Välj ett datum nedan."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "K_alender:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Kalender"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Lägg till en ny post"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Ange ny text:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Fel"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Ett fel har inträffat."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Formulärdialog"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Information"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Alla uppdateringar är färdiga."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Förlopp"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Kör..."
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Fråga"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Nej"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Är du säker på att du vill fortsätta?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Välj objekt från listan"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Välj objekt från listan nedan."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Varning"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Ange ditt lösenord"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Daniel Nylander <po@danielnylander.se>\n"
+#~ "Christian Rose\n"
+#~ "Sebastian Rasmussen <sebras@gmail.com>\n"
+#~ "\n"
+#~ "Skicka synpunkter på översättningen till\n"
+#~ "<tp-sv@listor.tp-sv.se>."
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "Ogiltigt värde för ett booleskt tips.\n"
+#~ "Värden som stöds är ”true” eller ”false”.\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "Tips saknar stöd. Hoppar över.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "Okänt tipsnamn. Hoppar över.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "Zenity-avisering"
+
+#~ msgid "Set the window icon"
+#~ msgstr "Ställ in fönsterikonen"
+
+#~ msgid "ICONPATH"
+#~ msgstr "IKONSÖKVÄG"
+
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "Ställ in föräldrafönster att fästa vid"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "Ställ in dialogikonen"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr "Bekräfta filval om filnamnet redan finns"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr ""
+#~ "Ändra standardsökfunktion för listor till att söka text i mitten, inte i "
+#~ "början"
+
+#~ msgid "Set the notification hints"
+#~ msgstr "Ställ in aviseringstipsen"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "OK"
+#~ msgstr "OK"
diff --git a/po/tr.po b/po/tr.po
index b4f2a84c..3c2ddfd1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,6 +1,6 @@
 # translation of zenity to Turkish
 # Copyright (C) 2005, 2006, 2007, 2008, 2009 the Free Software Foundation, Inc.
-# Copyright (C) 2010-2022 zenity's COPYRIGHT HOLDER
+# Copyright (C) 2010-2023 zenity's COPYRIGHT HOLDER
 # This file is distributed under the same license as the zenity package.
 #
 # Baris Cicek <baris@teamforce.name.tr>, 2005, 2007, 2008.
@@ -13,261 +13,234 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
-"POT-Creation-Date: 2022-07-29 08:30+0000\n"
-"PO-Revision-Date: 2017-12-03 17:13+0300\n"
-"Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
-"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
+"POT-Creation-Date: 2023-05-19 15:27+0000\n"
+"PO-Revision-Date: 2023-05-12 11:45+0300\n"
+"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
+"Language-Team: Türkçe <takim@gnome.org.tr>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 3.2.2\n"
 "X-POOTLE-MTIME: 1433335499.000000\n"
 
-#: src/about.c:56
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Komut satırından iletişim kutularını görüntüle"
+
+#: src/about.c:54
 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 "
 "Free Software Foundation; either version 2 of the License, or (at your "
 "option) any later version.\n"
 msgstr ""
-"Bu program bir özgür yazılmdır; Özgür Yazılım Vakfı tarafından yayınlanan "
-"GNU Kısıtlı Genel Kamu Lisansı'nın 2. sürümü ya da (tercihinize bağlı) "
-"sonraki sürümleri koşulları altında yeniden dağıtabilir ve/veya "
-"değiştirebilirsiniz.\n"
+"Bu program bir özgür yazılımdır; Özgür Yazılım Vakfı tarafından yayınlanan "
+"GNU Kısıtlı Genel Kamu Lisansı'nın 2. sürümü ya da (tercihinize bağlı) "
+"sonraki sürümleri koşulları altında yeniden dağıtabilir ve/veya "
+"değiştirebilirsiniz.\n"
 
-#: src/about.c:61
+#: src/about.c:59
 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 "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
 "for more details.\n"
 msgstr ""
-"Bu program, faydalı olacağı umut edilerek dağıtılmaktadır, fakat HİÇBİR "
-"GARANTİSİ YOKTUR; hatta ÜRÜN DEĞERİ ya da BİR AMACA UYGUNLUK gibi garantiler "
-"de vermez.  Ayrıntılar için lütfen GNU Kısıtlı Genel Kamu Lisansı'nı "
+"Bu program, faydalı olacağı umut edilerek dağıtılmaktadır, fakat HİÇBİR "
+"GARANTİSİ YOKTUR; hatta ÜRÜN DEĞERİ ya da BİR AMACA UYGUNLUK gibi garantiler "
+"de vermez.  Ayrıntılar için lütfen GNU Kısıtlı Genel Kamu Lisansı'nı "
 "inceleyiniz.\n"
 
-#: src/about.c:65
+#: src/about.c:63
 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, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Bu program ile birlikte GNU Kısıtlı Genel Kamu Lisansı'nın bir kopyasını "
-"almış olmalısınız; eğer almadıysanız, lütfen Free Software Foundation, Inc., "
+"almış olmalısınız; eğer almadıysanız, lütfen Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA adresine yazın."
 
-#: src/about.c:76
-msgid "translator-credits"
-msgstr ""
-"Burçin Dönmez <bdonmez@cisunix.unh.edu>\n"
-"Fatih Ergüven <fatih@erguven.org>\n"
-"Muhammet Kara <muhammetk@gmail.com>"
-
-#: src/about.c:93
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Kabuk betiklerinden pencere kutularını görüntüle"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:410 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_Tamam"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:406 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "Pencere çeşidi girmelisiniz. Detaylar için 'zenity --help'e bakınız.\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Hayır"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Evet"
-
-#: src/notification.c:50
+#: src/notification.c:62
 msgid "Could not parse message\n"
-msgstr "İleti ayrıştırılamadı\n"
+msgstr "İleti ayrıştırılamadı\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Bir mantıksal ipucu için geçersiz değer.\n"
-"Desteklenen değerler 'doğru' veya 'yanlış'tır.\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Desteklenmeyen ipucu. Atlanıyor.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Bilinmeyen ipucu adı. Atlanıyor.\n"
-
-#: src/notification.c:218
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
-msgstr "stdin'den gelen komut ayrıştırılamadı\n"
+msgstr "stdin'den gelen komut ayrıştırılamadı\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Zenity uyarısı"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "Pencere başlığını ayarla"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "BAŞLIK"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Pencere simgesini ayarla"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "SİMGEYOLU"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "Genişliği ayarla"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "GENİŞLİK"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "Yüksekliği ayarla"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "YÜKSEKLİK"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "Pencere zaman aşımını olabildiğince kısa tut"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "ZAMANAŞIMI"
 
-#: src/option.c:200
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "Tamam düğmesinin etiketini ayarla"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "METİN"
 
-#: src/option.c:207
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "İptal düğmesinin etiketini ayarla"
 
-#: src/option.c:214
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "Fazladan bir düğme ekle"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "Kalıcı ipucu ayarlayın"
 
-#: src/option.c:228
-msgid "Set the parent window to attach to"
-msgstr "Eklenecek üst pencereyi ayarlayın"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "KULLANILMIYOR; hiçbir şey yapmaz"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "PENCERE"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "KULLANILMIYOR; `--icon` kullan"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "SİMGE-ADI"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "Takvim penceresini görüntüle"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "Pencere metnini ayarla"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "Takvim gününü ayarla"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "GÜN"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "Takvim ayını ayarla"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "AY"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "Takvim yılını ayarla"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "YIL"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "Dönecek tarihler için tarih biçimini ayarla"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "DESEN"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Metin girişi penceresini görüntüle"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "Giriş metnini ayarla"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "Giriş metnini gizle"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "Hata penceresini görüntüle"
 
-#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
-msgid "Set the dialog icon"
-msgstr "İletişim penceresi simgesini ayarla"
-
-#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "SİMGE-ADI"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "Simge adını ayarla"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "Metin bölmesini etkinleştirme"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "Pango imlemesini etkinleştirme"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
@@ -275,89 +248,85 @@ msgstr ""
 "İletişim metinlerini elipsleştirmeyi etkinleştir. Bu uzun metinlerle yüksek "
 "pencere boyutunu çözecektir"
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "Bilgi penceresini görüntüle"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "Dosya seçme penceresini görüntüle"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "Dosya adını ayarla"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "DOSYAADI"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "Birden fazla dosya seçimine izin ver"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "Sadece-dizin seçeneğini etkinleştir"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "Saklama kipini etkinleştir"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "Çıktı ayraç karakterini ayarla"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "AYRAÇ"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Dosya adı zaten varsa dosya seçimini doğrula"
-
-#: src/option.c:448
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "Bir dosya adı süzgeci ayarla"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "İSİM | DOKU1 DOKU2 ..."
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "Liste penceresini görüntüle"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "Sütun başlığını ayarla"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "SÜTUN"
 
-#: src/option.c:481
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "İlk sütun için onay kutularını kullan"
 
-#: src/option.c:488
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "İlk sütun için radyo düğmelerini kullan"
 
-#: src/option.c:495
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "İlk sütun için bir resim kullan"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "Birden fazla satır seçimine izin ver"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "Metinde değişikliklere izin ver"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -366,109 +335,97 @@ msgstr ""
 "için kullanılabilir)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "SAYI"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "Belirli sütuna gizle"
 
-#: src/option.c:539
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "Sütun başlıklarını gizle"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Listenin öntanımlı arama özelliğini metnin başından değil ortasından olacak "
-"şekilde değiştir"
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "Uyarıyı görüntüle"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "Uyarı metnini ayarla"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "stdin'deki komutları dinle"
 
-#: src/option.c:578
-msgid "Set the notification hints"
-msgstr "Bildirim ipuçlarını ayarla"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "İlerleme belirtim penceresini görüntüle"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "Başlangıç yüzdesini ayarla"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "YÜZDE"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "İlerleme çubuğunu sallandır"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "%100'e ulaşıldığında pencereyi kapat"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
-msgstr "Eğer vazgeç tuşuna basılırsa üst süreci yok et"
+msgstr "Eğer vazgeç tuşuna basılırsa üst süreci yok et"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "İptal düğmesini gizle"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "İlerlemenin ne zaman %100 olacağını tahmin et"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "Soru penceresini göster"
 
-#: src/option.c:684
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "Öntanımlı olarak iptal düğmesine odaklan"
 
-#: src/option.c:698
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "Tamam ve İptal tuşlarını baskıla"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "Metin bilgisi penceresini göster"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "Dosya aç"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "Metin yazı tipini ayarla"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "Okudum ve Onayladım onay kutusunu etkinleştir"
 
-#: src/option.c:744
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "HTML desteğini etkinleştir"
 
-#: src/option.c:751
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
@@ -476,315 +433,353 @@ msgstr ""
 "Kullanıcının WebView ile etkileşimini kapat. Sadece --html seçeneğini "
 "kullandığınızda işe yarar"
 
-#: src/option.c:759
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Bir dosya yerine bir adres ayarla. Sadece --html seçeneğini kullanırsanız "
 "çalışır."
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
 "Metnin sonuna otomatik kaydır. Sadece metin standart girdiden alındığında"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "Uyarı penceresini görüntüle"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "Ölçek penceresini görüntüle"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "Başlangıç değerini ayarla"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "DEĞER"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "En düşük değeri ayarla"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "En yüksek değeri ayarla"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "Adım boyutunu ayarla"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "Kısmi değerleri yaz"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "Değeri gizle"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
-msgstr "Form iletişim penceresini görüntüle"
+msgstr "Form iletişim penceresini görüntüle"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
-msgstr "Form iletişim penceresine yeni bir giriş ekle"
+msgstr "Form iletişim penceresine yeni bir giriş ekle"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "Alan adı"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Form iletişim penceresine yeni bir Parola Girdisi ekle"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
-msgstr "Form iletişim penceresine yeni bir Takvim ekle"
+msgstr "Form iletişim penceresine yeni bir Takvim ekle"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "Takvim alanının adı"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
-msgstr "Form iletişim penceresine yeni bir Liste ekle"
+msgstr "Form iletişim penceresine yeni bir Liste ekle"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "Liste alanı ve başlık adı"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "Liste için değerler listesi"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "| ile ayrılmış değerler listesi"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "Sütunlar için değerler listesi"
 
-#: src/option.c:928
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
-msgstr "Form iletişim penceresine yeni bir açılan kutu ekle"
+msgstr "Form iletişim penceresine yeni bir açılan kutu ekle"
 
-#: src/option.c:929
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "Açılan kutu alan adı"
 
-#: src/option.c:935
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "Açılan kutu için değerler listesi"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "Sütun başlığını göster"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "Parola penceresini görüntüle"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "Kullanıcı adı seçeneğini göster"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "Renk seçme penceresini görüntüle"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "Rengi düzenle"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
-msgstr "Paleti göster"
+msgstr "Paleti göster"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
 msgstr "Zenity hakkında"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "Sürümü yazdır"
 
-#: src/option.c:1913
+#: src/option.c:1080
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Uyarı: --icon-name kullanımdan kaldırılmıştır ve gelecekteki bir zenity "
+"sürümünde kaldırılacak. -- icon olarak işleniyor.\n"
+
+#: src/option.c:1087
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Uyarı: --window-icon kullanımdan kaldırılmıştır ve gelecekteki bir zenity "
+"sürümünde kaldırılacak. --icon olarak işleniyor.\n"
+
+#: src/option.c:1094
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"Uyarı: --confirm-overwrite kullanımdan kaldırılmıştır ve gelecekteki bir "
+"zenity sürümünde kaldırılacak. Görmezden geliniyor.\n"
+
+#: src/option.c:1101
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Uyarı: --attach kullanımdan kaldırılmıştır ve gelecekteki bir zenity "
+"sürümünde kaldırılacak. Görmezden geliniyor.\n"
+
+#: src/option.c:1108
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Uyarı: --hint kullanımdan kaldırılmıştır ve gelecekteki bir zenity sürümünde "
+"kaldırılacak. Görmezden geliniyor.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "Genel seçenekler"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "Genel seçenekleri göster"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "Takvim seçenekleri"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "Takvim seçeneklerini göster"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "Metin giriş seçenekleri"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "Metin giriş seçeneklerini göster"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "Hata seçenekleri"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "Hata seçeneklerini göster"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "Bilgi seçenekleri"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "Bilgi seçeneklerini göster"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "Dosya seçme özellikleri"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "Dosya seçme seçeneklerini göster"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "Liste seçenekleri"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "Liste seçeneklerini göster"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Uyarı simgesi seçenekleri"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "Bildirim seçenekleri"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Uyarı simgesi seçeneklerini göster"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "Bildirim seçeneklerini göster"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "İlerleme seçenekleri"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "İlerleme seçeneklerini göster"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "Soru seçenekleri"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "Soru seçeneklerini göster"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "Uyarı seçenekleri"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "Uyarı seçeneklerini göster"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "Ölçek seçenekleri"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "Ölçek seçeneklerini göster"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "Metin bilgi seçenekleri"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "Metin bilgi seçeneklerini göster"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "Renk seçme özellikleri"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "Renk seçme seçeneklerini göster"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "Parola seçenekleri penceresi"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "Parola seçenekleri penceresini göster"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
-msgstr "Form iletişim penceresi seçenekleri"
+msgstr "Form iletişim penceresi seçenekleri"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
-msgstr "Form iletişim penceresi seçeneklerini göster"
+msgstr "Form iletişim penceresi seçeneklerini göster"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "Çeşitli seçenekler"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "Çeşitli seçenekleri göster"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Bu seçenek mevcut değil. Mevcut kullanımlar için lütfen --help'e bakınız.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s bu pencere için desteklenmiyor\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 msgid "Two or more dialog options specified\n"
 msgstr "İki veya daha fazla pencere seçeneği belirtildi\n"
 
-#. Checks if username has been passed as a parameter
-#: src/password.c:70
-msgid "Type your password"
-msgstr "Parolanızı giriniz"
-
-#: src/password.c:73
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Kullanıcı adınızı ve parolanızı yazın"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Kullanıcı adı:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Parola:"
 
-#: src/progress.c:102
+#: src/progress.c:111
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Kalan zaman: %lu:%02lu:%02lu"
@@ -793,101 +788,119 @@ msgstr "Kalan zaman: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "En yüksek değer en düşük değerden büyük olmalıdır.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Değer aralık dışında.\n"
 
-#: src/tree.c:389
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Uyarı: --mid-search kullanımdan kaldırılmıştır ve gelecekteki bir zenity "
+"sürümünde kaldırılacak. Görmezden geliniyor.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr "Liste penceresi için başlık belirtilmedi.\n"
 
-#: src/tree.c:395
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "Sadece tek bit Liste diyalog çeşidi kullanabilirsiniz.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:77
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr "%s simge dosyası bulunamadı; tema simgesi deneniyor."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 msgid "Adjust the scale value"
 msgstr "Ölçek değerini ayarla"
 
-#: src/zenity.ui:30 src/zenity.ui:136 src/zenity.ui:248 src/zenity.ui:379
-#: src/zenity.ui:580 src/zenity.ui:787 src/zenity.ui:974
-msgid "Cancel"
-msgstr "İptal"
-
-#: src/zenity.ui:44 src/zenity.ui:149 src/zenity.ui:262 src/zenity.ui:393
-#: src/zenity.ui:483 src/zenity.ui:593 src/zenity.ui:700 src/zenity.ui:801
-#: src/zenity.ui:988 src/zenity.ui:1085
-msgid "OK"
-msgstr "Tamam"
-
-#: src/zenity.ui:118
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Metin Görünümü"
 
-#: src/zenity.ui:232
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Takvim seçimi"
 
-#: src/zenity.ui:299
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Aşağıdan bir tarih seçin."
 
-#: src/zenity.ui:320
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "T_akvim:"
 
-#: src/zenity.ui:362
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Takvim"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Yeni bir giriş ekle"
 
-#: src/zenity.ui:429
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Yeni metin girişi:"
 
-#: src/zenity.ui:466
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Hata"
 
-#: src/zenity.ui:532
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Hata oluştu."
 
-#: src/zenity.ui:660
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Formlar iletişim penceresi"
 
-#: src/zenity.ui:683
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Bilgi"
 
-#: src/zenity.ui:744
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Bütün güncellemeler tamam."
 
-#: src/zenity.ui:771
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "İlerleme"
 
-#: src/zenity.ui:834
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Çalışıyor..."
 
-#: src/zenity.ui:885
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Soru"
 
-#: src/zenity.ui:933 src/zenity.ui:1131
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Hayır"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Evet"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Devam etmek istediğinize emin misiniz?"
 
-#: src/zenity.ui:957
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Öğeleri listeden seçiniz"
 
-#: src/zenity.ui:1019
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Aşağıdaki listeden öğeleri seçiniz."
 
-#: src/zenity.ui:1068
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Uyarı"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Parolanızı giriniz"
diff --git a/po/uk.po b/po/uk.po
index a99a9e23..8c5a2cdf 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,24 +8,32 @@
 # Korostil Daniel <ted.korostiled@gmail.com>, 2011, 2012.
 # Re. <ted.korostiled@gmail.com>, 2012.
 # Daniel Korostil <ted.korostiled@gmail.com>, 2012.
-# Yuri Chornoivan <yurchor@ukr.net>, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
-"POT-Creation-Date: 2020-02-25 16:44+0000\n"
-"PO-Revision-Date: 2020-03-10 18:45+0200\n"
+"POT-Creation-Date: 2023-04-28 19:28+0000\n"
+"PO-Revision-Date: 2023-04-29 19:29+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Lokalize 20.03.70\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"
+"X-Generator: Lokalize 20.12.0\n"
 
-#: src/about.c:60
+#: data/org.gnome.Zenity.desktop.in:3
+msgid "Zenity"
+msgstr "Zenity"
+
+#: data/org.gnome.Zenity.desktop.in:4
+msgid "Display dialog boxes from the command line"
+msgstr "Показ діалогових вікон з командного рядка"
+
+#: src/about.c:54
 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 "
@@ -37,7 +45,7 @@ msgstr ""
 "Foundation; версії 2 цієї ліцензії, або (на вашу думку) будь-якою пізнішої "
 "версії.\n"
 
-#: src/about.c:65
+#: src/about.c:59
 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 "
@@ -49,7 +57,7 @@ msgstr ""
 "ЦІННОСТІ чи ПРИДАТНОСТІ ДЛЯ БУДЬ-ЯКИХ ЦІЛЕЙ. Докладніше про це можете "
 "прочитати в GNU Lesser General Public License.\n"
 
-#: src/about.c:69
+#: src/about.c:63
 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, "
@@ -59,318 +67,268 @@ msgstr ""
 "програмою; якщо це не так, напишіть у Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/about.c:260
-msgid "translator-credits"
-msgstr ""
-"Юрій Сирота <yuriy@beer.com>\n"
-"Максим Дзюманенко <dziumanenko@gmail.com>\n"
-"Daniel Korostil <ted.korostiled@gmail.com>"
-
-#: src/about.c:277
+#: src/about.c:88
 msgid "Display dialog boxes from shell scripts"
 msgstr "Показ діалогових вікон зі скриптів оболонки"
 
-#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+#: src/fileselection.c:60 src/progress.c:415 src/zenity.ui:15 src/zenity.ui:52
+#: src/zenity.ui:86 src/zenity.ui:136 src/zenity.ui:173 src/zenity.ui:213
+#: src/zenity.ui:272 src/zenity.ui:382 src/zenity.ui:419 src/zenity.ui:457
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+#: src/fileselection.c:61 src/progress.c:411 src/zenity.ui:14 src/zenity.ui:51
+#: src/zenity.ui:85 src/zenity.ui:135 src/zenity.ui:212 src/zenity.ui:381
+#: src/zenity.ui:456
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/main.c:105
+#: src/main.c:119
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Потрібно вказати тип діалогового вікна. Скористуйтесь «zenity --help» для "
 "докладнішої інформації\n"
 
-#: src/msg.c:38
-msgid "_No"
-msgstr "_Ні"
-
-#: src/msg.c:40
-msgid "_Yes"
-msgstr "_Так"
-
-#: src/notification.c:50
-#| msgid "Could not parse message from stdin\n"
+#: src/notification.c:62
 msgid "Could not parse message\n"
 msgstr "Не вдалося проаналізувати повідомлення\n"
 
-#: src/notification.c:132
-msgid ""
-"Invalid value for a boolean typed hint.\n"
-"Supported values are 'true' or 'false'.\n"
-msgstr ""
-"Некоректне значення для типізованої булевої підказки.\n"
-"Підтримувані значення — «true» або «false».\n"
-
-#. (iibiiay)
-#: src/notification.c:149
-msgid "Unsupported hint. Skipping.\n"
-msgstr "Непідтримувана підказка. Пропускаємо.\n"
-
-#. unknown hints
-#: src/notification.c:166
-msgid "Unknown hint name. Skipping.\n"
-msgstr "Невідома назва підказки. Пропускаємо.\n"
-
-#: src/notification.c:218
-#| msgid "could not parse command from stdin\n"
+#: src/notification.c:140
 msgid "Could not parse command from stdin\n"
 msgstr "Не вдалося проаналізувати команду зі stdin\n"
 
-#: src/notification.c:318
-msgid "Zenity notification"
-msgstr "Сповіщення Zenity"
-
-#: src/option.c:164
+#: src/option.c:170
 msgid "Set the dialog title"
 msgstr "Вказати заголовок діалогу"
 
-#: src/option.c:165
+#: src/option.c:171
 msgid "TITLE"
 msgstr "ЗАГОЛОВОК"
 
-#: src/option.c:171
-msgid "Set the window icon"
-msgstr "Вказати піктограму вікна"
-
-#: src/option.c:172
-msgid "ICONPATH"
-msgstr "ШЛЯХ"
-
-#: src/option.c:178
+#: src/option.c:177
 msgid "Set the width"
 msgstr "Вказати ширину"
 
-#: src/option.c:179
+#: src/option.c:178
 msgid "WIDTH"
 msgstr "ШИРИНА"
 
-#: src/option.c:185
+#: src/option.c:184
 msgid "Set the height"
 msgstr "Вказати висоту"
 
-#: src/option.c:186
+#: src/option.c:185
 msgid "HEIGHT"
 msgstr "ВИСОТА"
 
-#: src/option.c:192
+#: src/option.c:191
 msgid "Set dialog timeout in seconds"
 msgstr "Вказати час очікування діалогу в секундах"
 
 #. Timeout for closing the dialog
-#: src/option.c:194
+#: src/option.c:193
 msgid "TIMEOUT"
 msgstr "ТАЙМАУТ"
 
-#: src/option.c:200
-#| msgid "Sets the label of the Ok button"
+#: src/option.c:199
 msgid "Set the label of the OK button"
 msgstr "Вказати мітку для кнопки «Гаразд»"
 
-#: 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
+#: src/option.c:200 src/option.c:207 src/option.c:214 src/option.c:259
+#: src/option.c:304 src/option.c:311 src/option.c:335 src/option.c:382
+#: src/option.c:491 src/option.c:587 src/option.c:608 src/option.c:625
+#: src/option.c:686 src/option.c:761 src/option.c:768 src/option.c:818
+#: src/option.c:865 src/option.c:997
 msgid "TEXT"
 msgstr "ТЕКСТ"
 
-#: src/option.c:207
-#| msgid "Sets the label of the Cancel button"
+#: src/option.c:206
 msgid "Set the label of the Cancel button"
 msgstr "Вказати мітку для кнопки «Скасувати»"
 
-#: src/option.c:214
-#| msgid "Hide Cancel button"
+#: src/option.c:213
 msgid "Add an extra button"
 msgstr "Додати додаткову кнопку"
 
-#: src/option.c:221
+#: src/option.c:220
 msgid "Set the modal hint"
 msgstr "Вказати модальну підказку"
 
-#: src/option.c:228
-#| msgid "Set the window icon"
-msgid "Set the parent window to attach to"
-msgstr "Вказати батьківське вікно, до якого слід долучити віджет"
+#: src/option.c:227 src/option.c:473 src/option.c:569 src/option.c:607
+msgid "DEPRECATED; does nothing"
+msgstr "Застаріло; не має наслідків"
 
-#: src/option.c:229
+#: src/option.c:228
 msgid "WINDOW"
 msgstr "ВІКНО"
 
-#: src/option.c:237
+#: src/option.c:234 src/option.c:241
+msgid "DEPRECATED; use `--icon`"
+msgstr "Застаріло; скористайтеся «--icon»"
+
+#: src/option.c:235 src/option.c:242 src/option.c:342 src/option.c:389
+#: src/option.c:594 src/option.c:693 src/option.c:825
+msgid "ICON-NAME"
+msgstr "ICON-NAME"
+
+#: src/option.c:251
 msgid "Display calendar dialog"
 msgstr "Показати діалог календаря"
 
-#: 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
+#: src/option.c:258 src/option.c:303 src/option.c:334 src/option.c:381
+#: src/option.c:490 src/option.c:624 src/option.c:685 src/option.c:817
+#: src/option.c:864 src/option.c:996
 msgid "Set the dialog text"
 msgstr "Вказати текст діалогу"
 
-#: src/option.c:251
+#: src/option.c:265
 msgid "Set the calendar day"
 msgstr "Вказати день у календарі"
 
-#: src/option.c:252
+#: src/option.c:266
 msgid "DAY"
 msgstr "ДЕНЬ"
 
-#: src/option.c:258
+#: src/option.c:272
 msgid "Set the calendar month"
 msgstr "Вказати місяць у календарі"
 
-#: src/option.c:259
+#: src/option.c:273
 msgid "MONTH"
 msgstr "МІСЯЦЬ"
 
-#: src/option.c:265
+#: src/option.c:279
 msgid "Set the calendar year"
 msgstr "Вказати рік у календарі"
 
-#: src/option.c:266
+#: src/option.c:280
 msgid "YEAR"
 msgstr "РІК"
 
-#: src/option.c:272 src/option.c:973
+#: src/option.c:286 src/option.c:1010
 msgid "Set the format for the returned date"
 msgstr "Вказати формат дати, що повертатиметься"
 
-#: src/option.c:273 src/option.c:974
+#: src/option.c:287 src/option.c:1011
 msgid "PATTERN"
 msgstr "ШАБЛОН"
 
-#: src/option.c:281
+#: src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Показати вікно з полем вводу"
 
-#: src/option.c:295
+#: src/option.c:310
 msgid "Set the entry text"
 msgstr "Вказати текст поля"
 
-#: src/option.c:302
+#: src/option.c:317
 msgid "Hide the entry text"
 msgstr "Сховати текст поля"
 
-#: src/option.c:311
+#: src/option.c:327
 msgid "Display error dialog"
 msgstr "Показати помилку діалогу"
 
-#: 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:326 src/option.c:369 src/option.c:665 src/option.c:793
-msgid "ICON-NAME"
-msgstr "ICON-NAME"
+#: src/option.c:341 src/option.c:388 src/option.c:593 src/option.c:692
+#: src/option.c:824
+msgid "Set the icon name"
+msgstr "Встановити назву піктограми"
 
-#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
+#: src/option.c:348 src/option.c:395 src/option.c:699 src/option.c:831
 msgid "Do not enable text wrapping"
 msgstr "Не вмикати перенесення тексту"
 
-#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
-#| msgid "Do not enable pango markup"
+#: src/option.c:355 src/option.c:402 src/option.c:706 src/option.c:838
 msgid "Do not enable Pango markup"
 msgstr "Не вмикати розмітку Pango"
 
-#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
+#: src/option.c:362 src/option.c:409 src/option.c:720 src/option.c:845
 msgid ""
 "Enable ellipsizing in the dialog text. This fixes the high window size with "
 "long texts"
 msgstr ""
-"Увімкнути можливість обрізання тексту у діалоговому вікні трьома крапками."
-" Так можна виправити розмір вікна за висотою для довгих фрагментів тексту."
+"Увімкнути можливість обрізання тексту у діалоговому вікні трьома крапками. "
+"Так можна виправити розмір вікна за висотою для довгих фрагментів тексту."
 
-#: src/option.c:354
+#: src/option.c:374
 msgid "Display info dialog"
 msgstr "Показати діалог інформації"
 
-#: src/option.c:398
+#: src/option.c:421
 msgid "Display file selection dialog"
 msgstr "Показати діалог вибору файла"
 
-#: src/option.c:405
+#: src/option.c:428
 msgid "Set the filename"
 msgstr "Вказати назву файла"
 
-#: src/option.c:406 src/option.c:716
+#: src/option.c:429 src/option.c:747
 msgid "FILENAME"
 msgstr "НАЗВА"
 
-#: src/option.c:412
+#: src/option.c:435
 msgid "Allow multiple files to be selected"
 msgstr "Дозволити вибирати кілька файлів"
 
-#: src/option.c:419
+#: src/option.c:442
 msgid "Activate directory-only selection"
 msgstr "Активувати виділення лише каталогів"
 
-#: src/option.c:426
+#: src/option.c:449
 msgid "Activate save mode"
 msgstr "Активувати режим збереження"
 
-#: src/option.c:433 src/option.c:502 src/option.c:966
+#: src/option.c:456 src/option.c:525 src/option.c:1003
 msgid "Set output separator character"
 msgstr "Вказати символ розділення для виводу"
 
-#: src/option.c:434 src/option.c:503 src/option.c:967
+#: src/option.c:457 src/option.c:526 src/option.c:1004
 msgid "SEPARATOR"
 msgstr "ВІДОКРЕМЛЮВАЧ"
 
-#: src/option.c:440
-msgid "Confirm file selection if filename already exists"
-msgstr "Підтвердити вибір файла, якщо назва файла вже існує"
-
-#: src/option.c:448
-#| msgid "Sets a filename filter"
+#: src/option.c:463
 msgid "Set a filename filter"
 msgstr "Вказати фільтр назв файлів"
 
 #. Help for file-filter argument (name and patterns for file
 #. selection)
-#: src/option.c:451
+#: src/option.c:466
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "НАЗВА | ШАБЛОН1 ШАБЛОН2 …"
 
-#: src/option.c:460
+#: src/option.c:483
 msgid "Display list dialog"
 msgstr "Показати діалог списку"
 
-#: src/option.c:474
+#: src/option.c:497
 msgid "Set the column header"
 msgstr "Вказати заголовок стовпчика"
 
-#: src/option.c:475
+#: src/option.c:498
 msgid "COLUMN"
 msgstr "СТОВПЧИК"
 
-#: src/option.c:481
-#| msgid "Use check boxes for first column"
+#: src/option.c:504
 msgid "Use check boxes for the first column"
 msgstr "Використовувати прапорці для першого стовпчика"
 
-#: src/option.c:488
-#| msgid "Use radio buttons for first column"
+#: src/option.c:511
 msgid "Use radio buttons for the first column"
 msgstr "Використовувати перемикачі для першого стовпчика"
 
-#: src/option.c:495
-#| msgid "Use an image for first column"
+#: src/option.c:518
 msgid "Use an image for the first column"
 msgstr "Використовувати зображення для першого стовпця"
 
-#: src/option.c:509
+#: src/option.c:532
 msgid "Allow multiple rows to be selected"
 msgstr "Дозволити виділяти декілька рядків"
 
-#: src/option.c:516 src/option.c:722
+#: src/option.c:539 src/option.c:753
 msgid "Allow changes to text"
 msgstr "Дозволити змінювати текст"
 
-#: src/option.c:523
+#: src/option.c:546
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -379,437 +337,467 @@ msgstr ""
 "для виводу всіх стовпчиків)"
 
 #. Column index number to print out on a list dialog
-#: src/option.c:526 src/option.c:533
+#: src/option.c:549 src/option.c:556
 msgid "NUMBER"
 msgstr "ЧИСЛО"
 
-#: src/option.c:532
+#: src/option.c:555
 msgid "Hide a specific column"
 msgstr "Сховати вказаний стовпчик"
 
-#: src/option.c:539
-#| msgid "Hides the column headers"
+#: src/option.c:562
 msgid "Hide the column headers"
 msgstr "Приховати заголовки стовпчиків"
 
-#: src/option.c:546
-msgid ""
-"Change list default search function searching for text in the middle, not on "
-"the beginning"
-msgstr ""
-"Змінити типову функціональну можливість пошуку у списку так, щоб пошук"
-" виконувався від середини списку, а не його початку."
-
-#: src/option.c:557
+#: src/option.c:579
 msgid "Display notification"
 msgstr "Показати сповіщення"
 
-#: src/option.c:564
+#: src/option.c:586
 msgid "Set the notification text"
 msgstr "Вказати текст сповіщення"
 
-#: src/option.c:571
+#: src/option.c:600
 msgid "Listen for commands on stdin"
 msgstr "Приймати команди з stdin"
 
-#: src/option.c:578
-#| msgid "Set the notification text"
-msgid "Set the notification hints"
-msgstr "Вказати підказки сповіщення"
-
-#: src/option.c:590
+#: src/option.c:617
 msgid "Display progress indication dialog"
 msgstr "Показати діалог з індикатором поступу"
 
-#: src/option.c:604
+#: src/option.c:631
 msgid "Set initial percentage"
 msgstr "Вказати початкові відсотки"
 
-#: src/option.c:605
+#: src/option.c:632
 msgid "PERCENTAGE"
 msgstr "ВІДСОТОК"
 
-#: src/option.c:611
+#: src/option.c:638
 msgid "Pulsate progress bar"
 msgstr "Пульсівна панель поступу"
 
-#: src/option.c:619
+#: src/option.c:646
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Прибрати діалог, коли буде досягнуто 100%"
 
-#: src/option.c:626
+#: src/option.c:653
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Вбити батьківський процес, якщо натиснуто кнопку «Скасувати»"
 
-#: src/option.c:633
+#: src/option.c:660
 msgid "Hide Cancel button"
 msgstr "Сховати кнопку «Скасувати»"
 
-#: src/option.c:641
+#: src/option.c:668
 #, no-c-format
 msgid "Estimate when progress will reach 100%"
 msgstr "Оцінка часу, який потрібен для досягнення рівня поступу 100%"
 
-#: src/option.c:650
+#: src/option.c:678
 msgid "Display question dialog"
 msgstr "Показати вікно запитання"
 
-#: src/option.c:684
-#| msgid "Hide Cancel button"
+#: src/option.c:713
 msgid "Give Cancel button focus by default"
 msgstr "Передати типово фокус на кнопку «Скасувати»"
 
-#: src/option.c:698
-#| msgid "Hide Cancel button"
+#: src/option.c:729
 msgid "Suppress OK and Cancel buttons"
 msgstr "Придушити показ кнопок «Гаразд» і «Скасувати»"
 
-#: src/option.c:708
+#: src/option.c:739
 msgid "Display text information dialog"
 msgstr "Показати діалог текстової інформації"
 
-#: src/option.c:715
+#: src/option.c:746
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: src/option.c:729
+#: src/option.c:760
 msgid "Set the text font"
 msgstr "Вказати шрифт тексту"
 
-#: src/option.c:736
+#: src/option.c:767
 msgid "Enable an I read and agree checkbox"
 msgstr "Увімкнути позначку «Я прочитав і погоджуюсь»"
 
-#: src/option.c:744
-#| msgid "Enable html support"
+#: src/option.c:775
 msgid "Enable HTML support"
 msgstr "Увімкнути підтримку HTML"
 
-#: src/option.c:751
-#| msgid "Sets an url instead of a file. Only works if you use --html option"
+#: src/option.c:782
 msgid ""
 "Do not enable user interaction with the WebView. Only works if you use --"
 "html option"
 msgstr ""
-"Не вмикати взаємодію користувача із вікном WebView. Працює лише за"
-" використання параметра --html"
+"Не вмикати взаємодію користувача із вікном WebView. Працює лише за "
+"використання параметра --html"
 
-#: src/option.c:759
-#| msgid "Sets an url instead of a file. Only works if you use --html option"
+#: src/option.c:790
 msgid "Set an URL instead of a file. Only works if you use --html option"
 msgstr ""
 "Вказати адресу замість файла. Працює лише за використання параметра --html"
 
-#: src/option.c:761
+#: src/option.c:792
 msgid "URL"
 msgstr "URL"
 
-#: src/option.c:768
+#: src/option.c:799
 msgid "Auto scroll the text to the end. Only when text is captured from stdin"
 msgstr ""
-"Автоматично гортати текст до кінця. Лише якщо текст захоплено зі стандартного"
-" джерела вхідних даних (stdin)"
+"Автоматично гортати текст до кінця. Лише якщо текст захоплено зі "
+"стандартного джерела вхідних даних (stdin)"
 
-#: src/option.c:778
+#: src/option.c:810
 msgid "Display warning dialog"
 msgstr "Показати діалог попередження"
 
-#: src/option.c:821
+#: src/option.c:857
 msgid "Display scale dialog"
 msgstr "Показати діалог масштабу"
 
-#: src/option.c:835
+#: src/option.c:871
 msgid "Set initial value"
 msgstr "Вказати початкове значення"
 
-#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
-#: src/option.c:1008
+#: src/option.c:872 src/option.c:879 src/option.c:886 src/option.c:893
+#: src/option.c:1045
 msgid "VALUE"
 msgstr "ЗНАЧЕННЯ"
 
-#: src/option.c:842
+#: src/option.c:878
 msgid "Set minimum value"
 msgstr "Вказати мінімальне значення"
 
-#: src/option.c:849
+#: src/option.c:885
 msgid "Set maximum value"
 msgstr "Вказати максимальне значення"
 
-#: src/option.c:856
+#: src/option.c:892
 msgid "Set step size"
 msgstr "Вказати розмір кроку"
 
-#: src/option.c:863
+#: src/option.c:899
 msgid "Print partial values"
 msgstr "Виводити часткові значення"
 
-#: src/option.c:870
+#: src/option.c:906
 msgid "Hide value"
 msgstr "Сховати величину"
 
-#: src/option.c:879
+#: src/option.c:916
 msgid "Display forms dialog"
 msgstr "Показати діалог форм"
 
-#: src/option.c:886
+#: src/option.c:923
 msgid "Add a new Entry in forms dialog"
 msgstr "Додати нове поле в діалог форм"
 
-#: src/option.c:887 src/option.c:894
+#: src/option.c:924 src/option.c:931
 msgid "Field name"
 msgstr "Назва поля"
 
-#: src/option.c:893
+#: src/option.c:930
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Додати нове поле вводу пароля в діалог форм"
 
-#: src/option.c:900
+#: src/option.c:937
 msgid "Add a new Calendar in forms dialog"
 msgstr "Додати новий календар у діалог форм"
 
-#: src/option.c:901
+#: src/option.c:938
 msgid "Calendar field name"
 msgstr "Поле назви календаря"
 
-#: src/option.c:907
+#: src/option.c:944
 msgid "Add a new List in forms dialog"
 msgstr "Додати новий список в діалог форм"
 
-#: src/option.c:908
+#: src/option.c:945
 msgid "List field and header name"
 msgstr "Поле списку та назва заголовку"
 
-#: src/option.c:914
+#: src/option.c:951
 msgid "List of values for List"
 msgstr "Значення списку для списку"
 
-#: src/option.c:915 src/option.c:922 src/option.c:936
+#: src/option.c:952 src/option.c:959 src/option.c:973
 msgid "List of values separated by |"
 msgstr "Значення списку, розділені |"
 
-#: src/option.c:921
+#: src/option.c:958
 msgid "List of values for columns"
 msgstr "Значення списку для стовпців"
 
-#: src/option.c:928
-#| msgid "Add a new List in forms dialog"
+#: src/option.c:965
 msgid "Add a new combo box in forms dialog"
 msgstr "Додати новий спадний список до вікна форм"
 
-#: src/option.c:929
-#| msgid "Calendar field name"
+#: src/option.c:966
 msgid "Combo box field name"
 msgstr "Назва поля спадного списку"
 
-#: src/option.c:935
-#| msgid "List of values for columns"
+#: src/option.c:972
 msgid "List of values for combo box"
 msgstr "Список значень для спадного списку"
 
-#: src/option.c:952
+#: src/option.c:989
 msgid "Show the columns header"
 msgstr "Показувати заголовки стовпців"
 
-#: src/option.c:983
+#: src/option.c:1020
 msgid "Display password dialog"
 msgstr "Показати діалог вводу пароля"
 
-#: src/option.c:990
+#: src/option.c:1027
 msgid "Display the username option"
 msgstr "Показати параметри користувача"
 
-#: src/option.c:1000
+#: src/option.c:1037
 msgid "Display color selection dialog"
 msgstr "Показати діалог вибору кольору"
 
-#: src/option.c:1007
+#: src/option.c:1044
 msgid "Set the color"
 msgstr "Вказати колір"
 
-#: src/option.c:1014
+#: src/option.c:1051
 msgid "Show the palette"
 msgstr "Показати палітру"
 
-#: src/option.c:1023
+#: src/option.c:1061
 msgid "About zenity"
 msgstr "Про Zenity"
 
-#: src/option.c:1030
+#: src/option.c:1068
 msgid "Print version"
 msgstr "Показати версію"
 
-#: src/option.c:1913
+#: src/option.c:1080
+#| msgid ""
+#| "Warning: --window-icon is deprecated and will be removed in a future "
+#| "version of zenity. Ignoring.\n"
+msgid ""
+"Warning: --icon-name is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Попередження: параметр --icon-name вважається застарілим; його буде "
+"вилучено у наступних версіях zenity. Обробляємо як --icon.\n"
+
+#: src/option.c:1087
+#| msgid ""
+#| "Warning: --window-icon is deprecated and will be removed in a future "
+#| "version of zenity. Ignoring.\n"
+msgid ""
+"Warning: --window-icon is deprecated and will be removed in a future version "
+"of zenity; Treating as --icon.\n"
+msgstr ""
+"Попередження: параметр --window-icon вважається застарілим; його буде "
+"вилучено у наступних версіях zenity. Обробляємо як --icon.\n"
+
+#: src/option.c:1094
+#| msgid ""
+#| "Warning: --mid-search is deprecated and will be removed in a future "
+#| "version of zenity. Ignoring.\n"
+msgid ""
+"Warning: --confirm-overwrite is deprecated and will be removed in a future "
+"version of zenity. Ignoring.\n"
+msgstr ""
+"Попередження: параметр --confirm-overwrite вважається застарілим; його буде "
+"вилучено у наступних версіях zenity. Ігноруємо.\n"
+
+#: src/option.c:1101
+#| msgid ""
+#| "Warning: --mid-search is deprecated and will be removed in a future "
+#| "version of zenity. Ignoring.\n"
+msgid ""
+"Warning: --attach is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Попередження: параметр --attach вважається застарілим; його буде "
+"вилучено у наступних версіях zenity. Ігноруємо.\n"
+
+#: src/option.c:1108
+#| msgid ""
+#| "Warning: --window-icon is deprecated and will be removed in a future "
+#| "version of zenity. Ignoring.\n"
+msgid ""
+"Warning: --hint is deprecated and will be removed in a future version of "
+"zenity. Ignoring.\n"
+msgstr ""
+"Попередження: параметр --hint вважається застарілим; його буде "
+"вилучено у наступних версіях zenity. Ігноруємо.\n"
+
+#: src/option.c:2029
 msgid "General options"
 msgstr "Загальні параметри"
 
-#: src/option.c:1914
+#: src/option.c:2030
 msgid "Show general options"
 msgstr "Показувати загальні параметри"
 
-#: src/option.c:1926
+#: src/option.c:2042
 msgid "Calendar options"
 msgstr "Параметри календаря"
 
-#: src/option.c:1927
+#: src/option.c:2043
 msgid "Show calendar options"
 msgstr "Показувати параметри календаря"
 
-#: src/option.c:1939
+#: src/option.c:2055
 msgid "Text entry options"
 msgstr "Параметри поля вводу"
 
-#: src/option.c:1940
+#: src/option.c:2056
 msgid "Show text entry options"
 msgstr "Показувати параметри поля вводу"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Error options"
 msgstr "Параметри помилки"
 
-#: src/option.c:1952
+#: src/option.c:2068
 msgid "Show error options"
 msgstr "Показувати параметри виводу помилки"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Info options"
 msgstr "Параметри інформації"
 
-#: src/option.c:1962
+#: src/option.c:2078
 msgid "Show info options"
 msgstr "Показувати параметри виводу інформації"
 
-#: src/option.c:1972
+#: src/option.c:2088
 msgid "File selection options"
 msgstr "Параметри вибору файла"
 
-#: src/option.c:1973
+#: src/option.c:2089
 msgid "Show file selection options"
 msgstr "Показувати параметри вибору файла"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "List options"
 msgstr "Параметри списку"
 
-#: src/option.c:1985
+#: src/option.c:2101
 msgid "Show list options"
 msgstr "Показувати параметри списку"
 
-#: src/option.c:1996
-msgid "Notification icon options"
-msgstr "Параметри піктограми сповіщення"
+#: src/option.c:2111
+msgid "Notification options"
+msgstr "Параметри сповіщення"
 
-#: src/option.c:1997
-msgid "Show notification icon options"
-msgstr "Параметри піктограми сповіщення"
+#: src/option.c:2112
+msgid "Show notification options"
+msgstr "Показати параметри сповіщення"
 
-#: src/option.c:2011
+#: src/option.c:2125
 msgid "Progress options"
 msgstr "Параметри поступу"
 
-#: src/option.c:2012
+#: src/option.c:2126
 msgid "Show progress options"
 msgstr "Показувати параметри поступу"
 
-#: src/option.c:2024
+#: src/option.c:2138
 msgid "Question options"
 msgstr "Параметри запитання"
 
-#: src/option.c:2025
+#: src/option.c:2139
 msgid "Show question options"
 msgstr "Показувати параметри запитання"
 
-#: src/option.c:2037
+#: src/option.c:2151
 msgid "Warning options"
 msgstr "Параметри попередження"
 
-#: src/option.c:2038
+#: src/option.c:2152
 msgid "Show warning options"
 msgstr "Показувати параметри виводу попередження"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Scale options"
 msgstr "Параметри масштабу"
 
-#: src/option.c:2050
+#: src/option.c:2164
 msgid "Show scale options"
 msgstr "Показувати параметри масштабу"
 
-#: src/option.c:2060
+#: src/option.c:2174
 msgid "Text information options"
 msgstr "Параметри текстової інформації"
 
-#: src/option.c:2061
+#: src/option.c:2175
 msgid "Show text information options"
 msgstr "Показувати параметри текстової інформації"
 
-#: src/option.c:2073
+#: src/option.c:2187
 msgid "Color selection options"
 msgstr "Параметри вибору кольору"
 
-#: src/option.c:2074
+#: src/option.c:2188
 msgid "Show color selection options"
 msgstr "Показувати параметри вибору кольору"
 
-#: src/option.c:2086
+#: src/option.c:2200
 msgid "Password dialog options"
 msgstr "Параметри діалогу пароля"
 
-#: src/option.c:2087
+#: src/option.c:2201
 msgid "Show password dialog options"
 msgstr "Показувати параметри діалогу запиту пароля"
 
-#: src/option.c:2099
+#: src/option.c:2213
 msgid "Forms dialog options"
 msgstr "Параметри діалогу форм"
 
-#: src/option.c:2100
+#: src/option.c:2214
 msgid "Show forms dialog options"
 msgstr "Показувати параметри діалогу форм"
 
-#: src/option.c:2112
+#: src/option.c:2226
 msgid "Miscellaneous options"
 msgstr "Інші параметри"
 
-#: src/option.c:2113
+#: src/option.c:2227
 msgid "Show miscellaneous options"
 msgstr "Показувати інші параметри"
 
-#: src/option.c:2139
+#: src/option.c:2250
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Цей параметр недоступний. Для перегляду доступних параметрів використовуйте "
 "ключ --help.\n"
 
-#: src/option.c:2144
+#: src/option.c:2255
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s не підтримується цим діалогом\n"
 
-#: src/option.c:2148
+#: src/option.c:2259
 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 password"
+#: src/password.c:85
 msgid "Type your username and password"
 msgstr "Введіть ваше ім'я користувач і пароль"
 
-#: src/password.c:100
+#. Add the username label and entry and increment the row for the
+#. * password entry so it will be added below the username.
+#.
+#: src/password.c:90
 msgid "Username:"
 msgstr "Користувач:"
 
-#: src/password.c:110
+#: src/password.c:105
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/progress.c:102
+#: src/progress.c:115
 #, c-format
 msgid "Time remaining: %lu:%02lu:%02lu"
 msgstr "Лишилося часу: %lu:%02lu:%02lu"
@@ -818,101 +806,175 @@ msgstr "Лишилося часу: %lu:%02lu:%02lu"
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Максимальне значення має бути більше за мінімальне.\n"
 
-#: src/scale.c:69
+#: src/scale.c:70
 msgid "Value out of range.\n"
 msgstr "Значення за межами діапазону.\n"
 
-#: src/tree.c:393
+#: src/tree.c:57
+msgid ""
+"Warning: --mid-search is deprecated and will be removed in a future version "
+"of zenity. Ignoring.\n"
+msgstr ""
+"Попередження: параметр --mid-search вважається застарілим; його буде "
+"вилучено у наступних версіях zenity. Ігноруємо.\n"
+
+#: src/tree.c:281
 msgid "No column titles specified for List dialog.\n"
 msgstr "Не вказано заголовків стовпчиків для вікна списків».\n"
 
-#: src/tree.c:399
+#: src/tree.c:288
 msgid "You should use only one List dialog type.\n"
 msgstr "Слід використовувати лише єдиний тип діалогу списків.\n"
 
-#: src/zenity.ui:14 src/zenity.ui:76
+#: src/util.c:68
+#, c-format
+msgid "Icon filename %s not found; trying theme icon."
+msgstr ""
+"Не знайдено файла піктограми %s; спробуємо скористатися піктограмою з теми."
+
+#: src/zenity.ui:9 src/zenity.ui:30
 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
+#: src/zenity.ui:45
 msgid "Text View"
 msgstr "Перегляд тексту"
 
-#: src/zenity.ui:231
+#: src/zenity.ui:82
 msgid "Calendar selection"
 msgstr "Вибір дати"
 
-#: src/zenity.ui:298
+#: src/zenity.ui:102
 msgid "Select a date from below."
 msgstr "Виберіть дату нижче."
 
-#: src/zenity.ui:319
+#: src/zenity.ui:112
 msgid "C_alendar:"
 msgstr "_Календар:"
 
-#: src/zenity.ui:361
+#: src/zenity.ui:117
+msgid "Calendar"
+msgstr "Календар"
+
+#: src/zenity.ui:132
 msgid "Add a new entry"
 msgstr "Додати нове поле"
 
-#: src/zenity.ui:428
+#: src/zenity.ui:156
 msgid "_Enter new text:"
 msgstr "_Введіть новий текст:"
 
-#: src/zenity.ui:465
+#: src/zenity.ui:170
 msgid "Error"
 msgstr "Помилка"
 
-#: src/zenity.ui:530
+#: src/zenity.ui:198
 msgid "An error has occurred."
 msgstr "Виникла помилка."
 
-#: src/zenity.ui:658
+#: src/zenity.ui:259
 msgid "Forms dialog"
 msgstr "Діалог форм"
 
-#: src/zenity.ui:681
+#: src/zenity.ui:269
 msgid "Information"
 msgstr "Інформація"
 
-#: src/zenity.ui:741
+#: src/zenity.ui:295
 msgid "All updates are complete."
 msgstr "Всі оновлення завершено."
 
-#: src/zenity.ui:768
+#: src/zenity.ui:305
 msgid "Progress"
 msgstr "Поступ"
 
-#: src/zenity.ui:831
+#: src/zenity.ui:317
 msgid "Running..."
 msgstr "Виконання…"
 
-#: src/zenity.ui:882
+#: src/zenity.ui:339
 msgid "Question"
 msgstr "Запитання"
 
-#: src/zenity.ui:929 src/zenity.ui:1126
+#: src/zenity.ui:342
+msgid "_No"
+msgstr "_Ні"
+
+#: src/zenity.ui:343
+msgid "_Yes"
+msgstr "_Так"
+
+#: src/zenity.ui:365 src/zenity.ui:442
 msgid "Are you sure you want to proceed?"
 msgstr "Продовжити?"
 
-#: src/zenity.ui:953
+#: src/zenity.ui:375
 msgid "Select items from the list"
 msgstr "Виберіть пункти зі списку"
 
-#: src/zenity.ui:1015
+#: src/zenity.ui:404
 msgid "Select items from the list below."
 msgstr "Виберіть пункти зі списку нижче."
 
-#: src/zenity.ui:1064
+#: src/zenity.ui:415 src/zenity.ui:452
 msgid "Warning"
 msgstr "Попередження"
+
+#: src/zenity.ui:479
+msgid "Type your password"
+msgstr "Введіть ваш пароль"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Юрій Сирота <yuriy@beer.com>\n"
+#~ "Максим Дзюманенко <dziumanenko@gmail.com>\n"
+#~ "Daniel Korostil <ted.korostiled@gmail.com>"
+
+#~ msgid ""
+#~ "Invalid value for a boolean typed hint.\n"
+#~ "Supported values are 'true' or 'false'.\n"
+#~ msgstr ""
+#~ "Некоректне значення для типізованої булевої підказки.\n"
+#~ "Підтримувані значення — «true» або «false».\n"
+
+#~ msgid "Unsupported hint. Skipping.\n"
+#~ msgstr "Непідтримувана підказка. Пропускаємо.\n"
+
+#~ msgid "Unknown hint name. Skipping.\n"
+#~ msgstr "Невідома назва підказки. Пропускаємо.\n"
+
+#~ msgid "Zenity notification"
+#~ msgstr "Сповіщення Zenity"
+
+#~ msgid "Set the window icon"
+#~ msgstr "Вказати піктограму вікна"
+
+#~ msgid "ICONPATH"
+#~ msgstr "ШЛЯХ"
+
+#~| msgid "Set the window icon"
+#~ msgid "Set the parent window to attach to"
+#~ msgstr "Вказати батьківське вікно, до якого слід долучити віджет"
+
+#~ msgid "Set the dialog icon"
+#~ msgstr "Вказати піктограму вікна"
+
+#~ msgid "Confirm file selection if filename already exists"
+#~ msgstr "Підтвердити вибір файла, якщо назва файла вже існує"
+
+#~ msgid ""
+#~ "Change list default search function searching for text in the middle, not "
+#~ "on the beginning"
+#~ msgstr ""
+#~ "Змінити типову функціональну можливість пошуку у списку так, щоб пошук "
+#~ "виконувався від середини списку, а не його початку."
+
+#~| msgid "Set the notification text"
+#~ msgid "Set the notification hints"
+#~ msgstr "Вказати підказки сповіщення"
+
+#~ msgid "Cancel"
+#~ msgstr "Скасувати"
+
+#~ msgid "OK"
+#~ msgstr "Гаразд"
diff --git a/src/about.c b/src/about.c
index c0baa9e7..b71ea134 100644
--- a/src/about.c
+++ b/src/about.c
@@ -1,12 +1,15 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * about.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
- * Copyright (C) 2001 CodeFactory AB
- * Copyright (C) 2001, 2002 Anders Carlsson
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2001 CodeFactory AB
+ * Copyright © 2001, 2002 Anders Carlsson
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
@@ -15,7 +18,7 @@
  * 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
+ * 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.
@@ -24,22 +27,19 @@
  *          Anders Carlsson <andersca@gnu.org>
  */
 
-#include "config.h"
 #include "util.h"
 #include "zenity.h"
-#include <gdk/gdkkeysyms.h>
+
 #include <string.h>
 
-#define GTK_RESPONSE_CREDITS 0
-#define ZENITY_HELP_PATH ZENITY_DATADIR "/help/"
+#include <config.h>
 
 static GtkWidget *dialog;
 
-static void zenity_about_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+static void zenity_about_close_cb (GtkWindow *window, gpointer data);
 
 /* Sync with the people in the THANKS file */
-static const gchar *const authors[] = {"Glynn Foster <glynn foster sun com>",
+static const char *const authors[] = {"Glynn Foster <glynn foster sun com>",
 	"Lucas Rocha <lucasr gnome org>",
 	"Mike Newman <mikegtn gnome org>",
 	NULL};
@@ -50,8 +50,6 @@ static const char *documenters[] = {"Glynn Foster <glynn.foster@sun.com>",
 	"GNOME Documentation Project",
 	NULL};
 
-static gchar *translators;
-
 static const char *license[] = {
 	N_ ("This program is free software; you can redistribute it and/or modify "
 		"it under the terms of the GNU Lesser General Public License as "
@@ -69,72 +67,55 @@ static const char *license[] = {
 		"02110-1301, USA.")};
 
 void
-zenity_about (ZenityData *data) {
-	GdkPixbuf *logo;
+zenity_about (ZenityData *data)
+{
 	char *license_trans;
 
-	translators = _ ("translator-credits");
-	logo =
-		gdk_pixbuf_new_from_file (ZENITY_IMAGE_FULLPATH ("zenity.png"), NULL);
-
 	license_trans = g_strconcat (
-		_ (license[0]), "\n", _ (license[1]), "\n", _ (license[2]), "\n", NULL);
+		_(license[0]), "\n", _(license[1]), "\n", _(license[2]), "\n", NULL);
 
 	dialog = gtk_about_dialog_new ();
 
 	g_object_set (G_OBJECT (dialog),
-		"name",
+		"program-name",
 		"Zenity",
 		"version",
 		VERSION,
 		"copyright",
-		"Copyright \xc2\xa9 2003 Sun Microsystems",
+		"Copyright \xc2\xa9 2003 Sun Microsystems\n"
+		"Copyright \xc2\xa9 2021-2023 Logan Rathbone\n",
 		"comments",
-		_ ("Display dialog boxes from shell scripts"),
+		_("Display dialog boxes from shell scripts"),
 		"authors",
 		authors,
 		"documenters",
 		documenters,
-		"translator-credits",
-		translators,
 		"website",
-		"http://live.gnome.org/Zenity",
-		"logo",
-		logo,
+		"https://gitlab.gnome.org/GNOME/zenity",
 		"wrap-license",
 		TRUE,
 		"license",
 		license_trans,
+		"icon-name",
+		"zenity",
+		"logo-icon-name",
+		"zenity",
 		NULL);
 
 	g_free (license_trans);
 
-	zenity_util_set_window_icon (
-		dialog, NULL, ZENITY_IMAGE_FULLPATH ("zenity.png"));
+	g_signal_connect (dialog, "close-request",
+			G_CALLBACK(zenity_about_close_cb), data);
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_about_dialog_response),
-		data);
-
-	zenity_util_show_dialog (dialog, data->attach);
-	gtk_main ();
+	zenity_util_show_dialog (dialog);
+	zenity_util_gapp_main (GTK_WINDOW (dialog));
 }
 
 static void
-zenity_about_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_about_close_cb (GtkWindow *window, gpointer data)
+{
 	ZenityData *zen_data = data;
 
-	switch (response) {
-		case GTK_RESPONSE_CLOSE:
-			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
-			break;
-
-		default:
-			/* Esc dialog */
-			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
-			break;
-	}
-
-	gtk_main_quit ();
+	zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
+	zenity_util_gapp_quit (window, zen_data);
 }
diff --git a/src/calendar.c b/src/calendar.c
index 9aaf927f..1eac9f3e 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -1,19 +1,22 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * calendar.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
@@ -21,55 +24,50 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include "config.h"
 
 #include "util.h"
 #include "zenity.h"
+
 #include <time.h>
 
+#include <config.h>
+
 static GtkWidget *calendar;
 static ZenityCalendarData *zen_cal_data;
 
-static void zenity_calendar_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
-static void zenity_calendar_double_click (GtkCalendar *calendar, gpointer data);
+static void zenity_calendar_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
 void
-zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) {
-	GtkBuilder *builder;
+zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data)
+{
+	g_autoptr(GtkBuilder) builder = NULL;
 	GtkWidget *dialog;
-	GtkWidget *button;
 	GObject *text;
 
 	zen_cal_data = cal_data;
 
-	builder = zenity_util_load_ui_file ("zenity_calendar_dialog", NULL);
+	builder = zenity_util_load_ui_file ("zenity_calendar_dialog", "zenity_calendar_box", NULL);
 
 	if (builder == NULL) {
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
-
-	dialog =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_calendar_dialog"));
+	dialog = GTK_WIDGET (gtk_builder_get_object (builder,
+				"zenity_calendar_dialog"));
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_calendar_dialog_response),
-		data);
+	g_signal_connect (dialog, "response",
+		G_CALLBACK(zenity_calendar_dialog_response), data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
-	zenity_util_set_window_icon (dialog,
-		data->window_icon,
-		ZENITY_IMAGE_FULLPATH ("zenity-calendar.png"));
+	gtk_window_set_icon_name (GTK_WINDOW(dialog),
+			"x-office-calendar");
 
 	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
+		gtk_window_set_default_size (GTK_WINDOW(dialog),
+				data->width, data->height);
 
 	if (data->modal)
 		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
@@ -77,24 +75,28 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) {
 	text = gtk_builder_get_object (builder, "zenity_calendar_text");
 
 	if (cal_data->dialog_text)
-		gtk_label_set_markup (
-			GTK_LABEL (text), g_strcompress (cal_data->dialog_text));
+		gtk_label_set_markup (GTK_LABEL(text),
+				g_strcompress (cal_data->dialog_text));
 
-	calendar = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_calendar"));
+	calendar = GTK_WIDGET(gtk_builder_get_object (builder, "zenity_calendar"));
 
 	if (cal_data->month > 0 || cal_data->year > 0)
-		gtk_calendar_select_month (
-			GTK_CALENDAR (calendar), cal_data->month - 1, cal_data->year);
-	if (cal_data->day > 0)
-		gtk_calendar_select_day (GTK_CALENDAR (calendar), cal_data->day);
+	{
+		g_object_set (calendar,
+				"month",	cal_data->month - 1,
+				"year",		cal_data->year,
+				NULL);
+	}
 
-	g_signal_connect (calendar,
-		"day-selected-double-click",
-		G_CALLBACK (zenity_calendar_double_click),
-		data);
+	if (cal_data->day > 0)
+	{
+		g_object_set (calendar,
+				"day", cal_data->day - 1,
+				NULL);
+	}
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (text), calendar);
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 
 	if (data->timeout_delay > 0) {
 		g_timeout_add_seconds (data->timeout_delay,
@@ -102,60 +104,58 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) {
 			dialog);
 	}
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
-	if (data->ok_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_calendar_ok_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+	if (data->ok_label)
+	{
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
 	}
 
-	if (data->cancel_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_calendar_cancel_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
 	}
 
-	g_object_unref (builder);
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
+
 static void
-zenity_calendar_dialog_output (void) {
-	guint day, month, year;
-	gchar time_string[128];
-	GDate *date = NULL;
-
-	gtk_calendar_get_date (GTK_CALENDAR (calendar), &day, &month, &year);
-	date = g_date_new_dmy (year, month + 1, day);
-	g_date_strftime (time_string, 127, zen_cal_data->date_format, date);
+zenity_calendar_dialog_output (void)
+{
+	int day, month, year;
+	g_autofree char *time_string = NULL;
+	g_autoptr(GDateTime) date = NULL;
+
+	g_object_get (calendar,
+			"day", &day,
+			"month", &month,
+			"year", &year,
+			NULL);
+
+	date = g_date_time_new_local (year, month + 1, day + 1,
+			0, 0, 0);
+
+	time_string = g_date_time_format (date, zen_cal_data->date_format);
 	g_print ("%s\n", time_string);
-
-	if (date != NULL)
-		g_date_free (date);
 }
 
 static void
-zenity_calendar_dialog_response (
-	GtkWidget *widget, int response, gpointer data) {
-	ZenityData *zen_data;
-
-	zen_data = data;
-
-	switch (response) {
-		case GTK_RESPONSE_OK:
+zenity_calendar_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
+	ZenityData *zen_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
+
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_calendar_dialog_output ();
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
@@ -166,15 +166,10 @@ zenity_calendar_dialog_response (
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
 				printf ("%s\n", zen_data->extra_label[response]);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-	gtk_main_quit ();
-}
-
-static void
-zenity_calendar_double_click (GtkCalendar *cal, gpointer data) {
-	zenity_calendar_dialog_response (NULL, GTK_RESPONSE_OK, data);
+	zenity_util_gapp_quit (GTK_WINDOW(gtk_widget_get_native (widget)), zen_data);
 }
diff --git a/src/color.c b/src/color.c
index 9ef233eb..d1f7c8e4 100644
--- a/src/color.c
+++ b/src/color.c
@@ -1,19 +1,22 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * color.c
  *
- * Copyright (C) 2010 Berislav Kovacki
+ * Copyright © 2010 Berislav Kovacki
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
@@ -27,51 +30,34 @@
 #include "zenity.h"
 #include <string.h>
 
+/* TODO: port to GtkColorDialog */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static ZenityData *zen_data;
 
-static void zenity_colorselection_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+static void zenity_colorselection_dialog_response (GtkWidget *widget, int response, gpointer data);
 
 void
-zenity_colorselection (ZenityData *data, ZenityColorData *color_data) {
+zenity_colorselection (ZenityData *data, ZenityColorData *color_data)
+{
 	GtkWidget *dialog;
-	GtkWidget *button;
 	GdkRGBA color;
 
 	zen_data = data;
 
 	dialog = gtk_color_chooser_dialog_new (data->dialog_title, NULL);
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_colorselection_dialog_response),
-		color_data);
+	g_signal_connect (dialog, "response", G_CALLBACK (zenity_colorselection_dialog_response), color_data);
 
-	if (color_data->color) {
-		if (gdk_rgba_parse (&color, color_data->color)) {
-			gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-		}
+	if (color_data->color &&
+			gdk_rgba_parse (&color, color_data->color))
+	{
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER(dialog), &color);
 	}
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
-	}
-
-	if (data->ok_label) {
-		g_object_get (G_OBJECT (dialog), "ok-button", &button, NULL);
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
-		g_object_unref (G_OBJECT (button));
-	}
-
-	if (data->cancel_label) {
-		g_object_get (G_OBJECT (dialog), "cancel-button", &button, NULL);
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
-		g_object_unref (G_OBJECT (button));
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
 	if (data->modal)
@@ -79,23 +65,23 @@ zenity_colorselection (ZenityData *data, ZenityColorData *color_data) {
 
 	g_object_set (dialog, "show-editor", !color_data->show_palette, NULL);
 
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 
 	if (data->timeout_delay > 0) {
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			dialog);
 	}
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_colorselection_dialog_response (
-	GtkWidget *widget, int response, gpointer data) {
+zenity_colorselection_dialog_response (GtkWidget *widget, int response, gpointer data)
+{
 	GdkRGBA color;
 
-	switch (response) {
+	switch (response)
+	{
 		case GTK_RESPONSE_OK:
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (widget), &color);
@@ -108,11 +94,12 @@ zenity_colorselection_dialog_response (
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
 				printf ("%s\n", zen_data->extra_label[response]);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
+
+G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/src/entry.c b/src/entry.c
index bf3db713..2632d280 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -1,19 +1,22 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * entry.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
@@ -21,98 +24,88 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include "config.h"
-
 #include "util.h"
 #include "zenity.h"
 
-static void zenity_entry_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+#include <config.h>
+
+static void zenity_entry_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
 static GtkWidget *entry;
-static gint n_entries = 0;
+static int n_entries = 0;
 
 static void
-zenity_entry_fill_entries (GSList **entries, const gchar **args) {
-	gint i = 0;
-
-	while (args[i] != NULL) {
-		*entries = g_slist_append (*entries, (gchar *) args[i]);
-		i++;
+zenity_entry_fill_entries (GSList **entries, const char **args)
+{
+	for (int i = 0; args[i] != NULL; ++i)
+	{
+		*entries = g_slist_append (*entries, (char *)args[i]);
 	}
 }
 
 static void
-zenity_entry_combo_activate_default (GtkEntry *entry, gpointer window) {
-	gtk_window_activate_default (GTK_WINDOW (window));
+zenity_entry_combo_activate_default (GtkEntry *entry, gpointer window)
+{
+	g_signal_emit_by_name (window, "activate-default");
 }
 
 void
-zenity_entry (ZenityData *data, ZenityEntryData *entry_data) {
-	GtkBuilder *builder = NULL;
+zenity_entry (ZenityData *data, ZenityEntryData *entry_data)
+{
+	g_autoptr(GtkBuilder) builder = NULL;
 	GtkWidget *dialog;
-	GtkWidget *button;
 	GObject *text;
 	GSList *entries = NULL;
 	GSList *tmp;
 	GObject *vbox;
 
-	builder = zenity_util_load_ui_file ("zenity_entry_dialog", NULL);
+	builder = zenity_util_load_ui_file ("zenity_entry_dialog", "zenity_entry_box", NULL);
 
-	if (builder == NULL) {
+	if (builder == NULL)
+	{
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
+	dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_entry_dialog"));
 
-	dialog =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_entry_dialog"));
-
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_entry_dialog_response),
-		data);
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_entry_dialog_response), data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
-	zenity_util_set_window_icon (
-		dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-entry.png"));
+	gtk_window_set_icon_name (GTK_WINDOW(dialog),
+			"insert-text");
 
 	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
+		gtk_window_set_default_size (GTK_WINDOW (dialog),
+				data->width, data->height);
 
 	if (data->modal)
 		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
-	if (data->ok_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_entry_ok_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+	if (data->ok_label)
+	{
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
 	}
 
-	if (data->cancel_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_entry_cancel_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
 	}
 
 	text = gtk_builder_get_object (builder, "zenity_entry_text");
 
-	if (entry_data->dialog_text)
-		gtk_label_set_text_with_mnemonic (
-			GTK_LABEL (text), g_strcompress (entry_data->dialog_text));
+	if (entry_data->dialog_text) {
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (text),
+				g_strcompress (entry_data->dialog_text));
+	}
 
 	vbox = gtk_builder_get_object (builder, "vbox4");
 
@@ -120,78 +113,97 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data) {
 
 	n_entries = g_slist_length (entries);
 
-	if (n_entries > 1) {
+	if (n_entries > 1)
+	{
+		GtkWidget *child;
+
 		entry = gtk_combo_box_text_new_with_entry ();
+		child = gtk_combo_box_get_child (GTK_COMBO_BOX(entry));
 
-		for (tmp = entries; tmp; tmp = tmp->next) {
-			gtk_combo_box_text_append_text (
-				GTK_COMBO_BOX_TEXT (entry), tmp->data);
+		for (tmp = entries; tmp; tmp = tmp->next)
+		{
+			gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(entry),
+					tmp->data);
 		}
 
-		if (entry_data->entry_text) {
-			gtk_combo_box_text_prepend_text (
-				GTK_COMBO_BOX_TEXT (entry), entry_data->entry_text);
-			gtk_combo_box_set_active (GTK_COMBO_BOX (entry), 0);
+		if (entry_data->entry_text)
+		{
+			gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT(entry),
+					entry_data->entry_text);
+			gtk_combo_box_set_active (GTK_COMBO_BOX(entry), 0);
 		}
 
-		g_signal_connect (gtk_bin_get_child (GTK_BIN (entry)),
-			"activate",
+		g_signal_connect (child, "activate",
 			G_CALLBACK (zenity_entry_combo_activate_default),
 			GTK_WINDOW (dialog));
-	} else {
+	}
+	else
+	{
+		GtkEntryBuffer *buffer;
+
 		entry = gtk_entry_new ();
+		buffer = gtk_entry_get_buffer (GTK_ENTRY(entry));
 
-		gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+		gtk_entry_set_activates_default (GTK_ENTRY(entry), TRUE);
 
-		if (entry_data->entry_text)
-			gtk_entry_set_text (GTK_ENTRY (entry), entry_data->entry_text);
+		if (entry_data->entry_text) {
+			gtk_entry_buffer_set_text (buffer, entry_data->entry_text, -1);
+		}
 
-		if (entry_data->hide_text)
-			g_object_set (G_OBJECT (entry), "visibility", FALSE, NULL);
+		if (entry_data->hide_text) {
+			gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE);
+		}
 	}
 
-	gtk_widget_show (entry);
-
-	gtk_box_pack_end (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+	gtk_box_append (GTK_BOX(vbox), entry);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (text), entry);
 
-	g_object_unref (builder);
-
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 
 	if (data->timeout_delay > 0) {
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			dialog);
 	}
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_entry_dialog_output (void) {
-	const gchar *text;
+zenity_entry_dialog_output (void)
+{
+	const char *text;
+
 	if (n_entries > 1)
-		text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (entry));
+	{
+		text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(entry));
+	}
 	else
-		text = gtk_entry_get_text (GTK_ENTRY (entry));
+	{
+		GtkEntryBuffer *buffer;
+
+		buffer = gtk_entry_get_buffer (GTK_ENTRY(entry));
+		text = gtk_entry_buffer_get_text (buffer);
+	}
 
 	if (text != NULL)
 		g_print ("%s\n", text);
 }
 
 static void
-zenity_entry_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_entry_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
 	ZenityData *zen_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
 
-	switch (response) {
-		case GTK_RESPONSE_OK:
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_entry_dialog_output ();
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
@@ -202,10 +214,10 @@ zenity_entry_dialog_response (GtkWidget *widget, int response, gpointer data) {
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
 				printf ("%s\n", zen_data->extra_label[response]);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
diff --git a/src/fileselection.c b/src/fileselection.c
index 465f08ae..cf6a481e 100644
--- a/src/fileselection.c
+++ b/src/fileselection.c
@@ -1,142 +1,119 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * fileselection.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
  *
- * Authors: Glynn Foster <glynn.foster@sun.com>
+ * Original Author: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include "config.h"
-
 #include "util.h"
 #include "zenity.h"
+
 #include <string.h>
 
+#include <config.h>
+
+/* TODO: port to GtkFileDialog.
+ */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static ZenityData *zen_data;
 
-static void zenity_fileselection_dialog_response (
-	gpointer obj, int response, gpointer data);
+static void zenity_fileselection_dialog_response (GtkWidget *widget, int response, gpointer data);
 
 void
-zenity_fileselection (ZenityData *data, ZenityFileData *file_data) {
-	gchar *dir;
-	gchar *basename;
+zenity_fileselection (ZenityData *data, ZenityFileData *file_data)
+{
 	GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
-#if GTK_CHECK_VERSION(3, 20, 0)
 	GtkFileChooserNative *dialog;
-#else
-	GtkWidget *dialog;
-#endif
 
 	zen_data = data;
 
 	if (file_data->directory) {
-		if (file_data->save)
-			action = GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER;
-		else
-			action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
-	} else {
-		if (file_data->save)
-			action = GTK_FILE_CHOOSER_ACTION_SAVE;
+		action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
+	}
+	else if (file_data->save) {
+		action = GTK_FILE_CHOOSER_ACTION_SAVE;
 	}
 
-#if GTK_CHECK_VERSION(3, 20, 0)
 	dialog = gtk_file_chooser_native_new (data->dialog_title,
-		NULL, /* TODO: Get parent from xid */
+		NULL,	/* parent */
 		action,
-		_ ("_OK"),
-		_ ("_Cancel"));
+		_("_OK"),
+		_("_Cancel"));
 
 	if (data->modal)
-		gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+		gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG(dialog), TRUE);
 
 	if (data->extra_label)
 		g_warning ("Cannot add extra labels to GtkFileChooserNative");
-#else
-	dialog = gtk_file_chooser_dialog_new (NULL,
-		NULL,
-		action,
-		_ ("_Cancel"),
-		GTK_RESPONSE_CANCEL,
-		_ ("_OK"),
-		GTK_RESPONSE_ACCEPT,
-		NULL);
 
-	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_fileselection_dialog_response), file_data);
 
-	if (data->modal)
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-
-	zenity_util_set_window_icon (
-		dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-file.png"));
+	if (file_data->uri)
+	{
+		if (g_path_is_absolute (file_data->uri) == TRUE)
+		{
+			g_autofree char *dir = g_path_get_dirname (file_data->uri);
+			g_autoptr(GFile) dir_gfile = g_file_new_for_path (dir);
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
+			gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dialog),
+					dir_gfile,
+					NULL);	/* GError */
 		}
-	}
-#endif
-
-	gtk_file_chooser_set_do_overwrite_confirmation (
-		GTK_FILE_CHOOSER (dialog), file_data->confirm_overwrite);
-
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_fileselection_dialog_response),
-		file_data);
-
-	if (file_data->uri) {
-		dir = g_path_get_dirname (file_data->uri);
-
-		if (g_path_is_absolute (file_data->uri) == TRUE)
-			gtk_file_chooser_set_current_folder (
-				GTK_FILE_CHOOSER (dialog), dir);
 
-		if (file_data->uri[strlen (file_data->uri) - 1] != '/') {
-			basename = g_path_get_basename (file_data->uri);
+		if (file_data->uri[strlen (file_data->uri) - 1] != '/')
+		{
 			if (file_data->save)
-				gtk_file_chooser_set_current_name (
-					GTK_FILE_CHOOSER (dialog), basename);
+			{
+				g_autofree char *basename = g_path_get_basename (file_data->uri);
+
+				gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
+						basename);
+			}
 			else
-				(void) gtk_file_chooser_set_filename (
-					GTK_FILE_CHOOSER (dialog), file_data->uri);
-			g_free (basename);
+			{
+				g_autoptr(GFile) file = g_file_new_for_uri (file_data->uri);
+
+				gtk_file_chooser_set_file (GTK_FILE_CHOOSER(dialog),
+						file,
+						NULL);	/* GError */
+			}
 		}
-		g_free (dir);
 	}
 
 	if (file_data->multi)
-		gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+		gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER(dialog), TRUE);
 
-	if (file_data->filter) {
+	if (file_data->filter)
+	{
 		/* Filter format: Executables | *.exe *.bat *.com */
-		gint filter_i;
-
-		for (filter_i = 0; file_data->filter[filter_i]; filter_i++) {
+		for (int filter_i = 0; file_data->filter[filter_i]; filter_i++)
+		{
 			GtkFileFilter *filter = gtk_file_filter_new ();
-			gchar *filter_str = file_data->filter[filter_i];
-			gchar **pattern, **patterns;
-			gchar *name = NULL;
-			gint i;
+			char *filter_str = file_data->filter[filter_i];
+			GStrv pattern;
+			g_auto(GStrv) patterns = NULL;
+			g_autofree char *name = NULL;
+			int i;
 
 			/* Set name */
 			for (i = 0; filter_str[i] != '\0'; i++)
@@ -165,20 +142,10 @@ zenity_fileselection (ZenityData *data, ZenityFileData *file_data) {
 			for (pattern = patterns; *pattern; pattern++)
 				gtk_file_filter_add_pattern (filter, *pattern);
 
-			if (name)
-				g_free (name);
-
-			g_strfreev (patterns);
-
-			gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+			gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
 		}
 	}
-
-#if GTK_CHECK_VERSION(3, 20, 0)
 	gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
-#else
-	zenity_util_show_dialog (dialog, data->attach);
-#endif
 
 	if (data->timeout_delay > 0) {
 		g_timeout_add_seconds (data->timeout_delay,
@@ -186,39 +153,47 @@ zenity_fileselection (ZenityData *data, ZenityFileData *file_data) {
 			dialog);
 	}
 
-	gtk_main ();
+	/* Since a native dialog is not a GtkWindow, we can't use our handy
+	 * util function.
+	 */
+	gtk_native_dialog_show (GTK_NATIVE_DIALOG(dialog));
+
+	zenity_util_gapp_main (NULL);
 }
 
 static void
-zenity_fileselection_dialog_output (
-	GtkFileChooser *chooser, ZenityFileData *file_data) {
-	GSList *selections, *iter;
-	selections = gtk_file_chooser_get_filenames (chooser);
-	for (iter = selections; iter != NULL; iter = iter->next) {
-		g_print ("%s",
-			g_filename_to_utf8 ((gchar *) iter->data, -1, NULL, NULL, NULL));
-		g_free (iter->data);
-		if (iter->next != NULL)
+zenity_fileselection_dialog_output (GtkFileChooser *chooser,
+		ZenityFileData *file_data)
+{
+	g_autoptr(GListModel) model = gtk_file_chooser_get_files (chooser);
+	guint items = g_list_model_get_n_items (model);
+
+	for (guint i = 0; i < items; ++i)
+	{
+		g_autoptr(GFile) file = g_list_model_get_item (model, i);
+
+		g_print ("%s", g_file_get_path (file));
+
+		if (i != items - 1)
 			g_print ("%s", file_data->separator);
 	}
 	g_print ("\n");
-	g_slist_free (selections);
 }
 
 static void
-zenity_fileselection_dialog_response (
-	gpointer obj, int response, gpointer data) {
+zenity_fileselection_dialog_response (GtkWidget *widget, int response, gpointer data)
+{
 	ZenityFileData *file_data = data;
+	GtkFileChooser *chooser = GTK_FILE_CHOOSER (widget);
 
-	GtkFileChooser *chooser = GTK_FILE_CHOOSER (obj);
-
-	switch (response) {
+	switch (response)
+	{
 		case GTK_RESPONSE_ACCEPT:
 			zenity_fileselection_dialog_output (chooser, file_data);
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case GTK_RESPONSE_REJECT:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
@@ -229,10 +204,13 @@ zenity_fileselection_dialog_response (
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+					response < (int)g_strv_length (zen_data->extra_label)) {
 				printf ("%s\n", zen_data->extra_label[response]);
+			}
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-	gtk_main_quit ();
+	zenity_util_gapp_quit (NULL, zen_data);
 }
+
+G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/src/forms.c b/src/forms.c
index 15df7189..13026c25 100644
--- a/src/forms.c
+++ b/src/forms.c
@@ -1,47 +1,54 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * forms.c
  *
- * Copyright (C) 2010 Arx Cruz
+ * Copyright © 2010 Arx Cruz
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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., 121 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
- * Authors: Arx Cruz <arxcruz@gnome.org>
+ * Original Author: Arx Cruz <arxcruz@gnome.org>
  */
 
-#include "config.h"
 #include "util.h"
 #include "zenity.h"
+
 #include <string.h>
 
+#include <config.h>
+
 static ZenityData *zen_data;
 static GSList *selected;
-static void zenity_forms_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+static void zenity_forms_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
 static void
 zenity_forms_dialog_get_selected (GtkTreeModel *model, GtkTreePath *path_buf,
-	GtkTreeIter *iter, GtkTreeView *tree_view) {
-	gint n_columns = 0;
-	gint i = 0;
-	GValue value = {
-		0,
-	};
+	GtkTreeIter *iter, gpointer data)
+{
+	int n_columns = 0;
+	GValue value = G_VALUE_INIT;
+	GtkTreeView *tree_view = GTK_TREE_VIEW(data);
+
+	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
 	n_columns = gtk_tree_model_get_n_columns (model);
-	for (i = 0; i < n_columns; i++) {
+
+	for (int i = 0; i < n_columns; ++i)
+	{
 		gtk_tree_model_get_value (model, iter, i, &value);
 		selected = g_slist_append (selected, g_value_dup_string (&value));
 		g_value_unset (&value);
@@ -49,95 +56,115 @@ zenity_forms_dialog_get_selected (GtkTreeModel *model, GtkTreePath *path_buf,
 }
 
 static GtkWidget *
-zenity_forms_create_and_fill_combo (
-	ZenityFormsData *forms_data, int combo_number) {
-	GtkListStore *list_store;
+zenity_forms_create_and_fill_combo (ZenityFormsData *forms_data,
+		int combo_number)
+{
+	g_autoptr(GtkListStore) list_store = NULL;
 	GtkWidget *combo_box;
 	GtkCellRenderer *renderer;
-	gchar *combo_values;
 
 	list_store = gtk_list_store_new (1, G_TYPE_STRING);
 
-	if (forms_data->combo_values) {
-		combo_values =
+	if (forms_data->combo_values)
+	{
+		g_autofree char *combo_values =
 			g_slist_nth_data (forms_data->combo_values, combo_number);
-		if (combo_values) {
-			gchar **row_values = g_strsplit_set (combo_values, "|", -1);
-			if (row_values) {
-				gint i = 0;
+
+		if (combo_values)
+		{
+			char **row_values = g_strsplit_set (combo_values, "|", -1);
+
+			if (row_values)
+			{
+				int i = 0;
 				GtkTreeIter iter;
-				gchar *row = row_values[i];
+				char *row = row_values[i];
 
-				while (row != NULL) {
+				while (row != NULL)
+				{
 					gtk_list_store_append (list_store, &iter);
 					gtk_list_store_set (list_store, &iter, 0, row, -1);
 					row = row_values[++i];
 				}
 				g_strfreev (row_values);
 			}
-			g_free (combo_values);
 		}
 	}
 
-	combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list_store));
-	g_object_unref (G_OBJECT (list_store));
+	combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL(list_store));
 
 	renderer = gtk_cell_renderer_text_new ();
-	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
-	gtk_cell_layout_set_attributes (
-		GTK_CELL_LAYOUT (combo_box), renderer, "text", 0, NULL);
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(combo_box),
+			renderer,
+			TRUE);	/* gboolean expand */
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(combo_box), renderer,
+			"text", 0,
+			NULL);
 
 	return combo_box;
 }
 
 static GtkWidget *
-zenity_forms_create_and_fill_list (
-	ZenityFormsData *forms_data, int list_number, gchar *header) {
-	GtkListStore *list_store;
+zenity_forms_create_and_fill_list (ZenityFormsData *forms_data,
+		int list_number, char *header)
+{
+	g_autoptr(GtkListStore) list_store = NULL;
 	GtkWidget *tree_view;
 	GtkWidget *scrolled_window;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
 	GType *column_types = NULL;
-	gchar *list_values;
-	gchar *column_values;
 
-	gint i = 0;
+	int i = 0;
 	/* If no column names available, default is one */
-	gint n_columns = 1;
-	gint column_index = 0;
+	int n_columns = 1;
+	int column_index = 0;
 
 	tree_view = gtk_tree_view_new ();
 
-	if (forms_data->column_values) {
-		int columns_values_count =
-			g_slist_length (forms_data->column_values);
+	if (forms_data->column_values)
+	{
+		char *column_values;
+		int columns_values_count = g_slist_length (forms_data->column_values);
 		int column_number = 0;
+
 		if (list_number < columns_values_count) {
 			column_number = list_number;
 		}
 
-		column_values =
-			g_slist_nth_data (forms_data->column_values, column_number);
-		if (column_values) {
-			gchar **values = g_strsplit_set (column_values, "|", -1);
-			if (values) {
+		column_values = g_slist_nth_data (forms_data->column_values,
+				column_number);
+
+		if (column_values)
+		{
+			char **values = g_strsplit_set (column_values, "|", -1);
+
+			if (values)
+			{
 				n_columns = g_strv_length (values);
 				column_types = g_new (GType, n_columns);
+
 				for (i = 0; i < n_columns; i++)
 					column_types[i] = G_TYPE_STRING;
 
-				for (i = 0; i < n_columns; i++) {
-					gchar *column_name = values[i];
+				for (i = 0; i < n_columns; i++)
+				{
+					GtkCellRenderer *renderer;
+					GtkTreeViewColumn *column;
+					char *column_name = values[i];
+
 					renderer = gtk_cell_renderer_text_new ();
-					column = gtk_tree_view_column_new_with_attributes (
-						column_name, renderer, "text", column_index, NULL);
-					gtk_tree_view_append_column (
-						GTK_TREE_VIEW (tree_view), column);
+					column =
+						gtk_tree_view_column_new_with_attributes (column_name,
+								renderer,
+								"text", column_index,
+								NULL);
+					gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
+							column);
 					column_index++;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			/* If no values available, add one with string type*/
 			column_types = g_new (GType, n_columns);
 			column_types[0] = G_TYPE_STRING;
@@ -148,18 +175,26 @@ zenity_forms_create_and_fill_list (
 
 	gtk_list_store_set_column_types (list_store, n_columns, column_types);
 
-	if (forms_data->list_values) {
-		list_values = g_slist_nth_data (forms_data->list_values, list_number);
-		if (list_values) {
-			gchar **row_values = g_strsplit_set (list_values, "|", -1);
-			if (row_values) {
+	if (forms_data->list_values)
+	{
+		g_autofree char *list_values =
+			g_slist_nth_data (forms_data->list_values, list_number);
+
+		if (list_values)
+		{
+			char **row_values = g_strsplit_set (list_values, "|", -1);
+
+			if (row_values)
+			{
 				GtkTreeIter iter;
-				gchar *row = row_values[0];
-				gint position = -1;
+				char *row = row_values[0];
+				int position = -1;
 				i = 0;
 
-				while (row != NULL) {
-					if (position >= n_columns || position == -1) {
+				while (row != NULL)
+				{
+					if (position >= n_columns || position == -1)
+					{
 						position = 0;
 						gtk_list_store_append (list_store, &iter);
 					}
@@ -169,34 +204,29 @@ zenity_forms_create_and_fill_list (
 				}
 				g_strfreev (row_values);
 			}
-			g_free (list_values);
 		}
 	}
 
-	gtk_tree_view_set_model (
-		GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (list_store));
-	g_object_unref (list_store);
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	// gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW
-	// (scrolled_window),
-	//                                       GTK_WIDGET (tree_view));
-	gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (tree_view));
-	gtk_widget_set_size_request (GTK_WIDGET (scrolled_window), -1, 100);
+	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
+			GTK_TREE_MODEL (list_store));
 	gtk_tree_view_set_headers_visible (
 		GTK_TREE_VIEW (tree_view), forms_data->show_header);
 
+	scrolled_window = gtk_scrolled_window_new ();
+	gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW(scrolled_window),
+			tree_view);
+	gtk_widget_set_size_request (scrolled_window, -1, 100);
+
 	return scrolled_window;
 }
 
 void
-zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data) {
-	GtkBuilder *builder = NULL;
+zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data)
+{
+	g_autoptr(GtkBuilder) builder = NULL;
 	GtkWidget *dialog;
 	GtkWidget *grid;
 	GtkWidget *text;
-	GtkWidget *button;
-
-	GSList *tmp;
 
 	int list_count = 0;
 	int combo_count = 0;
@@ -204,49 +234,40 @@ zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data) {
 
 	zen_data = data;
 
-	builder = zenity_util_load_ui_file ("zenity_forms_dialog", NULL);
+	builder = zenity_util_load_ui_file ("zenity_forms_dialog", "zenity_forms_box", NULL);
 
 	if (builder == NULL) {
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
-
-	dialog =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_forms_dialog"));
+	dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_forms_dialog"));
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_forms_dialog_response),
-		forms_data);
+	g_signal_connect (dialog, "response",
+		G_CALLBACK (zenity_forms_dialog_response), forms_data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
-
-	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
-
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
+
+	if (data->width > -1 || data->height > -1) {
+		gtk_window_set_default_size (GTK_WINDOW(dialog),
+				data->width, data->height);
 	}
 
-	if (data->ok_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_forms_ok_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
-	if (data->cancel_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_forms_cancel_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+	if (data->ok_label)
+	{
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
+	}
+
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
 	}
 
 	text = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_forms_text"));
@@ -257,37 +278,48 @@ zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data) {
 
 	grid = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_forms_grid"));
 
-	for (tmp = forms_data->list; tmp; tmp = tmp->next) {
-		ZenityFormsValue *zenity_value = (ZenityFormsValue *) tmp->data;
+	i = 0;
+	for (GSList *tmp = forms_data->list;
+			tmp != NULL;
+			tmp = tmp->next)
+	{
+		ZenityFormsValue *zenity_value = tmp->data;
 		GtkWidget *label;
 
 		label = gtk_label_new (zenity_value->option_value);
 		gtk_widget_set_halign (label, GTK_ALIGN_START);
 		gtk_grid_attach (GTK_GRID (grid), label, 0, i, 1, 1);
 
-		switch (zenity_value->type) {
+		switch (zenity_value->type)
+		{
 			case ZENITY_FORMS_ENTRY:
 				zenity_value->forms_widget = gtk_entry_new ();
 				break;
+
 			case ZENITY_FORMS_PASSWORD:
 				zenity_value->forms_widget = gtk_entry_new ();
-				gtk_entry_set_visibility (
-					GTK_ENTRY (zenity_value->forms_widget), FALSE);
+				gtk_entry_set_visibility (GTK_ENTRY(zenity_value->forms_widget),
+						FALSE);
 				break;
+
 			case ZENITY_FORMS_CALENDAR:
 				zenity_value->forms_widget = gtk_calendar_new ();
 				break;
+
 			case ZENITY_FORMS_LIST:
-				zenity_value->forms_widget = zenity_forms_create_and_fill_list (
-					forms_data, list_count, zenity_value->option_value);
+				zenity_value->forms_widget =
+					zenity_forms_create_and_fill_list (forms_data,
+							list_count, zenity_value->option_value);
 				list_count++;
 				break;
+
 			case ZENITY_FORMS_COMBO:
 				zenity_value->forms_widget =
-					zenity_forms_create_and_fill_combo (
-						forms_data, combo_count);
+					zenity_forms_create_and_fill_combo (forms_data,
+							combo_count);
 				combo_count++;
 				break;
+
 			default:
 				zenity_value->forms_widget = gtk_entry_new ();
 				break;
@@ -300,90 +332,104 @@ zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data) {
 			1,
 			1);
 
-		i++;
-	}
+		gtk_accessible_update_relation (GTK_ACCESSIBLE (zenity_value->forms_widget),
+			GTK_ACCESSIBLE_RELATION_LABELLED_BY,
+			label,
+			NULL,
+			-1);
 
-	gtk_widget_show_all (GTK_WIDGET (dialog));
+		++i;
+	}
 
-	g_object_unref (builder);
+	zenity_util_show_dialog (dialog);
 
-	if (data->timeout_delay > 0) {
+	if (data->timeout_delay > 0)
+	{
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			dialog);
 	}
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_forms_dialog_output (ZenityFormsData *forms_data) {
+zenity_forms_dialog_output (ZenityFormsData *forms_data)
+{
 	GSList *tmp, *tmp2;
 	guint day, year, month;
-	GDate *date = NULL;
-	gchar time_string[128];
-	gchar *combo_value = NULL;
+	g_autoptr(GDate) date = NULL;
+	char time_string[128];
+	g_autofree char *combo_value = NULL;
 	GtkTreeSelection *selection;
-	GtkListStore *list_store;
+	g_autoptr(GtkListStore) list_store = NULL;
 	GtkTreeIter iter;
 
-	for (tmp = forms_data->list; tmp; tmp = tmp->next) {
-		ZenityFormsValue *zenity_value = (ZenityFormsValue *) tmp->data;
-		switch (zenity_value->type) {
+	for (tmp = forms_data->list; tmp; tmp = tmp->next)
+	{
+		ZenityFormsValue *zenity_value = tmp->data;
+
+		switch (zenity_value->type)
+		{
 			case ZENITY_FORMS_PASSWORD:
 			case ZENITY_FORMS_ENTRY:
 				g_print ("%s",
-					gtk_entry_get_text (
-						GTK_ENTRY (zenity_value->forms_widget)));
+						gtk_entry_buffer_get_text (gtk_entry_get_buffer
+							(GTK_ENTRY(zenity_value->forms_widget))));
 				break;
+
 			case ZENITY_FORMS_LIST:
-				selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (
-					gtk_bin_get_child (GTK_BIN (zenity_value->forms_widget))));
+				selection =
+					gtk_tree_view_get_selection
+						(GTK_TREE_VIEW(gtk_scrolled_window_get_child
+						   (GTK_SCROLLED_WINDOW(zenity_value->forms_widget))));
+
 				gtk_tree_selection_selected_foreach (selection,
-					(GtkTreeSelectionForeachFunc)
-						zenity_forms_dialog_get_selected,
-					GTK_TREE_VIEW (gtk_bin_get_child (
-						GTK_BIN (zenity_value->forms_widget))));
+					zenity_forms_dialog_get_selected,
+					GTK_TREE_VIEW(gtk_scrolled_window_get_child
+						(GTK_SCROLLED_WINDOW(zenity_value->forms_widget))));
 
-				for (tmp2 = selected; tmp2; tmp2 = tmp2->next) {
+				for (tmp2 = selected; tmp2; tmp2 = tmp2->next)
+				{
 					if (tmp->next != NULL) {
-						g_print ("%s,", (gchar *) tmp2->data);
+						g_print ("%s,", (char *)tmp2->data);
 					} else
-						g_print ("%s", (gchar *) tmp2->data);
+						g_print ("%s", (char *)tmp2->data);
 				}
 
-				g_slist_foreach (selected, (GFunc) g_free, NULL);
-				selected = NULL;
-
+				g_slist_free_full (g_steal_pointer (&selected), g_free);
 				break;
+
 			case ZENITY_FORMS_CALENDAR:
-				gtk_calendar_get_date (
-					GTK_CALENDAR (zenity_value->forms_widget),
-					&day,
-					&month,
-					&year);
-				date = g_date_new_dmy (year, month + 1, day);
-				g_date_strftime (
-					time_string, 127, forms_data->date_format, date);
+				g_object_get (zenity_value->forms_widget,
+						"day", &day,
+						"month", &month,
+						"year", &year,
+						NULL);
+				date = g_date_new_dmy (day, month + 1, year);
+				g_date_strftime (time_string, sizeof time_string, forms_data->date_format, date);
 				g_print ("%s", time_string);
 				break;
+
 			case ZENITY_FORMS_COMBO:
-				if (gtk_combo_box_get_active_iter (
-						GTK_COMBO_BOX (zenity_value->forms_widget), &iter)) {
-					list_store = GTK_LIST_STORE (gtk_combo_box_get_model (
-						GTK_COMBO_BOX (zenity_value->forms_widget)));
-					gtk_tree_model_get (GTK_TREE_MODEL (list_store),
+				if (gtk_combo_box_get_active_iter
+						(GTK_COMBO_BOX(zenity_value->forms_widget), &iter))
+				{
+					list_store =
+						GTK_LIST_STORE(gtk_combo_box_get_model
+								(GTK_COMBO_BOX(zenity_value->forms_widget)));
+
+					gtk_tree_model_get (GTK_TREE_MODEL(list_store),
 						&iter,
 						0,
 						&combo_value,
 						-1);
-					g_object_unref (G_OBJECT (list_store));
 
 					g_print ("%s", combo_value);
-					g_free (combo_value);
-				} else
+				}
+				else
 					g_print (" ");
 				break;
+
 		}
 		if (tmp->next != NULL)
 			g_print ("%s", forms_data->separator);
@@ -392,16 +438,19 @@ zenity_forms_dialog_output (ZenityFormsData *forms_data) {
 }
 
 static void
-zenity_forms_dialog_response (GtkWidget *widget, int response, gpointer data) {
-	ZenityFormsData *forms_data = (ZenityFormsData *) data;
-
-	switch (response) {
-		case GTK_RESPONSE_OK:
+zenity_forms_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
+	ZenityFormsData *forms_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
+
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_forms_dialog_output (forms_data);
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
@@ -412,11 +461,10 @@ zenity_forms_dialog_response (GtkWidget *widget, int response, gpointer data) {
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
 				printf ("%s\n", zen_data->extra_label[response]);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
diff --git a/src/gdialog.in b/src/gdialog.in
deleted file mode 100755
index 2fc46336..00000000
--- a/src/gdialog.in
+++ /dev/null
@@ -1,353 +0,0 @@
-#!@PERL@
-
-# gdialog -> zenity conversion wrapper
-#
-# by Mike Newman <mikegtn@gnome.org>
-#
-# This is all, of course, horrible - but it should translate
-# most commond gdialog types to zenity equivalents. It will mostly drop
-# the pointless and unused (even by gdialog!) size arguments
-# but hopefully will translate all the others.
-#
-# For testing purposes, I've used a couple of the nautilus scripts
-# available at http://g-scripts.sourceforge.net - what is sometimes
-# unclear is what is a gdialog/zenity translation problem, and what is
-# a problem with the original script
-
-my @command = ("zenity");	# the command line we build up to execute
-my $element = "";		# current bit of command line
-my $argn = 0;			# counter for walking args
-my $args = $#ARGV + 1;		# total number of command line arguments
-my $separator = 0;		# set if --separate-output is in use
-
-
-# Additon by: Kevin C. Krinke (kck) <kckrinke@opendoorsoftware.com>
-#
-# gdialog itself supports both the X-Windows interface as well as a console
-# interface. Here's a fix to use regular dialog when appropriate.
-# This should probably be a more advanced test of some sort, but I don't know
-# of any other easy way of detecting and X-Windows environment. If someone does
-# know better, please let me know. So for now this works: "no DISPLAY; no X".
-
-unless (defined $ENV{'DISPLAY'} && length($ENV{'DISPLAY'})) {
-
-        # reset the command string
-
-        @command = ();
-
-        # examine all the available/default paths
-
-        my $PATHS = ($ENV{'PATH'}||'/bin:/usr/bin:/usr/local/bin:/opt/bin');
-
-      BIN: foreach my $PATH (split(/\:/,$PATHS)) {
-
-                if (-x $PATH."/gdialog.real") {
-
-			# Some GNU/Linux distributions divert binaries when
-			# other packages are installed. If this exists, chances
-			# are it's the real gdialog and not the Zenity wrapper.
-			# gdialog has full support for the Console medium and
-			# as such is the preference over using the "regular"
-			# dialog interface.
-
-                        @command = ($PATH."/gdialog.real");
-                        last BIN;
-
-                } elsif (-x $PATH."/dialog") {
-
-                        # change the command and skip ahead!
-
-                        @command = ($PATH."/dialog");
-                        last BIN;
-
-                }
-
-
-        }
-
-        unless (@command) {
-
-		# we didn't find the dialog binary, exit(254) with a message
-		# to STDERR.
-
-                print STDERR "missing DISPLAY and a console dialog could".
-                             " not be found.\n";
-
-		# exit code 254 is used because 255, 1, 2, 3 are used by Zenity
-		# and cDialog. This error, is a very _bad_ error so it's semi-
-		# non-standard at 254.
-
-                exit(254);
-
-        }
-
-	# all is well if we've made it this far
-
-	# so join the arguments double-quoting things so that proper shell
-	# notation is saved.
-
-        push @command, @ARGV;
-
-	# and fork the process
-
-        exec(@command);
-
-}
-
-# Got DISPLAY, has X continue as normal...
-# End Addtition by: KCK
-
-# this just loads the current arg into $element
-
-sub get_arg () { 
-	$element = $ARGV[$argn];
-}
-
-# walk the command line
-
-ARG: while ($argn < $args) {
-
-	get_arg;
-	
-# Informational stuff
-
-	if ($element eq "--help" || $element eq "--about") {
-	print ( "gdialog is a compatibility wrapper around zenity, " .
-		"provided to hopefully\nallow older scripts to run. " .
-		"If you are reading this message, you should\n" .
-		"probably be using zenity directly\n\n" .
-		"type: 'zenity --help' or 'man zenity' for more information\n");
-	exit (1);
-	}
-
-# Section 1 : Args which gdialog expects BEFORE box options
-# --clear, --backtitle have no obvious effect - ignored
-
-	if ($element eq "--title") {
-	
-		# --title argument is almost analogous in gdialog and
-		# zenity - so pass it almost entirely as is
-		
-		$argn++;
-		get_arg;
-		push @command, "--title=$element";
-		
-		# keep processing args
-		$argn++;
-		next ARG;
-	}
-
-	if ($element eq "--separate-output") {
-
-		# set the flag to pring list output line by line
-		$separator = 1;
-
-		# keep processing args
-		$argn++;
-		next ARG;
-	}
-
-# Section 2 : Box Options and subsequent args
-	
-	if ($element eq "--msgbox" || $element eq "--infobox") {
-	
-		# This bit is common to almost all of the dialogs
-		# the arg following the dialog type in gdialog is usually
-		# equivalent to zenity's --text arg.
-		
-		$argn++;
-		get_arg;
-		push @command, "--info", "--text=$element";
-		
-		# this also happens a lot - gdialog accepted size args
-		# for dialog compatability - which it pretty much ignored
-		# and we will do the same
- 
-		$argn+=2;
-		last ARG;
-	}
-	
-	if ($element eq "--yesno") {
-
-		# this will silently ignore the gdialog option to set
-		# the default button in question dialogs - which is
-		# highly hig-norant anyway!
-		
-		$argn++;
-		get_arg;
-		push @command, "--question", "--text=$element";
-		last ARG;
-	}
-	
-	if ($element eq "--inputbox") {
-		$argn++;
-		get_arg;
-		push @command, "--entry", "--text=$element";
-		
-		# ignore size elements and maybe there is some
-		# default text to initialize the entry with?
-		
-		$argn+=3;
-		get_arg;
-		push @command, "--entry-text=$element";
-		last ARG;
-	}
-	
-	if ($element eq "--textbox") {
-		push @command, "--text-info";
-		
-		# the arg immediately following the dialog type in
-		# gdialog is the filename, so pass this to zenity
-		
-		$argn++;
-		get_arg;
-		push @command, "--filename=$element";
-
-		# width and height matter for this one, so get them
-		# and apply the same multipliers as used in gdialog
-
-		$argn++;
-		get_arg;
-		$element = $element * 7;
-		push @command, "--height=$element";
-		$argn++;
-		get_arg;
-		$element = $element * 8;
-		push @command, "--width=$element";
-		last ARG;
-	}
-	
-	if ($element eq "--checklist" || $element eq "--radiolist") {
-		$list=$element;
-		$argn++;
-		get_arg;
-		
-		# Conveniently, zenity and gdialog use the same names
-		# for list types, so pass this to zenity intact along with
-		# an untitled column for the check or radio buttons
-		# and the 'text' arg as a second column header
-		
-		push @command, "--list", $list, "--column=''", "--column=''", "--column", $element;
-
-		# should output be line by line?
-		if ($separator) {
-			push @command, "--separator=\n";
-		}
-
-		# Skip to the first 'item' arg of the list content
-		# bypassing height, width and list-height
-		# from here args run [tag] [item] [status] ...
-
-		$argn += 4; 
-		
-		# Loop over the remainder of the commandline
-		# discarding the 'status' args of each item
-		# and using the 'item' for display in our second column
-		# also pass a fake NULL argument since zenity can't set
-		# the status of a row like gdialog can
-		
-		while ($argn < $args) {
-			get_arg;
-			push @command, "NULL", $element;
-			$argn += 1;
-			get_arg;
-			push @command, $element;
-			$argn += 2;
-		}
-		last ARG;
-	} 
-	
-	if ($element eq "--menu") {
-		$list=$element;
-		$argn++;
-		get_arg;
-		
-		# a gdialog --menu is just a two column zenity --list
-		# Leave the first column blank (not provided)
-		# Use the 'text' arg as a second column header
-		# FIXME: or should it be the dialog text, or both?
-		
-		push @command, "--list", "--column", "", "--column", $element;
-			
-		# Skip to the first 'item' arg of the list content
-		# after using height, width and bypassing list-height
-		# from here args run [tag] [item] ...
-
-		$argn += 1;
-		
-		get_arg;
-		# Height and width in characters to be displayed, so adjust
-		# cdialog uses 6 height for non-list, zenity uses ~24 pixels
-		# per list entry (default font), and 103 pixels for non-list
-		# This appears to be almost exact
-		$element = $element*24 - 35;
-		push @command, "--height", $element;
-		
-		$argn += 1;
-		get_arg;
-		# cdialog uses 6 width for non-list, zenity uses ~7 pixels
-		# per character (default font), and 22 pixels for non-list
-		# This is not exact, but close enough
-		$element = $element*7 - 20;
-		push @command, "--width", $element;
-		
-		$argn += 2; 
-		
-		# Loop over the remainder of the commandline
-		# keeping 'tag' args of each item (required to return)
-		# and using the 'item' for display in our second column
-		
-		while ($argn < $args) {
-			get_arg;
-			push @command, $element;
-			$argn += 1;
-		}
-		last ARG;
-	} 
-	
-	if ($element eq "--gauge") {
-		$argn++;
-		get_arg;
-		push @command, "--progress", "--text=$element";
-		
-		# discard the size args as usually, and see if
-		# a percentage value was supplied to initialize the
-		# dialog
-		
-		$argn += 3;
-		get_arg;
-		if ($element) {
-			push @command, "--percentage=$element";
-		}
-		last ARG;
-	}
-	
-	$argn++;
-}
-
-# save STDOUT and STDERR
-open(ORG_STDOUT, ">&STDOUT");
-open(ORG_STDERR, ">&STDERR");
-
-# redirect STDERR to /dev/null (GTK messages ie: 
-#  (zenity:637): Gtk-WARNING **: Unable to locate theme engine in module_path: "mist",)
-open(STDERR, ">/dev/null");
-
-# redirect STDOUT to STDERR (gdialog direct output to STDERR by default)
-open(STDOUT, ">&ORG_STDERR");
-
-# execute the constructed zenity command line
-
-# perl doc: The return value of system() is the exit status of the
-#program as returned by the wait() call. To get the actual exit value
-# divide by 256.
-
-my $return = system(@command)/256;
-
-# restore STDOUT and STDERR
-open(STDOUT, ">&ORG_STDOUT");
-open(STDERR, ">&ORG_STDERR");
-close(ORG_STDOUT);
-close(ORG_STDERR);
-
-exit $return;
diff --git a/src/main.c b/src/main.c
index 18b2a725..42404cb4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,120 +1,163 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * main.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
  *
- * Authors: Glynn Foster <glynn.foster@sun.com>
+ * Original Author: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include <config.h>
-
 #include "option.h"
 #include "zenity.h"
 
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <langinfo.h>
-#include <stdlib.h>
-#ifdef HAVE_LOCALE_H
+#include <adwaita.h>
 #include <locale.h>
-#endif
+#include <stdlib.h>
 
-gint
-main (gint argc, gchar **argv) {
-	ZenityParsingOptions *results;
-	gint retval;
+#include <config.h>
 
-#ifdef HAVE_LOCALE_H
-	setlocale (LC_ALL, "");
-#endif
+typedef struct {
+	int argc;
+	char **argv;
+} ZenityArgs;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	gtk_init (&argc, &argv);
+static void
+command_line_cb (GApplication *app,
+               GApplicationCommandLine *command_line,
+               gpointer user_data)
+{
+	ZenityArgs *args = user_data;
+	ZenityParsingOptions *results;
 
-	results = zenity_option_parse (argc, argv);
+	results = zenity_option_parse (args->argc, args->argv);
 
-	switch (results->mode) {
+	switch (results->mode)
+	{
 		case MODE_CALENDAR:
 			zenity_calendar (results->data, results->calendar_data);
 			break;
+
 		case MODE_ENTRY:
-			results->entry_data->data = (const gchar **) argv + 1;
+			/* allow for a series of tokens (or even a bash array!) to be
+			 * passed as arguments so as to auto-populate the entry with
+			 * a list of options as a combo-box.
+			 */
+			results->entry_data->data = (const char **) args->argv + 1;
 			zenity_entry (results->data, results->entry_data);
 			break;
+
 		case MODE_ERROR:
 		case MODE_QUESTION:
 		case MODE_WARNING:
 		case MODE_INFO:
 			zenity_msg (results->data, results->msg_data);
 			break;
+
 		case MODE_SCALE:
 			zenity_scale (results->data, results->scale_data);
 			break;
+
 		case MODE_FILE:
 			zenity_fileselection (results->data, results->file_data);
 			break;
+
 		case MODE_LIST:
-			results->tree_data->data = (const gchar **) argv + 1;
+			results->tree_data->data = (const char **) args->argv + 1;
 			zenity_tree (results->data, results->tree_data);
 			break;
-#ifdef HAVE_LIBNOTIFY
+			
 		case MODE_NOTIFICATION:
 			zenity_notification (results->data, results->notification_data);
 			break;
-#endif
+
 		case MODE_PROGRESS:
 			zenity_progress (results->data, results->progress_data);
 			break;
+
 		case MODE_TEXTINFO:
 			zenity_text (results->data, results->text_data);
 			break;
+
 		case MODE_COLOR:
 			zenity_colorselection (results->data, results->color_data);
 			break;
+
 		case MODE_PASSWORD:
 			zenity_password_dialog (results->data, results->password_data);
 			break;
+
 		case MODE_ABOUT:
 			zenity_about (results->data);
 			break;
+
 		case MODE_FORMS:
 			zenity_forms_dialog (results->data, results->forms_data);
 			break;
+
 		case MODE_VERSION:
 			g_print ("%s\n", VERSION);
 			break;
+
 		case MODE_LAST:
 			g_printerr (_ ("You must specify a dialog type. See 'zenity "
 						   "--help' for details\n"));
-			zenity_option_free ();
 			exit (-1);
+
 		default:
 			g_assert_not_reached ();
-			zenity_option_free ();
 			exit (-1);
 	}
 
-	retval = results->data->exit_code;
+	g_free (args);
+}
+
+static void dummy_log_func (void) { }
+
+int
+main (int argc, char *argv[])
+{
+	ZenityArgs *args;
+	g_autoptr(AdwApplication) app = NULL;
+	int status;
+
+	/* <i18n> */
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+                                                                                
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+	/* </i18n> */
+
+	/* Turn off g_message's from libadwaita - this is to suppress the 'this is
+	 * discouraged' message re: mapping dialogs without a transient parent.
+	 */
+	g_log_set_handler ("Adwaita", G_LOG_LEVEL_MESSAGE, (GLogFunc)dummy_log_func, NULL);
+
+	args = g_new0 (ZenityArgs, 1);
+	args->argc = argc;
+	args->argv = argv;
+
+	app = adw_application_new (APP_ID, G_APPLICATION_HANDLES_COMMAND_LINE | G_APPLICATION_NON_UNIQUE);
+	g_signal_connect (app, "command-line", G_CALLBACK(command_line_cb), args);
 
-	zenity_option_free ();
+	status = g_application_run (G_APPLICATION(app), 0, NULL);
 
-	exit (retval);
+	return status;
 }
diff --git a/src/meson.build b/src/meson.build
index 748fe316..e2395ca0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -15,15 +15,28 @@ zenity_sources = [
   'scale.c',
   'text.c',
   'tree.c',
-  'util.c'
+  'util.c',
+  'zenity-tree-column-view.c',
 ]
 
-zenity_deps = [
-  gtk_dep,
-  libnotify,
-  webkitgtk,
-  x11
-]
+zenity_cv_enums = gnome.mkenums_simple('zenity-tree-column-view-enums',
+         sources: 'zenity-tree-column-view.h',
+)
+
+zenity_res_conf = configuration_data()
+zenity_res_conf.set('resource_base_path', resource_base_path)
+
+zenity_res_in = configure_file(
+  input: 'zenity.gresource.xml.in',
+  output: 'zenity.gresource.xml',
+  configuration: zenity_res_conf
+)
+
+zenity_res = gnome.compile_resources(
+  'zenity-resources',
+  zenity_res_in,
+  c_name: 'zenity'
+)
 
 zenity_c_args = [
   '-DG_LOG_DOMAIN="Zenity"'
@@ -31,21 +44,9 @@ zenity_c_args = [
 
 zenity = executable(
   meson.project_name(),
-  zenity_sources,
+  zenity_sources + zenity_cv_enums + zenity_res,
   include_directories: zenity_root_dir,
-  dependencies: zenity_deps,
   c_args: zenity_c_args,
+  dependencies: [adw_dep, webkitgtk_dep],
   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/msg.c b/src/msg.c
index 92651525..8ebb2e02 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -1,7 +1,10 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * msg.c
  *
  * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,38 +24,17 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include "config.h"
+#include <config.h>
 
 #include "util.h"
 #include "zenity.h"
 
-static void zenity_msg_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
-static void
-zenity_msg_construct_question_dialog (
-	GtkWidget *dialog, ZenityMsgData *msg_data, ZenityData *data) {
-
-	GtkWidget *cancel_button, *ok_button;
-
-	cancel_button = gtk_dialog_add_button (
-		GTK_DIALOG (dialog), _ ("_No"), GTK_RESPONSE_CANCEL);
-	ok_button = gtk_dialog_add_button (
-		GTK_DIALOG (dialog), _ ("_Yes"), GTK_RESPONSE_OK);
-
-	gtk_widget_grab_focus (
-		msg_data->default_cancel ? cancel_button : ok_button);
-
-	if (data->cancel_label) {
-		gtk_button_set_label (GTK_BUTTON (cancel_button), data->cancel_label);
-	}
-
-	if (data->ok_label) {
-		gtk_button_set_label (GTK_BUTTON (ok_button), data->ok_label);
-	}
-}
+static void zenity_msg_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
+/* FIXME - Is this still necessary with gtk4? */
 static void
-zenity_label_widget_clipboard_selection (GtkWidget *widget) {
+zenity_label_widget_clipboard_selection (GtkWidget *widget)
+{
 	/* Workaround hotfix for suspected toolkit issue:
 	   since focus change of the dialog's focussed widget (text)
 	   somehow currently chooses to destroy
@@ -76,52 +58,46 @@ zenity_label_widget_clipboard_selection (GtkWidget *widget) {
 }
 
 void
-zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
-	GtkBuilder *builder;
+zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
+{
+	g_autoptr(GtkBuilder) builder;
 	GtkWidget *dialog;
-	GtkWidget *ok_button;
 	GObject *text;
 	GObject *image;
 
-	switch (msg_data->mode) {
+	switch (msg_data->mode)
+	{
 		case ZENITY_MSG_WARNING:
-			builder = zenity_util_load_ui_file ("zenity_warning_dialog", NULL);
+			builder = zenity_util_load_ui_file ("zenity_warning_dialog", "zenity_warning_box", NULL);
 			dialog = GTK_WIDGET (
 				gtk_builder_get_object (builder, "zenity_warning_dialog"));
 			text = gtk_builder_get_object (builder, "zenity_warning_text");
 			image = gtk_builder_get_object (builder, "zenity_warning_image");
-			ok_button = GTK_WIDGET (
-				gtk_builder_get_object (builder, "zenity_warning_ok_button"));
 			break;
 
 		case ZENITY_MSG_QUESTION:
 		case ZENITY_MSG_SWITCH:
-			builder = zenity_util_load_ui_file ("zenity_question_dialog", NULL);
-			dialog = GTK_WIDGET (
-				gtk_builder_get_object (builder, "zenity_question_dialog"));
+			builder = zenity_util_load_ui_file ("zenity_question_dialog", "zenity_question_box", NULL);
+			dialog = GTK_WIDGET (gtk_builder_get_object (builder,
+						"zenity_question_dialog"));
 			text = gtk_builder_get_object (builder, "zenity_question_text");
 			image = gtk_builder_get_object (builder, "zenity_question_image");
-			ok_button = NULL;
 			break;
 
 		case ZENITY_MSG_ERROR:
-			builder = zenity_util_load_ui_file ("zenity_error_dialog", NULL);
-			dialog = GTK_WIDGET (
-				gtk_builder_get_object (builder, "zenity_error_dialog"));
+			builder = zenity_util_load_ui_file ("zenity_error_dialog", "zenity_error_box", NULL);
+			dialog = GTK_WIDGET (gtk_builder_get_object (builder,
+						"zenity_error_dialog"));
 			text = gtk_builder_get_object (builder, "zenity_error_text");
 			image = gtk_builder_get_object (builder, "zenity_error_image");
-			ok_button = GTK_WIDGET (
-				gtk_builder_get_object (builder, "zenity_error_ok_button"));
 			break;
 
 		case ZENITY_MSG_INFO:
-			builder = zenity_util_load_ui_file ("zenity_info_dialog", NULL);
-			dialog = GTK_WIDGET (
-				gtk_builder_get_object (builder, "zenity_info_dialog"));
+			builder = zenity_util_load_ui_file ("zenity_info_dialog", "zenity_info_box", NULL);
+			dialog = GTK_WIDGET (gtk_builder_get_object (builder,
+						"zenity_info_dialog"));
 			text = gtk_builder_get_object (builder, "zenity_info_text");
 			image = gtk_builder_get_object (builder, "zenity_info_image");
-			ok_button = GTK_WIDGET (
-				gtk_builder_get_object (builder, "zenity_info_ok_button"));
 			break;
 
 		default:
@@ -129,18 +105,13 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
 			dialog = NULL;
 			text = NULL;
 			image = NULL;
-			ok_button = NULL;
 			g_assert_not_reached ();
 			break;
 	}
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog) 
 	}
 
 	if (builder == NULL) {
@@ -148,89 +119,90 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
 		return;
 	}
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_msg_dialog_response),
-		data);
-
-	gtk_builder_connect_signals (builder, NULL);
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_msg_dialog_response), data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
-	if (ok_button) {
-		if (data->ok_label) {
-			gtk_button_set_label (GTK_BUTTON (ok_button), data->ok_label);
-		}
+	if (data->ok_label)
+	{
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog)
 	}
 
-	switch (msg_data->mode) {
+	switch (msg_data->mode)
+	{
 		case ZENITY_MSG_WARNING:
-			zenity_util_set_window_icon_from_icon_name (
-				dialog, data->window_icon, "dialog-warning");
+			gtk_window_set_icon_name (GTK_WINDOW(dialog),
+					"dialog-warning");
 			break;
 
 		case ZENITY_MSG_QUESTION:
-			zenity_util_set_window_icon_from_icon_name (
-				dialog, data->window_icon, "dialog-question");
-			zenity_msg_construct_question_dialog (dialog, msg_data, data);
+			gtk_window_set_icon_name (GTK_WINDOW(dialog),
+					"dialog-question");
 			break;
 
 		case ZENITY_MSG_SWITCH:
-			zenity_util_set_window_icon_from_icon_name (
-				dialog, data->window_icon, "dialog-question");
+			gtk_window_set_icon_name (GTK_WINDOW(dialog),
+					"dialog-question");
 			break;
 
 		case ZENITY_MSG_ERROR:
-			zenity_util_set_window_icon_from_icon_name (
-				dialog, data->window_icon, "dialog-error");
+			gtk_window_set_icon_name (GTK_WINDOW(dialog),
+					"dialog-error");
 			break;
 
 		case ZENITY_MSG_INFO:
-			zenity_util_set_window_icon_from_icon_name (
-				dialog, data->window_icon, "dialog-information");
+			gtk_window_set_icon_name (GTK_WINDOW(dialog),
+					"dialog-information");
 			break;
 
 		default:
 			break;
 	}
+	if (data->width > -1 || data->height > -1) {
+		gtk_window_set_default_size (GTK_WINDOW(dialog),
+				data->width, data->height);
+	}
 
-	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
-
-	if (data->width > -1)
+	if (data->width > -1) {
 		gtk_widget_set_size_request (GTK_WIDGET (text), data->width, -1);
+	}
 	else if (!msg_data->ellipsize && !msg_data->no_wrap) {
-		/* The magic number 60 is taken from gtk+/gtk/ui/gtkmessagedialog.ui
-		   with 10 as a minimum width. */
-		gtk_label_set_width_chars (GTK_LABEL (text), 10);
-		gtk_label_set_max_width_chars (GTK_LABEL (text), 60);
+		/* the magic number 60 is picked from gtk+/gtk/ui/gtkmessagedialog.ui
+		 */
+		gtk_label_set_max_width_chars (GTK_LABEL(text), 60);
 	}
 
 	if (data->modal)
 		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
-	if (msg_data->dialog_text) {
-		if (msg_data->no_markup)
+	if (msg_data->dialog_text)
+	{
+		if (msg_data->no_markup) {
 			gtk_label_set_text (GTK_LABEL (text), msg_data->dialog_text);
-		else
-			gtk_label_set_markup (
-				GTK_LABEL (text), g_strcompress (msg_data->dialog_text));
+		}
+		else {
+			gtk_label_set_markup (GTK_LABEL (text),
+					g_strcompress (msg_data->dialog_text));
+		}
 		zenity_label_widget_clipboard_selection (GTK_WIDGET (text));
 	}
 
 	if (msg_data->ellipsize)
-		gtk_label_set_ellipsize (GTK_LABEL (text), PANGO_ALIGN_RIGHT);
+		gtk_label_set_ellipsize (GTK_LABEL (text), PANGO_ELLIPSIZE_END);
 
 	if (msg_data->dialog_icon)
-		gtk_image_set_from_icon_name (
-			GTK_IMAGE (image), msg_data->dialog_icon, GTK_ICON_SIZE_DIALOG);
+	{
+		g_autoptr(GIcon) icon = NULL;
+
+		icon = zenity_util_gicon_from_string (msg_data->dialog_icon);
+		gtk_image_set_from_gicon (GTK_IMAGE (image), icon);
+	}
 
 	if (msg_data->no_wrap)
-		gtk_label_set_line_wrap (GTK_LABEL (text), FALSE);
+		gtk_label_set_wrap (GTK_LABEL(text), FALSE);
 
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 
 	if (data->timeout_delay > 0) {
 		g_timeout_add_seconds (data->timeout_delay,
@@ -238,30 +210,31 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
 			NULL);
 	}
 
-	g_object_unref (builder);
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_msg_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_msg_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
 	ZenityData *zen_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
 
-	switch (response) {
-		case GTK_RESPONSE_OK:
+	switch (response)
+	{	
+		case ZENITY_OK:
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
 				printf ("%s\n", zen_data->extra_label[response]);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
diff --git a/src/notification.c b/src/notification.c
index eb0e79eb..295c1c26 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -1,8 +1,11 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * notification.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
- * Copyright (C) 2006 Christian Persch
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2006 Christian Persch
+ * Copyright © 2021-2022 Logan Rathbone
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -19,7 +22,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
- * Authors: Glynn Foster <glynn.foster@sun.com>
+ * Original Author: Glynn Foster <glynn.foster@sun.com>
  */
 
 #include <config.h>
@@ -29,184 +32,102 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#ifdef HAVE_LIBNOTIFY
-#include <libnotify/notify.h>
 
 #include "util.h"
 #include "zenity.h"
 
 #define MAX_HINTS 16
 
-static char *icon_file;
-static GHashTable *notification_hints;
+static void
+zenity_send_notification (GNotification *notification)
+{
+	g_application_send_notification (g_application_get_default (),
+			"zenity-notification",
+			notification);
+}
 
-static NotifyNotification *
-zenity_notification_new (gchar *message, gchar *icon_file) {
-	NotifyNotification *notif;
-	gchar **text;
+static GNotification *
+zenity_notification_new (char *message, char *icon_path)
+{
+	g_autoptr (GNotification) notif;
+	g_auto(GStrv) text = NULL;
 
+	/* Accept a title and optional body in the form of `my title\nmy body'.
+	 * The way this is displayed by the notification system is implementation
+	 * defined.
+	 */
 	text = g_strsplit (g_strcompress (message), "\n", 2);
-	if (*text == NULL) {
-		g_printerr (_ ("Could not parse message\n"));
+	if (*text == NULL)
+	{
+		g_printerr (_("Could not parse message\n"));
 		return NULL;
 	}
 
-	notif = notify_notification_new (text[0], /* title */
-		text[1], /* summary */
-		icon_file);
-	g_strfreev (text);
-	return notif;
-}
-
-static void
-on_notification_default_action (
-	NotifyNotification *n, const char *action, void *user_data) {
-	ZenityData *zen_data;
-
-	zen_data = (ZenityData *) user_data;
-	notify_notification_close (n, NULL);
+	notif = g_notification_new (text[0]);	/* title */
 
-	zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
-
-	gtk_main_quit ();
-}
-
-static GHashTable *
-zenity_notification_parse_hints_array (gchar **hints) {
-	GHashTable *result;
-	gchar **pair;
-	int i;
+	if (text[1])
+		g_notification_set_body (notif, text[1]);
 
-	result = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+	if (icon_path)
+	{
+		g_autoptr(GIcon) icon = NULL;
 
-	for (i = 0; i < g_strv_length (hints); i++) {
-		pair = g_strsplit (hints[i], ":", 2);
-		g_hash_table_replace (result, g_strdup (pair[0]), g_strdup (pair[1]));
-		g_strfreev (pair);
+		icon = zenity_util_gicon_from_string (icon_path);
+		g_notification_set_icon (notif, icon);
 	}
-	if (g_hash_table_size (result) == 0) {
-		g_hash_table_unref (result);
-		return NULL;
-	} else {
-		return result;
-	}
-}
 
-static GHashTable *
-zenity_notification_parse_hints (gchar *hints) {
-	GHashTable *result;
-	gchar **hint_array;
-
-	hint_array = g_strsplit (g_strcompress (hints), "\n", MAX_HINTS);
-	result = zenity_notification_parse_hints_array (hint_array);
-	g_strfreev (hint_array);
-	return result;
+	return g_steal_pointer (&notif);
 }
 
 static void
-zenity_notification_set_hint (
-	gpointer key, gpointer value, gpointer user_data) {
-	NotifyNotification *notification;
-	gchar *hint_name;
-	GVariant *hint_value;
-
-	gchar *string_value;
-	gboolean boolean_value;
-	gint32 int_value;
-	guchar byte_value;
-
-	hint_name = (gchar *) key;
-	string_value = (gchar *) value;
-	notification = (NotifyNotification *) user_data;
-
-	if ((g_ascii_strcasecmp ("action-icons", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("resident", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("suppress-sound", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("transient", hint_name) == 0)) {
-		/* boolean hints */
-		if (g_ascii_strcasecmp ("true", string_value) == 0) {
-			boolean_value = TRUE;
-		} else if (g_ascii_strcasecmp ("false", string_value) == 0) {
-			boolean_value = FALSE;
-		} else {
-			g_printerr (_ ("Invalid value for a boolean typed hint.\nSupported "
-						   "values are 'true' or 'false'.\n"));
-			return;
-		}
-		hint_value = g_variant_new_boolean (boolean_value);
-	} else if ((g_ascii_strcasecmp ("category", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("desktop-entry", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("image-path", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("image_path", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("sound-file", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("sound-name", hint_name) == 0)) {
-		/* string hints */
-		hint_value = g_variant_new_string (string_value);
-	} else if ((g_ascii_strcasecmp ("image-data", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("image_data", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("icon-data", hint_name) == 0)) {
-		/* (iibiiay) */
-		g_printerr (_ ("Unsupported hint. Skipping.\n"));
-		return;
-	} else if ((g_ascii_strcasecmp ("x", hint_name) == 0) ||
-		(g_ascii_strcasecmp ("y", hint_name) == 0)) {
-		/* int hints */
-		if (string_value == NULL)
-			string_value = "";
-		int_value = (gint32) g_ascii_strtoll (string_value, NULL, 0);
-		hint_value = g_variant_new_int32 (int_value);
-	} else if ((g_ascii_strcasecmp ("urgency", hint_name) == 0)) {
-		/* byte hints */
-		if (string_value == NULL)
-			string_value = "";
-		byte_value = (guchar) g_ascii_strtoll (string_value, NULL, 0);
-		hint_value = g_variant_new_byte (byte_value);
-	} else {
-		/* unknown hints */
-		g_printerr (_ ("Unknown hint name. Skipping.\n"));
-		return;
-	}
-
-	notify_notification_set_hint (notification, hint_name, hint_value);
-}
+on_notification_default_action (GSimpleAction *self,
+		GVariant *parameter,
+		gpointer user_data)
+{
+	ZenityData *zen_data = user_data;
 
-static void
-zenity_notification_set_hints (
-	NotifyNotification *notification, GHashTable *hints) {
-	if (hints == NULL) {
-		return;
-	}
+	zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
 
-	g_hash_table_foreach (hints, zenity_notification_set_hint, notification);
+	zenity_util_gapp_quit (NULL, zen_data);
 }
 
 static gboolean
-zenity_notification_handle_stdin (
-	GIOChannel *channel, GIOCondition condition, gpointer user_data) {
-	if ((condition & G_IO_IN) != 0) {
-		GString *string;
-		GError *error = NULL;
+zenity_notification_handle_stdin (GIOChannel *channel, GIOCondition condition,
+		gpointer user_data)
+{
+	static char *icon_file;
+
+	if ((condition & G_IO_IN) != 0)
+	{
+		g_autoptr(GString) string = NULL;
+		g_autoptr(GError) error = NULL;
 
-		string = g_string_new (NULL);
 		while (channel->is_readable == FALSE)
 			;
+
+		string = g_string_new (NULL);
+
 		do {
-			gint status;
-			gchar *command, *value, *colon;
+			int status;
+			g_autofree char *command = NULL;
+			char *value, *colon;
 
 			do {
-				status = g_io_channel_read_line_string (
-					channel, string, NULL, &error);
-				while (gdk_events_pending ())
-					gtk_main_iteration ();
+				status = g_io_channel_read_line_string (channel, string,
+						NULL, &error);
+
+				while (g_main_context_pending (NULL)) {
+					g_main_context_iteration (NULL, FALSE);
+				}
 
 			} while (status == G_IO_STATUS_AGAIN);
 
-			if (status != G_IO_STATUS_NORMAL) {
+			if (status != G_IO_STATUS_NORMAL)
+			{
 				if (error) {
-					g_warning ("zenity_notification_handle_stdin () : %s",
-						error->message);
-					g_error_free (error);
+					g_warning ("%s: %s",
+							__func__,
+							error->message);
 					error = NULL;
 				}
 				continue;
@@ -214,10 +135,12 @@ zenity_notification_handle_stdin (
 
 			zenity_util_strip_newline (string->str);
 			colon = strchr (string->str, ':');
-			if (colon == NULL) {
-				g_printerr (_ ("Could not parse command from stdin\n"));
+			if (colon == NULL)
+			{
+				g_printerr (_("Could not parse command from stdin\n"));
 				continue;
 			}
+
 			/* split off the command and value */
 			command = g_strstrip (g_strndup (string->str, colon - string->str));
 
@@ -225,69 +148,62 @@ zenity_notification_handle_stdin (
 			while (*value && g_ascii_isspace (*value))
 				value++;
 
-			if (!g_ascii_strcasecmp (command, "icon")) {
+			if (! g_ascii_strcasecmp (command, "icon"))
+			{
 				g_free (icon_file);
 				icon_file = g_strdup (value);
-			} else if (!g_ascii_strcasecmp (command, "hints")) {
-				if (notification_hints != NULL) {
-					g_hash_table_unref (notification_hints);
-				}
-				notification_hints = zenity_notification_parse_hints (value);
-			} else if (!g_ascii_strcasecmp (command, "message")) {
+			}
+			else if (!g_ascii_strcasecmp (command, "message"))
+			{
 				/* display a notification bubble */
-				if (!g_utf8_validate (value, -1, NULL)) {
+				if (! g_utf8_validate (value, -1, NULL))
+				{
 					g_warning ("Invalid UTF-8 in input!");
-				} else {
-					NotifyNotification *notif;
-					error = NULL;
+				}
+				else
+				{
+					g_autoptr(GNotification) notif = NULL;
 
 					notif = zenity_notification_new (value, icon_file);
+
 					if (notif == NULL)
 						continue;
 
-					zenity_notification_set_hints (notif, notification_hints);
-
-					notify_notification_show (notif, &error);
-					if (error) {
-						g_warning (
-							"Error showing notification: %s", error->message);
-						g_error_free (error);
-						error = NULL;
-					}
-
-					g_object_unref (notif);
+					zenity_send_notification (notif);
 				}
-			} else if (!g_ascii_strcasecmp (command, "tooltip")) {
-				if (!g_utf8_validate (value, -1, NULL)) {
+			}
+			else if (! g_ascii_strcasecmp (command, "tooltip"))
+			{
+				if (! g_utf8_validate (value, -1, NULL))
+				{
 					g_warning ("Invalid UTF-8 in input!");
-				} else {
-					NotifyNotification *notif;
+				}
+				else
+				{
+					g_autoptr(GNotification) notif = NULL;
+
 					notif = zenity_notification_new (value, icon_file);
+
 					if (notif == NULL)
 						continue;
 
-					zenity_notification_set_hints (notif, notification_hints);
-
-					notify_notification_show (notif, &error);
-					if (error) {
-						g_warning (
-							"Error showing notification: %s", error->message);
-						g_error_free (error);
-						error = NULL;
-					}
+					zenity_send_notification (notif);
 				}
-			} else if (!g_ascii_strcasecmp (command, "visible")) {
+			}
+			else if (!g_ascii_strcasecmp (command, "visible"))
+			{
 
-			} else {
+			}
+			else
+			{
 				g_warning ("Unknown command '%s'", command);
 			}
-			g_free (command);
 
 		} while (g_io_channel_get_buffer_condition (channel) == G_IO_IN);
-		g_string_free (string, TRUE);
 	}
 
-	if ((condition & G_IO_HUP) != 0) {
+	if ((condition & G_IO_HUP) != 0)
+	{
 		g_io_channel_shutdown (channel, TRUE, NULL);
 		return FALSE;
 	}
@@ -296,76 +212,59 @@ zenity_notification_handle_stdin (
 }
 
 static void
-zenity_notification_listen_on_stdin (ZenityData *data) {
+zenity_notification_listen_on_stdin (ZenityData *data)
+{
 	GIOChannel *channel;
 
 	channel = g_io_channel_unix_new (0);
 	g_io_channel_set_encoding (channel, NULL, NULL);
 	g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
-	g_io_add_watch (
-		channel, G_IO_IN | G_IO_HUP, zenity_notification_handle_stdin, data);
+	g_io_add_watch (channel,
+			G_IO_IN | G_IO_HUP,
+			zenity_notification_handle_stdin,
+			data);
 }
 
 void
-zenity_notification (
-	ZenityData *data, ZenityNotificationData *notification_data) {
-	GError *error;
-	NotifyNotification *notification;
-	GHashTable *notification_hints;
-
-	/* create the notification widget */
-	if (!notify_is_initted ()) {
-		notify_init (_ ("Zenity notification"));
-	}
+zenity_notification (ZenityData *data,
+		ZenityNotificationData *notification_data)
+{
+	GNotification *notification;
 
-	if (notification_data->listen) {
+	if (notification_data->listen)
+	{
 		zenity_notification_listen_on_stdin (data);
-		gtk_main ();
-	} else {
-		if (notification_data->notification_text == NULL) {
+
+		zenity_util_gapp_main (NULL);
+	}
+	else
+	{
+		g_autoptr(GSimpleAction) action = NULL;
+
+		if (notification_data->notification_text == NULL)
 			exit (1);
-		}
 
 		notification = zenity_notification_new (
-			notification_data->notification_text, data->window_icon);
+				notification_data->notification_text, notification_data->icon);
 
-		if (notification == NULL) {
+		if (notification == NULL)
 			exit (1);
-		}
 
 		/* if we aren't listening for changes, then close on default action */
-		notify_notification_add_action (notification,
-			"default",
-			"Do Default Action",
-			(NotifyActionCallback) on_notification_default_action,
-			data,
-			NULL);
+		action = g_simple_action_new ("app.default", NULL);
+		g_signal_connect (action, "activate",
+				G_CALLBACK(on_notification_default_action), data);
 
-		/* set the notification hints for the displayed notification */
-		if (notification_data->notification_hints != NULL) {
-			notification_hints = zenity_notification_parse_hints_array (
-				notification_data->notification_hints);
-			zenity_notification_set_hints (notification, notification_hints);
-			g_hash_table_unref (notification_hints);
-		}
-
-		/* Show icon and wait */
-		error = NULL;
-		if (!notify_notification_show (notification, &error)) {
-			if (error != NULL) {
-				g_warning ("Error showing notification: %s", error->message);
-				g_error_free (error);
-			}
-			exit (1);
-		}
+		g_notification_set_default_action (notification, "app.default");
+
+		zenity_send_notification (notification);
 	}
 
 	if (data->timeout_delay > 0) {
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			NULL);
-		gtk_main ();
+
+		zenity_util_gapp_main (NULL);
 	}
 }
-
-#endif
diff --git a/src/option.c b/src/option.c
index 61df34d3..ef26d533 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1,3 +1,5 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * option.h
  *
@@ -22,32 +24,32 @@
  *          Lucas Rocha <lucasr@im.ufba.br>
  */
 
-#include "config.h"
-
 #include "option.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <locale.h>
+#include <langinfo.h>
+
+#include <config.h>
 
 /* General Options */
-static gchar *zenity_general_dialog_title;
-static gchar *zenity_general_window_icon;
+static char *zenity_general_dialog_title;
 static int zenity_general_width;
 static int zenity_general_height;
-static gchar *zenity_general_dialog_text;
-static gchar *zenity_general_dialog_icon;
-static gchar *zenity_general_separator;
+static char *zenity_general_dialog_text;
+static char *zenity_general_icon;
+static char *zenity_general_separator;
 static gboolean zenity_general_multiple;
 static gboolean zenity_general_editable;
-static gchar *zenity_general_uri;
+static char *zenity_general_uri;
 static gboolean zenity_general_dialog_no_wrap;
 static gboolean zenity_general_dialog_no_markup;
-static gint zenity_general_timeout_delay;
-static gchar *zenity_general_ok_button;
-static gchar *zenity_general_cancel_button;
-static gchar **zenity_general_extra_buttons;
+static int zenity_general_timeout_delay;
+static char *zenity_general_ok_button;
+static char *zenity_general_cancel_button;
+static char **zenity_general_extra_buttons;
 static gboolean zenity_general_modal;
-static guintptr zenity_general_attach;
 static gboolean zenity_general_dialog_ellipsize;
 
 /* Calendar Dialog Options */
@@ -55,11 +57,11 @@ static gboolean zenity_calendar_active;
 static int zenity_calendar_day;
 static int zenity_calendar_month;
 static int zenity_calendar_year;
-static gchar *zenity_calendar_date_format;
+static char *zenity_calendar_date_format;
 
 /* Entry Dialog Options */
 static gboolean zenity_entry_active;
-static gchar *zenity_entry_entry_text;
+static char *zenity_entry_entry_text;
 static gboolean zenity_entry_hide_text;
 
 /* Error Dialog Options */
@@ -72,26 +74,21 @@ static gboolean zenity_info_active;
 static gboolean zenity_file_active;
 static gboolean zenity_file_directory;
 static gboolean zenity_file_save;
-static gboolean zenity_file_confirm_overwrite;
-static gchar **zenity_file_filter;
+static char **zenity_file_filter;
 
 /* List Dialog Options */
 static gboolean zenity_list_active;
-static gchar **zenity_list_columns;
+static char **zenity_list_columns;
 static gboolean zenity_list_checklist;
 static gboolean zenity_list_radiolist;
-static gchar *zenity_list_print_column;
-static gchar *zenity_list_hide_column;
+static char *zenity_list_print_column;
+static char *zenity_list_hide_column;
 static gboolean zenity_list_hide_header;
 static gboolean zenity_list_imagelist;
-static gboolean zenity_list_mid_search;
 
-#ifdef HAVE_LIBNOTIFY
 /* Notification Dialog Options */
 static gboolean zenity_notification_active;
 static gboolean zenity_notification_listen;
-static gchar **zenity_notification_hints;
-#endif
 
 /* Progress Dialog Options */
 static gboolean zenity_progress_active;
@@ -109,14 +106,14 @@ static gboolean zenity_question_switch;
 
 /* Text Dialog Options */
 static gboolean zenity_text_active;
-static gchar *zenity_text_font;
-static gchar *zenity_text_checkbox;
+static char *zenity_text_font;
+static char *zenity_text_checkbox;
 static gboolean zenity_text_auto_scroll;
 
 #ifdef HAVE_WEBKITGTK
 static gboolean zenity_text_enable_html;
 static gboolean zenity_text_no_interaction;
-static gchar *zenity_text_url;
+static char *zenity_text_url;
 #endif
 
 /* Warning Dialog Options */
@@ -124,16 +121,16 @@ static gboolean zenity_warning_active;
 
 /* Scale Dialog Options */
 static gboolean zenity_scale_active;
-static gint zenity_scale_value;
-static gint zenity_scale_min_value;
-static gint zenity_scale_max_value;
-static gint zenity_scale_step;
+static int zenity_scale_value;
+static int zenity_scale_min_value;
+static int zenity_scale_max_value;
+static int zenity_scale_step;
 static gboolean zenity_scale_print_partial;
 static gboolean zenity_scale_hide_value;
 
 /* Color Selection Dialog Options */
 static gboolean zenity_colorsel_active;
-static gchar *zenity_colorsel_color;
+static char *zenity_colorsel_color;
 static gboolean zenity_colorsel_show_palette;
 
 /* Password Dialog Options */
@@ -143,251 +140,277 @@ static gboolean zenity_password_show_username;
 /* Forms Dialog Options */
 static gboolean zenity_forms_active;
 static gboolean zenity_forms_show_header;
-static gchar *zenity_forms_date_format;
-// static gchar   *zenity_forms_hide_column;
-static gchar **zenity_forms_list_values;
-static gchar **zenity_forms_column_values;
-static gchar **zenity_forms_combo_values;
+static char *zenity_forms_date_format;
+static char **zenity_forms_list_values;
+static char **zenity_forms_column_values;
+static char **zenity_forms_combo_values;
 
 /* Miscelaneus Options */
 static gboolean zenity_misc_about;
 static gboolean zenity_misc_version;
 
-static gboolean zenity_forms_callback (const gchar *option_name,
-	const gchar *value, gpointer data, GError **error);
-
-static GOptionEntry general_options[] = {{"title",
-											 '\0',
-											 0,
-											 G_OPTION_ARG_STRING,
-											 &zenity_general_dialog_title,
-											 N_ ("Set the dialog title"),
-											 N_ ("TITLE")},
-	{"window-icon",
-		'\0',
-		0,
-		G_OPTION_ARG_FILENAME,
-		&zenity_general_window_icon,
-		N_ ("Set the window icon"),
-		N_ ("ICONPATH")},
-	{"width",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_general_width,
-		N_ ("Set the width"),
-		N_ ("WIDTH")},
-	{"height",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_general_height,
-		N_ ("Set the height"),
-		N_ ("HEIGHT")},
-	{"timeout",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_general_timeout_delay,
-		N_ ("Set dialog timeout in seconds"),
-		/* Timeout for closing the dialog */
-		N_ ("TIMEOUT")},
-	{"ok-label",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_ok_button,
-		N_ ("Set the label of the OK button"),
-		N_ ("TEXT")},
-	{"cancel-label",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_cancel_button,
-		N_ ("Set the label of the Cancel button"),
-		N_ ("TEXT")},
-	{"extra-button",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING_ARRAY,
-		&zenity_general_extra_buttons,
-		N_ ("Add an extra button"),
-		N_ ("TEXT")},
-	{"modal",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_modal,
-		N_ ("Set the modal hint"),
-		NULL},
-	{"attach",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_INT,
-		&zenity_general_attach,
-		N_ ("Set the parent window to attach to"),
-		N_ ("WINDOW")},
-	{NULL}};
-
-static GOptionEntry calendar_options[] = {{"calendar",
-											  '\0',
-											  G_OPTION_FLAG_IN_MAIN,
-											  G_OPTION_ARG_NONE,
-											  &zenity_calendar_active,
-											  N_ ("Display calendar dialog"),
-											  NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"day",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_calendar_day,
-		N_ ("Set the calendar day"),
-		N_ ("DAY")},
-	{"month",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_calendar_month,
-		N_ ("Set the calendar month"),
-		N_ ("MONTH")},
-	{"year",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_calendar_year,
-		N_ ("Set the calendar year"),
-		N_ ("YEAR")},
-	{"date-format",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING,
-		&zenity_calendar_date_format,
-		N_ ("Set the format for the returned date"),
-		N_ ("PATTERN")},
-	{NULL}};
+/* DEPRECATED Options */
+
+static char *zenity_general_window_icon_DEPRECATED;
+static char *zenity_general_icon_name_DEPRECATED;
+static gboolean zenity_list_mid_search_DEPRECATED;
+static gboolean zenity_file_confirm_overwrite_DEPRECATED;
+static guintptr zenity_general_attach_DEPRECATED;
+static gchar **zenity_notification_hints_DEPRECATED;
+
+static gboolean zenity_forms_callback (const char *option_name,
+	const char *value, gpointer data, GError **error);
+
+static GOptionEntry general_options[] =
+		{{"title",
+			 '\0',
+			 0,
+			 G_OPTION_ARG_STRING,
+			 &zenity_general_dialog_title,
+			 N_ ("Set the dialog title"),
+			 N_ ("TITLE")},
+		{"width",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_general_width,
+			N_ ("Set the width"),
+			N_ ("WIDTH")},
+		{"height",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_general_height,
+			N_ ("Set the height"),
+			N_ ("HEIGHT")},
+		{"timeout",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_general_timeout_delay,
+			N_ ("Set dialog timeout in seconds"),
+			/* Timeout for closing the dialog */
+			N_ ("TIMEOUT")},
+		{"ok-label",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_ok_button,
+			N_ ("Set the label of the OK button"),
+			N_ ("TEXT")},
+		{"cancel-label",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_cancel_button,
+			N_ ("Set the label of the Cancel button"),
+			N_ ("TEXT")},
+		{"extra-button",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING_ARRAY,
+			&zenity_general_extra_buttons,
+			N_ ("Add an extra button"),
+			N_ ("TEXT")},
+		{"modal",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_modal,
+			N_ ("Set the modal hint"),
+			NULL},
+		{"attach",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_INT,
+			&zenity_general_attach_DEPRECATED,
+			N_ ("DEPRECATED; does nothing"),
+			N_ ("WINDOW")},
+		{"icon-name",
+			'\0',
+			G_OPTION_FLAG_HIDDEN,
+			G_OPTION_ARG_STRING,
+			&zenity_general_icon_name_DEPRECATED,
+			N_ ("DEPRECATED; use `--icon`"),
+			N_ ("ICON-NAME")},
+		{"window-icon",
+			'\0',
+			G_OPTION_FLAG_HIDDEN,
+			G_OPTION_ARG_STRING,
+			&zenity_general_window_icon_DEPRECATED,
+			N_ ("DEPRECATED; use `--icon`"),
+			N_ ("ICON-NAME")},
+		{NULL}};
 
-static GOptionEntry entry_options[] = {{"entry",
-										   '\0',
-										   G_OPTION_FLAG_IN_MAIN,
-										   G_OPTION_ARG_NONE,
-										   &zenity_entry_active,
-										   N_ ("Display text entry dialog"),
-										   NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"entry-text",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING,
-		&zenity_entry_entry_text,
-		N_ ("Set the entry text"),
-		N_ ("TEXT")},
-	{"hide-text",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_entry_hide_text,
-		N_ ("Hide the entry text"),
-		NULL},
-	{NULL}};
+static GOptionEntry calendar_options[] =
+		{{"calendar",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_calendar_active,
+			 N_ ("Display calendar dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"day",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_calendar_day,
+			N_ ("Set the calendar day"),
+			N_ ("DAY")},
+		{"month",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_calendar_month,
+			N_ ("Set the calendar month"),
+			N_ ("MONTH")},
+		{"year",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_calendar_year,
+			N_ ("Set the calendar year"),
+			N_ ("YEAR")},
+		{"date-format",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING,
+			&zenity_calendar_date_format,
+			N_ ("Set the format for the returned date"),
+			N_ ("PATTERN")},
+		{NULL}};
 
-static GOptionEntry error_options[] = {{"error",
-										   '\0',
-										   G_OPTION_FLAG_IN_MAIN,
-										   G_OPTION_ARG_NONE,
-										   &zenity_error_active,
-										   N_ ("Display error dialog"),
-										   NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"icon-name",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_icon,
-		N_ ("Set the dialog icon"),
-		N_ ("ICON-NAME")},
-	{"no-wrap",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_wrap,
-		N_ ("Do not enable text wrapping"),
-		NULL},
-	{"no-markup",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_markup,
-		N_ ("Do not enable Pango markup")},
-	{"ellipsize",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_ellipsize,
-		N_ ("Enable ellipsizing in the dialog text. This fixes the high window "
-			"size with long texts")},
-	{NULL}};
+static GOptionEntry entry_options[] =
+		{{"entry",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_entry_active,
+			 N_ ("Display text entry dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"entry-text",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING,
+			&zenity_entry_entry_text,
+			N_ ("Set the entry text"),
+			N_ ("TEXT")},
+		{"hide-text",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_entry_hide_text,
+			N_ ("Hide the entry text"),
+			NULL},
+		{NULL}};
 
-static GOptionEntry info_options[] = {{"info",
-										  '\0',
-										  G_OPTION_FLAG_IN_MAIN,
-										  G_OPTION_ARG_NONE,
-										  &zenity_info_active,
-										  N_ ("Display info dialog"),
-										  NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"icon-name",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_icon,
-		N_ ("Set the dialog icon"),
-		N_ ("ICON-NAME")},
-	{"no-wrap",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_wrap,
-		N_ ("Do not enable text wrapping"),
-		NULL},
-	{"no-markup",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_markup,
-		N_ ("Do not enable Pango markup")},
-	{"ellipsize",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_ellipsize,
-		N_ ("Enable ellipsizing in the dialog text. This fixes the high window "
-			"size with long texts")},
-	{NULL}};
+static GOptionEntry error_options[] =
+		{{"error",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_error_active,
+			 N_ ("Display error dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"icon",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_icon,
+			N_ ("Set the icon name"),
+			N_ ("ICON-NAME")},
+		{"no-wrap",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_wrap,
+			N_ ("Do not enable text wrapping"),
+			NULL},
+		{"no-markup",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_markup,
+			N_ ("Do not enable Pango markup"),
+			NULL},
+		{"ellipsize",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_ellipsize,
+			N_ ("Enable ellipsizing in the dialog text. "
+					"This fixes the high window "
+					"size with long texts"),
+			NULL},
+			{NULL}};
+
+static GOptionEntry info_options[] =
+		{{"info",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_info_active,
+			 N_ ("Display info dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"icon",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_icon,
+			N_ ("Set the icon name"),
+			N_ ("ICON-NAME")},
+		{"no-wrap",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_wrap,
+			N_ ("Do not enable text wrapping"),
+			NULL},
+		{"no-markup",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_markup,
+			N_ ("Do not enable Pango markup"),
+			NULL},
+		{"ellipsize",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_ellipsize,
+			N_ ("Enable ellipsizing in the dialog text. "
+					"This fixes the high window "
+					"size with long texts"),
+			NULL},
+			{NULL}};
 
 static GOptionEntry file_selection_options[] =
 	{{"file-selection",
@@ -432,15 +455,7 @@ static GOptionEntry file_selection_options[] =
 			&zenity_general_separator,
 			N_ ("Set output separator character"),
 			N_ ("SEPARATOR")},
-		{"confirm-overwrite",
-			'\0',
-			0,
-			G_OPTION_ARG_NONE,
-			&zenity_file_confirm_overwrite,
-			N_ ("Confirm file selection if filename already exists"),
-			NULL},
-		{
-			"file-filter",
+		{"file-filter",
 			'\0',
 			0,
 			G_OPTION_ARG_STRING_ARRAY,
@@ -450,257 +465,273 @@ static GOptionEntry file_selection_options[] =
 			   selection) */
 			N_ ("NAME | PATTERN1 PATTERN2 ..."),
 		},
+		{"confirm-overwrite",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_file_confirm_overwrite_DEPRECATED,
+			N_ ("DEPRECATED; does nothing"),
+			NULL},
 		{NULL}};
 
-static GOptionEntry list_options[] = {{"list",
-										  '\0',
-										  G_OPTION_FLAG_IN_MAIN,
-										  G_OPTION_ARG_NONE,
-										  &zenity_list_active,
-										  N_ ("Display list dialog"),
-										  NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"column",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING_ARRAY,
-		&zenity_list_columns,
-		N_ ("Set the column header"),
-		N_ ("COLUMN")},
-	{"checklist",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_list_checklist,
-		N_ ("Use check boxes for the first column"),
-		NULL},
-	{"radiolist",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_list_radiolist,
-		N_ ("Use radio buttons for the first column"),
-		NULL},
-	{"imagelist",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_list_imagelist,
-		N_ ("Use an image for the first column"),
-		NULL},
-	{"separator",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_separator,
-		N_ ("Set output separator character"),
-		N_ ("SEPARATOR")},
-	{"multiple",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_multiple,
-		N_ ("Allow multiple rows to be selected"),
-		NULL},
-	{"editable",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_editable,
-		N_ ("Allow changes to text"),
-		NULL},
-	{"print-column",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING,
-		&zenity_list_print_column,
-		N_ ("Print a specific column (Default is 1. 'ALL' can be used to print "
-			"all columns)"),
-		/* Column index number to print out on a list dialog */
-		N_ ("NUMBER")},
-	{"hide-column",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING,
-		&zenity_list_hide_column,
-		N_ ("Hide a specific column"),
-		N_ ("NUMBER")},
-	{"hide-header",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_list_hide_header,
-		N_ ("Hide the column headers"),
-		NULL},
-	{"mid-search",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_list_mid_search,
-		N_ ("Change list default search function searching for text in the "
-			"middle, not on the beginning"),
-		NULL},
-	{NULL}};
-
-#ifdef HAVE_LIBNOTIFY
-static GOptionEntry notification_options[] = {{"notification",
-												  '\0',
-												  G_OPTION_FLAG_IN_MAIN,
-												  G_OPTION_ARG_NONE,
-												  &zenity_notification_active,
-												  N_ ("Display notification"),
-												  NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the notification text"),
-		N_ ("TEXT")},
-	{"listen",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_notification_listen,
-		N_ ("Listen for commands on stdin"),
-		NULL},
-	{"hint",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING_ARRAY,
-		&zenity_notification_hints,
-		N_ ("Set the notification hints"),
-		N_ ("TEXT")},
-	{NULL}};
-
-#endif
-
-static GOptionEntry progress_options[] = {
-	{"progress",
-		'\0',
-		G_OPTION_FLAG_IN_MAIN,
-		G_OPTION_ARG_NONE,
-		&zenity_progress_active,
-		N_ ("Display progress indication dialog"),
-		NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"percentage",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_progress_percentage,
-		N_ ("Set initial percentage"),
-		N_ ("PERCENTAGE")},
-	{"pulsate",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_progress_pulsate,
-		N_ ("Pulsate progress bar"),
-		NULL},
-	{"auto-close",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_progress_auto_close,
-		/* xgettext: no-c-format */
-		N_ ("Dismiss the dialog when 100% has been reached"),
-		NULL},
-	{"auto-kill",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_progress_auto_kill,
-		N_ ("Kill parent process if Cancel button is pressed"),
-		NULL},
-	{"no-cancel",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_progress_no_cancel,
-		N_ ("Hide Cancel button"),
-		NULL},
-	{"time-remaining",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_progress_time_remaining,
-		/* xgettext: no-c-format */
-		N_ ("Estimate when progress will reach 100%"),
-		NULL},
-	{NULL}};
+static GOptionEntry list_options[] =
+		{{"list",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_list_active,
+			 N_ ("Display list dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"column",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING_ARRAY,
+			&zenity_list_columns,
+			N_ ("Set the column header"),
+			N_ ("COLUMN")},
+		{"checklist",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_list_checklist,
+			N_ ("Use check boxes for the first column"),
+			NULL},
+		{"radiolist",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_list_radiolist,
+			N_ ("Use radio buttons for the first column"),
+			NULL},
+		{"imagelist",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_list_imagelist,
+			N_ ("Use an image for the first column"),
+			NULL},
+		{"separator",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_separator,
+			N_ ("Set output separator character"),
+			N_ ("SEPARATOR")},
+		{"multiple",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_multiple,
+			N_ ("Allow multiple rows to be selected"),
+			NULL},
+		{"editable",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_editable,
+			N_ ("Allow changes to text"),
+			NULL},
+		{"print-column",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING,
+			&zenity_list_print_column,
+			N_ ("Print a specific column (Default is 1. "
+					"'ALL' can be used to print all columns)"),
+			/* Column index number to print out on a list dialog */
+			N_ ("NUMBER")},
+		{"hide-column",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING,
+			&zenity_list_hide_column,
+			N_ ("Hide a specific column"),
+			N_ ("NUMBER")},
+		{"hide-header",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_list_hide_header,
+			N_ ("Hide the column headers"),
+			NULL},
+		{"mid-search",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_list_mid_search_DEPRECATED,
+			N_ ("DEPRECATED; does nothing"),
+			NULL},
+		{NULL}};
 
-static GOptionEntry question_options[] = {{"question",
-											  '\0',
-											  G_OPTION_FLAG_IN_MAIN,
-											  G_OPTION_ARG_NONE,
-											  &zenity_question_active,
-											  N_ ("Display question dialog"),
-											  NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"icon-name",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_icon,
-		N_ ("Set the dialog icon"),
-		N_ ("ICON-NAME")},
-	{"no-wrap",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_wrap,
-		N_ ("Do not enable text wrapping"),
-		NULL},
-	{"no-markup",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_markup,
-		N_ ("Do not enable Pango markup")},
-	{"default-cancel",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_question_default_cancel,
-		N_ ("Give Cancel button focus by default"),
-		NULL},
-	{"ellipsize",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_ellipsize,
-		N_ ("Enable ellipsizing in the dialog text. This fixes the high window "
-			"size with long texts")},
-	{"switch",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_question_switch,
-		N_ ("Suppress OK and Cancel buttons"),
-		NULL},
-	{NULL}};
+static GOptionEntry notification_options[] =
+		{{"notification",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_notification_active,
+			 N_ ("Display notification"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the notification text"),
+			N_ ("TEXT")},
+		{"icon",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_icon,
+			N_ ("Set the icon name"),
+			N_ ("ICON-NAME")},
+		{"listen",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_notification_listen,
+			N_ ("Listen for commands on stdin"),
+			NULL},
+		{"hint",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING_ARRAY,
+			&zenity_notification_hints_DEPRECATED,
+			N_ ("DEPRECATED; does nothing"),
+			N_ ("TEXT")},
+		{NULL}};
+
+static GOptionEntry progress_options[] =
+		{{"progress",
+			'\0',
+			G_OPTION_FLAG_IN_MAIN,
+			G_OPTION_ARG_NONE,
+			&zenity_progress_active,
+			N_ ("Display progress indication dialog"),
+			NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"percentage",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_progress_percentage,
+			N_ ("Set initial percentage"),
+			N_ ("PERCENTAGE")},
+		{"pulsate",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_progress_pulsate,
+			N_ ("Pulsate progress bar"),
+			NULL},
+		{"auto-close",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_progress_auto_close,
+			/* xgettext: no-c-format */
+			N_ ("Dismiss the dialog when 100% has been reached"),
+			NULL},
+		{"auto-kill",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_progress_auto_kill,
+			N_ ("Kill parent process if Cancel button is pressed"),
+			NULL},
+		{"no-cancel",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_progress_no_cancel,
+			N_ ("Hide Cancel button"),
+			NULL},
+		{"time-remaining",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_progress_time_remaining,
+			/* xgettext: no-c-format */
+			N_ ("Estimate when progress will reach 100%"),
+			NULL},
+		{NULL}};
 
-static GOptionEntry text_options[] = {
-	{"text-info",
+static GOptionEntry question_options[] =
+		{{"question",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_question_active,
+			 N_ ("Display question dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"icon",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_icon,
+			N_ ("Set the icon name"),
+			N_ ("ICON-NAME")},
+		{"no-wrap",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_wrap,
+			N_ ("Do not enable text wrapping"),
+			NULL},
+		{"no-markup",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_markup,
+			N_ ("Do not enable Pango markup"),
+			NULL},
+		{"default-cancel",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_question_default_cancel,
+			N_ ("Give Cancel button focus by default"),
+			NULL},
+		{"ellipsize",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_ellipsize,
+			N_ ("Enable ellipsizing in the dialog text. "
+					"This fixes the high window "
+					"size with long texts"),
+			NULL},
+			{"switch",
+				'\0',
+				G_OPTION_FLAG_NOALIAS,
+				G_OPTION_ARG_NONE,
+				&zenity_question_switch,
+				N_ ("Suppress OK and Cancel buttons"),
+				NULL},
+			{NULL}};
+
+static GOptionEntry text_options[] =
+	{{"text-info",
 		'\0',
 		G_OPTION_FLAG_IN_MAIN,
 		G_OPTION_ARG_NONE,
@@ -743,239 +774,245 @@ static GOptionEntry text_options[] = {
 		&zenity_text_enable_html,
 		N_ ("Enable HTML support"),
 		NULL},
-	{"no-interaction",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_text_no_interaction,
-		N_ ("Do not enable user interaction with the WebView. Only works if "
-			"you use --html option"),
-		NULL},
-	{"url",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_text_url,
-		N_ ("Set an URL instead of a file. Only works if you use --html "
-			"option"),
-		N_ ("URL")},
-#endif
-	{"auto-scroll",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_text_auto_scroll,
-		N_ ("Auto scroll the text to the end. Only when text is captured from "
-			"stdin"),
-		NULL},
-	{NULL}};
-
-static GOptionEntry warning_options[] = {{"warning",
-											 '\0',
-											 G_OPTION_FLAG_IN_MAIN,
-											 G_OPTION_ARG_NONE,
-											 &zenity_warning_active,
-											 N_ ("Display warning dialog"),
-											 NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"icon-name",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_icon,
-		N_ ("Set the dialog icon"),
-		N_ ("ICON-NAME")},
-	{"no-wrap",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_wrap,
-		N_ ("Do not enable text wrapping"),
-		NULL},
-	{"no-markup",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_no_markup,
-		N_ ("Do not enable Pango markup")},
-	{"ellipsize",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_NONE,
-		&zenity_general_dialog_ellipsize,
-		N_ ("Enable ellipsizing in the dialog text. This fixes the high window "
-			"size with long texts")},
-	{NULL}};
-
-static GOptionEntry scale_options[] = {{"scale",
-										   '\0',
-										   G_OPTION_FLAG_IN_MAIN,
-										   G_OPTION_ARG_NONE,
-										   &zenity_scale_active,
-										   N_ ("Display scale dialog"),
-										   NULL},
-	{"text",
-		'\0',
-		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"value",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_scale_value,
-		N_ ("Set initial value"),
-		N_ ("VALUE")},
-	{"min-value",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_scale_min_value,
-		N_ ("Set minimum value"),
-		N_ ("VALUE")},
-	{"max-value",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_scale_max_value,
-		N_ ("Set maximum value"),
-		N_ ("VALUE")},
-	{"step",
-		'\0',
-		0,
-		G_OPTION_ARG_INT,
-		&zenity_scale_step,
-		N_ ("Set step size"),
-		N_ ("VALUE")},
-	{"print-partial",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_scale_print_partial,
-		N_ ("Print partial values"),
-		NULL},
-	{"hide-value",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_scale_hide_value,
-		N_ ("Hide value"),
-		NULL},
-	{NULL}};
-
-static GOptionEntry forms_dialog_options[] = {{"forms",
-												  '\0',
-												  G_OPTION_FLAG_IN_MAIN,
-												  G_OPTION_ARG_NONE,
-												  &zenity_forms_active,
-												  N_ ("Display forms dialog"),
-												  NULL},
-	{"add-entry",
-		'\0',
-		0,
-		G_OPTION_ARG_CALLBACK,
-		zenity_forms_callback,
-		N_ ("Add a new Entry in forms dialog"),
-		N_ ("Field name")},
-	{"add-password",
-		'\0',
-		0,
-		G_OPTION_ARG_CALLBACK,
-		zenity_forms_callback,
-		N_ ("Add a new Password Entry in forms dialog"),
-		N_ ("Field name")},
-	{"add-calendar",
-		'\0',
-		0,
-		G_OPTION_ARG_CALLBACK,
-		zenity_forms_callback,
-		N_ ("Add a new Calendar in forms dialog"),
-		N_ ("Calendar field name")},
-	{"add-list",
-		'\0',
-		0,
-		G_OPTION_ARG_CALLBACK,
-		zenity_forms_callback,
-		N_ ("Add a new List in forms dialog"),
-		N_ ("List field and header name")},
-	{"list-values",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING_ARRAY,
-		&zenity_forms_list_values,
-		N_ ("List of values for List"),
-		N_ ("List of values separated by |")},
-	{"column-values",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING_ARRAY,
-		&zenity_forms_column_values,
-		N_ ("List of values for columns"),
-		N_ ("List of values separated by |")},
-	{"add-combo",
-		'\0',
-		0,
-		G_OPTION_ARG_CALLBACK,
-		zenity_forms_callback,
-		N_ ("Add a new combo box in forms dialog"),
-		N_ ("Combo box field name")},
-	{"combo-values",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING_ARRAY,
-		&zenity_forms_combo_values,
-		N_ ("List of values for combo box"),
-		N_ ("List of values separated by |")},
-	/* TODO: Implement how to hide specifc column
-	 {
-	   "hide-column",
-	   '\0',
-	   0,
-	   G_OPTION_ARG_STRING,
-	   &zenity_forms_hide_column,
-	   N_("Hide a specific column"),
-	   N_("NUMBER")
-	 },*/
-	{"show-header",
+	{"no-interaction",
 		'\0',
-		0,
+		G_OPTION_FLAG_NOALIAS,
 		G_OPTION_ARG_NONE,
-		&zenity_forms_show_header,
-		N_ ("Show the columns header"),
+		&zenity_text_no_interaction,
+		N_ ("Do not enable user interaction with the WebView. Only works if "
+			"you use --html option"),
 		NULL},
-	{"text",
+	{"url",
 		'\0',
 		G_OPTION_FLAG_NOALIAS,
 		G_OPTION_ARG_STRING,
-		&zenity_general_dialog_text,
-		N_ ("Set the dialog text"),
-		N_ ("TEXT")},
-	{"separator",
+		&zenity_text_url,
+		N_ ("Set an URL instead of a file. Only works if you use --html "
+			"option"),
+		N_ ("URL")},
+#endif
+	{"auto-scroll",
 		'\0',
 		G_OPTION_FLAG_NOALIAS,
-		G_OPTION_ARG_STRING,
-		&zenity_general_separator,
-		N_ ("Set output separator character"),
-		N_ ("SEPARATOR")},
-	{"date-format",
-		'\0',
-		0,
-		G_OPTION_ARG_STRING,
-		&zenity_forms_date_format,
-		N_ ("Set the format for the returned date"),
-		N_ ("PATTERN")},
+		G_OPTION_ARG_NONE,
+		&zenity_text_auto_scroll,
+		N_ ("Auto scroll the text to the end. Only when text is captured from "
+			"stdin"),
+		NULL},
 	{NULL}};
 
-static GOptionEntry password_dialog_options[] = {
-	{"password",
+static GOptionEntry warning_options[] =
+		{{"warning",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_warning_active,
+			 N_ ("Display warning dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"icon",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_icon,
+			N_ ("Set the icon name"),
+			N_ ("ICON-NAME")},
+		{"no-wrap",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_wrap,
+			N_ ("Do not enable text wrapping"),
+			NULL},
+		{"no-markup",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_no_markup,
+			N_ ("Do not enable Pango markup"),
+			NULL},
+		{"ellipsize",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_NONE,
+			&zenity_general_dialog_ellipsize,
+			N_ ("Enable ellipsizing in the dialog text. "
+					"This fixes the high window "
+					"size with long texts"),
+			NULL},
+			{NULL}};
+
+static GOptionEntry scale_options[] =
+		{{"scale",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_scale_active,
+			 N_ ("Display scale dialog"),
+			 NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"value",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_scale_value,
+			N_ ("Set initial value"),
+			N_ ("VALUE")},
+		{"min-value",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_scale_min_value,
+			N_ ("Set minimum value"),
+			N_ ("VALUE")},
+		{"max-value",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_scale_max_value,
+			N_ ("Set maximum value"),
+			N_ ("VALUE")},
+		{"step",
+			'\0',
+			0,
+			G_OPTION_ARG_INT,
+			&zenity_scale_step,
+			N_ ("Set step size"),
+			N_ ("VALUE")},
+		{"print-partial",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_scale_print_partial,
+			N_ ("Print partial values"),
+			NULL},
+		{"hide-value",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_scale_hide_value,
+			N_ ("Hide value"),
+			NULL},
+		{NULL}};
+
+static GOptionEntry forms_dialog_options[] =
+		{{"forms",
+			 '\0',
+			 G_OPTION_FLAG_IN_MAIN,
+			 G_OPTION_ARG_NONE,
+			 &zenity_forms_active,
+			 N_ ("Display forms dialog"),
+			 NULL},
+		{"add-entry",
+			'\0',
+			0,
+			G_OPTION_ARG_CALLBACK,
+			zenity_forms_callback,
+			N_ ("Add a new Entry in forms dialog"),
+			N_ ("Field name")},
+		{"add-password",
+			'\0',
+			0,
+			G_OPTION_ARG_CALLBACK,
+			zenity_forms_callback,
+			N_ ("Add a new Password Entry in forms dialog"),
+			N_ ("Field name")},
+		{"add-calendar",
+			'\0',
+			0,
+			G_OPTION_ARG_CALLBACK,
+			zenity_forms_callback,
+			N_ ("Add a new Calendar in forms dialog"),
+			N_ ("Calendar field name")},
+		{"add-list",
+			'\0',
+			0,
+			G_OPTION_ARG_CALLBACK,
+			zenity_forms_callback,
+			N_ ("Add a new List in forms dialog"),
+			N_ ("List field and header name")},
+		{"list-values",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING_ARRAY,
+			&zenity_forms_list_values,
+			N_ ("List of values for List"),
+			N_ ("List of values separated by |")},
+		{"column-values",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING_ARRAY,
+			&zenity_forms_column_values,
+			N_ ("List of values for columns"),
+			N_ ("List of values separated by |")},
+		{"add-combo",
+			'\0',
+			0,
+			G_OPTION_ARG_CALLBACK,
+			zenity_forms_callback,
+			N_ ("Add a new combo box in forms dialog"),
+			N_ ("Combo box field name")},
+		{"combo-values",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING_ARRAY,
+			&zenity_forms_combo_values,
+			N_ ("List of values for combo box"),
+			N_ ("List of values separated by |")},
+		/* TODO: Implement how to hide specifc column
+		   {
+		   "hide-column",
+		   '\0',
+		   0,
+		   G_OPTION_ARG_STRING,
+		   &zenity_forms_hide_column,
+		   N_("Hide a specific column"),
+		   N_("NUMBER")
+		   },*/
+		{"show-header",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_forms_show_header,
+			N_ ("Show the columns header"),
+			NULL},
+		{"text",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_dialog_text,
+			N_ ("Set the dialog text"),
+			N_ ("TEXT")},
+		{"separator",
+			'\0',
+			G_OPTION_FLAG_NOALIAS,
+			G_OPTION_ARG_STRING,
+			&zenity_general_separator,
+			N_ ("Set output separator character"),
+			N_ ("SEPARATOR")},
+		{"date-format",
+			'\0',
+			0,
+			G_OPTION_ARG_STRING,
+			&zenity_forms_date_format,
+			N_ ("Set the format for the returned date"),
+			N_ ("PATTERN")},
+		{NULL}};
+
+static GOptionEntry password_dialog_options[] =
+	{{"password",
 		'\0',
 		G_OPTION_FLAG_IN_MAIN,
 		G_OPTION_ARG_NONE,
@@ -991,8 +1028,8 @@ static GOptionEntry password_dialog_options[] = {
 		NULL},
 	{NULL}};
 
-static GOptionEntry color_selection_options[] = {
-	{"color-selection",
+static GOptionEntry color_selection_options[] =
+	{{"color-selection",
 		'\0',
 		G_OPTION_FLAG_IN_MAIN,
 		G_OPTION_ARG_NONE,
@@ -1015,28 +1052,66 @@ static GOptionEntry color_selection_options[] = {
 		NULL},
 	{NULL}};
 
-static GOptionEntry miscellaneous_options[] = {{"about",
-												   '\0',
-												   0,
-												   G_OPTION_ARG_NONE,
-												   &zenity_misc_about,
-												   N_ ("About zenity"),
-												   NULL},
-	{"version",
-		'\0',
-		0,
-		G_OPTION_ARG_NONE,
-		&zenity_misc_version,
-		N_ ("Print version"),
-		NULL},
-	{NULL}};
+static GOptionEntry miscellaneous_options[] =
+		{{"about",
+			 '\0',
+			 0,
+			 G_OPTION_ARG_NONE,
+			 &zenity_misc_about,
+			 N_ ("About zenity"),
+			 NULL},
+		{"version",
+			'\0',
+			0,
+			G_OPTION_ARG_NONE,
+			&zenity_misc_version,
+			N_ ("Print version"),
+			NULL},
+		{NULL}};
 
 static ZenityParsingOptions *results;
 static GOptionContext *ctx;
 
+/* Deprecation warnings */
+
+static void
+show_icon_name_deprecation_warning (void)
+{
+	g_printerr (_("Warning: --icon-name is deprecated and will be removed in a "
+			"future version of zenity; Treating as --icon.\n"));
+}
+
+static void
+show_window_icon_deprecation_warning (void)
+{
+	g_printerr (_("Warning: --window-icon is deprecated and will be removed in a "
+			"future version of zenity; Treating as --icon.\n"));
+}
+
+static void
+show_confirm_overwrite_deprecation_warning (void)
+{
+	g_printerr (_("Warning: --confirm-overwrite is deprecated and will be removed in a "
+			"future version of zenity. Ignoring.\n"));
+}
+
 static void
-zenity_option_init (void) {
+show_attach_deprecation_warning (void)
+{
+	g_printerr (_("Warning: --attach is deprecated and will be removed in a "
+			"future version of zenity. Ignoring.\n"));
+}
+
+static void
+show_notification_hints_deprecation_warning (void)
+{
+	g_printerr (_("Warning: --hint is deprecated and will be removed in a "
+			"future version of zenity. Ignoring.\n"));
+}
 
+static void
+zenity_option_init (void)
+{
 	results = g_new0 (ZenityParsingOptions, 1);
 
 	/* Initialize the various dialog structures */
@@ -1050,77 +1125,17 @@ zenity_option_init (void) {
 	results->progress_data = g_new0 (ZenityProgressData, 1);
 	results->text_data = g_new0 (ZenityTextData, 1);
 	results->tree_data = g_new0 (ZenityTreeData, 1);
-#ifdef HAVE_LIBNOTIFY
 	results->notification_data = g_new0 (ZenityNotificationData, 1);
-#endif
 	results->color_data = g_new0 (ZenityColorData, 1);
 	results->password_data = g_new0 (ZenityPasswordData, 1);
 	results->forms_data = g_new0 (ZenityFormsData, 1);
 }
 
-void
-zenity_option_free (void) {
-	if (zenity_general_dialog_title)
-		g_free (zenity_general_dialog_title);
-	if (zenity_general_window_icon)
-		g_free (zenity_general_window_icon);
-	if (zenity_general_dialog_text)
-		g_free (zenity_general_dialog_text);
-	if (zenity_general_uri)
-		g_free (zenity_general_uri);
-	g_free (zenity_general_separator);
-	if (zenity_general_ok_button)
-		g_free (zenity_general_ok_button);
-	if (zenity_general_cancel_button)
-		g_free (zenity_general_cancel_button);
-	if (zenity_general_extra_buttons)
-		g_strfreev (zenity_general_extra_buttons);
-
-	if (zenity_calendar_date_format)
-		g_free (zenity_calendar_date_format);
-
-	if (zenity_forms_date_format)
-		g_free (zenity_forms_date_format);
-	if (zenity_forms_list_values)
-		g_strfreev (zenity_forms_list_values);
-	if (zenity_forms_combo_values)
-		g_strfreev (zenity_forms_combo_values);
-	if (zenity_forms_column_values)
-		g_strfreev (zenity_forms_column_values);
-	//  if (zenity_forms_hide_column)
-	//    g_free (zenity_forms_hide_column);
-	if (zenity_entry_entry_text)
-		g_free (zenity_entry_entry_text);
-
-	if (zenity_file_filter)
-		g_strfreev (zenity_file_filter);
-
-	if (zenity_list_columns)
-		g_strfreev (zenity_list_columns);
-	if (zenity_list_print_column)
-		g_free (zenity_list_print_column);
-	if (zenity_list_hide_column)
-		g_free (zenity_list_hide_column);
-
-#ifdef HAVE_LIBNOTIFY
-	if (zenity_notification_hints)
-		g_strfreev (zenity_notification_hints);
-#endif
-
-	if (zenity_text_font)
-		g_free (zenity_text_font);
-	if (zenity_text_checkbox)
-		g_free (zenity_text_checkbox);
-
-	if (zenity_colorsel_color)
-		g_free (zenity_colorsel_color);
-
-	g_option_context_free (ctx);
-}
-
 static void
-zenity_option_set_dialog_mode (gboolean is_active, ZenityDialogMode mode) {
-	if (is_active == TRUE) {
+zenity_option_set_dialog_mode (gboolean is_active, ZenityDialogMode mode)
+{
+	if (is_active == TRUE)
+	{
 		if (results->mode == MODE_LAST)
 			results->mode = mode;
 		else
@@ -1128,21 +1143,22 @@ zenity_option_set_dialog_mode (gboolean is_active, ZenityDialogMode mode) {
 	}
 }
 
-static gchar *
-zenity_option_get_name (GOptionEntry *entries, gpointer arg_data) {
-	int i;
-
-	for (i = 1; entries[i].long_name != NULL; i++) {
+static char *
+zenity_option_get_name (GOptionEntry *entries, gpointer arg_data)
+{
+	for (int i = 1; entries[i].long_name != NULL; i++)
+	{
 		if (entries[i].arg_data == arg_data)
-			return (gchar *) entries[i].long_name;
+			return (char *)entries[i].long_name;
 	}
 	return NULL;
 }
 
 /* Forms callback */
 static gboolean
-zenity_forms_callback (const gchar *option_name, const gchar *value,
-	gpointer data, GError **error) {
+zenity_forms_callback (const char *option_name, const char *value,
+	gpointer data, GError **error)
+{
 	ZenityFormsValue *forms_value = g_new0 (ZenityFormsValue, 1);
 
 	forms_value->option_value = g_strdup (value);
@@ -1167,7 +1183,8 @@ zenity_forms_callback (const gchar *option_name, const gchar *value,
 /* Error callback */
 static void
 zenity_option_error_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_error (NULL, ERROR_SYNTAX);
 }
 
@@ -1175,9 +1192,9 @@ zenity_option_error_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_general_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_general_dialog_title = NULL;
-	zenity_general_window_icon = NULL;
 	zenity_general_width = -1;
 	zenity_general_height = -1;
 	zenity_general_dialog_text = NULL;
@@ -1192,14 +1209,14 @@ zenity_general_pre_callback (GOptionContext *context, GOptionGroup *group,
 	zenity_general_dialog_no_markup = FALSE;
 	zenity_general_timeout_delay = -1;
 	zenity_general_modal = FALSE;
-	zenity_general_attach = 0;
 
 	return TRUE;
 }
 
 static gboolean
 zenity_calendar_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_calendar_active = FALSE;
 	zenity_calendar_date_format = NULL;
 	zenity_calendar_day = -1;
@@ -1211,7 +1228,8 @@ zenity_calendar_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_entry_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_entry_active = FALSE;
 	zenity_entry_entry_text = NULL;
 	zenity_entry_hide_text = FALSE;
@@ -1221,7 +1239,8 @@ zenity_entry_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_error_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_error_active = FALSE;
 
 	return TRUE;
@@ -1229,7 +1248,8 @@ zenity_error_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_info_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_info_active = FALSE;
 
 	return TRUE;
@@ -1237,19 +1257,21 @@ zenity_info_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_file_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_file_active = FALSE;
 	zenity_file_directory = FALSE;
 	zenity_file_save = FALSE;
-	zenity_file_confirm_overwrite = FALSE;
 	zenity_file_filter = NULL;
+	zenity_file_confirm_overwrite_DEPRECATED = FALSE;
 
 	return TRUE;
 }
 
 static gboolean
 zenity_list_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_list_active = FALSE;
 	zenity_list_columns = NULL;
 	zenity_list_checklist = FALSE;
@@ -1258,25 +1280,25 @@ zenity_list_pre_callback (GOptionContext *context, GOptionGroup *group,
 	zenity_list_hide_header = FALSE;
 	zenity_list_print_column = NULL;
 	zenity_list_hide_column = NULL;
-	zenity_list_mid_search = FALSE;
+	zenity_list_mid_search_DEPRECATED = FALSE;
 
 	return TRUE;
 }
 
-#ifdef HAVE_LIBNOTIFY
 static gboolean
 zenity_notification_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_notification_active = FALSE;
 	zenity_notification_listen = FALSE;
 
 	return TRUE;
 }
-#endif
 
 static gboolean
 zenity_progress_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_progress_active = FALSE;
 	zenity_progress_percentage = 0;
 	zenity_progress_pulsate = FALSE;
@@ -1284,21 +1306,25 @@ zenity_progress_pre_callback (GOptionContext *context, GOptionGroup *group,
 	zenity_progress_auto_kill = FALSE;
 	zenity_progress_no_cancel = FALSE;
 	zenity_progress_time_remaining = FALSE;
+
 	return TRUE;
 }
 
 static gboolean
 zenity_question_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_question_active = FALSE;
 	zenity_question_default_cancel = FALSE;
 	zenity_question_switch = FALSE;
+
 	return TRUE;
 }
 
 static gboolean
 zenity_text_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_text_active = FALSE;
 	zenity_text_font = NULL;
 	zenity_text_checkbox = NULL;
@@ -1308,12 +1334,14 @@ zenity_text_pre_callback (GOptionContext *context, GOptionGroup *group,
 	zenity_text_no_interaction = FALSE;
 	zenity_text_url = NULL;
 #endif
+
 	return TRUE;
 }
 
 static gboolean
 zenity_warning_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_warning_active = FALSE;
 
 	return TRUE;
@@ -1321,7 +1349,8 @@ zenity_warning_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_scale_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_scale_active = FALSE;
 	zenity_scale_value = 0;
 	zenity_scale_min_value = 0;
@@ -1335,7 +1364,8 @@ zenity_scale_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_color_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_colorsel_active = FALSE;
 	zenity_colorsel_color = NULL;
 	zenity_colorsel_show_palette = FALSE;
@@ -1345,7 +1375,8 @@ zenity_color_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_password_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_password_active = FALSE;
 	zenity_password_show_username = FALSE;
 
@@ -1354,17 +1385,19 @@ zenity_password_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_forms_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_forms_active = FALSE;
 	zenity_forms_show_header = FALSE;
 	zenity_forms_date_format = NULL;
-	//  zenity_forms_hide_column = NULL;
+
 	return TRUE;
 }
 
 static gboolean
 zenity_misc_pre_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_misc_about = FALSE;
 	zenity_misc_version = FALSE;
 
@@ -1376,9 +1409,9 @@ zenity_misc_pre_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_general_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	results->data->dialog_title = zenity_general_dialog_title;
-	results->data->window_icon = zenity_general_window_icon;
 	results->data->width = zenity_general_width;
 	results->data->height = zenity_general_height;
 	results->data->timeout_delay = zenity_general_timeout_delay;
@@ -1386,17 +1419,34 @@ zenity_general_post_callback (GOptionContext *context, GOptionGroup *group,
 	results->data->cancel_label = zenity_general_cancel_button;
 	results->data->extra_label = zenity_general_extra_buttons;
 	results->data->modal = zenity_general_modal;
-	results->data->attach = zenity_general_attach;
+
+	/* Deprecated options */
+
+	if (zenity_general_window_icon_DEPRECATED)
+	{
+		zenity_general_icon = zenity_general_window_icon_DEPRECATED;
+		show_window_icon_deprecation_warning ();
+	}
+	if (zenity_general_icon_name_DEPRECATED)
+	{
+		zenity_general_icon = zenity_general_icon_name_DEPRECATED;
+		show_icon_name_deprecation_warning ();
+	}
+
+	if (zenity_general_attach_DEPRECATED)
+		show_attach_deprecation_warning ();
 
 	return TRUE;
 }
 
 static gboolean
 zenity_calendar_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_calendar_active, MODE_CALENDAR);
 
-	if (results->mode == MODE_CALENDAR) {
+	if (results->mode == MODE_CALENDAR)
+	{
 		struct tm *t;
 		time_t current_time;
 
@@ -1415,69 +1465,81 @@ zenity_calendar_post_callback (GOptionContext *context, GOptionGroup *group,
 		results->calendar_data->month = zenity_calendar_month;
 		results->calendar_data->year = zenity_calendar_year;
 
-		if (zenity_calendar_date_format)
+		if (zenity_calendar_date_format) {
 			results->calendar_data->date_format = zenity_calendar_date_format;
-		else
+		} else {
 			results->calendar_data->date_format =
 				g_locale_to_utf8 (nl_langinfo (D_FMT), -1, NULL, NULL, NULL);
-
-	} else {
-		if (zenity_calendar_day > -1)
-			zenity_option_error (
-				zenity_option_get_name (calendar_options, &zenity_calendar_day),
+		}
+	}
+	else
+	{
+		if (zenity_calendar_day > -1) {
+			zenity_option_error (zenity_option_get_name (calendar_options,
+						&zenity_calendar_day),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_calendar_month > -1)
-			zenity_option_error (zenity_option_get_name (
-									 calendar_options, &zenity_calendar_month),
+		if (zenity_calendar_month > -1) {
+			zenity_option_error (zenity_option_get_name (calendar_options,
+						&zenity_calendar_month),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_calendar_year > -1)
-			zenity_option_error (zenity_option_get_name (
-									 calendar_options, &zenity_calendar_year),
+		if (zenity_calendar_year > -1) {
+			zenity_option_error (zenity_option_get_name (calendar_options,
+						&zenity_calendar_year),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_calendar_date_format)
+		if (zenity_calendar_date_format) {
 			zenity_option_error (zenity_option_get_name (calendar_options,
-									 &zenity_calendar_date_format),
+						&zenity_calendar_date_format),
 				ERROR_SUPPORT);
+		}
 	}
-
 	return TRUE;
 }
 
 static gboolean
 zenity_entry_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_entry_active, MODE_ENTRY);
 
-	if (results->mode == MODE_ENTRY) {
+	if (results->mode == MODE_ENTRY)
+	{
 		results->entry_data->dialog_text = zenity_general_dialog_text;
 		results->entry_data->entry_text = zenity_entry_entry_text;
 		results->entry_data->hide_text = zenity_entry_hide_text;
-	} else {
-		if (zenity_entry_entry_text)
-			zenity_option_error (zenity_option_get_name (
-									 entry_options, &zenity_entry_entry_text),
+	}
+	else
+	{
+		if (zenity_entry_entry_text) {
+			zenity_option_error (zenity_option_get_name (entry_options,
+						&zenity_entry_entry_text),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_entry_hide_text)
-			zenity_option_error (
-				zenity_option_get_name (entry_options, &zenity_entry_hide_text),
+		if (zenity_entry_hide_text) {
+			zenity_option_error (zenity_option_get_name (entry_options,
+						&zenity_entry_hide_text),
 				ERROR_SUPPORT);
+		}
 	}
-
 	return TRUE;
 }
 
 static gboolean
 zenity_error_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_error_active, MODE_ERROR);
 
-	if (results->mode == MODE_ERROR) {
+	if (results->mode == MODE_ERROR)
+	{
 		results->msg_data->dialog_text = zenity_general_dialog_text;
-		results->msg_data->dialog_icon = zenity_general_dialog_icon;
+		results->msg_data->dialog_icon = zenity_general_icon;
 		results->msg_data->mode = ZENITY_MSG_ERROR;
 		results->msg_data->no_wrap = zenity_general_dialog_no_wrap;
 		results->msg_data->no_markup = zenity_general_dialog_no_markup;
@@ -1489,12 +1551,14 @@ zenity_error_post_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_info_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_info_active, MODE_INFO);
 
-	if (results->mode == MODE_INFO) {
+	if (results->mode == MODE_INFO)
+	{
 		results->msg_data->dialog_text = zenity_general_dialog_text;
-		results->msg_data->dialog_icon = zenity_general_dialog_icon;
+		results->msg_data->dialog_icon = zenity_general_icon;
 		results->msg_data->mode = ZENITY_MSG_INFO;
 		results->msg_data->no_wrap = zenity_general_dialog_no_wrap;
 		results->msg_data->no_markup = zenity_general_dialog_no_markup;
@@ -1506,51 +1570,65 @@ zenity_info_post_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_file_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_file_active, MODE_FILE);
 
-	if (results->mode == MODE_FILE) {
+	if (results->mode == MODE_FILE)
+	{
 		results->file_data->uri = zenity_general_uri;
 		results->file_data->multi = zenity_general_multiple;
 		results->file_data->directory = zenity_file_directory;
 		results->file_data->save = zenity_file_save;
-		results->file_data->confirm_overwrite = zenity_file_confirm_overwrite;
 		results->file_data->separator = zenity_general_separator;
 		results->file_data->filter = zenity_file_filter;
-	} else {
-		if (zenity_file_directory)
+	}
+	else
+	{
+		if (zenity_file_directory) {
 			zenity_option_error (zenity_option_get_name (file_selection_options,
-									 &zenity_file_directory),
+						&zenity_file_directory),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_file_save)
-			zenity_option_error (zenity_option_get_name (
-									 file_selection_options, &zenity_file_save),
+		if (zenity_file_save) {
+			zenity_option_error (zenity_option_get_name (file_selection_options,
+						&zenity_file_save),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_file_filter)
+		if (zenity_file_filter) {
 			zenity_option_error (zenity_option_get_name (file_selection_options,
-									 &zenity_file_filter),
+						&zenity_file_filter),
 				ERROR_SUPPORT);
+		}
 	}
 
+	if (zenity_file_confirm_overwrite_DEPRECATED)
+		show_confirm_overwrite_deprecation_warning ();
+
 	return TRUE;
 }
 
 static gboolean
 zenity_list_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	int i = 0;
-	gchar *column;
+	char *column;
 
 	zenity_option_set_dialog_mode (zenity_list_active, MODE_LIST);
 
-	if (results->mode == MODE_LIST) {
+	if (results->mode == MODE_LIST)
+	{
 		results->tree_data->dialog_text = zenity_general_dialog_text;
 
-		if (zenity_list_columns) {
+		if (zenity_list_columns)
+		{
 			column = zenity_list_columns[0];
-			while (column != NULL) {
+
+			while (column != NULL)
+			{
 				results->tree_data->columns =
 					g_slist_append (results->tree_data->columns, column);
 				column = zenity_list_columns[++i];
@@ -1566,8 +1644,10 @@ zenity_list_post_callback (GOptionContext *context, GOptionGroup *group,
 		results->tree_data->hide_column = zenity_list_hide_column;
 		results->tree_data->hide_header = zenity_list_hide_header;
 		results->tree_data->separator = zenity_general_separator;
-		results->tree_data->mid_search = zenity_list_mid_search;
-	} else {
+		results->tree_data->mid_search_DEPRECATED = zenity_list_mid_search_DEPRECATED;
+	}
+	else
+	{
 		if (zenity_list_columns)
 			zenity_option_error (
 				zenity_option_get_name (list_options, &zenity_list_columns),
@@ -1602,44 +1682,50 @@ zenity_list_post_callback (GOptionContext *context, GOptionGroup *group,
 			zenity_option_error (
 				zenity_option_get_name (list_options, &zenity_list_hide_header),
 				ERROR_SUPPORT);
-		if (zenity_list_mid_search)
+		if (zenity_list_mid_search_DEPRECATED)
 			zenity_option_error (
-				zenity_option_get_name (list_options, &zenity_list_mid_search),
+				zenity_option_get_name (list_options, &zenity_list_mid_search_DEPRECATED),
 				ERROR_SUPPORT);
 	}
-
 	return TRUE;
 }
 
-#ifdef HAVE_LIBNOTIFY
 static gboolean
 zenity_notification_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
-	zenity_option_set_dialog_mode (
-		zenity_notification_active, MODE_NOTIFICATION);
+	gpointer data, GError **error)
+{
+	zenity_option_set_dialog_mode (zenity_notification_active,
+			MODE_NOTIFICATION);
 
-	if (results->mode == MODE_NOTIFICATION) {
+	if (results->mode == MODE_NOTIFICATION)
+	{
 		results->notification_data->notification_text =
 			zenity_general_dialog_text;
 		results->notification_data->listen = zenity_notification_listen;
-		results->notification_data->notification_hints =
-			zenity_notification_hints;
-	} else {
-		if (zenity_notification_listen)
+		results->notification_data->icon = zenity_general_icon;
+	}
+	else
+	{
+		if (zenity_notification_listen) {
 			zenity_option_error (zenity_option_get_name (notification_options,
-									 &zenity_notification_listen),
+						&zenity_notification_listen),
 				ERROR_SUPPORT);
+		}
 	}
 
+	if (zenity_notification_hints_DEPRECATED)
+		show_notification_hints_deprecation_warning ();
+
 	return TRUE;
 }
-#endif
 
 static gboolean
 zenity_progress_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_progress_active, MODE_PROGRESS);
-	if (results->mode == MODE_PROGRESS) {
+	if (results->mode == MODE_PROGRESS)
+	{
 		results->progress_data->dialog_text = zenity_general_dialog_text;
 		results->progress_data->pulsate = zenity_progress_pulsate;
 		results->progress_data->autoclose = zenity_progress_auto_close;
@@ -1647,48 +1733,58 @@ zenity_progress_post_callback (GOptionContext *context, GOptionGroup *group,
 		results->progress_data->percentage = zenity_progress_percentage;
 		results->progress_data->no_cancel = zenity_progress_no_cancel;
 		results->progress_data->time_remaining = zenity_progress_time_remaining;
-	} else {
-		if (zenity_progress_pulsate)
+	}
+	else
+	{
+		if (zenity_progress_pulsate) {
 			zenity_option_error (zenity_option_get_name (progress_options,
-									 &zenity_progress_pulsate),
+						&zenity_progress_pulsate),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_progress_percentage)
+		if (zenity_progress_percentage) {
 			zenity_option_error (zenity_option_get_name (progress_options,
-									 &zenity_progress_percentage),
+						&zenity_progress_percentage),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_progress_auto_close)
+		if (zenity_progress_auto_close) {
 			zenity_option_error (zenity_option_get_name (progress_options,
-									 &zenity_progress_auto_close),
+						&zenity_progress_auto_close),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_progress_auto_kill)
+		if (zenity_progress_auto_kill) {
 			zenity_option_error (zenity_option_get_name (progress_options,
-									 &zenity_progress_auto_kill),
+						&zenity_progress_auto_kill),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_progress_no_cancel)
+		if (zenity_progress_no_cancel) {
 			zenity_option_error (zenity_option_get_name (progress_options,
-									 &zenity_progress_no_cancel),
+						&zenity_progress_no_cancel),
 				ERROR_SUPPORT);
+		}
 
-		if (zenity_progress_time_remaining)
+		if (zenity_progress_time_remaining) {
 			zenity_option_error (zenity_option_get_name (progress_options,
-									 &zenity_progress_time_remaining),
+						&zenity_progress_time_remaining),
 				ERROR_SUPPORT);
+		}
 	}
-
 	return TRUE;
 }
 
 static gboolean
 zenity_question_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_question_active, MODE_QUESTION);
-	if (results->mode == MODE_QUESTION) {
+
+	if (results->mode == MODE_QUESTION)
+	{
 		results->msg_data->dialog_text = zenity_general_dialog_text;
-		results->msg_data->dialog_icon = zenity_general_dialog_icon;
+		results->msg_data->dialog_icon = zenity_general_icon;
 		if (zenity_question_switch)
 			results->msg_data->mode = ZENITY_MSG_SWITCH;
 		else
@@ -1698,20 +1794,24 @@ zenity_question_post_callback (GOptionContext *context, GOptionGroup *group,
 		results->msg_data->ellipsize = zenity_general_dialog_ellipsize;
 		results->msg_data->default_cancel = zenity_question_default_cancel;
 	}
-	if (zenity_question_switch && zenity_general_extra_buttons == NULL)
-		zenity_option_error (
-			zenity_option_get_name (question_options, &zenity_question_switch),
-			ERROR_SYNTAX);
 
+	if (zenity_question_switch && zenity_general_extra_buttons == NULL)
+	{
+		zenity_option_error (zenity_option_get_name (question_options,
+					&zenity_question_switch),
+				ERROR_SYNTAX);
+	}
 	return TRUE;
 }
 
 static gboolean
 zenity_text_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_text_active, MODE_TEXTINFO);
 
-	if (results->mode == MODE_TEXTINFO) {
+	if (results->mode == MODE_TEXTINFO)
+	{
 		results->text_data->uri = zenity_general_uri;
 		results->text_data->editable = zenity_general_editable;
 		results->text_data->no_wrap = zenity_general_dialog_no_wrap;
@@ -1723,16 +1823,20 @@ zenity_text_post_callback (GOptionContext *context, GOptionGroup *group,
 		results->text_data->no_interaction = zenity_text_no_interaction;
 		results->text_data->url = zenity_text_url;
 #endif
-	} else {
-		if (zenity_text_font)
-			zenity_option_error (
-				zenity_option_get_name (text_options, &zenity_text_font),
-				ERROR_SUPPORT);
+	}
+	else
+	{
+		if (zenity_text_font) {
+			zenity_option_error (zenity_option_get_name (text_options,
+						&zenity_text_font),
+					ERROR_SUPPORT);
+		}
 #ifdef HAVE_WEBKITGTK
-		if (zenity_text_enable_html)
-			zenity_option_error (
-				zenity_option_get_name (text_options, &zenity_text_enable_html),
+		if (zenity_text_enable_html) {
+			zenity_option_error (zenity_option_get_name (text_options,
+						&zenity_text_enable_html),
 				ERROR_SUPPORT);
+		}
 #endif
 	}
 	return TRUE;
@@ -1740,12 +1844,14 @@ zenity_text_post_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_warning_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_warning_active, MODE_WARNING);
 
-	if (results->mode == MODE_WARNING) {
+	if (results->mode == MODE_WARNING)
+	{
 		results->msg_data->dialog_text = zenity_general_dialog_text;
-		results->msg_data->dialog_icon = zenity_general_dialog_icon;
+		results->msg_data->dialog_icon = zenity_general_icon;
 		results->msg_data->mode = ZENITY_MSG_WARNING;
 		results->msg_data->no_wrap = zenity_general_dialog_no_wrap;
 		results->msg_data->no_markup = zenity_general_dialog_no_markup;
@@ -1757,10 +1863,12 @@ zenity_warning_post_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_scale_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_scale_active, MODE_SCALE);
 
-	if (results->mode == MODE_SCALE) {
+	if (results->mode == MODE_SCALE)
+	{
 		results->scale_data->dialog_text = zenity_general_dialog_text;
 		results->scale_data->value = zenity_scale_value;
 		results->scale_data->min_value = zenity_scale_min_value;
@@ -1775,40 +1883,47 @@ zenity_scale_post_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_color_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_colorsel_active, MODE_COLOR);
 
-	if (results->mode == MODE_COLOR) {
+	if (results->mode == MODE_COLOR)
+	{
 		results->color_data->color = zenity_colorsel_color;
 		results->color_data->show_palette = zenity_colorsel_show_palette;
-	} else {
-		if (zenity_colorsel_color)
-			zenity_option_error (
-				zenity_option_get_name (
-					color_selection_options, &zenity_colorsel_color),
-				ERROR_SUPPORT);
-
-		if (zenity_colorsel_show_palette)
-			zenity_option_error (
-				zenity_option_get_name (
-					color_selection_options, &zenity_colorsel_show_palette),
-				ERROR_SUPPORT);
 	}
+	else
+	{
+		if (zenity_colorsel_color) {
+			zenity_option_error
+				(zenity_option_get_name (color_selection_options,
+										 &zenity_colorsel_color),
+				 ERROR_SUPPORT);
+		}
 
+		if (zenity_colorsel_show_palette) {
+			zenity_option_error
+				(zenity_option_get_name (color_selection_options,
+										 &zenity_colorsel_show_palette),
+				 ERROR_SUPPORT);
+		}
+	}
 	return TRUE;
 }
 
 static gboolean
 zenity_forms_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
-	gchar *values;
+	gpointer data, GError **error)
+{
+	char *values;
 	int i = 0;
 
 	zenity_option_set_dialog_mode (zenity_forms_active, MODE_FORMS);
-	if (results->mode == MODE_FORMS) {
+
+	if (results->mode == MODE_FORMS)
+	{
 		results->forms_data->dialog_text = zenity_general_dialog_text;
 		results->forms_data->separator = zenity_general_separator;
-		//    results->forms_data->hide_column = zenity_forms_hide_column;
 		results->forms_data->show_header = zenity_forms_show_header;
 
 		if (zenity_forms_list_values) {
@@ -1845,7 +1960,9 @@ zenity_forms_post_callback (GOptionContext *context, GOptionGroup *group,
 		else
 			results->forms_data->date_format =
 				g_locale_to_utf8 (nl_langinfo (D_FMT), -1, NULL, NULL, NULL);
-	} else {
+	}
+	else
+	{
 		if (zenity_forms_date_format)
 			zenity_option_error (zenity_option_get_name (forms_dialog_options,
 									 &zenity_forms_date_format),
@@ -1854,10 +1971,6 @@ zenity_forms_post_callback (GOptionContext *context, GOptionGroup *group,
 			zenity_option_error (zenity_option_get_name (forms_dialog_options,
 									 &zenity_forms_list_values),
 				ERROR_SUPPORT);
-		//    if (zenity_forms_hide_column)
-		//      zenity_option_error (zenity_option_get_name
-		//      (forms_dialog_options, &zenity_forms_hide_column),
-		//                          ERROR_SUPPORT);
 		if (zenity_forms_column_values)
 			zenity_option_error (zenity_option_get_name (forms_dialog_options,
 									 &zenity_forms_column_values),
@@ -1877,24 +1990,26 @@ zenity_forms_post_callback (GOptionContext *context, GOptionGroup *group,
 
 static gboolean
 zenity_password_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_password_active, MODE_PASSWORD);
+
 	if (results->mode == MODE_PASSWORD) {
 		results->password_data->username = zenity_password_show_username;
 	} else {
 		if (zenity_password_show_username)
-			zenity_option_error (
-				zenity_option_get_name (
-					password_dialog_options, &zenity_password_show_username),
-				ERROR_SUPPORT);
+			zenity_option_error
+				(zenity_option_get_name (password_dialog_options,
+										 &zenity_password_show_username),
+				 ERROR_SUPPORT);
 	}
-
 	return TRUE;
 }
 
 static gboolean
 zenity_misc_post_callback (GOptionContext *context, GOptionGroup *group,
-	gpointer data, GError **error) {
+	gpointer data, GError **error)
+{
 	zenity_option_set_dialog_mode (zenity_misc_about, MODE_ABOUT);
 	zenity_option_set_dialog_mode (zenity_misc_version, MODE_VERSION);
 
@@ -1902,7 +2017,8 @@ zenity_misc_post_callback (GOptionContext *context, GOptionGroup *group,
 }
 
 static GOptionContext *
-zenity_create_context (void) {
+zenity_create_context (void)
+{
 	GOptionContext *tmp_ctx;
 	GOptionGroup *a_group;
 
@@ -1915,8 +2031,8 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, general_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_general_pre_callback, zenity_general_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_general_pre_callback, zenity_general_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
@@ -1928,8 +2044,8 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, calendar_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_calendar_pre_callback, zenity_calendar_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_calendar_pre_callback, zenity_calendar_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
@@ -1941,15 +2057,15 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, entry_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_entry_pre_callback, zenity_entry_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_entry_pre_callback, zenity_entry_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
 
 	/* Adds error option entries */
-	a_group = g_option_group_new (
-		"error", N_ ("Error options"), N_ ("Show error options"), NULL, NULL);
+	a_group = g_option_group_new ("error",
+			N_ ("Error options"), N_ ("Show error options"), NULL, NULL);
 	g_option_group_add_entries (a_group, error_options);
 	g_option_group_set_parse_hooks (
 		a_group, zenity_error_pre_callback, zenity_error_post_callback);
@@ -1958,8 +2074,8 @@ zenity_create_context (void) {
 	g_option_context_add_group (tmp_ctx, a_group);
 
 	/* Adds info option entries */
-	a_group = g_option_group_new (
-		"info", N_ ("Info options"), N_ ("Show info options"), NULL, NULL);
+	a_group = g_option_group_new ("info",
+			N_ ("Info options"), N_ ("Show info options"), NULL, NULL);
 	g_option_group_add_entries (a_group, info_options);
 	g_option_group_set_parse_hooks (
 		a_group, zenity_info_pre_callback, zenity_info_post_callback);
@@ -1990,11 +2106,10 @@ zenity_create_context (void) {
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
 
-#ifdef HAVE_LIBNOTIFY
 	/* Adds notification option entries */
 	a_group = g_option_group_new ("notification",
-		N_ ("Notification icon options"),
-		N_ ("Show notification icon options"),
+		N_ ("Notification options"),
+		N_ ("Show notification options"),
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, notification_options);
@@ -2004,7 +2119,6 @@ zenity_create_context (void) {
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
-#endif
 
 	/* Adds progress option entries */
 	a_group = g_option_group_new ("progress",
@@ -2026,8 +2140,8 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, question_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_question_pre_callback, zenity_question_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_question_pre_callback, zenity_question_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
@@ -2039,15 +2153,15 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, warning_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_warning_pre_callback, zenity_warning_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_warning_pre_callback, zenity_warning_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
 
 	/* Adds scale option entries */
-	a_group = g_option_group_new (
-		"scale", N_ ("Scale options"), N_ ("Show scale options"), NULL, NULL);
+	a_group = g_option_group_new ("scale",
+			N_ ("Scale options"), N_ ("Show scale options"), NULL, NULL);
 	g_option_group_add_entries (a_group, scale_options);
 	g_option_group_set_parse_hooks (
 		a_group, zenity_scale_pre_callback, zenity_scale_post_callback);
@@ -2075,8 +2189,8 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, color_selection_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_color_pre_callback, zenity_color_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_color_pre_callback, zenity_color_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
@@ -2088,8 +2202,8 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, password_dialog_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_password_pre_callback, zenity_password_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_password_pre_callback, zenity_password_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
@@ -2101,8 +2215,8 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, forms_dialog_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_forms_pre_callback, zenity_forms_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_forms_pre_callback, zenity_forms_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
@@ -2114,17 +2228,12 @@ zenity_create_context (void) {
 		NULL,
 		NULL);
 	g_option_group_add_entries (a_group, miscellaneous_options);
-	g_option_group_set_parse_hooks (
-		a_group, zenity_misc_pre_callback, zenity_misc_post_callback);
+	g_option_group_set_parse_hooks (a_group,
+			zenity_misc_pre_callback, zenity_misc_post_callback);
 	g_option_group_set_error_hook (a_group, zenity_option_error_callback);
 	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
 	g_option_context_add_group (tmp_ctx, a_group);
 
-	/* Adds gtk option entries */
-	a_group = gtk_get_option_group (TRUE);
-	g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
-	g_option_context_add_group (tmp_ctx, a_group);
-
 	/* Enable help options */
 	g_option_context_set_help_enabled (tmp_ctx, TRUE);
 	g_option_context_set_ignore_unknown_options (tmp_ctx, FALSE);
@@ -2133,28 +2242,31 @@ zenity_create_context (void) {
 }
 
 void
-zenity_option_error (gchar *string, ZenityError error) {
-	switch (error) {
+zenity_option_error (char *string, ZenityError error)
+{
+	switch (error)
+	{
 		case ERROR_SYNTAX:
 			g_printerr (_ ("This option is not available. Please see --help "
 						   "for all possible usages.\n"));
-			zenity_option_free ();
 			exit (-1);
+
 		case ERROR_SUPPORT:
 			g_printerr (_ ("--%s is not supported for this dialog\n"), string);
-			zenity_option_free ();
 			exit (-1);
+
 		case ERROR_DIALOG:
 			g_printerr (_ ("Two or more dialog options specified\n"));
-			zenity_option_free ();
 			exit (-1);
+
 		default:
 			return;
 	}
 }
 
 ZenityParsingOptions *
-zenity_option_parse (gint argc, gchar **argv) {
+zenity_option_parse (int argc, char **argv)
+{
 	GError *error = NULL;
 
 	zenity_option_init ();
diff --git a/src/option.h b/src/option.h
index b495e0e7..5da7cfe5 100644
--- a/src/option.h
+++ b/src/option.h
@@ -1,7 +1,8 @@
 /*
  * option.h
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -24,11 +25,9 @@
 #define OPTION_H
 
 #include "zenity.h"
+
 #include <glib.h>
-#include <langinfo.h>
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
+#include <config.h>
 
 typedef enum {
 	MODE_CALENDAR,
@@ -42,9 +41,7 @@ typedef enum {
 	MODE_WARNING,
 	MODE_SCALE,
 	MODE_INFO,
-#ifdef HAVE_LIBNOTIFY
 	MODE_NOTIFICATION,
-#endif
 	MODE_COLOR,
 	MODE_PASSWORD,
 	MODE_FORMS,
@@ -72,18 +69,14 @@ typedef struct {
 	ZenityProgressData *progress_data;
 	ZenityTextData *text_data;
 	ZenityTreeData *tree_data;
-#ifdef HAVE_LIBNOTIFY
 	ZenityNotificationData *notification_data;
-#endif
 	ZenityColorData *color_data;
 	ZenityPasswordData *password_data;
 	ZenityFormsData *forms_data;
 } ZenityParsingOptions;
 
-void zenity_option_error (gchar *string, ZenityError error);
-
-ZenityParsingOptions *zenity_option_parse (gint argc, gchar **argv);
+void zenity_option_error (char *string, ZenityError error);
 
-void zenity_option_free (void);
+ZenityParsingOptions *zenity_option_parse (int argc, char **argv);
 
 #endif /* OPTION_H */
diff --git a/src/password.c b/src/password.c
index a5490d35..fc270216 100644
--- a/src/password.c
+++ b/src/password.c
@@ -1,19 +1,22 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * password.c
  *
- * Copyright (C) 2010 Arx Cruz
+ * Copyright © 2010 Arx Cruz
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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., 121 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
@@ -21,153 +24,155 @@
  * Authors: Arx Cruz <arxcruz@gmail.com>
  */
 
-#include "config.h"
 #include "util.h"
 #include "zenity.h"
+
 #include <string.h>
 
+#include <config.h>
+
 static ZenityData *zen_data;
 
-static void zenity_password_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+static void zenity_password_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
 void
-zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data) {
+zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data)
+{
+	GtkBuilder *builder;
 	GtkWidget *dialog;
-	GtkWidget *image;
-	GtkWidget *hbox;
-	GtkWidget *vbox_labels;
-	GtkWidget *vbox_entries;
+	GtkWidget *grid;
 	GtkWidget *label;
+	int pass_row = 0;
 
+	/* Set global */
 	zen_data = data;
 
-	dialog = gtk_dialog_new ();
+	builder = zenity_util_load_ui_file ("zenity_password_dialog", "zenity_password_box", NULL);
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (builder == NULL)
+	{
+		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
+		return;
 	}
 
-	gtk_dialog_add_button (GTK_DIALOG (dialog),
-		data->cancel_label != NULL ? data->cancel_label : _ ("_Cancel"),
-		GTK_RESPONSE_CANCEL);
-	gtk_dialog_add_button (GTK_DIALOG (dialog),
-		data->ok_label != NULL ? data->ok_label : _ ("_OK"),
-		GTK_RESPONSE_OK);
+	dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_password_dialog"));
+
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
+	}
 
-	image =
-		gtk_image_new_from_icon_name ("dialog-password", GTK_ICON_SIZE_DIALOG);
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 12);
+	if (data->ok_label) {
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
+	}
 
-	/* Checks if username has been passed as a parameter */
-	gchar *title_text = _ ("Type your password");
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
+	}
 
+	grid = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_password_grid"));
+
+	/* Checks if username has been passed as a parameter */
 	if (password_data->username)
-		title_text = _ ("Type your username and password");
-
-	label = gtk_label_new (title_text);
-
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 12);
-	gtk_box_pack_start (
-		GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-		hbox,
-		FALSE,
-		TRUE,
-		5);
-
-	vbox_labels = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-	vbox_entries = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-	gtk_box_pack_start (
-		GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-		hbox,
-		FALSE,
-		TRUE,
-		5);
-
-	gtk_box_pack_start (GTK_BOX (hbox), vbox_labels, FALSE, TRUE, 12);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox_entries, TRUE, TRUE, 12);
-
-	if (password_data->username) {
-		label = gtk_label_new (_ ("Username:"));
-		gtk_box_pack_start (GTK_BOX (vbox_labels), label, TRUE, FALSE, 12);
+	{
+		/* Change the password label to ask for both username and password */
+		label = GTK_WIDGET(gtk_builder_get_object (builder,
+					"zenity_password_title"));
+		gtk_label_set_text (GTK_LABEL(label),
+				_("Type your username and password"));
+
+		/* Add the username label and entry and increment the row for the
+		 * password entry so it will be added below the username.
+		 */
+		label = gtk_label_new (_("Username:"));
+		gtk_grid_attach (GTK_GRID(grid), label,
+				0,		/* col */
+				0,		/* row */
+				1, 1);	/* width/height by cell. */	
+
 		password_data->entry_username = gtk_entry_new ();
-		gtk_box_pack_start (GTK_BOX (vbox_entries),
-			password_data->entry_username,
-			TRUE,
-			TRUE,
-			12);
+		gtk_grid_attach (GTK_GRID(grid), password_data->entry_username,
+				1,
+				0,
+				1, 1);
+
+		++pass_row;
 	}
 
-	label = gtk_label_new (_ ("Password:"));
-	gtk_box_pack_start (GTK_BOX (vbox_labels), label, TRUE, FALSE, 12);
+	label = gtk_label_new (_("Password:"));
+	gtk_grid_attach (GTK_GRID(grid), label,
+			0,		/* col */
+			pass_row,		/* row */
+			1, 1);	/* width/height by cell. */	
+
 	password_data->entry_password = gtk_entry_new ();
-	gtk_entry_set_visibility (GTK_ENTRY (password_data->entry_password), FALSE);
-	gtk_entry_set_activates_default (
-		GTK_ENTRY (password_data->entry_password), TRUE);
-	gtk_box_pack_start (
-		GTK_BOX (vbox_entries), password_data->entry_password, TRUE, TRUE, 12);
+	gtk_entry_set_visibility (GTK_ENTRY(password_data->entry_password), FALSE);
+	gtk_entry_set_input_purpose (GTK_ENTRY(password_data->entry_password),
+			GTK_INPUT_PURPOSE_PASSWORD);
+	gtk_entry_set_activates_default (GTK_ENTRY(password_data->entry_password),
+			TRUE);
+	gtk_grid_attach (GTK_GRID(grid), password_data->entry_password,
+			1,
+			pass_row,
+			1, 1);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
 	if (data->modal)
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+		gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_password_dialog_response), password_data);
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_password_dialog_response),
-		password_data);
-	gtk_widget_show_all (
-		GTK_WIDGET (gtk_dialog_get_content_area (GTK_DIALOG (dialog))));
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 
-	if (data->timeout_delay > 0) {
+	if (data->timeout_delay > 0)
+	{
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			dialog);
 	}
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_password_dialog_response (
-	GtkWidget *widget, int response, gpointer data) {
-	ZenityPasswordData *password_data = (ZenityPasswordData *) data;
-	switch (response) {
-		case GTK_RESPONSE_OK:
+zenity_password_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
+	ZenityPasswordData *password_data = data;
+	GtkEntryBuffer *user_buff, *pass_buff;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
+
+	user_buff = gtk_entry_get_buffer (GTK_ENTRY(password_data->entry_username));
+	pass_buff = gtk_entry_get_buffer (GTK_ENTRY(password_data->entry_password));
+
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
-			if (password_data->username)
+			if (password_data->username) {
 				g_print ("%s|%s\n",
-					gtk_entry_get_text (
-						GTK_ENTRY (password_data->entry_username)),
-					gtk_entry_get_text (
-						GTK_ENTRY (password_data->entry_password)));
-			else
+					gtk_entry_buffer_get_text (user_buff),
+					gtk_entry_buffer_get_text (pass_buff));
+			}
+			else {
 				g_print ("%s\n",
-					gtk_entry_get_text (
-						GTK_ENTRY (password_data->entry_password)));
+					gtk_entry_buffer_get_text (pass_buff));
+			}
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
 				printf ("%s\n", zen_data->extra_label[response]);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
diff --git a/src/progress.c b/src/progress.c
index 00bb8aaa..8e6e8951 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -1,30 +1,33 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * progress.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
  *
- * Authors: Glynn Foster <glynn.foster@sun.com>
+ * Original Author: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include "config.h"
 
 #include "util.h"
 #include "zenity.h"
+
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,29 +36,29 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <config.h>
+
 static GtkBuilder *builder;
 static ZenityData *zen_data;
-static GIOChannel *channel;
 
-static gint pulsate_timeout = -1;
+static int pulsate_timeout = -1;
 static gboolean autokill;
 static gboolean no_cancel;
 static gboolean auto_close;
 
-gint zenity_progress_timeout (gpointer data);
-gint zenity_progress_pulsate_timeout (gpointer data);
-
-static void zenity_progress_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+static void zenity_progress_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
 static gboolean
-zenity_progress_pulsate_progress_bar (gpointer user_data) {
+zenity_progress_pulsate_progress_bar (gpointer user_data)
+{
 	gtk_progress_bar_pulse (GTK_PROGRESS_BAR (user_data));
+
 	return TRUE;
 }
 
 static void
-zenity_progress_pulsate_stop (void) {
+zenity_progress_pulsate_stop (void)
+{
 	if (pulsate_timeout > 0) {
 		g_source_remove (pulsate_timeout);
 		pulsate_timeout = -1;
@@ -63,34 +66,40 @@ zenity_progress_pulsate_stop (void) {
 }
 
 static void
-zenity_progress_pulsate_start (GObject *progress_bar) {
+zenity_progress_pulsate_start (GObject *progress_bar)
+{
 	if (pulsate_timeout == -1) {
-		pulsate_timeout = g_timeout_add (
-			100, zenity_progress_pulsate_progress_bar, progress_bar);
+		pulsate_timeout = g_timeout_add (100,
+				zenity_progress_pulsate_progress_bar, progress_bar);
 	}
 }
 
 static void
-zenity_progress_update_time_remaining (ZenityProgressData *progress_data) {
+zenity_progress_update_time_remaining (ZenityProgressData *progress_data)
+{
 	static GObject *progress_time = NULL;
 	static time_t start_time = (time_t) (-1);
 	float percentage = progress_data->percentage;
 
 	if (progress_time == NULL)
-		progress_time =
-			gtk_builder_get_object (builder, "zenity_progress_time");
+		progress_time = gtk_builder_get_object (builder,
+				"zenity_progress_time");
+
 	if (start_time == (time_t) (-1) || percentage <= 0.0 ||
-		percentage >= 100.0) {
+		percentage >= 100.0)
+	{
 		start_time = time (NULL);
 		gtk_label_set_text (GTK_LABEL (progress_time), "");
-	} else {
+	}
+	else
+	{
 		time_t current_time = time (NULL);
 		time_t elapsed_time = current_time - start_time;
 		time_t total_time =
 			(time_t) (100.0 * elapsed_time / progress_data->percentage);
 		time_t remaining_time = total_time - elapsed_time;
 		gulong hours, minutes, seconds;
-		gchar *remaining_message;
+		g_autofree char *remaining_message = NULL;
 
 		seconds = (gulong) (remaining_time % 60);
 		remaining_time /= 60;
@@ -98,26 +107,33 @@ zenity_progress_update_time_remaining (ZenityProgressData *progress_data) {
 		remaining_time /= 60;
 		hours = (gulong) remaining_time;
 
-		remaining_message = g_strdup_printf (
-			_ ("Time remaining: %lu:%02lu:%02lu"), hours, minutes, seconds);
+		remaining_message =
+			g_strdup_printf (_("Time remaining: %lu:%02lu:%02lu"),
+					hours, minutes, seconds);
 		gtk_label_set_text (GTK_LABEL (progress_time), remaining_message);
-		g_free (remaining_message);
 	}
 }
 
 static float
-stof(const char* s) {
+stof (const char *s)
+{
 	float rez = 0, fact = 1;
+
 	if (*s == '-') {
 		s++;
 		fact = -1;
 	}
-	for (int point_seen = 0; *s; s++) {
+
+	for (int point_seen = 0; *s; s++)
+	{
+		int d;
+
 		if (*s == '.' || *s == ',') {
 			point_seen = 1;
 			continue;
 		}
-		int d = *s - '0';
+
+		d = *s - '0';
 		if (d >= 0 && d <= 9) {
 			if (point_seen) fact /= 10.0f;
 			rez = rez * 10.0f + (float)d;
@@ -127,48 +143,51 @@ stof(const char* s) {
 }
 
 static gboolean
-zenity_progress_handle_stdin (
-	GIOChannel *channel, GIOCondition condition, gpointer data) {
-	static ZenityProgressData *progress_data;
-	static GObject *progress_bar;
-	static GObject *progress_label;
+zenity_progress_handle_stdin (GIOChannel *source, GIOCondition condition,
+		gpointer data)
+{
+	ZenityProgressData *progress_data;
+	GObject *progress_bar;
+	GObject *progress_label;
+	GtkWindow *parent;
 	float percentage = 0.0;
 	GIOStatus status = G_IO_STATUS_NORMAL;
 
-	progress_data = (ZenityProgressData *) data;
+	progress_data = data;
 	progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
 	progress_label = gtk_builder_get_object (builder, "zenity_progress_text");
+	parent = GTK_WINDOW(gtk_widget_get_native (GTK_WIDGET(progress_bar)));
 
-	if ((condition & G_IO_IN) != 0) {
-		GString *string;
-		GError *error = NULL;
+	if ((condition & G_IO_IN) != 0)
+	{
+		g_autoptr(GString) string = g_string_new (NULL);
+		g_autoptr(GError) error = NULL;
 
-		string = g_string_new (NULL);
-
-		while (channel->is_readable != TRUE)
+		while (source->is_readable != TRUE)
 			;
 		do {
 			do {
 				status = g_io_channel_read_line_string (
-					channel, string, NULL, &error);
-
-				while (gtk_events_pending ())
-					gtk_main_iteration ();
+					source, string, NULL, &error);
 
+				while (g_main_context_pending (NULL)) {
+					g_main_context_iteration (NULL, FALSE);
+				}
 			} while (status == G_IO_STATUS_AGAIN);
 
-			if (status != G_IO_STATUS_NORMAL) {
+			if (status != G_IO_STATUS_NORMAL)
+			{
 				if (error) {
-					g_warning (
-						"zenity_progress_handle_stdin () : %s", error->message);
-					g_error_free (error);
+					g_warning ("%s: %s",
+							__func__, error->message);
 					error = NULL;
 				}
 				continue;
 			}
 
-			if (!g_ascii_strncasecmp (string->str, "#", 1)) {
-				gchar *match;
+			if (! g_ascii_strncasecmp (string->str, "#", 1))
+			{
+				char *match;
 
 				/* We have a comment, so let's try to change the label */
 				match = g_strstr_len (string->str, strlen (string->str), "#");
@@ -176,8 +195,11 @@ zenity_progress_handle_stdin (
 				gtk_label_set_text (GTK_LABEL (progress_label),
 					g_strcompress (g_strchomp (g_strchug (match))));
 
-			} else if (g_str_has_prefix (string->str, "pulsate")) {
-				gchar *colon, *command, *value;
+			}
+			else if (g_str_has_prefix (string->str, "pulsate"))
+			{
+				char *colon, *value;
+				g_autofree char *command = NULL;
 
 				zenity_util_strip_newline (string->str);
 
@@ -194,90 +216,89 @@ zenity_progress_handle_stdin (
 				while (*value && g_ascii_isspace (*value))
 					value++;
 
-				if (!g_ascii_strcasecmp (value, "false")) {
+				if (! g_ascii_strcasecmp (value, "false"))
+				{
 					zenity_progress_pulsate_stop ();
 
-					gtk_progress_bar_set_fraction (
-						GTK_PROGRESS_BAR (progress_bar),
+					gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress_bar),
 						progress_data->percentage / 100.0);
-				} else {
+				}
+				else {
 					zenity_progress_pulsate_start (progress_bar);
 				}
-
-				g_free (command);
-			} else {
-
-				if (!g_ascii_isdigit (*(string->str)))
+			}
+			else
+			{
+				if (! g_ascii_isdigit (*(string->str)))
 					continue;
 
 				/* Now try to convert the thing to a number */
 				percentage = CLAMP (stof (string->str), 0, 100);
 
-				gtk_progress_bar_set_fraction (
-					GTK_PROGRESS_BAR (progress_bar), percentage / 100.0);
+				gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress_bar),
+						percentage / 100.0);
 
 				progress_data->percentage = percentage;
 
 				if (progress_data->time_remaining == TRUE)
 					zenity_progress_update_time_remaining (progress_data);
 
-				if (percentage == 100) {
-					GObject *button;
-
-					button = gtk_builder_get_object (
-						builder, "zenity_progress_ok_button");
-					gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE);
-					gtk_widget_grab_focus (GTK_WIDGET (button));
+				if (percentage == 100)
+				{
+					if (!auto_close)
+					{
+						adw_message_dialog_set_response_enabled (ADW_MESSAGE_DIALOG(parent), "ok", TRUE);
+						adw_message_dialog_set_default_response (ADW_MESSAGE_DIALOG(parent), "ok");
+					}
 
-					if (progress_data->autoclose) {
+					if (progress_data->autoclose)
+					{
 						zen_data->exit_code =
 							zenity_util_return_exit_code (ZENITY_OK);
-						gtk_main_quit ();
+
+						zenity_util_gapp_quit (parent, zen_data);
 					}
 				}
 			}
 
-		} while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) ==
+		} while ((g_io_channel_get_buffer_condition (source) & G_IO_IN) ==
 				G_IO_IN &&
 			status != G_IO_STATUS_EOF);
-		g_string_free (string, TRUE);
 	}
 
-	if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+	if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF)
+	{
 		/* We assume that we are done, so stop the pulsating and de-sensitize
 		 * the buttons */
-		GtkWidget *button;
-
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_progress_ok_button"));
-		gtk_widget_set_sensitive (button, TRUE);
-		gtk_widget_grab_focus (button);
-
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_progress_cancel_button"));
-
-		gtk_widget_set_sensitive (button, FALSE);
+		if (!no_cancel)
+			adw_message_dialog_set_response_enabled (ADW_MESSAGE_DIALOG(parent), "cancel", FALSE);
+		if (!auto_close)
+		{
+			adw_message_dialog_set_response_enabled (ADW_MESSAGE_DIALOG(parent), "ok", TRUE);
+			adw_message_dialog_set_default_response (ADW_MESSAGE_DIALOG(parent), "ok");
+		}
 
 		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0);
 
 		zenity_progress_pulsate_stop ();
 
-		g_object_unref (builder);
-
-		if (progress_data->autoclose) {
+		if (progress_data->autoclose)
+		{
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
-			gtk_main_quit ();
+			zenity_util_gapp_quit (parent, zen_data);
 		}
 
-		g_io_channel_shutdown (channel, TRUE, NULL);
+		g_io_channel_shutdown (source, TRUE, NULL);
 		return FALSE;
 	}
 	return TRUE;
 }
 
 static void
-zenity_progress_read_info (ZenityProgressData *progress_data) {
-	channel = g_io_channel_unix_new (0);
+zenity_progress_read_info (ZenityProgressData *progress_data)
+{
+	GIOChannel *channel = g_io_channel_unix_new (0);
+
 	g_io_channel_set_encoding (channel, NULL, NULL);
 	g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
 	g_io_add_watch (channel,
@@ -287,148 +308,136 @@ zenity_progress_read_info (ZenityProgressData *progress_data) {
 	/* We need to check the pulsate state here, because, the g_io_add_watch
 	   doesn't call the zenity_progress_handle_stdin function if there's no
 	   input. This fix the Bug 567663 */
-	if (progress_data->pulsate) {
+	if (progress_data->pulsate)
+	{
 		GObject *progress_bar =
 			gtk_builder_get_object (builder, "zenity_progress_bar");
+
 		zenity_progress_pulsate_start (progress_bar);
 	}
 }
 
-static void
-zenity_text_size_allocate (
-	GtkWidget *widget, GtkAllocation *allocation, gpointer data) {
-	gtk_widget_set_size_request (widget, allocation->width / 2, -1);
-}
-
 void
-zenity_progress (ZenityData *data, ZenityProgressData *progress_data) {
+zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
+{
 	GtkWidget *dialog;
-	GtkWidget *button;
 	GObject *text;
 	GObject *progress_bar;
-	GObject *cancel_button, *ok_button;
 
 	zen_data = data;
-	builder = zenity_util_load_ui_file ("zenity_progress_dialog", NULL);
+	builder = zenity_util_load_ui_file ("zenity_progress_dialog", "zenity_progress_box", NULL);
 
 	if (builder == NULL) {
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
-
 	text = gtk_builder_get_object (builder, "zenity_progress_text");
 
-	dialog =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_progress_dialog"));
+	dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_progress_dialog"));
 
 	progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_progress_dialog_response),
-		data);
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_progress_dialog_response), data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
-	zenity_util_set_window_icon (dialog,
-		data->window_icon,
-		ZENITY_IMAGE_FULLPATH ("zenity-progress.png"));
+	gtk_window_set_icon_name (GTK_WINDOW(dialog),
+			"appointment-soon");
 
 	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
-
-	if (data->width > -1) {
-		gtk_widget_set_size_request (GTK_WIDGET (text), data->width, -1);
-	} else {
-		g_signal_connect_after (G_OBJECT (text),
-			"size-allocate",
-			G_CALLBACK (zenity_text_size_allocate),
-			data);
-		g_signal_connect_after (G_OBJECT (progress_bar),
-			"size-allocate",
-			G_CALLBACK (zenity_text_size_allocate),
-			data);
+		gtk_window_set_default_size (GTK_WINDOW(dialog),
+				data->width, data->height);
+
+	if (data->width > -1)
+	{
+		gtk_widget_set_size_request (GTK_WIDGET(text), data->width, -1);
 	}
+#if 0
+	else
+	{
+		g_signal_connect_after (text, "size-allocate",
+			G_CALLBACK(zenity_text_size_allocate), data);
+
+		g_signal_connect_after (progress_bar, "size-allocate",
+			G_CALLBACK(zenity_text_size_allocate), data);
+	}
+#endif
 
 	if (data->modal)
 		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
 	if (data->ok_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_progress_ok_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
 	}
 
-	if (data->cancel_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_progress_cancel_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
 	}
 
-	if (progress_data->dialog_text)
-		gtk_label_set_markup (
-			GTK_LABEL (text), g_strcompress (progress_data->dialog_text));
+	if (progress_data->dialog_text) {
+		gtk_label_set_markup (GTK_LABEL(text),
+				g_strcompress (progress_data->dialog_text));
+	}
 
-	if (progress_data->percentage > -1)
-		gtk_progress_bar_set_fraction (
-			GTK_PROGRESS_BAR (progress_bar), progress_data->percentage / 100.0);
+	if (progress_data->percentage > -1) {
+		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress_bar),
+				progress_data->percentage / 100.0);
+	}
 
 	autokill = progress_data->autokill;
-
 	auto_close = progress_data->autoclose;
-	ok_button = gtk_builder_get_object (builder, "zenity_progress_ok_button");
-
 	no_cancel = progress_data->no_cancel;
-	cancel_button =
-		gtk_builder_get_object (builder, "zenity_progress_cancel_button");
 
-	if (no_cancel) {
-		gtk_widget_hide (GTK_WIDGET (cancel_button));
-		gtk_window_set_deletable (GTK_WINDOW (dialog), FALSE);
+	/* Unlike some other dialogs, this one starts off blank and we need to add
+	 * the OK/Cancel buttons depending on the options.
+	 */
+	if (no_cancel)
+		gtk_window_set_deletable (GTK_WINDOW(dialog), FALSE);
+	else
+		adw_message_dialog_add_response (ADW_MESSAGE_DIALOG(dialog), "cancel", _("_Cancel"));
+
+	if (!auto_close)
+	{
+		adw_message_dialog_add_response (ADW_MESSAGE_DIALOG(dialog), "ok", _("_OK"));
+		adw_message_dialog_set_response_enabled (ADW_MESSAGE_DIALOG(dialog), "ok", FALSE);
 	}
 
-	if (no_cancel && auto_close)
-		gtk_widget_hide (GTK_WIDGET (ok_button));
-
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 	zenity_progress_read_info (progress_data);
 
-	if (data->timeout_delay > 0) {
+	if (data->timeout_delay > 0)
+	{
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			NULL);
 	}
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_progress_dialog_response (
-	GtkWidget *widget, int response, gpointer data) {
-	switch (response) {
-		case GTK_RESPONSE_OK:
+zenity_progress_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
+
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			/* We do not want to kill the parent process, in order to give the
-			   user
-			   the ability to choose the action to be taken. See bug #310824.
-			   But we want to give people the option to choose this behavior.
-			   -- Monday 27, March 2006
+			 * user the ability to choose the action to be taken. But we want
+			 * to give people the option to choose this behavior.
 			*/
 			if (autokill) {
 				kill (getppid (), 1);
@@ -439,12 +448,15 @@ zenity_progress_dialog_response (
 		case ZENITY_TIMEOUT:
 			zenity_util_exit_code_with_data (ZENITY_TIMEOUT, zen_data);
 			break;
+
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
+			{
 				printf ("%s\n", zen_data->extra_label[response]);
+			}
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
diff --git a/src/scale.c b/src/scale.c
index 42284f57..73ab015a 100644
--- a/src/scale.c
+++ b/src/scale.c
@@ -1,46 +1,48 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * scale.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
  *
- * Authors: Lucas Rocha <lucasr@gnome.org>
+ * Original Author: Lucas Rocha <lucasr@gnome.org>
  */
 
-#include "config.h"
 
 #include "util.h"
 #include "zenity.h"
 
+#include <config.h>
+
 static GtkWidget *scale;
 
 static void zenity_scale_value_changed (GtkWidget *widget, gpointer data);
-static void zenity_scale_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+static void zenity_scale_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
 void
-zenity_scale (ZenityData *data, ZenityScaleData *scale_data) {
-	GtkBuilder *builder;
+zenity_scale (ZenityData *data, ZenityScaleData *scale_data)
+{
+	g_autoptr(GtkBuilder) builder = NULL;
 	GtkWidget *dialog;
-	GtkWidget *button;
 	GObject *text;
 
-	builder =
-		zenity_util_load_ui_file ("zenity_scale_dialog", "adjustment1", NULL);
+	builder = zenity_util_load_ui_file ("zenity_scale_dialog", "zenity_scale_adjustment", "zenity_scale_box", NULL);
 
 	if (builder == NULL) {
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
@@ -53,108 +55,104 @@ zenity_scale (ZenityData *data, ZenityScaleData *scale_data) {
 		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_scale_hscale"));
 	text = gtk_builder_get_object (builder, "zenity_scale_text");
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_scale_dialog_response),
-		data);
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_scale_dialog_response), data);
 
-	if (scale_data->min_value >= scale_data->max_value) {
-		g_printerr (_ ("Maximum value must be greater than minimum value.\n"));
+	if (scale_data->min_value >= scale_data->max_value)
+	{
+		g_printerr (_("Maximum value must be greater than minimum value.\n"));
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
 	if (scale_data->value < scale_data->min_value ||
-		scale_data->value > scale_data->max_value) {
+		scale_data->value > scale_data->max_value)
+	{
 		g_printerr (_ ("Value out of range.\n"));
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
-
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
-	zenity_util_set_window_icon (
-		dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-scale.png"));
+	gtk_window_set_icon_name (GTK_WINDOW(dialog),
+			"dialog-question");
 
-	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
+	if (data->width > -1 || data->height > -1) {
+		gtk_window_set_default_size (GTK_WINDOW(dialog),
+				data->width, data->height);
+	}
 
 	if (data->modal)
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+		gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
-	if (data->ok_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_scale_ok_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+	if (data->ok_label)
+	{
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
 	}
 
-	if (data->cancel_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_scale_cancel_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
 	}
 
-	if (scale_data->dialog_text)
-		gtk_label_set_markup (
-			GTK_LABEL (text), g_strcompress (scale_data->dialog_text));
+	if (scale_data->dialog_text) {
+		gtk_label_set_markup (GTK_LABEL (text),
+				g_strcompress (scale_data->dialog_text));
+	}
 
-	gtk_range_set_range (
-		GTK_RANGE (scale), scale_data->min_value, scale_data->max_value);
+	gtk_range_set_range (GTK_RANGE (scale),
+			scale_data->min_value, scale_data->max_value);
 	gtk_range_set_value (GTK_RANGE (scale), scale_data->value);
 	gtk_range_set_increments (
 		GTK_RANGE (scale), scale_data->step, scale_data->step);
 
 	if (scale_data->print_partial)
-		g_signal_connect (G_OBJECT (scale),
-			"value-changed",
-			G_CALLBACK (zenity_scale_value_changed),
-			data);
+	{
+		g_signal_connect (scale, "value-changed",
+			G_CALLBACK(zenity_scale_value_changed), data);
+	}
 
 	if (scale_data->hide_value)
 		gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
 
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 
-	if (data->timeout_delay > 0) {
+	if (data->timeout_delay > 0)
+	{
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			dialog);
 	}
 
-	g_object_unref (builder);
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_scale_value_changed (GtkWidget *widget, gpointer data) {
-	g_print ("%.0f\n", gtk_range_get_value (GTK_RANGE (widget)));
+zenity_scale_value_changed (GtkWidget *widget, gpointer data)
+{
+	g_print ("%.0f\n", gtk_range_get_value (GTK_RANGE(widget)));
 }
 
 static void
-zenity_scale_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_scale_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
 	ZenityData *zen_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
 
-	switch (response) {
-		case GTK_RESPONSE_OK:
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			g_print ("%.0f\n", gtk_range_get_value (GTK_RANGE (scale)));
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
@@ -165,10 +163,13 @@ zenity_scale_dialog_response (GtkWidget *widget, int response, gpointer data) {
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
+			{
 				printf ("%s\n", zen_data->extra_label[response]);
+			}
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-	gtk_main_quit ();
+
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
diff --git a/src/text.c b/src/text.c
index bbfa4212..7f09cdae 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,41 +1,45 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * text.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
  *
- * Authors: Glynn Foster <glynn.foster@sun.com>
+ * Original Author: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include "config.h"
 
 #include "util.h"
 #include "zenity.h"
+
 #include <gio/gio.h>
 
 #ifdef HAVE_WEBKITGTK
-#include <webkit2/webkit2.h>
+#include <webkit/webkit.h>
 #endif
 
+#include <config.h>
+
 static ZenityTextData *zen_text_data;
 
-static void zenity_text_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
-static void zenity_text_toggle_button (GtkToggleButton *button, gpointer data);
+static void zenity_text_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
+static void zenity_text_toggle_button (GtkCheckButton *button, AdwMessageDialog *dialog);
 
 #ifdef HAVE_WEBKITGTK
 static void
@@ -72,7 +76,6 @@ zenity_configure_webkit (WebKitWebView *web_view) {
 		NULL);
 	g_object_set (G_OBJECT (settings), "enable-page-cache", FALSE, NULL);
 	g_object_set (G_OBJECT (settings), "enable-plugins", FALSE, NULL);
-	g_object_set (G_OBJECT (settings), "enable-private-browsing", TRUE, NULL);
 	/*
 	  Stick to defaults
 	  "enforce-96-dpi"           gboolean              : Read / Write /
@@ -146,53 +149,60 @@ zenity_text_webview_load_changed (
 	}
 }
 
-#endif
+#endif	/* HAVE_WEBKITGTK */
 
 static gboolean
-zenity_text_handle_stdin (
-	GIOChannel *channel, GIOCondition condition, gpointer data) {
+zenity_text_handle_stdin (GIOChannel *channel, GIOCondition condition,
+		gpointer data)
+{
+#define BUF_SIZE 1024
 	static GtkTextBuffer *buffer;
 	static GtkTextView *text_view;
-	gchar buf[1024];
+	char buf[BUF_SIZE];
 
 	gsize len;
 
 	text_view = GTK_TEXT_VIEW (data);
 	buffer = gtk_text_view_get_buffer (text_view);
 
-	if ((condition & G_IO_IN) || (condition & (G_IO_IN | G_IO_HUP))) {
-		GError *error = NULL;
-		gint status;
+	if ((condition & G_IO_IN) || (condition & (G_IO_IN | G_IO_HUP)))
+	{
+		g_autoptr(GError) error = NULL;
+		int status;
 
 		while (channel->is_readable != TRUE)
 			;
 
 		do {
-			status = g_io_channel_read_chars (channel, buf, 1024, &len, &error);
-
-			while (gtk_events_pending ())
-				gtk_main_iteration ();
+			status = g_io_channel_read_chars (channel, buf, BUF_SIZE,
+					&len, &error);
 
+			while (g_main_context_pending (NULL)) {
+				g_main_context_iteration (NULL, FALSE);
+			}
 		} while (status == G_IO_STATUS_AGAIN);
 
-		if (status != G_IO_STATUS_NORMAL) {
+		if (status != G_IO_STATUS_NORMAL)
+		{
 			if (error) {
-				g_warning ("zenity_text_handle_stdin () : %s", error->message);
-				g_error_free (error);
+				g_warning ("%s: %s",
+						__func__, error->message);
 				error = NULL;
 			}
 			return FALSE;
 		}
 
-		if (len > 0) {
+		if (len > 0)
+		{
 			GtkTextIter end;
-			gchar *utftext;
+			g_autofree char *utftext = NULL;
 			gsize localelen;
 			gsize utflen;
 
 			gtk_text_buffer_get_end_iter (buffer, &end);
 
-			if (!g_utf8_validate (buf, len, NULL)) {
+			if (! g_utf8_validate (buf, len, NULL))
+			{
 				utftext = g_convert_with_fallback (buf,
 					len,
 					"UTF-8",
@@ -202,41 +212,45 @@ zenity_text_handle_stdin (
 					&utflen,
 					NULL);
 				gtk_text_buffer_insert (buffer, &end, utftext, utflen);
-				g_free (utftext);
-			} else {
+			}
+			else
+			{
 				gtk_text_buffer_insert (buffer, &end, buf, len);
 			}
-			if (zen_text_data->auto_scroll) {
-				GtkTextMark *mark = NULL;
-				mark = gtk_text_buffer_get_insert (buffer);
+
+			if (zen_text_data->auto_scroll)
+			{
+				GtkTextMark *mark = gtk_text_buffer_get_insert (buffer);
+
 				if (mark != NULL)
-					gtk_text_view_scroll_to_mark (
-						text_view, mark, 0.0, FALSE, 0, 0);
+				{
+					gtk_text_view_scroll_to_mark (text_view, mark,
+							0.0, FALSE, 0, 0);
+				}
 			}
 		}
 	}
-
 	return TRUE;
 }
 
 static void
-zenity_text_fill_entries_from_stdin (GtkTextView *text_view) {
+zenity_text_fill_entries_from_stdin (GtkTextView *text_view)
+{
 	GIOChannel *channel;
 
 	channel = g_io_channel_unix_new (0);
 	g_io_channel_set_encoding (channel, "UTF-8", NULL);
 	g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
-	g_io_add_watch (
-		channel, G_IO_IN | G_IO_HUP, zenity_text_handle_stdin, text_view);
+	g_io_add_watch (channel,
+			G_IO_IN | G_IO_HUP, zenity_text_handle_stdin, text_view);
 }
 
 void
-zenity_text (ZenityData *data, ZenityTextData *text_data) {
-	GtkBuilder *builder;
+zenity_text (ZenityData *data, ZenityTextData *text_data)
+{
+	g_autoptr(GtkBuilder) builder = NULL;
 	GtkWidget *dialog;
-	GtkWidget *ok_button;
 	GtkWidget *checkbox;
-	GtkWidget *cancel_button;
 
 	GObject *text_view;
 	GtkTextBuffer *text_buffer;
@@ -245,41 +259,31 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
 	GtkWidget *web_kit;
 	GtkWidget *scrolled_window;
 	GtkTextIter start_iter, end_iter;
-	gchar *content;
+	g_autofree char *content = NULL;
 #endif
+
 	zen_text_data = text_data;
-	builder =
-		zenity_util_load_ui_file ("zenity_text_dialog", "textbuffer1", NULL);
+	builder = zenity_util_load_ui_file ("zenity_text_dialog", "zenity_text_box", NULL);
 
 	if (builder == NULL) {
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
-
-	dialog =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_text_dialog"));
+	dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_text_dialog"));
 
-	ok_button = GTK_WIDGET (
-		gtk_builder_get_object (builder, "zenity_text_close_button"));
-	cancel_button = GTK_WIDGET (
-		gtk_builder_get_object (builder, "zenity_text_cancel_button"));
-	checkbox =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_text_checkbox"));
+	checkbox = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_text_checkbox"));
 
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_text_dialog_response),
-		data);
+	g_signal_connect (dialog, "response",
+		G_CALLBACK(zenity_text_dialog_response), data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
-	zenity_util_set_window_icon (
-		dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-text.png"));
-
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+	gtk_window_set_icon_name (GTK_WINDOW(dialog),
+			"accessories-text-editor");
 
 	text_buffer = gtk_text_buffer_new (NULL);
 	text_view = gtk_builder_get_object (builder, "zenity_text_view");
@@ -289,13 +293,24 @@ 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);
+	if (text_data->font)
+	{
+		PangoFontDescription *desc;
+		GtkStyleContext *context;
+		GtkCssProvider *provider;
+		g_autofree char *css_str = NULL;
+
+		desc = pango_font_description_from_string (text_data->font);
+		css_str = zenity_util_pango_font_description_to_css (desc);
+			
+		provider = gtk_css_provider_new ();
+		gtk_css_provider_load_from_data (provider, css_str, -1);
+
+		context = gtk_widget_get_style_context (GTK_WIDGET(text_view));
+		gtk_style_context_add_provider (context,
+				GTK_STYLE_PROVIDER(provider),
+				GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 	}
-G_GNUC_END_IGNORE_DEPRECATIONS
 
 	if (text_data->uri)
 		zenity_util_fill_file_buffer (text_buffer, text_data->uri);
@@ -305,46 +320,51 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 	if (text_data->editable)
 		zen_text_data->buffer = text_buffer;
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
 	if (data->ok_label) {
-		gtk_button_set_label (GTK_BUTTON (ok_button), data->ok_label);
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
 	}
 
-	if (data->cancel_label) {
-		gtk_button_set_label (GTK_BUTTON (cancel_button), data->cancel_label);
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
 	}
 
 	if (text_data->checkbox) {
-		gtk_widget_set_visible (GTK_WIDGET (checkbox), TRUE);
-		gtk_widget_set_sensitive (GTK_WIDGET (ok_button), FALSE);
-		gtk_button_set_label (GTK_BUTTON (checkbox), text_data->checkbox);
-
-		g_signal_connect (G_OBJECT (checkbox),
-			"toggled",
-			G_CALLBACK (zenity_text_toggle_button),
-			ok_button);
+		gtk_widget_set_visible (GTK_WIDGET(checkbox), TRUE);
+		gtk_check_button_set_label (GTK_CHECK_BUTTON(checkbox), text_data->checkbox);
+		adw_message_dialog_set_response_enabled (ADW_MESSAGE_DIALOG(dialog), "ok", FALSE);
+
+		g_signal_connect (checkbox, "toggled", G_CALLBACK(zenity_text_toggle_button), dialog);
 	}
 
 	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
-	else
+	{
+		gtk_window_set_default_size (GTK_WINDOW (dialog),
+				data->width, data->height);
+	}
+	else {
 		gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
+	}
 
 	if (data->modal)
 		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
 #ifdef HAVE_WEBKITGTK
-	if (text_data->html) {
-		web_kit = webkit_web_view_new ();
+	if (text_data->html)
+	{
+		/* "ephemeral" == private browsing */
+		g_autoptr(WebKitWebContext) wk_context = webkit_web_context_new ();
+		g_autoptr(WebKitNetworkSession) wk_session = webkit_network_session_new_ephemeral ();
+
+		web_kit = WEBKIT_WEB_VIEW (g_object_new (WEBKIT_TYPE_WEB_VIEW,
+				"web-context", wk_context,
+				"network-session", wk_session,
+				NULL));
 		scrolled_window = GTK_WIDGET (
 			gtk_builder_get_object (builder, "zenity_text_scrolled_window"));
 
@@ -358,23 +378,19 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 			webkit_web_view_load_uri (
 				WEBKIT_WEB_VIEW (web_kit), text_data->url);
 		} else {
-			gchar *cwd;
-			gchar *dirname;
-			gchar *dirname_uri;
+			g_autofree char *cwd = NULL;
+			g_autofree char *dirname = NULL;
+			g_autofree char *dirname_uri = NULL;
 			dirname = text_data->uri ? g_path_get_dirname (text_data->uri)
 									 : g_strdup ("/");
 			cwd = g_get_current_dir ();
 			dirname_uri = g_strconcat ("file://", cwd, "/", dirname, "/", NULL);
-			g_free (cwd);
-			g_free (dirname);
 			gtk_text_buffer_get_start_iter (text_buffer, &start_iter);
 			gtk_text_buffer_get_end_iter (text_buffer, &end_iter);
 			content = gtk_text_buffer_get_text (
 				text_buffer, &start_iter, &end_iter, TRUE);
 			webkit_web_view_load_html (
 				WEBKIT_WEB_VIEW (web_kit), content, dirname_uri);
-			g_free (dirname_uri);
-			g_free (content);
 		}
 
 		// We don't want user to click on links and navigate to another page.
@@ -385,51 +401,51 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 			G_CALLBACK (zenity_text_webview_load_changed),
 			NULL);
 
-		gtk_widget_destroy (GTK_WIDGET (text_view));
-		gtk_container_add (GTK_CONTAINER (scrolled_window), web_kit);
-		gtk_widget_show (GTK_WIDGET (web_kit));
+		gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW(scrolled_window), web_kit);
 	}
-#endif
-
-	zenity_util_show_dialog (dialog, data->attach);
+#endif /* HAVE_WEBKITGTK */
 
-	g_object_unref (builder);
+	zenity_util_show_dialog (dialog);
 
-	if (data->timeout_delay > 0) {
+	if (data->timeout_delay > 0)
+	{
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			dialog);
 	}
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_text_toggle_button (GtkToggleButton *button, gpointer data) {
-	GtkWidget *ok_button = (GtkWidget *) data;
-	gtk_widget_set_sensitive (
-		GTK_WIDGET (ok_button), gtk_toggle_button_get_active (button));
+zenity_text_toggle_button (GtkCheckButton *button, AdwMessageDialog *dialog)
+{
+	adw_message_dialog_set_response_enabled (dialog, "ok", gtk_check_button_get_active (button));
 }
 
 static void
-zenity_text_dialog_output (ZenityData *zen_data) {
-	if (zen_text_data->editable) {
+zenity_text_dialog_output (ZenityData *zen_data)
+{
+	if (zen_text_data->editable)
+	{
 		GtkTextIter start, end;
-		gchar *text;
+		g_autofree char *text = NULL;
+
 		gtk_text_buffer_get_bounds (zen_text_data->buffer, &start, &end);
-		text =
-			gtk_text_buffer_get_text (zen_text_data->buffer, &start, &end, 0);
+		text = gtk_text_buffer_get_text (zen_text_data->buffer,
+				&start, &end, 0);
 		g_print ("%s", text);
-		g_free (text);
 	}
 }
 
 static void
-zenity_text_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_text_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
 	ZenityData *zen_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
 
-	switch (response) {
-		case GTK_RESPONSE_CLOSE:
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_text_dialog_output (zen_data);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
 			break;
@@ -439,12 +455,18 @@ zenity_text_dialog_response (GtkWidget *widget, int response, gpointer data) {
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_TIMEOUT);
 			break;
 
+		case ZENITY_CANCEL:
+			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
+			break;
+			
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
+			{
 				printf ("%s\n", zen_data->extra_label[response]);
+			}
 			zenity_util_exit_code_with_data (ZENITY_ESC, zen_data);
 			break;
 	}
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
diff --git a/src/tree.c b/src/tree.c
index 7d98ad2d..f43de030 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1,244 +1,158 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * tree.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
  *
- * Authors: Glynn Foster <glynn.foster@sun.com>
+ * Original Authors: Glynn Foster <glynn.foster@sun.com>
  *          Jonathan Blanford <jrb@redhat.com>
  *          Kristian Rietveld <kris@gtk.org>
  */
 
-#include "config.h"
 
 #include "util.h"
 #include "zenity.h"
+#include "zenity-tree-column-view.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#define MAX_ELEMENTS_BEFORE_SCROLLING 5
+#include <config.h>
+
 #define PRINT_HIDE_COLUMN_SEPARATOR ","
 
-static GtkBuilder *builder;
+static ZenityTreeColumnView *col_view;
+static gboolean editable;
 static GSList *selected;
-static gchar *separator;
+static char *separator;
 static gboolean print_all_columns = FALSE;
-static gint *print_columns = NULL;
-static gint *hide_columns = NULL;
+static int *print_columns = NULL;
+static int *hide_columns = NULL;
 static GIOChannel *channel;
 
-static int *zenity_tree_extract_column_indexes (char *indexes, gint n_columns);
-static gboolean zenity_tree_column_is_hidden (gint column_index);
-static void zenity_tree_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
-static void zenity_tree_row_activated (GtkTreeView *tree_view,
-	GtkTreePath *tree_path, GtkTreeViewColumn *tree_col, gpointer data);
-
-static gboolean
-zenity_tree_dialog_untoggle (
-	GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) {
-	GValue toggle_value = {
-		0,
-	};
-
-	gtk_tree_model_get_value (model, iter, 0, &toggle_value);
-
-	if (g_value_get_boolean (&toggle_value))
-		gtk_list_store_set (GTK_LIST_STORE (model), iter, 0, FALSE, -1);
-	return FALSE;
-}
+static int *zenity_tree_extract_column_indexes (char *indexes, int n_columns);
+static void zenity_tree_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
+static void zenity_tree_dialog_output (void);
 
 static void
-check_or_radio_label_activated_cb (GtkTreeView *tree_view,
-		GtkTreePath *path,
-		GtkTreeViewColumn *column,
-		gpointer user_data)
+show_mid_search_deprecation_warning (void)
 {
-	GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
-	GtkTreeIter iter;
-	gboolean value;
-
-	/* Because this is a radio list, we should untoggle the previous toggle so
-	 * that
-	 * we only have one selection at any given time
-	 */
-	if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "radio")) == 1) {
-		gtk_tree_model_foreach (model, zenity_tree_dialog_untoggle, NULL);
-	}
-
-	gtk_tree_model_get_iter (model, &iter, path);
-	gtk_tree_model_get (model, &iter, 0, &value, -1);
-
-	value = !value;
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, value, -1);
-}
-
-static void
-zenity_load_pixbuf (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
-	GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) {
-	static GHashTable *pixbuf_cache = NULL;
-	GError *error = NULL;
-	GdkPixbuf *pixbuf;
-	gchar *str;
-
-	gtk_tree_model_get (tree_model, iter, 0, &str, -1);
-
-	if (!str)
-		return;
-
-	if (!pixbuf_cache) {
-		pixbuf_cache = g_hash_table_new (g_str_hash, g_str_equal);
-		g_assert (pixbuf_cache);
-	}
-
-	pixbuf = g_hash_table_lookup (pixbuf_cache, str);
-
-	if (!pixbuf) {
-		pixbuf = gdk_pixbuf_new_from_file (str, &error);
-		if (!pixbuf)
-			g_warning ("Failed to load '%s'", str);
-
-		g_hash_table_insert (pixbuf_cache, g_strdup (str), pixbuf);
-	}
-
-	if (pixbuf)
-		g_object_set (cell, "pixbuf", pixbuf, NULL);
-
-	g_free (str);
+	g_printerr (_("Warning: --mid-search is deprecated and will be removed in a "
+			"future version of zenity. Ignoring.\n"));
 }
-
 static gboolean
-zenity_tree_handle_stdin (
-	GIOChannel *channel, GIOCondition condition, gpointer data) {
-	static GtkTreeView *tree_view;
-	GtkTreeModel *model;
-	static GtkTreeIter iter;
-	static gint column_count = 0;
-	static gint row_count = 0;
-	static gint n_columns;
-	static gboolean editable;
-	static gboolean toggles;
+zenity_tree_handle_stdin (GIOChannel *channel, GIOCondition condition, gpointer data)
+{
+	static int column_count = 0;
+	static int row_count = 0;
 	static gboolean first_time = TRUE;
 	GIOStatus status = G_IO_STATUS_NORMAL;
+	int n_columns = zenity_tree_column_view_get_n_columns (col_view);
+	gboolean toggles = FALSE;
+	ZenityTreeListType list_type = zenity_tree_column_view_get_list_type (col_view);
+	GListStore *store = G_LIST_STORE(zenity_tree_column_view_get_model (col_view));
 
-	tree_view = GTK_TREE_VIEW (data);
-	n_columns =
-		GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
-	editable =
-		GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "editable"));
-	toggles =
-		GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "toggles"));
-
-	model = gtk_tree_view_get_model (tree_view);
-
-	if (first_time) {
+	if (first_time)
 		first_time = FALSE;
-		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-	}
 
-	if ((condition & G_IO_IN) == G_IO_IN) {
-		GString *string;
-		GError *error = NULL;
+	if (list_type == ZENITY_TREE_LIST_RADIO || list_type == ZENITY_TREE_LIST_CHECK)
+		toggles = TRUE;
 
-		string = g_string_new (NULL);
+	if ((condition & G_IO_IN) == G_IO_IN)
+	{
+		ZenityTreeRow *row = NULL;
+		g_autoptr(GString) gstring = g_string_new (NULL);
+		g_autoptr(GError) error = NULL;
 
 		while ((g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE) !=
 			G_IO_FLAG_IS_READABLE)
 			;
+
+		row = zenity_tree_row_new ();
 		do {
+			ZenityTreeItem *item;
+
 			do {
-				if (g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE)
-					status = g_io_channel_read_line_string (
-						channel, string, NULL, &error);
-				else
+				if (g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE) {
+					status = g_io_channel_read_line_string (channel, gstring, NULL, &error);
+					g_strchomp (gstring->str);
+				}
+				else {
 					return FALSE;
+				}
 
-				while (gtk_events_pending ())
-					gtk_main_iteration ();
-
-				// TODO: Find a better way to avoid 100% cpu utilization
+				while (g_main_context_pending (NULL)) {
+					g_main_context_iteration (NULL, FALSE);
+				}
+				/* FIXME: Find a better way to avoid 100% cpu utilization */
 				g_usleep (10000);
 
 			} while (status == G_IO_STATUS_AGAIN);
 
-			if (status != G_IO_STATUS_NORMAL) {
+			if (status != G_IO_STATUS_NORMAL)
+			{
 				if (error) {
-					g_warning (
-						"zenity_tree_handle_stdin () : %s", error->message);
-					g_error_free (error);
-					error = NULL;
+					g_warning ("%s: %s", __func__, error->message);
+					g_clear_error (&error);
 				}
 				continue;
 			}
 
-			if (column_count == n_columns) {
+			if (column_count == n_columns)
+			{
 				/* We're starting a new row */
 				column_count = 0;
 				row_count++;
-				gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+				if (row)
+					g_list_store_append (store, row);
+				row = zenity_tree_row_new ();
 			}
 
-			if (toggles && column_count == 0) {
-				if (strcmp (g_ascii_strdown (
-								zenity_util_strip_newline (string->str), -1),
-						"true") == 0)
-					gtk_list_store_set (
-						GTK_LIST_STORE (model), &iter, column_count, TRUE, -1);
-				else
-					gtk_list_store_set (
-						GTK_LIST_STORE (model), &iter, column_count, FALSE, -1);
-			} else {
-				gtk_list_store_set (GTK_LIST_STORE (model),
-					&iter,
-					column_count,
-					zenity_util_strip_newline (string->str),
-					-1);
+			if (toggles && column_count == 0)
+			{
+				item = zenity_tree_item_new (gstring->str, gtk_check_button_new ());
 			}
-
-			if (editable) {
-				gtk_list_store_set (
-					GTK_LIST_STORE (model), &iter, n_columns, TRUE, -1);
+			else if (list_type == ZENITY_TREE_LIST_IMAGE && column_count == 0)
+			{
+				item = zenity_tree_item_new (gstring->str, gtk_image_new ());
 			}
-
-			if (row_count == MAX_ELEMENTS_BEFORE_SCROLLING) {
-				GtkWidget *scrolled_window;
-				GtkRequisition rectangle;
-
-				gtk_widget_get_preferred_size (
-					GTK_WIDGET (tree_view), &rectangle, NULL);
-				scrolled_window = GTK_WIDGET (
-					gtk_builder_get_object (builder, "zenity_tree_window"));
-				gtk_widget_set_size_request (
-					scrolled_window, -1, rectangle.height);
-				gtk_scrolled_window_set_policy (
-					GTK_SCROLLED_WINDOW (scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
+			else
+			{
+				if (editable)
+					item = zenity_tree_item_new (gstring->str, gtk_editable_label_new (NULL));
+				else
+					item = zenity_tree_item_new (gstring->str, gtk_label_new (NULL));
 			}
 
+			zenity_tree_row_add (row, item);
 			column_count++;
 
-		} while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) ==
-				G_IO_IN &&
-			status != G_IO_STATUS_EOF);
-		g_string_free (string, TRUE);
+		} while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) == G_IO_IN &&
+			status != G_IO_STATUS_EOF);	/* !do while */
+
+		if (row)
+			g_list_store_append (store, row);
 	}
 
-	if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+	if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF)
+	{
 		g_io_channel_shutdown (channel, TRUE, NULL);
 		return FALSE;
 	}
@@ -246,119 +160,92 @@ zenity_tree_handle_stdin (
 }
 
 static void
-zenity_tree_fill_entries_from_stdin (GtkTreeView *tree_view, gint n_columns,
-	gboolean toggles, gboolean editable) {
-	g_object_set_data (
-		G_OBJECT (tree_view), "n_columns", GINT_TO_POINTER (n_columns));
-	g_object_set_data (
-		G_OBJECT (tree_view), "toggles", GINT_TO_POINTER (toggles));
-	g_object_set_data (
-		G_OBJECT (tree_view), "editable", GINT_TO_POINTER (editable));
-
+zenity_tree_fill_entries_from_stdin (void)
+{
 	channel = g_io_channel_unix_new (0);
 	g_io_channel_set_encoding (channel, NULL, NULL);
 	g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
-	g_io_add_watch (
-		channel, G_IO_IN | G_IO_HUP, zenity_tree_handle_stdin, tree_view);
+	g_io_add_watch (channel, G_IO_IN | G_IO_HUP, zenity_tree_handle_stdin, NULL);
 }
 
 static void
-zenity_tree_fill_entries (GtkTreeView *tree_view, const gchar **args,
-	gint n_columns, gboolean toggles, gboolean editable) {
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gint i = 0;
-
-	model = gtk_tree_view_get_model (tree_view);
-
-	g_object_set_data (
-		G_OBJECT (tree_view), "n_columns", GINT_TO_POINTER (n_columns));
-
-	while (args[i] != NULL) {
-		gint j;
-
-		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+zenity_tree_fill_entries (const char **args)
+{
+	int n_columns = zenity_tree_column_view_get_n_columns (col_view);
+	ZenityTreeListType list_type = zenity_tree_column_view_get_list_type (col_view);
+	GListStore *store = G_LIST_STORE(zenity_tree_column_view_get_model (col_view));
+	gboolean toggles = FALSE;
 
-		for (j = 0; j < n_columns; j++) {
+	if (list_type == ZENITY_TREE_LIST_RADIO || list_type == ZENITY_TREE_LIST_CHECK)
+		toggles = TRUE;
 
-			if (toggles && j == 0) {
-				if (strcmp (g_ascii_strdown ((gchar *) args[i + j], -1),
-						"true") == 0)
-					gtk_list_store_set (
-						GTK_LIST_STORE (model), &iter, j, TRUE, -1);
+	for (int i = 0; args[i]; i+= n_columns)
+	{
+		ZenityTreeRow *row = zenity_tree_row_new ();
+
+		for (int j = 0; j < n_columns; j++)
+		{
+			ZenityTreeItem *item;
+			const char *str = args[i + j];
+			
+			if (toggles && j == 0)
+			{
+				item = zenity_tree_item_new (str, gtk_check_button_new ());
+			}
+			else if (list_type == ZENITY_TREE_LIST_IMAGE && j == 0)
+			{
+				item = zenity_tree_item_new (str, gtk_image_new ());
+			}
+			else
+			{
+				if (editable)
+					item = zenity_tree_item_new (str, gtk_editable_label_new (""));
 				else
-					gtk_list_store_set (
-						GTK_LIST_STORE (model), &iter, j, FALSE, -1);
-			} else
-				gtk_list_store_set (
-					GTK_LIST_STORE (model), &iter, j, args[i + j], -1);
-		}
-
-		if (editable)
-			gtk_list_store_set (
-				GTK_LIST_STORE (model), &iter, n_columns, TRUE, -1);
-
-		if (i == MAX_ELEMENTS_BEFORE_SCROLLING) {
-			GtkWidget *scrolled_window;
-			GtkRequisition rectangle;
-
-			gtk_widget_get_preferred_size (
-				GTK_WIDGET (tree_view), &rectangle, NULL);
-			scrolled_window = GTK_WIDGET (
-				gtk_builder_get_object (builder, "zenity_tree_window"));
-			gtk_widget_set_size_request (scrolled_window, -1, rectangle.height);
-			gtk_scrolled_window_set_policy (
-				GTK_SCROLLED_WINDOW (scrolled_window),
-				GTK_POLICY_AUTOMATIC,
-				GTK_POLICY_AUTOMATIC);
+					item = zenity_tree_item_new (str, gtk_label_new (NULL));
+			}
+			zenity_tree_row_add (row, item);
 		}
-
-		i += n_columns;
+		g_list_store_append (store, row);
 	}
 }
 
-static gboolean
-zenity_mid_search_func (GtkTreeModel *model, gint column, const gchar *key,
-	GtkTreeIter *iter, gpointer search_data) {
-	gchar *iter_string = NULL;
-	gtk_tree_model_get (model, iter, column, &iter_string, -1);
-	return !(g_strrstr (g_utf8_strdown (iter_string, -1),
-				 g_utf8_strdown (key, -1)) != NULL);
-}
-
 static void
-zenity_cell_edited_callback (GtkCellRendererText *cell,
-	const gchar *path_string, const gchar *new_text, gpointer data) {
-	GtkTreeModel *model;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	gint column;
+cv_activated_cb (ZenityTreeColumnView *cv, gpointer data)
+{
+	GtkWindow *parent;
+	ZenityData *zen_data = data;
 
-	model = GTK_TREE_MODEL (data);
-	path = gtk_tree_path_new_from_string (path_string);
+	zenity_tree_dialog_output ();
+	zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
 
-	column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
-	gtk_tree_model_get_iter (model, &iter, path);
+	parent = GTK_WINDOW(gtk_widget_get_native (GTK_WIDGET(col_view)));
 
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column, new_text, -1);
+	zenity_util_gapp_quit (parent, zen_data);
+}
 
-	gtk_tree_path_free (path);
+static void
+search_changed_cb (GtkSearchEntry *entry, gpointer data)
+{
+	zenity_tree_column_view_set_search (col_view,
+			gtk_editable_get_text (GTK_EDITABLE(entry)));
 }
 
 void
-zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
+zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
+{
+	g_autoptr(GtkBuilder) builder = NULL;
 	GtkWidget *dialog;
-	GtkWidget *button;
-	GObject *tree_view;
+	GtkWidget *search_entry;
 	GObject *text;
-	GtkTreeViewColumn *column;
-	GtkListStore *model;
-	GType *column_types;
+	GListStore *store;
+	ZenityTreeListType list_type;
 	GSList *tmp;
-	gboolean first_column = FALSE;
-	gint i, column_index, n_columns;
+	int n_columns;
 
-	builder = zenity_util_load_ui_file ("zenity_tree_dialog", NULL);
+	if (tree_data->mid_search_DEPRECATED)
+		show_mid_search_deprecation_warning ();
+
+	builder = zenity_util_load_ui_file ("zenity_tree_dialog", "zenity_tree_box", NULL);
 
 	if (builder == NULL) {
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
@@ -369,426 +256,284 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
 
 	n_columns = g_slist_length (tree_data->columns);
 
-	if (tree_data->print_column) {
+	if (tree_data->print_column)
+	{
 		if (strcmp (g_ascii_strdown (tree_data->print_column, -1), "all") == 0)
 			print_all_columns = TRUE;
 		else
 			print_columns = zenity_tree_extract_column_indexes (
 				tree_data->print_column, n_columns);
-	} else {
+	}
+	else
+	{
 		print_columns = g_new (gint, 2);
 		print_columns[0] = (tree_data->radiobox || tree_data->checkbox ? 2 : 1);
 		print_columns[1] = 0;
 	}
 
-	if (tree_data->hide_column)
-		hide_columns = zenity_tree_extract_column_indexes (
-			tree_data->hide_column, n_columns);
+	if (tree_data->hide_column) {
+		hide_columns =
+			zenity_tree_extract_column_indexes (tree_data->hide_column,
+					n_columns);
+	}
 
 	if (n_columns == 0) {
-		g_printerr (_ ("No column titles specified for List dialog.\n"));
+		g_printerr (_("No column titles specified for List dialog.\n"));
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	if (tree_data->checkbox + tree_data->radiobox + tree_data->imagebox > 1) {
+	if (tree_data->checkbox + tree_data->radiobox + tree_data->imagebox > 1)
+	{
 		g_printerr (_ ("You should use only one List dialog type.\n"));
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
-
-	dialog =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_tree_dialog"));
-
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_tree_dialog_response),
-		data);
+	dialog = GTK_WIDGET(gtk_builder_get_object (builder, "zenity_tree_dialog"));
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_tree_dialog_response), data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
 
 	if (data->modal)
 		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
 	if (data->ok_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_tree_ok_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog)
 	}
 
 	if (data->cancel_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_tree_cancel_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog)
 	}
 
 	text = gtk_builder_get_object (builder, "zenity_tree_text");
 
 	if (tree_data->dialog_text)
-		gtk_label_set_markup (
-			GTK_LABEL (text), g_strcompress (tree_data->dialog_text));
-
-	zenity_util_set_window_icon (
-		dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-list.png"));
+		gtk_label_set_markup (GTK_LABEL(text),
+				g_strcompress (tree_data->dialog_text));
 
-	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
+	gtk_window_set_icon_name (GTK_WINDOW(dialog),
+			"view-sort-ascending");
 
-	tree_view = gtk_builder_get_object (builder, "zenity_tree_view");
+	if (data->width > -1 || data->height > -1) {
+		gtk_window_set_default_size (GTK_WINDOW(dialog),
+				data->width, data->height);
+	}
 
-	if (tree_data->radiobox || tree_data->checkbox)
-	{
-		gtk_tree_view_set_activate_on_single_click (GTK_TREE_VIEW(tree_view),
-				TRUE);
+	/* Create a list store */
+	store = g_list_store_new (ZENITY_TREE_TYPE_ROW);
 
-		g_signal_connect (tree_view,
-			"row-activated",
-			G_CALLBACK (check_or_radio_label_activated_cb),
-			data);
-	}
-	else
-	{
-		g_signal_connect (tree_view,
-			"row-activated",
-			G_CALLBACK (zenity_tree_row_activated),
-			data);
-	}
+	/* Define global col_view */
+	col_view = ZENITY_TREE_COLUMN_VIEW(gtk_builder_get_object (builder, "zenity_tree_cv"));
 
-	/* Create an empty list store */
-	model = g_object_new (GTK_TYPE_LIST_STORE, NULL);
+	/* This signal will only get emitted for certain kinds of lists, but if
+	 * applicable, it should finish the job.
+	 */
+	g_signal_connect (col_view, "activated", G_CALLBACK(cv_activated_cb), data);
 
-	if (tree_data->editable)
-		column_types = g_new (GType, n_columns + 1);
-	else
-		column_types = g_new (GType, n_columns);
+	search_entry = GTK_WIDGET(gtk_builder_get_object (builder, "zenity_tree_search_entry"));
+	g_signal_connect (search_entry, "search-changed", G_CALLBACK(search_changed_cb), NULL);
 
-	for (i = 0; i < n_columns; i++) {
-		/* Have the limitation that the radioboxes and checkboxes are in the
-		 * first column */
-		if (i == 0 && (tree_data->checkbox || tree_data->radiobox))
-			column_types[i] = G_TYPE_BOOLEAN;
-		else
-			column_types[i] = G_TYPE_STRING;
+	if (tree_data->radiobox) {
+		list_type = ZENITY_TREE_LIST_RADIO;
+	}
+	else if (tree_data->checkbox) {
+		list_type = ZENITY_TREE_LIST_CHECK;
+	}
+	else if (tree_data->imagebox) {
+		list_type = ZENITY_TREE_LIST_IMAGE;
+	}
+	else {
+		list_type = ZENITY_TREE_LIST_NONE;
 	}
 
-	if (tree_data->editable)
-		column_types[n_columns] = G_TYPE_BOOLEAN;
+	editable = tree_data->editable;
+	g_object_set (col_view,
+			"list-type", list_type,
+			"multi", tree_data->multi,
+			"model", G_LIST_MODEL(store),
+			NULL);
 
-	if (tree_data->editable)
-		gtk_list_store_set_column_types (model, n_columns + 1, column_types);
-	else
-		gtk_list_store_set_column_types (model, n_columns, column_types);
+	for (tmp = tree_data->columns; tmp; tmp = tmp->next)
+	{
+		zenity_tree_column_view_add_column (col_view, tmp->data);
+	}
 
-	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
+	if (hide_columns)
+	{
+		for (guint i = 0; hide_columns[i] != 0; i++)
+		{
+			zenity_tree_column_view_show_column (col_view, hide_columns[i]-1, FALSE);
+		}
+	}
 
-	if (tree_data->radiobox || tree_data->checkbox)
+	if (tree_data->data && *tree_data->data)	/* we have argv after opts */
 	{
-		gtk_tree_selection_set_mode (
-			gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
-			GTK_SELECTION_SINGLE);
+		zenity_tree_fill_entries (tree_data->data);
 	}
 	else
 	{
-		if (tree_data->multi)
-			gtk_tree_selection_set_mode (
-				gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
-				GTK_SELECTION_MULTIPLE);
-		else
-			gtk_tree_selection_set_mode (
-				gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
-				GTK_SELECTION_SINGLE);
+		zenity_tree_fill_entries_from_stdin ();
 	}
 
-	column_index = 0;
+	zenity_util_show_dialog (dialog);
 
-	for (tmp = tree_data->columns; tmp; tmp = tmp->next) {
-		if (!first_column) {
-			if (tree_data->checkbox || tree_data->radiobox) {
-				GtkCellRenderer *cell_renderer;
+	if (data->timeout_delay > 0) {
+		g_timeout_add_seconds (data->timeout_delay,
+			(GSourceFunc) zenity_util_timeout_handle,
+			dialog);
+	}
 
-				cell_renderer = gtk_cell_renderer_toggle_new ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
+}
 
-				if (tree_data->radiobox) {
-					g_object_set (
-						G_OBJECT (cell_renderer), "radio", TRUE, NULL);
-					g_object_set_data (
-						G_OBJECT (model), "radio", GINT_TO_POINTER (1));
-				}
+static gboolean
+get_row_checkbtn_toggled (ZenityTreeRow *row)
+{
+	ZenityTreeItem *item = zenity_tree_row_get_item (row, 0);
+	GtkWidget *child = zenity_tree_item_get_child (item);
 
-				column = gtk_tree_view_column_new_with_attributes (
-					tmp->data, cell_renderer, "active", column_index, NULL);
-			} else if (tree_data->imagebox) {
-				GtkCellRenderer *cell_renderer =
-					gtk_cell_renderer_pixbuf_new ();
-				column = gtk_tree_view_column_new_with_attributes (
-					tmp->data, cell_renderer, NULL);
-				gtk_tree_view_column_set_cell_data_func (
-					column, cell_renderer, zenity_load_pixbuf, NULL, NULL);
-			} else {
-				if (tree_data->editable) {
-					GtkCellRenderer *cell_renderer;
-
-					cell_renderer = gtk_cell_renderer_text_new ();
-					g_signal_connect (G_OBJECT (cell_renderer),
-						"edited",
-						G_CALLBACK (zenity_cell_edited_callback),
-						gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view)));
-					g_object_set_data (G_OBJECT (cell_renderer),
-						"column",
-						GINT_TO_POINTER (column_index));
-
-					column =
-						gtk_tree_view_column_new_with_attributes (tmp->data,
-							cell_renderer,
-							"text",
-							column_index,
-							"editable",
-							n_columns,
-							NULL);
-				} else {
-					column =
-						gtk_tree_view_column_new_with_attributes (tmp->data,
-							gtk_cell_renderer_text_new (),
-							"text",
-							column_index,
-							NULL);
-				}
+	if (GTK_IS_CHECK_BUTTON (child))
+	{
+		return gtk_check_button_get_active (GTK_CHECK_BUTTON(child));
+	}
 
-				gtk_tree_view_column_set_sort_column_id (column, column_index);
-				gtk_tree_view_column_set_resizable (column, TRUE);
-			}
-			if (zenity_tree_column_is_hidden (1))
-				gtk_tree_view_column_set_visible (column, FALSE);
+	return FALSE;
+}
 
-			first_column = TRUE;
-		} else {
-			if (tree_data->editable) {
-				GtkCellRenderer *cell_renderer;
-
-				cell_renderer = gtk_cell_renderer_text_new ();
-				g_signal_connect (G_OBJECT (cell_renderer),
-					"edited",
-					G_CALLBACK (zenity_cell_edited_callback),
-					gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view)));
-				g_object_set_data (G_OBJECT (cell_renderer),
-					"column",
-					GINT_TO_POINTER (column_index));
-
-				column = gtk_tree_view_column_new_with_attributes (tmp->data,
-					cell_renderer,
-					"text",
-					column_index,
-					"editable",
-					n_columns,
-					NULL);
-			} else {
-				column = gtk_tree_view_column_new_with_attributes (tmp->data,
-					gtk_cell_renderer_text_new (),
-					"text",
-					column_index,
-					NULL);
-			}
+static void
+zenity_tree_dialog_get_selected (void)
+{
+	int n_columns = zenity_tree_column_view_get_n_columns (col_view);
+	GListModel *model = zenity_tree_column_view_get_model (col_view);
+	ZenityTreeItem *item;
 
-			gtk_tree_view_column_set_sort_column_id (column, column_index);
-			gtk_tree_view_column_set_resizable (column, TRUE);
+	for (guint i = 0; i < g_list_model_get_n_items (model); ++i)
+	{
+		ZenityTreeRow *row;
 
-			if (zenity_tree_column_is_hidden (column_index + 1))
-				gtk_tree_view_column_set_visible (column, FALSE);
-		}
+		if (! zenity_tree_column_view_is_selected (col_view, i))
+			continue;
 
-		gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-		column_index++;
-	}
+		row = g_list_model_get_item (model, i);
 
-	if (tree_data->hide_header)
-		gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
+		if (print_all_columns)
+		{
+			for (int j = 0; j < n_columns; j++)
+			{
+				item = zenity_tree_row_get_item (row, j);
 
-	if (tree_data->radiobox || tree_data->checkbox) {
-		if (tree_data->data && *tree_data->data)
-			zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view),
-				tree_data->data,
-				n_columns,
-				TRUE,
-				tree_data->editable);
-		else
-			zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view),
-				n_columns,
-				TRUE,
-				tree_data->editable);
-	} else {
-		if (tree_data->data && *tree_data->data)
-			zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view),
-				tree_data->data,
-				n_columns,
-				FALSE,
-				tree_data->editable);
+				selected = g_slist_append (selected,
+						g_strdup (zenity_tree_item_get_text (item)));
+			}
+		}
 		else
-			zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view),
-				n_columns,
-				FALSE,
-				tree_data->editable);
-	}
-
-	/* GTK will automatically pick the image column as the search column
-	 * despite it not containing any user readable text.
-	 * Set it to second column instead if it exists. */
-	if (tree_data->imagebox && n_columns > 1) {
-		gtk_tree_view_set_search_column (GTK_TREE_VIEW (tree_view),
-			1);
-	}
-
-	zenity_util_show_dialog (dialog, data->attach);
-
-	if (tree_data->mid_search)
-		gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (tree_view),
-			(GtkTreeViewSearchEqualFunc) zenity_mid_search_func,
-			model,
-			NULL);
-
-	if (data->timeout_delay > 0) {
-		g_timeout_add_seconds (data->timeout_delay,
-			(GSourceFunc) zenity_util_timeout_handle,
-			dialog);
+		{
+			for (int j = 0; print_columns[j] != 0; j++)
+			{
+				/* columns in CLI count from 1 and are allocated as 0-terminated
+				 * arrays, so account for that here with -1. */
+				item = zenity_tree_row_get_item (row, print_columns[j] - 1);
+
+				selected = g_slist_append (selected,
+						g_strdup (zenity_tree_item_get_text (item)));
+			}
+		}
 	}
-
-	gtk_main ();
-
-	g_object_unref (builder);
 }
 
 static void
-zenity_tree_dialog_get_selected (GtkTreeModel *model, GtkTreePath *path_buf,
-	GtkTreeIter *iter, GtkTreeView *tree_view) {
-	GValue value = {
-		0,
-	};
-	gint n_columns, i;
-
-	n_columns =
-		GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
-
-	if (print_all_columns) {
-		for (i = 0; i < n_columns; i++) {
-			gtk_tree_model_get_value (model, iter, i, &value);
-
-			selected = g_slist_append (selected, g_value_dup_string (&value));
-			g_value_unset (&value);
-		}
-		return;
-	}
+zenity_tree_dialog_toggle_get_selected (ZenityTreeRow *row, gpointer unused)
+{
+	int n_columns;
+	ZenityTreeItem *item;
 
-	for (i = 0; print_columns[i] != 0; i++) {
-		gtk_tree_model_get_value (model, iter, print_columns[i] - 1, &value);
+	if (! get_row_checkbtn_toggled (row))
+		return;
 
-		selected = g_slist_append (selected, g_value_dup_string (&value));
-		g_value_unset (&value);
-	}
-}
+	n_columns = zenity_tree_column_view_get_n_columns (col_view);
 
-static gboolean
-zenity_tree_dialog_toggle_get_selected (GtkTreeModel *model, GtkTreePath *path,
-	GtkTreeIter *iter, GtkTreeView *tree_view) {
-	GValue toggle_value = {
-		0,
-	};
-	gint n_columns, i;
-
-	n_columns =
-		GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
-
-	gtk_tree_model_get_value (model, iter, 0, &toggle_value);
-
-	if (g_value_get_boolean (&toggle_value)) {
-		GValue value = {
-			0,
-		};
-
-		if (print_all_columns) {
-			for (i = 1; i < n_columns; i++) {
-				gtk_tree_model_get_value (model, iter, i, &value);
-
-				selected =
-					g_slist_append (selected, g_value_dup_string (&value));
-				g_value_unset (&value);
-			}
-			g_value_unset (&toggle_value);
-			return FALSE;
+	if (print_all_columns)
+	{
+		/* start at 1 because we're not printing the checklist column string
+		 */
+		for (int i = 1; i < n_columns; i++)
+		{
+			item = zenity_tree_row_get_item (row, i);
+
+			selected = g_slist_append (selected,
+					g_strdup (zenity_tree_item_get_text (item)));
 		}
-
-		for (i = 0; print_columns[i] != 0; i++) {
-			gtk_tree_model_get_value (
-				model, iter, print_columns[i] - 1, &value);
-
-			selected = g_slist_append (selected, g_value_dup_string (&value));
-			g_value_unset (&value);
+	}
+	else
+	{
+		for (int i = 0; print_columns[i] != 0; i++)
+		{
+			/* columns in CLI count from 1 and are allocated as 0-terminated
+			 * arrays, so account for that here with -1. */
+			item = zenity_tree_row_get_item (row, print_columns[i] - 1);
+			
+			selected = g_slist_append (selected,
+					g_strdup (zenity_tree_item_get_text (item)));
 		}
 	}
-
-	g_value_unset (&toggle_value);
-
-	return FALSE;
 }
 
 static void
-zenity_tree_dialog_output (void) {
-	GObject *tree_view;
-	GtkTreeSelection *selection;
-	GtkTreeModel *model;
-
-	tree_view = gtk_builder_get_object (builder, "zenity_tree_view");
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
-
-	if (gtk_tree_model_get_column_type (model, 0) == G_TYPE_BOOLEAN)
-		gtk_tree_model_foreach (model,
-			(GtkTreeModelForeachFunc) zenity_tree_dialog_toggle_get_selected,
-			GTK_TREE_VIEW (tree_view));
-	else {
-		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-		gtk_tree_selection_selected_foreach (selection,
-			(GtkTreeSelectionForeachFunc) zenity_tree_dialog_get_selected,
-			GTK_TREE_VIEW (tree_view));
+zenity_tree_dialog_output (void)
+{
+	gboolean multi = zenity_tree_column_view_get_multi (col_view);
+	ZenityTreeListType list_type = zenity_tree_column_view_get_list_type (col_view);
+
+	if (list_type == ZENITY_TREE_LIST_RADIO || list_type == ZENITY_TREE_LIST_CHECK)
+	{
+		zenity_tree_column_view_foreach_row (col_view,
+				(GFunc)zenity_tree_dialog_toggle_get_selected, NULL);
+	}
+	else if (multi)
+	{
+	}
+	else
+	{
+		zenity_tree_dialog_get_selected ();
 	}
 
-	GSList *tmp;
 
-	for (tmp = selected; tmp; tmp = tmp->next) {
+	for (GSList *tmp = selected; tmp != NULL; tmp = tmp->next)
+	{
 		if (tmp->next != NULL) {
-			g_print ("%s%s", (gchar *) tmp->data, separator);
-		} else
-			g_print ("%s\n", (gchar *) tmp->data);
+			g_print ("%s%s", (char *)tmp->data, separator);
+		} else {
+			g_print ("%s\n", (char *)tmp->data);
+		}
 	}
 
 	g_free (print_columns);
 	g_free (hide_columns);
 	g_free (separator);
-	g_slist_foreach (selected, (GFunc) g_free, NULL);
-	selected = NULL;
+	g_slist_free_full (g_steal_pointer (&selected), g_free);
 }
 
 static void
-zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_tree_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
 	ZenityData *zen_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
 
-	switch (response) {
-		case GTK_RESPONSE_OK:
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_tree_dialog_output ();
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
@@ -799,62 +544,45 @@ zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data) {
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
+			{
 				printf ("%s\n", zen_data->extra_label[response]);
+			}
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
 	if (channel != NULL &&
 		g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE)
+	{
 		g_io_channel_shutdown (channel, TRUE, NULL);
+	}
 
-	gtk_main_quit ();
-}
-
-static void
-zenity_tree_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path,
-	GtkTreeViewColumn *tree_col, gpointer data) {
-	ZenityData *zen_data = data;
-
-	zenity_tree_dialog_output ();
-	zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
-	gtk_main_quit ();
-}
-
-static gboolean
-zenity_tree_column_is_hidden (gint column_index) {
-	gint i;
-
-	if (hide_columns != NULL)
-		for (i = 0; hide_columns[i] != 0; i++)
-			if (hide_columns[i] == column_index)
-				return TRUE;
-
-	return FALSE;
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }
 
-static gint *
-zenity_tree_extract_column_indexes (char *indexes, int n_columns) {
-	char **tmp;
-	gint *result;
-	gint i, j, index;
+static int *
+zenity_tree_extract_column_indexes (char *indexes, int n_columns)
+{
+	g_auto(GStrv) tmp;
+	int *result;
+	int i, j, index;
 
 	tmp = g_strsplit (indexes, PRINT_HIDE_COLUMN_SEPARATOR, 0);
 
-	result = g_new (gint, 1);
+	result = g_new (int, 1);
 
-	for (j = i = 0; tmp[i] != NULL; i++) {
+	for (j = i = 0; tmp[i] != NULL; i++)
+	{
 		index = atoi (tmp[i]);
 
-		if (index > 0 && index <= n_columns) {
+		if (index > 0 && index <= n_columns)
+		{
 			result[j] = index;
 			j++;
-			result = g_renew (gint, result, j + 1);
+			result = g_renew (int, result, j + 1);
 		}
 	}
 	result[j] = 0;
 
-	g_strfreev (tmp);
-
 	return result;
 }
diff --git a/src/util.c b/src/util.c
index 2887fd96..13440130 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,22 +1,25 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * util.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
- *           (C) 1999, 2000 Red Hat Inc.
- *           (C) 1998 James Henstridge
- *           (C) 1995-2002 Free Software Foundation
+ * Copyright © 2002 Sun Microsystems, Inc.
+ *           © 1999, 2000 Red Hat Inc.
+ *           © 1998 James Henstridge
+ *           © 1995-2002 Free Software Foundation
+ *           © 2021-2023 Logan Rathbone
  *
  * 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.
  *
  * 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
+ * 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.
@@ -27,11 +30,9 @@
  *          Tom Tromey <tromey@redhat.com>
  */
 
-#include "config.h"
-
-#include "config.h"
 #include "util.h"
 #include "zenity.h"
+
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
@@ -39,25 +40,49 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
+#include "config.h"
 
 #define ZENITY_OK_DEFAULT 0
 #define ZENITY_CANCEL_DEFAULT 1
 #define ZENITY_ESC_DEFAULT 1
 #define ZENITY_ERROR_DEFAULT -1
 #define ZENITY_EXTRA_DEFAULT 127
+#define ZENITY_UI_RESOURCE_PATH RESOURCE_BASE_PATH "/zenity.ui"
+
+GIcon *
+zenity_util_gicon_from_string (const char *str)
+{
+	GIcon *icon = NULL;
+	g_autoptr(GFile) icon_file = NULL;
+
+	if (str)
+	{
+		icon_file = g_file_new_for_path (str);
+
+		if (g_file_query_exists (icon_file, NULL))
+		{
+			icon = g_file_icon_new (icon_file);
+		}
+		else
+		{
+			g_debug (_("Icon filename %s not found; trying theme icon."), str);
+			icon = g_themed_icon_new_with_default_fallbacks (str);
+		}
+	}
+
+	return icon;
+}
 
 GtkBuilder *
-zenity_util_load_ui_file (const gchar *root_widget, ...) {
+zenity_util_load_ui_file (const char *root_widget, ...)
+{
 	va_list args;
-	gchar *arg = NULL;
+	char *arg = NULL;
 	GPtrArray *ptrarray;
 	GtkBuilder *builder = gtk_builder_new ();
-	GError *error = NULL;
-	gchar **objects;
-	guint result = 0;
+	g_autoptr(GError) error = NULL;
+	char **objects;
+	gboolean result = FALSE;
 
 	gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
 
@@ -68,43 +93,47 @@ zenity_util_load_ui_file (const gchar *root_widget, ...) {
 
 	va_start (args, root_widget);
 
-	arg = va_arg (args, gchar *);
+	arg = va_arg (args, char *);
 
 	while (arg) {
 		g_ptr_array_add (ptrarray, g_strdup (arg));
-		arg = va_arg (args, gchar *);
+		arg = va_arg (args, char *);
 	}
 	va_end (args);
 
 	/* Enforce terminating NULL */
 	g_ptr_array_add (ptrarray, NULL);
-	objects = (gchar **) g_ptr_array_free (ptrarray, FALSE);
+	objects = (char **)g_ptr_array_free (ptrarray, FALSE);
 
-	if (g_file_test (ZENITY_UI_FILE_RELATIVEPATH, G_FILE_TEST_EXISTS)) {
-		/* Try current dir, for debugging */
-		result = gtk_builder_add_objects_from_file (
-			builder, ZENITY_UI_FILE_RELATIVEPATH, objects, NULL);
-	}
+	/* Make sure this custom widget type is registered before this initial
+	 * GtkBuilder method call. */
+	g_type_ensure (ZENITY_TREE_TYPE_COLUMN_VIEW);
 
-	if (result == 0)
-		result = gtk_builder_add_objects_from_file (
-			builder, ZENITY_UI_FILE_FULLPATH, objects, &error);
+	result = gtk_builder_add_objects_from_resource (builder,
+			ZENITY_UI_RESOURCE_PATH,
+			(const char **)objects,
+			&error);
 
 	g_strfreev (objects);
 
-	if (result == 0) {
-		g_warning ("Could not load ui file %s: %s",
-			ZENITY_UI_FILE_FULLPATH,
-			error->message);
-		g_error_free (error);
-		g_object_unref (builder);
-		return NULL;
+	if (! result) {
+		g_error ("Could not load ui resource %s: %s",
+				ZENITY_UI_RESOURCE_PATH,
+				error->message);
+	}
+
+	/* This should never happen, but if an unexpected error is logged, print
+	 * it for debugging purposes. */
+	if (error) {
+		g_debug ("%s: Error generated: %s",
+				__func__, error->message);
 	}
 
 	return builder;
 }
-gchar *
-zenity_util_strip_newline (gchar *string) {
+
+char *
+zenity_util_strip_newline (char *string) {
 	gsize len;
 
 	g_return_val_if_fail (string != NULL, NULL);
@@ -121,11 +150,11 @@ zenity_util_strip_newline (gchar *string) {
 }
 
 gboolean
-zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename) {
+zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const char *filename) {
 	GtkTextIter iter, end;
 	FILE *f;
-	gchar buf[2048];
-	gint remaining = 0;
+	char buf[2048];
+	int remaining = 0;
 
 	if (filename == NULL)
 		return FALSE;
@@ -140,7 +169,7 @@ zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename) {
 	gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
 
 	while (!feof (f)) {
-		gint count;
+		int count;
 		const char *leftover;
 		int to_read = 2047 - remaining;
 
@@ -153,7 +182,7 @@ zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename) {
 		gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf);
 
 		remaining = (buf + remaining + count) - leftover;
-		memmove (buf, leftover, remaining);
+		memmove(buf, leftover, remaining);
 
 		if (remaining > 6 || count < to_read)
 			break;
@@ -177,79 +206,19 @@ zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename) {
 	return TRUE;
 }
 
-const gchar *
-zenity_util_icon_name_from_filename (const gchar *filename) {
-	if (!filename || !filename[0])
-		return "dialog-warning"; /* default */
-
-	if (!g_ascii_strcasecmp (filename, "warning"))
-		return "dialog-warning";
-	if (!g_ascii_strcasecmp (filename, "info"))
-		return "dialog-information";
-	if (!g_ascii_strcasecmp (filename, "question"))
-		return "dialog-question";
-	if (!g_ascii_strcasecmp (filename, "error"))
-		return "dialog-error";
-	return NULL;
-}
-
-void
-zenity_util_set_window_icon_from_file (
-	GtkWidget *widget, const gchar *filename) {
-	GdkPixbuf *pixbuf;
-	const gchar *icon_name;
-
-	icon_name = zenity_util_icon_name_from_filename (filename);
-	if (icon_name) {
-		gtk_window_set_icon_name (GTK_WINDOW (widget), icon_name);
-	} else {
-		pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-		gtk_window_set_icon (GTK_WINDOW (widget), pixbuf);
-		g_object_unref (pixbuf);
-	}
-}
-
-void
-zenity_util_set_window_icon (
-	GtkWidget *widget, const gchar *filename, const gchar *default_file) {
-	GdkPixbuf *pixbuf;
-
-	if (filename != NULL) {
-		zenity_util_set_window_icon_from_file (widget, filename);
-	} else {
-		pixbuf = gdk_pixbuf_new_from_file (default_file, NULL);
-		if (pixbuf != NULL) {
-			gtk_window_set_icon (GTK_WINDOW (widget), pixbuf);
-			g_object_unref (pixbuf);
-		}
-	}
-}
-
-void
-zenity_util_set_window_icon_from_icon_name (
-	GtkWidget *widget, const gchar *filename, const gchar *default_icon_name) {
-	if (filename != NULL)
-		zenity_util_set_window_icon_from_file (widget, filename);
-	else
-		gtk_window_set_icon_name (GTK_WINDOW (widget), default_icon_name);
-}
-
 void
 zenity_util_show_help (GError **error) {
-	gchar *tmp;
-	tmp = g_find_program_in_path ("yelp");
+	g_autofree char *tmp = g_find_program_in_path ("yelp");
 
-	if (tmp) {
-		g_free (tmp);
+	if (tmp)
 		g_spawn_command_line_async ("yelp help:zenity", error);
-	}
 }
 
-gint
-zenity_util_return_exit_code (ZenityExitCode value) {
-
-	const gchar *env_var = NULL;
-	gint retval;
+int
+zenity_util_return_exit_code (ZenityExitCode value)
+{
+	const char *env_var = NULL;
+	int retval;
 
 	switch (value) {
 
@@ -311,108 +280,239 @@ zenity_util_return_exit_code (ZenityExitCode value) {
 }
 
 void
-zenity_util_exit_code_with_data (ZenityExitCode value, ZenityData *zen_data) {
+zenity_util_exit_code_with_data (ZenityExitCode value, ZenityData *zen_data)
+{
 	zen_data->exit_code = zenity_util_return_exit_code (value);
 }
 
-#ifdef GDK_WINDOWING_X11
-
-static Window
-transient_get_xterm (void) {
-	const char *wid_str = g_getenv ("WINDOWID");
-	if (wid_str) {
-		char *wid_str_end;
-		int ret;
-		Window wid = strtoul (wid_str, &wid_str_end, 10);
-		if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0) {
-			XWindowAttributes attrs;
-			GdkDisplay *display;
-			display = gdk_display_get_default ();
-			gdk_x11_display_error_trap_push (display);
-			ret = XGetWindowAttributes (
-				GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wid, &attrs);
-			if (gdk_x11_display_error_trap_pop (display) != 0 || ret == 0) {
-				return None;
-			}
-			return wid;
+/* This function was written by Matthias Clasen and is included somewhere in
+ * the GTK source tree.. I believe it is also included in libdazzle, but I
+ * didn't want to include a whole dependency just for one function. LGPL, but
+ * credit where credit is due!
+ */
+char *
+zenity_util_pango_font_description_to_css (PangoFontDescription *desc)
+{
+	GString *s;
+	PangoFontMask set;
+
+	s = g_string_new ("* { ");
+
+	set = pango_font_description_get_set_fields (desc);
+	if (set & PANGO_FONT_MASK_FAMILY)
+	{
+		g_string_append (s, "font-family: ");
+		g_string_append (s, pango_font_description_get_family (desc));
+		g_string_append (s, "; ");
+	}
+	if (set & PANGO_FONT_MASK_STYLE)
+	{
+		switch (pango_font_description_get_style (desc))
+		{
+			case PANGO_STYLE_NORMAL:
+				g_string_append (s, "font-style: normal; ");
+				break;
+			case PANGO_STYLE_OBLIQUE:
+				g_string_append (s, "font-style: oblique; ");
+				break;
+			case PANGO_STYLE_ITALIC:
+				g_string_append (s, "font-style: italic; ");
+				break;
 		}
 	}
-	return None;
-}
+	if (set & PANGO_FONT_MASK_VARIANT)
+	{
+		switch (pango_font_description_get_variant (desc))
+		{
+			case PANGO_VARIANT_NORMAL:
+				g_string_append (s, "font-variant: normal; ");
+				break;
+			case PANGO_VARIANT_SMALL_CAPS:
+				g_string_append (s, "font-variant: small-caps; ");
+				break;
+			default:
+				break;
+		}
+	}
+	if (set & PANGO_FONT_MASK_WEIGHT)
+	{
+		switch (pango_font_description_get_weight (desc))
+		{
+			case PANGO_WEIGHT_THIN:
+				g_string_append (s, "font-weight: 100; ");
+				break;
+			case PANGO_WEIGHT_ULTRALIGHT:
+				g_string_append (s, "font-weight: 200; ");
+				break;
+			case PANGO_WEIGHT_LIGHT:
+			case PANGO_WEIGHT_SEMILIGHT:
+				g_string_append (s, "font-weight: 300; ");
+				break;
+			case PANGO_WEIGHT_BOOK:
+			case PANGO_WEIGHT_NORMAL:
+				g_string_append (s, "font-weight: 400; ");
+				break;
+			case PANGO_WEIGHT_MEDIUM:
+				g_string_append (s, "font-weight: 500; ");
+				break;
+			case PANGO_WEIGHT_SEMIBOLD:
+				g_string_append (s, "font-weight: 600; ");
+				break;
+			case PANGO_WEIGHT_BOLD:
+				g_string_append (s, "font-weight: 700; ");
+				break;
+			case PANGO_WEIGHT_ULTRABOLD:
+				g_string_append (s, "font-weight: 800; ");
+				break;
+			case PANGO_WEIGHT_HEAVY:
+			case PANGO_WEIGHT_ULTRAHEAVY:
+				g_string_append (s, "font-weight: 900; ");
+				break;
+		}
+	}
+	if (set & PANGO_FONT_MASK_STRETCH)
+	{
+		switch (pango_font_description_get_stretch (desc))
+		{
+			case PANGO_STRETCH_ULTRA_CONDENSED:
+				g_string_append (s, "font-stretch: ultra-condensed; ");
+				break;
+			case PANGO_STRETCH_EXTRA_CONDENSED:
+				g_string_append (s, "font-stretch: extra-condensed; ");
+				break;
+			case PANGO_STRETCH_CONDENSED:
+				g_string_append (s, "font-stretch: condensed; ");
+				break;
+			case PANGO_STRETCH_SEMI_CONDENSED:
+				g_string_append (s, "font-stretch: semi-condensed; ");
+				break;
+			case PANGO_STRETCH_NORMAL:
+				g_string_append (s, "font-stretch: normal; ");
+				break;
+			case PANGO_STRETCH_SEMI_EXPANDED:
+				g_string_append (s, "font-stretch: semi-expanded; ");
+				break;
+			case PANGO_STRETCH_EXPANDED:
+				g_string_append (s, "font-stretch: expanded; ");
+				break;
+			case PANGO_STRETCH_EXTRA_EXPANDED:
+				g_string_append (s, "font-stretch: extra-expanded; ");
+				break;
+			case PANGO_STRETCH_ULTRA_EXPANDED:
+				g_string_append (s, "font-stretch: ultra-expanded; ");
+				break;
+		}
+	}
+	if (set & PANGO_FONT_MASK_SIZE)
+	{
+		g_string_append_printf (s, "font-size: %dpt; ",
+				pango_font_description_get_size (desc) / PANGO_SCALE);
+	}
 
-static void
-transient_x_free (void *ptr) {
-	if (ptr)
-		XFree (ptr);
-}
+	g_string_append (s, "}");
 
-static gboolean
-transient_is_toplevel (Window wid) {
-	XTextProperty prop;
-	Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-	if (!XGetWMName (dpy, wid, &prop))
-		return FALSE;
-	transient_x_free (prop.value);
-	return !!prop.value;
+	return g_string_free (s, FALSE);
 }
 
-/*
- * GNOME Terminal doesn't give us its toplevel window, but the WM needs a
- * toplevel XID for proper stacking.  Other terminals work fine without this
- * magic.  We can't use GDK here since "xterm" is a foreign window.
- */
+void
+zenity_util_show_dialog (GtkWidget *dialog)
+{
+	gtk_widget_show (dialog);
+}
 
-static Window
-transient_get_xterm_toplevel (void) {
-	Window xterm = transient_get_xterm ();
-	Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-	while (xterm != None && !transient_is_toplevel (xterm)) {
-		Window root, parent, *children;
-		unsigned nchildren;
-		XQueryTree (dpy, xterm, &root, &parent, &children, &nchildren);
-		transient_x_free (children);
-		if (parent == root)
-			xterm = None;
-		else
-			xterm = parent;
+gboolean
+zenity_util_timeout_handle (AdwMessageDialog *dialog)
+{
+	if (dialog) {
+		adw_message_dialog_response (dialog, "timeout");
+	}
+	else {
+		exit (ZENITY_TIMEOUT);
 	}
-	return xterm;
+	return FALSE;
 }
 
-static void
-zenity_util_make_transient (GdkWindow *window, Window parent) {
-	Window parent_window = parent;
-	if (parent_window == 0)
-		parent_window = transient_get_xterm_toplevel ();
-	if (parent_window != None) {
-		XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-			GDK_WINDOW_XID (window),
-			parent_window);
+void
+zenity_util_gapp_main (GtkWindow *window)
+{
+	GApplication *app = g_application_get_default ();
+
+	if (window)
+	{
+		/* As this behaves quite differently if a window is provided vs. not,
+		 * let's ensure any window passed is valid.
+		 */
+		g_assert (GTK_IS_WINDOW (window));
+
+		gtk_application_add_window (GTK_APPLICATION(app), window);
+	}
+	else {
+		g_application_hold (g_application_get_default ());
 	}
 }
 
-#endif /* GDK_WINDOWING_X11 */
-
 void
-zenity_util_show_dialog (GtkWidget *dialog, guintptr parent) {
-	gtk_widget_realize (dialog);
-#ifdef GDK_WINDOWING_X11
-	if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
-		g_assert (gtk_widget_get_window (dialog));
-		zenity_util_make_transient (gtk_widget_get_window (dialog), parent);
+zenity_util_gapp_quit (GtkWindow *window, ZenityData *data)
+{
+	static gboolean quit_requested = FALSE;
+
+	if (quit_requested)
+	{
+		g_debug ("%s: Quit request already pending. Ignoring superfluous quit request.", __func__);
+		return;
 	}
-#endif
-	gtk_widget_show (dialog);
+
+	/* This is a bit hack-ish, but GApplication doesn't really allow for
+	 * customized exit statuses within that API.
+	 */
+	if (data->exit_code != 0)
+		exit (data->exit_code);
+
+	if (window)
+		gtk_window_destroy (window);
+	else
+		g_application_release (g_application_get_default ());
+
+	quit_requested = TRUE;
 }
 
-gboolean
-zenity_util_timeout_handle (gpointer data) {
-	GtkDialog *dialog = GTK_DIALOG (data);
-	if (dialog != NULL)
-		gtk_dialog_response (dialog, ZENITY_TIMEOUT);
-	else {
-		gtk_main_quit ();
-		exit (ZENITY_TIMEOUT);
+int
+zenity_util_parse_dialog_response (const char *response)
+{
+	if (g_strcmp0 (response, "ok") == 0 || g_strcmp0 (response, "yes") == 0)
+	{
+		return ZENITY_OK;
 	}
-	return FALSE;
+	else if (g_strcmp0 (response, "cancel") == 0 || g_strcmp0 (response, "no") == 0)
+	{
+		return ZENITY_CANCEL;
+	}
+	else if (g_strcmp0 (response, "timeout") == 0)
+	{
+		return ZENITY_TIMEOUT;
+	}
+	else if (response[0] >= '0' && response[0] <= '9')
+	{
+		/* FIXME - atoi returns 0 on error, so this *could* mean the function
+		 * failed - but that would be a programmer error, so we'll leave this
+		 * in place.
+		 */
+		return atoi (response);
+	}
+	else
+	{
+		return ZENITY_ESC;
+	}
+}
+
+GtkWidget *
+zenity_util_add_button (AdwMessageDialog *dialog, const char *button_text,
+		ZenityExitCode response_id)
+{
+	GtkWidget *w = GTK_WIDGET(dialog);
+	g_autofree char *response_str = g_strdup_printf ("%d", response_id);
+
+	adw_message_dialog_add_response (dialog, response_str, button_text);
+
+	return w;
 }
diff --git a/src/util.h b/src/util.h
index 3e5391b2..54081a62 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,35 +1,76 @@
-#ifndef UTIL_H
-#define UTIL_H
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
+/*
+ * util.h
+ *
+ * Copyright © 2002 Sun Microsystems, Inc.
+ *           © 1999, 2000 Red Hat Inc.
+ *           © 1998 James Henstridge
+ *           © 1995-2002 Free Software Foundation
+ *           © 2021-2023 Logan Rathbone
+ *
+ * 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 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, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Original Authors of util.c (inferring they were the authors of
+ * this file as well):
+ *
+ * 			Glynn Foster <glynn.foster@sun.com>
+ *          Havoc Pennington <hp@redhat.com>
+ *          James Henstridge <james@daa.com.au>
+ *          Tom Tromey <tromey@redhat.com>
+ */
+
+#pragma once
 
 #include "zenity.h"
+#include "zenity-tree-column-view.h"
+
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-#define ZENITY_UI_FILE_FULLPATH ZENITY_DATADIR "/zenity.ui"
-#define ZENITY_UI_FILE_RELATIVEPATH "./zenity.ui"
-
-#define ZENITY_IMAGE_FULLPATH(filename) (ZENITY_DATADIR "/" filename)
-
-GtkBuilder *zenity_util_load_ui_file (
-	const gchar *widget_root, ...) G_GNUC_NULL_TERMINATED;
-gchar *zenity_util_strip_newline (gchar *string);
-gboolean zenity_util_fill_file_buffer (
-	GtkTextBuffer *buffer, const gchar *filename);
-const gchar *zenity_util_icon_name_from_filename (const gchar *filename);
-void zenity_util_set_window_icon (
-	GtkWidget *widget, const gchar *filename, const gchar *default_file);
-void zenity_util_set_window_icon_from_icon_name (
-	GtkWidget *widget, const gchar *filename, const gchar *default_icon_name);
-void zenity_util_set_window_icon_from_file (
-	GtkWidget *widget, const gchar *filename);
+#define ZENITY_IMAGE_FULLPATH(filename) (PACKAGE_DATADIR "/" filename)
+
+#define ZENITY_UTIL_ADD_EXTRA_LABELS(DIALOG) \
+	for (int i = 0; data->extra_label[i] != NULL; ++i) { \
+		zenity_util_add_button (ADW_MESSAGE_DIALOG (DIALOG), data->extra_label[i], i); \
+	}
+
+#define ZENITY_UTIL_SETUP_OK_BUTTON_LABEL(DIALOG) \
+	adw_message_dialog_set_response_label (ADW_MESSAGE_DIALOG(DIALOG), "ok", data->ok_label);
+
+#define ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL(DIALOG) \
+	adw_message_dialog_set_response_label (ADW_MESSAGE_DIALOG(DIALOG), "cancel", data->cancel_label);
+
+GIcon *zenity_util_gicon_from_string (const char *str);
+GtkBuilder *zenity_util_load_ui_file (const char *widget_root,
+		...) G_GNUC_NULL_TERMINATED;
+char *zenity_util_strip_newline (char *string);
+gboolean zenity_util_fill_file_buffer (GtkTextBuffer *buffer,
+		const char *filename);
 void zenity_util_show_help (GError **error);
-gint zenity_util_return_exit_code (ZenityExitCode value);
+int zenity_util_return_exit_code (ZenityExitCode value);
 void zenity_util_exit_code_with_data (ZenityExitCode value, ZenityData *data);
-void zenity_util_show_dialog (GtkWidget *widget, guintptr parent);
-
-gboolean zenity_util_timeout_handle (gpointer data);
+void zenity_util_show_dialog (GtkWidget *widget);
+gboolean zenity_util_timeout_handle (AdwMessageDialog *dialog);
+char *zenity_util_pango_font_description_to_css (PangoFontDescription *desc);
+void zenity_util_gapp_main (GtkWindow *window);
+void zenity_util_gapp_quit (GtkWindow *window, ZenityData *data);
+ZenityExitCode zenity_util_parse_dialog_response (const char *response);
+GtkWidget *zenity_util_add_button (AdwMessageDialog *dialog, const char
+		*button_text, ZenityExitCode response_id);
 
 G_END_DECLS
-
-#endif /* UTIL_H */
diff --git a/src/zenity-tree-column-view.c b/src/zenity-tree-column-view.c
new file mode 100644
index 00000000..5117f954
--- /dev/null
+++ b/src/zenity-tree-column-view.c
@@ -0,0 +1,702 @@
+/* vim: ts=4 sw=4
+ */
+/*
+ * zenity-tree-column-view.c
+ *
+ * Copyright © 2023 Logan Rathbone
+ *
+ * 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 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, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "zenity-tree-column-view.h"
+#include <config.h>
+
+#define UI_FILE RESOURCE_BASE_PATH "/zenity-tree-column-view.ui"
+
+/* ZenityTreeItem */
+
+enum zenity_tree_item_prop_enum
+{
+	TEXT = 1,
+	CHILD,
+	N_PROPERTIES_ZENITY_TREE_ITEM
+};
+
+static GParamSpec *zenity_tree_item_properties[N_PROPERTIES_ZENITY_TREE_ITEM];
+
+struct _ZenityTreeItem
+{
+	GObject parent_instance;
+	GtkWidget *child;
+	char *text;
+};
+
+G_DEFINE_TYPE (ZenityTreeItem, zenity_tree_item, G_TYPE_OBJECT)
+
+static void
+zenity_tree_item_set_property (GObject *object,
+		guint property_id,
+		const GValue *value,
+		GParamSpec *pspec)
+{
+	ZenityTreeItem *self = ZENITY_TREE_ITEM(object);
+
+	switch (property_id)
+	{
+		case TEXT:
+			zenity_tree_item_set_text (self, g_value_get_string (value));
+			break;
+
+		case CHILD:
+			zenity_tree_item_set_child (self, GTK_WIDGET(g_value_get_object (value)));
+			break;
+
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+			break;
+	}
+}
+
+static void
+zenity_tree_item_get_property (GObject *object,
+		guint property_id,
+		GValue *value,
+		GParamSpec *pspec)
+{
+	ZenityTreeItem *self = ZENITY_TREE_ITEM(object);
+
+	switch (property_id)
+	{
+		case TEXT:
+			g_value_set_string (value, zenity_tree_item_get_text (self));
+			break;
+
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+			break;
+	}
+}
+static void
+zenity_tree_item_init (ZenityTreeItem *item)
+{
+}
+
+static void
+zenity_tree_item_dispose (GObject *object)
+{
+	ZenityTreeItem *self = ZENITY_TREE_ITEM(object);
+
+	if (g_object_is_floating (self->child))
+		g_warning ("%s: trying to dispose ZenityTreeItem before the widget has been parented. "
+				"Likely a programmer error. A leak will likely result.", __func__);
+	else
+		g_clear_object (&self->child);
+
+	G_OBJECT_CLASS(zenity_tree_item_parent_class)->dispose (object);
+}
+
+static void
+zenity_tree_item_finalize (GObject *object)
+{
+	ZenityTreeItem *self = ZENITY_TREE_ITEM(object);
+
+	g_free (self->text);
+
+	G_OBJECT_CLASS(zenity_tree_item_parent_class)->finalize (object);
+}
+
+static void
+zenity_tree_item_class_init (ZenityTreeItemClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+	GParamFlags flags = G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT;
+
+	object_class->dispose = zenity_tree_item_dispose;
+	object_class->finalize = zenity_tree_item_finalize;
+	object_class->set_property = zenity_tree_item_set_property;
+	object_class->get_property = zenity_tree_item_get_property;
+
+	zenity_tree_item_properties[TEXT] = g_param_spec_string ("text", NULL, NULL, NULL, flags);
+	zenity_tree_item_properties[CHILD] = g_param_spec_object ("child", NULL, NULL, GTK_TYPE_WIDGET, flags);
+
+	g_object_class_install_properties (object_class, N_PROPERTIES_ZENITY_TREE_ITEM, zenity_tree_item_properties);
+}
+
+GtkWidget *
+zenity_tree_item_get_child (ZenityTreeItem *item)
+{
+	return item->child;
+}
+
+const char *
+zenity_tree_item_get_text (ZenityTreeItem *item)
+{
+	return item->text;
+}
+
+void
+zenity_tree_item_set_text (ZenityTreeItem *self, const char *text)
+{
+	g_clear_pointer (&self->text, g_free);
+	self->text = g_strdup (text);
+
+	g_object_notify_by_pspec (G_OBJECT(self), zenity_tree_item_properties[TEXT]);
+}
+
+void
+zenity_tree_item_set_child (ZenityTreeItem *self, GtkWidget *child)
+{
+	if (self->child)
+		g_object_unref (self->child);
+
+	self->child = g_object_ref (child);
+
+	g_object_notify_by_pspec (G_OBJECT(self), zenity_tree_item_properties[CHILD]);
+}
+
+ZenityTreeItem *
+zenity_tree_item_new (const char *text, GtkWidget *child)
+{
+	ZenityTreeItem *item;
+
+	g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
+
+	item = g_object_new (ZENITY_TREE_TYPE_ITEM,
+			"text", text,
+			"child", child,
+			NULL);
+
+	return item;
+}
+
+/* ZenityTreeRow */
+
+struct _ZenityTreeRow
+{
+	GObject parent_instance;
+	GPtrArray *items;
+};
+
+G_DEFINE_TYPE (ZenityTreeRow, zenity_tree_row, G_TYPE_OBJECT)
+
+static void
+zenity_tree_row_init (ZenityTreeRow *self)
+{
+	self->items = g_ptr_array_new ();
+}
+
+static void
+zenity_tree_row_class_init (ZenityTreeRowClass *klass)
+{
+}
+
+ZenityTreeRow *
+zenity_tree_row_new (void)
+{
+	return g_object_new (ZENITY_TREE_TYPE_ROW, NULL);
+}
+
+void
+zenity_tree_row_add (ZenityTreeRow *row, ZenityTreeItem *item)
+{
+	g_ptr_array_add (row->items, item);
+}
+
+guint
+zenity_tree_row_get_n_items (ZenityTreeRow *row)
+{
+	return row->items->len;
+}
+
+ZenityTreeItem *
+zenity_tree_row_get_item (ZenityTreeRow *row, guint index)
+{
+	g_return_val_if_fail (index < row->items->len, NULL);
+
+	return row->items->pdata[index];
+}
+
+/* ZenityTreeColumnView */
+
+enum zenity_tree_column_view_signal_enum {
+	ACTIVATED,
+	LAST_SIGNAL
+};
+
+static guint zenity_tree_column_view_signals[LAST_SIGNAL];
+
+enum zenity_tree_column_view_prop_enum
+{
+	MULTI = 1,
+	LIST_TYPE,
+	MODEL,
+	N_PROPERTIES_ZENITY_TREE_COLUMN_VIEW
+};
+
+static GParamSpec *zenity_tree_column_view_properties[N_PROPERTIES_ZENITY_TREE_COLUMN_VIEW];
+
+struct _ZenityTreeColumnView
+{
+	GtkWidget parent_instance;
+	GtkWidget *scrolled_window;
+	GtkColumnView *child_cv;
+	gboolean multi;
+	ZenityTreeListType list_type;
+	GListModel *model;
+	GtkStringFilter *filter;
+	GtkCheckButton *initial_checkbutton_group;
+};
+
+G_DEFINE_TYPE (ZenityTreeColumnView, zenity_tree_column_view, GTK_TYPE_WIDGET)
+
+/* Callback for the GClosure defined below. Just cram the text from all row
+ * items into a single string; that way, if the string in the searchbar matches
+ * any text in a given row, there will be a match, and only those rows will be
+ * shown.
+ */
+static char *
+eval_str (ZenityTreeRow *row)
+{
+	GString *gstring;
+
+	g_return_val_if_fail (ZENITY_TREE_IS_ROW (row), NULL);
+
+	gstring = g_string_new (NULL);
+
+	for (guint i = 0; i < row->items->len; ++i)
+	{
+		ZenityTreeItem *item = row->items->pdata[i];
+		g_string_append_printf (gstring, "%s ", item->text);
+	}
+
+	return g_string_free (gstring, FALSE);
+}
+
+void
+zenity_tree_column_view_set_model (ZenityTreeColumnView *self, GListModel *model)
+{
+	GtkStringFilter *filter;
+	GtkFilterListModel *filter_model;
+
+	GtkExpression *expr;
+
+	/* This tells the column view to use a callback with 'this' (ZenityTreeRow)
+	 * as the instance and no other params or user_data, with a string retval.
+	 */
+	expr = gtk_cclosure_expression_new (G_TYPE_STRING,
+			NULL,					/* GClosureMarshal marshal, */
+			0, 						/* guint n_params, */
+			NULL,					/* GtkExpression** params, */
+			G_CALLBACK(eval_str),	/* GCallback callback_func, */
+			NULL,					/* gpointer user_data, */
+			NULL);					/* GClosureNotify user_destroy) */
+
+	filter = gtk_string_filter_new (expr);
+	filter_model = gtk_filter_list_model_new (model, GTK_FILTER(filter));
+
+	self->model = model;
+	self->filter = filter;
+
+	if (self->multi)
+	{
+		gtk_column_view_set_model (self->child_cv,
+				GTK_SELECTION_MODEL(gtk_multi_selection_new (G_LIST_MODEL(filter_model))));
+	}
+	else
+	{
+		gtk_column_view_set_model (self->child_cv,
+				GTK_SELECTION_MODEL(gtk_single_selection_new (G_LIST_MODEL(filter_model))));
+	}
+
+	g_object_notify_by_pspec (G_OBJECT(self), zenity_tree_column_view_properties[MODEL]);
+}
+
+GListModel *
+zenity_tree_column_view_get_model (ZenityTreeColumnView *self)
+{
+	return self->model;
+}
+
+static void
+zenity_tree_column_view_emit_activated (ZenityTreeColumnView *self)
+{
+	g_signal_emit (self, zenity_tree_column_view_signals[ACTIVATED], 0);
+}
+
+static void
+cv_check_or_radio_activated_cb (ZenityTreeColumnView *self, guint position, GtkColumnView *cv)
+{
+	GListModel *model = zenity_tree_column_view_get_model (self);
+	ZenityTreeRow *row = g_list_model_get_item (model, position);
+	ZenityTreeItem *item = zenity_tree_row_get_item (row, 0);
+	GtkWidget *item_child = zenity_tree_item_get_child (item);
+	GtkCheckButton *cb;
+
+	if (! GTK_IS_CHECK_BUTTON (item_child))
+		return;
+
+	cb = GTK_CHECK_BUTTON(item_child);
+
+	switch (self->list_type)
+	{
+		case ZENITY_TREE_LIST_CHECK:
+			gtk_check_button_set_active (cb, !gtk_check_button_get_active (cb));
+			break;
+
+		case ZENITY_TREE_LIST_RADIO:
+			gtk_check_button_set_active (cb, TRUE);
+			break;
+
+		default:
+			g_warning ("%s: Programmer error: invalid list type.", __func__);
+			break;
+	}
+}
+
+void
+zenity_tree_column_view_set_list_type (ZenityTreeColumnView *self, ZenityTreeListType type)
+{
+	self->list_type = type;
+
+	g_signal_handlers_disconnect_by_func (self->child_cv, zenity_tree_column_view_emit_activated, self);
+
+	switch (self->list_type)
+	{
+		case ZENITY_TREE_LIST_NONE:
+		case ZENITY_TREE_LIST_IMAGE:
+			gtk_column_view_set_single_click_activate (self->child_cv, FALSE);
+			g_signal_connect_swapped (self->child_cv, "activate", G_CALLBACK(zenity_tree_column_view_emit_activated), self);
+			break;
+
+		case ZENITY_TREE_LIST_RADIO:
+		case ZENITY_TREE_LIST_CHECK:
+			gtk_column_view_set_single_click_activate (self->child_cv, TRUE);
+			g_signal_connect_swapped (self->child_cv, "activate", G_CALLBACK(cv_check_or_radio_activated_cb), self);
+			break;
+
+		default:
+			g_warning ("%s: Invalid ZenityTreeListType provided.", __func__);
+			break;
+	}
+
+	g_object_notify_by_pspec (G_OBJECT(self), zenity_tree_column_view_properties[LIST_TYPE]);
+}
+
+ZenityTreeListType
+zenity_tree_column_view_get_list_type (ZenityTreeColumnView *self)
+{
+	return self->list_type;
+}
+
+gboolean
+zenity_tree_column_view_get_multi (ZenityTreeColumnView *self)
+{
+	return self->multi;
+}
+
+static void
+zenity_tree_column_view_set_property (GObject *object,
+		guint property_id,
+		const GValue *value,
+		GParamSpec *pspec)
+{
+	ZenityTreeColumnView *self = ZENITY_TREE_COLUMN_VIEW(object);
+
+	switch (property_id)
+	{
+		case MULTI:
+			self->multi = g_value_get_boolean (value);
+			break;
+
+		case LIST_TYPE:
+			zenity_tree_column_view_set_list_type (self, g_value_get_enum (value));
+			break;
+
+		case MODEL:
+			zenity_tree_column_view_set_model (self, G_LIST_MODEL(g_value_get_object (value)));
+			break;
+
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+			break;
+	}
+}
+
+static void
+zenity_tree_column_view_get_property (GObject *object,
+		guint property_id,
+		GValue *value,
+		GParamSpec *pspec)
+{
+	ZenityTreeColumnView *self = ZENITY_TREE_COLUMN_VIEW(object);
+
+	switch (property_id)
+	{
+		case MULTI:
+			g_value_set_boolean (value, self->multi);
+			break;
+
+		case LIST_TYPE:
+			g_value_set_enum (value, zenity_tree_column_view_get_list_type (self));
+			break;
+
+		case MODEL:
+			g_value_set_object (value, G_OBJECT(zenity_tree_column_view_get_model (self)));
+			break;
+
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+			break;
+	}
+}
+
+static void
+zenity_tree_column_view_dispose (GObject *object)
+{
+	ZenityTreeColumnView *self = ZENITY_TREE_COLUMN_VIEW(object);
+
+	g_clear_pointer (&self->scrolled_window, gtk_widget_unparent);
+
+	G_OBJECT_CLASS(zenity_tree_column_view_parent_class)->dispose (object);
+}
+
+static void
+zenity_tree_column_view_init (ZenityTreeColumnView *self)
+{
+	GtkWidget *widget = GTK_WIDGET(self);
+
+	gtk_widget_init_template (widget);
+
+	gtk_widget_set_hexpand (widget, TRUE);
+	gtk_widget_set_vexpand (widget, TRUE);
+}
+
+static void
+zenity_tree_column_view_class_init (ZenityTreeColumnViewClass *klass)
+{
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+	GParamFlags flags = G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT;
+
+	object_class->dispose = zenity_tree_column_view_dispose;
+	object_class->set_property = zenity_tree_column_view_set_property;
+	object_class->get_property = zenity_tree_column_view_get_property;
+
+	zenity_tree_column_view_properties[MULTI] = g_param_spec_boolean ("multi", NULL, NULL,
+			FALSE, flags);
+	zenity_tree_column_view_properties[LIST_TYPE] = g_param_spec_enum ("list-type", NULL, NULL,
+			ZENITY_TYPE_TREE_LIST_TYPE, ZENITY_TREE_LIST_NONE, flags);
+	zenity_tree_column_view_properties[MODEL] = g_param_spec_object ("model", NULL, NULL,
+			G_TYPE_LIST_MODEL, flags);
+
+	g_object_class_install_properties (object_class, N_PROPERTIES_ZENITY_TREE_COLUMN_VIEW, zenity_tree_column_view_properties);
+
+	zenity_tree_column_view_signals[ACTIVATED] = g_signal_new_class_handler ("activated",
+			G_OBJECT_CLASS_TYPE (object_class),
+			G_SIGNAL_RUN_LAST,
+		/* no default C function */
+			NULL,
+		/* defaults for accumulator, marshaller &c. */
+			NULL, NULL, NULL,	
+		/* No return type or params. */
+			G_TYPE_NONE, 0);
+
+	gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
+
+	gtk_widget_class_set_template_from_resource (widget_class, UI_FILE);
+
+	gtk_widget_class_bind_template_child (widget_class, ZenityTreeColumnView, scrolled_window);
+	gtk_widget_class_bind_template_child (widget_class, ZenityTreeColumnView, child_cv);
+}
+
+#if 0
+static GtkWidget *
+zenity_tree_column_view_new (GListModel *model)
+{
+	g_return_val_if_fail (G_IS_LIST_MODEL (model), NULL);
+
+	return g_object_new (ZENITY_TREE_TYPE_COLUMN_VIEW,
+			"model", model,
+			NULL);
+}
+#endif
+
+static void
+editable_notify_text_cb (GtkEditable *editable, GParamSpec *pspec, ZenityTreeItem *item)
+{
+	const char *str = gtk_editable_get_text (editable);
+	zenity_tree_item_set_text (item, str);
+}
+
+static void
+factory_bind_cb (ZenityTreeColumnView *self,
+		GtkListItem *list_item,
+		GtkSignalListItemFactory *factory)
+{
+	ZenityTreeRow *row = gtk_list_item_get_item (list_item);
+	int col_index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT(factory), "col_index"));
+	ZenityTreeItem *item;
+	GtkWidget *item_child;
+	const char *item_text;
+
+	item = zenity_tree_row_get_item (row, col_index);
+	item_child = zenity_tree_item_get_child (item);
+	item_text = zenity_tree_item_get_text (item);
+	if (!gtk_widget_get_parent (item_child))
+		gtk_list_item_set_child (list_item, item_child);
+
+	gtk_widget_set_halign (item_child, GTK_ALIGN_START);
+
+	if (GTK_IS_EDITABLE (item_child))	/* handle first to capture anything editable */
+	{
+		gtk_editable_set_text (GTK_EDITABLE(item_child), item_text);
+		g_signal_connect (item_child, "notify::text", G_CALLBACK(editable_notify_text_cb), item);
+	}
+	else if (GTK_IS_LABEL (item_child))
+	{
+		gtk_label_set_text (GTK_LABEL(item_child), item_text);
+	}
+	else if (GTK_IS_CHECK_BUTTON (item_child) && item_text)
+	{
+		gboolean initialized = FALSE;
+		gboolean checked = FALSE;
+
+		if (g_object_get_data (G_OBJECT(item_child), "initialized"))
+			initialized = TRUE;
+
+		if (! initialized)
+		{
+			/* Radio-button-ize our check buttons if radio list requested
+			*/
+			if (self->list_type == ZENITY_TREE_LIST_RADIO)
+			{
+				if (!self->initial_checkbutton_group)
+				{
+					self->initial_checkbutton_group = GTK_CHECK_BUTTON(item_child);
+				}
+
+				/* Annoying - if you try to add checkbtn to its own group, gtk
+				 * spews errors instead of just returning silently.
+				 */
+				if (GTK_CHECK_BUTTON(item_child) != self->initial_checkbutton_group)	
+					gtk_check_button_set_group (GTK_CHECK_BUTTON(item_child), self->initial_checkbutton_group);
+			}
+
+			if (g_ascii_strcasecmp (item_text, "true") == 0)
+				checked = TRUE;
+
+			gtk_check_button_set_active (GTK_CHECK_BUTTON(item_child), checked);
+
+			g_object_set_data (G_OBJECT(item_child), "initialized", GINT_TO_POINTER(TRUE));
+		}
+	}
+	else if (GTK_IS_IMAGE (item_child) && item_text)
+	{
+		gtk_image_set_from_file (GTK_IMAGE(item_child), item_text);
+	}
+	else
+	{
+		g_warning ("%s: Widget type of child not implemented.", __func__);
+	}
+}
+
+void
+zenity_tree_column_view_add_column (ZenityTreeColumnView *self, const char *col_name)
+{
+	int new_col_index;
+	GtkListItemFactory *factory;
+	GtkColumnViewColumn *column;
+
+	new_col_index = zenity_tree_column_view_get_n_columns (self);
+
+	factory = gtk_signal_list_item_factory_new ();
+	g_object_set_data (G_OBJECT(factory), "col_index", GINT_TO_POINTER(new_col_index));
+	g_signal_connect_swapped (factory, "bind", G_CALLBACK (factory_bind_cb), self);
+
+	/* nb: seems the signals for the factory need to be setup first *before* creating the column. */
+
+	column = gtk_column_view_column_new (col_name, factory);
+	
+	if (new_col_index == 0 &&
+			(self->list_type == ZENITY_TREE_LIST_CHECK || self->list_type == ZENITY_TREE_LIST_RADIO))
+	{
+		gtk_column_view_column_set_resizable (column, FALSE);
+	}
+	else
+	{
+		gtk_column_view_column_set_resizable (column, TRUE);
+		gtk_column_view_column_set_expand (column, TRUE);
+	}
+
+	gtk_column_view_append_column (self->child_cv, column);
+}
+
+void
+zenity_tree_column_view_foreach_item (ZenityTreeColumnView *self, GFunc func, gpointer user_data)
+{
+	GListModel *model = zenity_tree_column_view_get_model (self);
+
+	for (guint i = 0; i < g_list_model_get_n_items (model); ++i)
+	{
+		ZenityTreeRow *row = g_list_model_get_item (model, i);
+
+		for (guint j = 0; j < zenity_tree_row_get_n_items (row); ++j)
+		{
+			ZenityTreeItem *item = zenity_tree_row_get_item (row, j);
+
+			func (item, user_data);
+		}
+	}
+}
+
+void
+zenity_tree_column_view_foreach_row (ZenityTreeColumnView *self, GFunc func, gpointer user_data)
+{
+	GListModel *model = zenity_tree_column_view_get_model (self);
+
+	for (guint i = 0; i < g_list_model_get_n_items (model); ++i)
+	{
+		ZenityTreeRow *row = g_list_model_get_item (model, i);
+		func (row, user_data);
+	}
+}
+
+int
+zenity_tree_column_view_get_n_columns (ZenityTreeColumnView *self)
+{
+	return g_list_model_get_n_items (gtk_column_view_get_columns (self->child_cv));
+}
+
+gboolean
+zenity_tree_column_view_is_selected (ZenityTreeColumnView *self, guint pos)
+{
+	return gtk_selection_model_is_selected (gtk_column_view_get_model (self->child_cv), pos);
+}
+
+void
+zenity_tree_column_view_set_search (ZenityTreeColumnView *self, const char *search_str)
+{
+	gtk_string_filter_set_search (self->filter, search_str);
+}
+
+void
+zenity_tree_column_view_show_column (ZenityTreeColumnView *self, guint pos, gboolean show)
+{
+	GListModel *cols = gtk_column_view_get_columns (self->child_cv);
+	GtkColumnViewColumn *col = g_list_model_get_item (cols, pos);
+
+	gtk_column_view_column_set_visible (col, show);
+}
diff --git a/src/zenity-tree-column-view.h b/src/zenity-tree-column-view.h
new file mode 100644
index 00000000..8b5a2552
--- /dev/null
+++ b/src/zenity-tree-column-view.h
@@ -0,0 +1,80 @@
+/* vim: ts=4 sw=4
+ */
+/*
+ * zenity-tree-column-view.c
+ *
+ * Copyright © 2023 Logan Rathbone
+ *
+ * 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 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, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "zenity-tree-column-view-enums.h"	/* auto-generated by build system */
+
+G_BEGIN_DECLS
+
+typedef enum
+{
+	ZENITY_TREE_LIST_NONE,
+	ZENITY_TREE_LIST_CHECK,
+	ZENITY_TREE_LIST_RADIO,
+	ZENITY_TREE_LIST_IMAGE
+} ZenityTreeListType;
+
+/* ZenityTreeItem */
+
+#define ZENITY_TREE_TYPE_ITEM (zenity_tree_item_get_type ())
+G_DECLARE_FINAL_TYPE (ZenityTreeItem, zenity_tree_item, ZENITY_TREE, ITEM, GObject)
+
+ZenityTreeItem * zenity_tree_item_new (const char *text, GtkWidget *child);
+GtkWidget * zenity_tree_item_get_child (ZenityTreeItem *item);
+const char * zenity_tree_item_get_text (ZenityTreeItem *item);
+void zenity_tree_item_set_text (ZenityTreeItem *item, const char *text);
+void zenity_tree_item_set_child (ZenityTreeItem *item, GtkWidget *child);
+
+/* ZenityTreeRow */
+
+#define ZENITY_TREE_TYPE_ROW (zenity_tree_row_get_type ())
+G_DECLARE_FINAL_TYPE (ZenityTreeRow, zenity_tree_row, ZENITY_TREE, ROW, GObject)
+
+ZenityTreeRow * zenity_tree_row_new (void);
+void zenity_tree_row_add (ZenityTreeRow *row, ZenityTreeItem *item);
+guint zenity_tree_row_get_n_items (ZenityTreeRow *row);
+ZenityTreeItem * zenity_tree_row_get_item (ZenityTreeRow *row, guint index);
+
+/* ZenityTreeColumnView */
+
+#define ZENITY_TREE_TYPE_COLUMN_VIEW (zenity_tree_column_view_get_type ())
+G_DECLARE_FINAL_TYPE (ZenityTreeColumnView, zenity_tree_column_view, ZENITY_TREE, COLUMN_VIEW, GtkWidget)
+
+void zenity_tree_column_view_set_model (ZenityTreeColumnView *self, GListModel *model);
+GListModel * zenity_tree_column_view_get_model (ZenityTreeColumnView *self);
+void zenity_tree_column_view_set_list_type (ZenityTreeColumnView *self, ZenityTreeListType type);
+ZenityTreeListType zenity_tree_column_view_get_list_type (ZenityTreeColumnView *self);
+void zenity_tree_column_view_add_column (ZenityTreeColumnView *self, const char *col_name);
+void zenity_tree_column_view_foreach_item (ZenityTreeColumnView *self, GFunc func, gpointer user_data);
+void zenity_tree_column_view_foreach_row (ZenityTreeColumnView *self, GFunc func, gpointer user_data);
+int zenity_tree_column_view_get_n_columns (ZenityTreeColumnView *self);
+gboolean zenity_tree_column_view_get_editable (ZenityTreeColumnView *self);
+gboolean zenity_tree_column_view_get_multi (ZenityTreeColumnView *self);
+gboolean zenity_tree_column_view_is_selected (ZenityTreeColumnView *self, guint pos);
+void zenity_tree_column_view_set_search (ZenityTreeColumnView *self, const char *search_str);
+void zenity_tree_column_view_show_column (ZenityTreeColumnView *self, guint pos, gboolean show);
+
+G_END_DECLS
diff --git a/src/zenity-tree-column-view.ui b/src/zenity-tree-column-view.ui
new file mode 100644
index 00000000..fcfdd289
--- /dev/null
+++ b/src/zenity-tree-column-view.ui
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- vim: ts=2 sw=2
+-->
+
+<interface>
+	<template class="ZenityTreeColumnView" parent="GtkWidget">
+		<child>
+			<object class="GtkScrolledWindow" id="scrolled_window">
+				<child>
+					<object class="GtkViewport">
+						<property name="scroll-to-focus">true</property>	<!-- good to explicitly set to true for backwards compatibility, acc. to TFM. -->
+						<child>
+							<object class="GtkColumnView" id="child_cv" />
+						</child>
+					</object>
+				</child>
+			</object>
+		</child>
+	</template>
+</interface>
diff --git a/src/zenity.gresource.xml.in b/src/zenity.gresource.xml.in
new file mode 100644
index 00000000..12e4b452
--- /dev/null
+++ b/src/zenity.gresource.xml.in
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- vim:ts=4 sw=4
+-->
+<!--
+   Copyright © 2021-2023 Logan Rathbone <poprocks@gmail.com>
+
+   Zenity 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 of the
+   License, or (at your option) any later version.
+
+   Zenity 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 Zenity; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
+
+<gresources>
+	<gresource prefix="@resource_base_path@">
+		<file preprocess="xml-stripblanks" compressed="true">zenity.ui</file>
+		<file preprocess="xml-stripblanks" compressed="true">zenity-tree-column-view.ui</file>
+	</gresource>
+</gresources>
diff --git a/src/zenity.h b/src/zenity.h
index 404eec77..ac8b9022 100644
--- a/src/zenity.h
+++ b/src/zenity.h
@@ -1,47 +1,42 @@
-#ifndef ZENITY_H
-#define ZENITY_H
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
+#pragma once
 
-#include <gtk/gtk.h>
+#include <adwaita.h>
+#include <glib/gi18n.h>
+
+#include <config.h>
 
 G_BEGIN_DECLS
 
-#include <libintl.h>
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop (String)
-#else
-#define N_(String) (String)
-#endif
+typedef enum
+{
+	ZENITY_OK 		= -1,
+	ZENITY_CANCEL	= -2,
+	ZENITY_ESC		= -3,
+	ZENITY_ERROR	= -4,
+	ZENITY_EXTRA	= -5,
+	ZENITY_TIMEOUT	= -6
+} ZenityExitCode;
 
 typedef struct {
-	gchar *dialog_title;
-	gchar *window_icon;
-	gchar *ok_label;
-	gchar *cancel_label;
-	gchar **extra_label;
-	gint width;
-	gint height;
-	gint exit_code;
-	gint timeout_delay;
+	char *dialog_title;
+	char *ok_label;
+	char *cancel_label;
+	char **extra_label;
+	int width;
+	int height;
+	int exit_code;
+	int timeout_delay;
 	gboolean modal;
-	guintptr attach;
 } ZenityData;
 
-typedef enum {
-	ZENITY_OK,
-	ZENITY_CANCEL,
-	ZENITY_ESC,
-	ZENITY_ERROR,
-	ZENITY_EXTRA,
-	ZENITY_TIMEOUT
-} ZenityExitCode;
-
 typedef struct {
-	gchar *dialog_text;
-	gint day;
-	gint month;
-	gint year;
-	gchar *date_format;
+	char *dialog_text;
+	int day;
+	int month;
+	int year;
+	char *date_format;
 } ZenityCalendarData;
 
 typedef enum {
@@ -53,8 +48,8 @@ typedef enum {
 } MsgMode;
 
 typedef struct {
-	gchar *dialog_text;
-	gchar *dialog_icon;
+	char *dialog_text;
+	char *dialog_icon;
 	MsgMode mode;
 	gboolean no_wrap;
 	gboolean no_markup;
@@ -63,35 +58,34 @@ typedef struct {
 } ZenityMsgData;
 
 typedef struct {
-	gchar *dialog_text;
-	gint value;
-	gint min_value;
-	gint max_value;
-	gint step;
+	char *dialog_text;
+	int value;
+	int min_value;
+	int max_value;
+	int step;
 	gboolean print_partial;
 	gboolean hide_value;
 } ZenityScaleData;
 
 typedef struct {
-	gchar *uri;
+	char *uri;
 	gboolean multi;
 	gboolean directory;
 	gboolean save;
-	gboolean confirm_overwrite;
-	gchar *separator;
-	gchar **filter;
+	char *separator;
+	char **filter;
 } ZenityFileData;
 
 typedef struct {
-	gchar *dialog_text;
-	gchar *entry_text;
+	char *dialog_text;
+	char *entry_text;
 	gboolean hide_text;
-	const gchar **data;
+	const char **data;
 } ZenityEntryData;
 
 typedef struct {
-	gchar *dialog_text;
-	gchar *entry_text;
+	char *dialog_text;
+	char *entry_text;
 	gboolean pulsate;
 	gboolean autoclose;
 	gboolean autokill;
@@ -101,46 +95,44 @@ typedef struct {
 } ZenityProgressData;
 
 typedef struct {
-	gchar *uri;
+	char *uri;
 	gboolean editable;
 	gboolean no_wrap;
 	gboolean auto_scroll;
-	gchar *font;
+	char *font;
 	GtkTextBuffer *buffer;
-	gchar *checkbox;
+	char *checkbox;
 #ifdef HAVE_WEBKITGTK
 	gboolean html;
 	gboolean no_interaction;
-	gchar *url;
+	char *url;
 #endif
 } ZenityTextData;
 
 typedef struct {
-	gchar *dialog_text;
+	char *dialog_text;
 	GSList *columns;
 	gboolean checkbox;
 	gboolean radiobox;
 	gboolean hide_header;
 	gboolean imagebox;
-	gchar *separator;
+	char *separator;
 	gboolean multi;
 	gboolean editable;
-	gboolean mid_search;
-	gchar *print_column;
-	gchar *hide_column;
-	const gchar **data;
+	gboolean mid_search_DEPRECATED;
+	char *print_column;
+	char *hide_column;
+	const char **data;
 } ZenityTreeData;
 
-#ifdef HAVE_LIBNOTIFY
 typedef struct {
-	gchar *notification_text;
+	char *notification_text;
 	gboolean listen;
-	gchar **notification_hints;
+	char *icon;
 } ZenityNotificationData;
-#endif
 
 typedef struct {
-	gchar *color;
+	char *color;
 	gboolean show_palette;
 } ZenityColorData;
 
@@ -150,10 +142,9 @@ typedef struct {
 	GSList *list_values;
 	GSList *column_values;
 	GSList *combo_values;
-	gchar *dialog_text;
-	gchar *separator;
-	gchar *date_format;
-	//  gchar *hide_column;
+	char *dialog_text;
+	char *separator;
+	char *date_format;
 	gboolean show_header;
 } ZenityFormsData;
 
@@ -166,14 +157,14 @@ typedef enum {
 } ZenityFormsType;
 
 typedef struct {
-	gchar *option_value;
+	char *option_value;
 	ZenityFormsType type;
 	GtkWidget *forms_widget;
 } ZenityFormsValue;
 
 typedef struct {
 	gboolean username;
-	gchar *password;
+	char *password;
 	GtkWidget *entry_username;
 	GtkWidget *entry_password;
 } ZenityPasswordData;
@@ -185,10 +176,8 @@ void zenity_entry (ZenityData *data, ZenityEntryData *entry_data);
 void zenity_progress (ZenityData *data, ZenityProgressData *progress_data);
 void zenity_text (ZenityData *data, ZenityTextData *text_data);
 void zenity_tree (ZenityData *data, ZenityTreeData *tree_data);
-#ifdef HAVE_LIBNOTIFY
-void zenity_notification (
-	ZenityData *data, ZenityNotificationData *notification_data);
-#endif
+void zenity_notification (ZenityData *data,
+		ZenityNotificationData *notification_data);
 
 void zenity_colorselection (
 	ZenityData *data, ZenityColorData *notification_data);
@@ -199,5 +188,3 @@ void zenity_password_dialog (
 	ZenityData *data, ZenityPasswordData *password_data);
 void zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data);
 G_END_DECLS
-
-#endif /* ZENITY_H */
diff --git a/src/zenity.ui b/src/zenity.ui
index c1a367c3..5644aff0 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -1,1155 +1,491 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+
+<!-- vim: ts=2 sw=2
+-->
+
 <interface>
-  <requires lib="gtk+" version="3.0"/>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkDialog" id="zenity_scale_dialog">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Adjust the scale value</property>
-    <property name="default_width">300</property>
-    <property name="default_height">100</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox11">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_scale_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="zenity_scale_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="has_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="zenity_scale_text">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="ypad">4</property>
-                <property name="label" translatable="yes">Adjust the scale value</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="zenity_scale_hscale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="digits">0</property>
-                <property name="value_pos">right</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">zenity_scale_cancel_button</action-widget>
-      <action-widget response="-5">zenity_scale_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkTextBuffer" id="textbuffer1"/>
-  <object class="GtkDialog" id="zenity_text_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Text View</property>
-    <property name="window_position">center</property>
-    <property name="default_width">300</property>
-    <property name="default_height">200</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_text_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="zenity_text_close_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="image_position">right</property>
-                <accelerator key="Return" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkScrolledWindow" id="zenity_text_scrolled_window">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="zenity_text_view">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="pixels_above_lines">2</property>
-                    <property name="pixels_below_lines">2</property>
-                    <property name="editable">False</property>
-                    <property name="wrap_mode">word</property>
-                    <property name="left_margin">2</property>
-                    <property name="right_margin">2</property>
-                    <property name="buffer">textbuffer1</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="zenity_text_checkbox">
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="xalign">0.5</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">zenity_text_cancel_button</action-widget>
-      <action-widget response="-7">zenity_text_close_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_calendar_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Calendar selection</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_calendar_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="zenity_calendar_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkBox" id="vbox2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="zenity_calendar_text">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Select a date from below.</property>
-                    <property name="wrap">True</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="zenity_calendar_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">C_alendar:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">zenity_calendar</property>
-                <property name="xalign">0</property>
-                <accessibility>
-                  <relation type="label-for" target="zenity_calendar"/>
-                </accessibility>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCalendar" id="zenity_calendar">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">zenity_calendar_cancel_button</action-widget>
-      <action-widget response="-5">zenity_calendar_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_entry_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Add a new entry</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_entry_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="zenity_entry_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <child>
-              <object class="GtkBox" id="vbox4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="zenity_entry_text">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Enter new text:</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">zenity_entry_cancel_button</action-widget>
-      <action-widget response="-5">zenity_entry_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_error_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Error</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <property name="resizable">false</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox7">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">14</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_error_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <child>
-              <object class="GtkBox" id="hbox3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">5</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkImage" id="zenity_error_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
-                    <property name="icon_name">dialog-error</property>
-                    <property name="icon_size">6</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="zenity_error_text">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">An error has occurred.</property>
-                    <property name="wrap">True</property>
-                    <property name="selectable">True</property>
-                    <property name="yalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-5">zenity_error_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_forms_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">normal</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox12">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_forms_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="zenity_forms_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <child>
-              <object class="GtkGrid" id="zenity_forms_grid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">6</property>
-                <property name="margin_top">12</property>
-                <property name="margin_bottom">6</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">10</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="zenity_forms_text">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Forms dialog</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">zenity_forms_cancel_button</action-widget>
-      <action-widget response="-5">zenity_forms_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_info_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Information</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <property name="resizable">false</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox9">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">14</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_info_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="hbox4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkImage" id="zenity_info_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="yalign">0</property>
-                <property name="icon_name">dialog-information</property>
-                <property name="icon_size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="zenity_info_text">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">All updates are complete.</property>
-                <property name="wrap">True</property>
-                <property name="selectable">True</property>
-                <property name="yalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-5">zenity_info_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_progress_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Progress</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox6">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_progress_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="zenity_progress_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="zenity_progress_text">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Running...</property>
-                <property name="wrap">True</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkProgressBar" id="zenity_progress_bar">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pulse_step">0.10000000149</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="zenity_progress_time">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">zenity_progress_cancel_button</action-widget>
-      <action-widget response="-5">zenity_progress_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_question_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Question</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <property name="resizable">false</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">14</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="zenity_question_button_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="hbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkImage" id="zenity_question_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="icon_name">dialog-question</property>
-                <property name="icon_size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="zenity_question_text">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Are you sure you want to proceed?</property>
-                <property name="wrap">True</property>
-                <property name="selectable">True</property>
-                <property name="yalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkDialog" id="zenity_tree_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Select items from the list</property>
-    <property name="window_position">center</property>
-    <property name="default_width">300</property>
-    <property name="default_height">196</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox8">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_tree_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="zenity_tree_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="zenity_tree_text">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Select items from the list below.</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="zenity_tree_window">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
-                <property name="expand">True</property>
-                <child>
-                  <object class="GtkTreeView" id="zenity_tree_view">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection1"/>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">zenity_tree_cancel_button</action-widget>
-      <action-widget response="-5">zenity_tree_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="zenity_warning_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Warning</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <property name="resizable">false</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">14</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="zenity_warning_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="hbox2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkImage" id="zenity_warning_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="icon_name">dialog-warning</property>
-                <property name="icon_size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="zenity_warning_text">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Are you sure you want to proceed?</property>
-                <property name="wrap">True</property>
-                <property name="selectable">True</property>
-                <property name="yalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-5">zenity_warning_ok_button</action-widget>
-    </action-widgets>
-  </object>
+	<requires lib="gtk" version="4.0"/>
+	<object class="AdwMessageDialog" id="zenity_scale_dialog">
+		<property name="heading" translatable="yes">Adjust the scale value</property>
+		<property name="default_width">300</property>
+		<property name="default_height">100</property>
+		<property name="extra-child">zenity_scale_box</property>
+		<responses>
+			<response id="cancel" translatable="yes">_Cancel</response>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkAdjustment" id="zenity_scale_adjustment">
+		<property name="upper">100</property>
+		<property name="step_increment">1</property>
+		<property name="page_increment">1</property>
+	</object>
+	<object class="GtkBox" id="zenity_scale_box">
+		<property name="orientation">vertical</property>
+		<property name="spacing">6</property>
+		<child>
+			<object class="GtkLabel" id="zenity_scale_text">
+				<property name="valign">center</property>
+				<property name="vexpand">true</property>
+				<property name="label" translatable="yes">Adjust the scale value</property>
+				<property name="xalign">0</property>
+			</object>
+		</child>
+		<child>
+			<object class="GtkScale" id="zenity_scale_hscale">
+				<property name="hexpand">true</property>
+				<property name="draw-value">1</property>
+				<property name="adjustment">zenity_scale_adjustment</property>
+				<property name="digits">0</property>
+				<property name="value_pos">right</property>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_text_dialog">
+		<property name="heading" translatable="yes">Text View</property>
+		<property name="default_width">300</property>
+		<property name="default_height">200</property>
+		<property name="resizable">true</property>
+		<property name="extra-child">zenity_text_box</property>
+		<responses>
+			<response id="cancel" translatable="yes">_Cancel</response>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_text_box">
+		<property name="spacing">2</property>
+		<child>
+			<object class="GtkBox" id="vbox5">
+				<property name="hexpand">1</property>
+				<property name="orientation">vertical</property>
+				<child>
+					<object class="GtkScrolledWindow" id="zenity_text_scrolled_window">
+						<property name="vexpand">1</property>
+						<property name="child">
+							<object class="GtkTextView" id="zenity_text_view">
+								<property name="editable">false</property>
+								<property name="wrap_mode">word</property>
+							</object>
+						</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkCheckButton" id="zenity_text_checkbox">
+						<property name="valign">center</property>
+						<property name="visible">0</property>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_calendar_dialog">
+		<property name="heading" translatable="yes">Calendar selection</property>
+		<property name="extra-child">zenity_calendar_box</property>
+		<responses>
+			<response id="cancel" translatable="yes">_Cancel</response>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_calendar_box">
+		<property name="spacing">2</property>
+		<child>
+			<object class="GtkBox" id="vbox1">
+				<property name="orientation">vertical</property>
+				<property name="spacing">6</property>
+				<child>
+					<object class="GtkBox" id="vbox2">
+						<property name="vexpand">1</property>
+						<property name="spacing">6</property>
+						<child>
+							<object class="GtkLabel" id="zenity_calendar_text">
+								<property name="halign">center</property>
+								<property name="label" translatable="yes">Select a date from below.</property>
+								<property name="wrap">1</property>
+								<property name="xalign">0</property>
+							</object>
+						</child>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="zenity_calendar_label">
+						<property name="valign">center</property>
+						<property name="label" translatable="yes">C_alendar:</property>
+						<property name="use_underline">1</property>
+						<property name="mnemonic_widget">zenity_calendar</property>
+						<property name="xalign">0</property>
+						<accessibility>
+							<property name="label" translatable="yes">Calendar</property>
+							<relation name="labelled-by">zenity_calendar</relation>
+						</accessibility>
+					</object>
+				</child>
+				<child>
+					<object class="GtkCalendar" id="zenity_calendar">
+						<property name="valign">center</property>
+						<property name="vexpand">true</property>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_entry_dialog">
+		<property name="heading" translatable="yes">Add a new entry</property>
+		<property name="extra-child">zenity_entry_box</property>
+		<responses>
+			<response id="cancel" translatable="yes">_Cancel</response>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_entry_box">
+		<property name="orientation">vertical</property>
+		<property name="spacing">2</property>
+		<property name="margin-start">12</property>
+		<property name="margin-end">12</property>
+		<property name="margin-bottom">12</property>
+		<property name="margin-top">12</property>
+		<child>
+			<object class="GtkBox" id="vbox3">
+				<child>
+					<object class="GtkBox" id="vbox4">
+						<property name="hexpand">1</property>
+						<property name="orientation">vertical</property>
+						<property name="spacing">6</property>
+						<child>
+							<object class="GtkLabel" id="zenity_entry_text">
+								<property name="valign">center</property>
+								<property name="label" translatable="yes">_Enter new text:</property>
+								<property name="use_underline">1</property>
+								<property name="xalign">0</property>
+							</object>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_error_dialog">
+		<property name="heading" translatable="yes">Error</property>
+		<property name="extra-child">zenity_error_box</property>
+		<responses>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_error_box">
+		<property name="spacing">14</property>
+		<property name="margin-start">12</property>
+		<property name="margin-end">12</property>
+		<property name="margin-bottom">12</property>
+		<property name="margin-top">12</property>
+		<child>
+			<object class="GtkBox" id="vbox8">
+				<child>
+					<object class="GtkBox" id="hbox3">
+						<property name="hexpand">1</property>
+						<property name="spacing">12</property>
+						<child>
+							<object class="GtkImage" id="zenity_error_image">
+								<property name="halign">center</property>
+								<property name="icon_name">dialog-error</property>
+								<property name="icon_size">large</property>
+							</object>
+						</child>
+						<child>
+							<object class="GtkLabel" id="zenity_error_text">
+								<property name="halign">center</property>
+								<property name="label" translatable="yes">An error has occurred.</property>
+								<property name="wrap">true</property>
+								<property name="selectable">true</property>
+								<property name="can-focus">false</property>
+							</object>
+						</child>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_forms_dialog">
+		<property name="extra-child">zenity_forms_box</property>
+		<responses>
+			<response id="cancel" translatable="yes">_Cancel</response>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_forms_box">
+		<property name="spacing">2</property>
+		<child>
+			<object class="GtkFrame" id="frame1">
+				<property name="child">
+					<object class="GtkGrid" id="zenity_forms_grid">
+						<property name="margin-start">12</property>
+						<property name="margin-end">6</property>
+						<property name="margin_top">12</property>
+						<property name="margin_bottom">6</property>
+						<property name="row_spacing">6</property>
+						<property name="column_spacing">10</property>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+						<child>
+							<placeholder/>
+						</child>
+					</object>
+				</property>
+				<child type="label">
+					<object class="GtkLabel" id="zenity_forms_text">
+						<property name="label" translatable="yes">Forms dialog</property>
+						<attributes>
+							<attribute name="weight" value="bold"></attribute>
+						</attributes>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_info_dialog">
+		<property name="heading" translatable="yes">Information</property>
+		<property name="extra-child">zenity_info_box</property>
+		<responses>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_info_box">
+		<property name="spacing">14</property>
+		<property name="margin-start">12</property>
+		<property name="margin-end">12</property>
+		<property name="margin-bottom">12</property>
+		<property name="margin-top">12</property>
+		<child>
+			<object class="GtkBox" id="hbox4">
+				<property name="spacing">12</property>
+				<child>
+					<object class="GtkImage" id="zenity_info_image">
+						<property name="halign">center</property>
+						<property name="icon_name">dialog-information</property>
+						<property name="icon_size">large</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="zenity_info_text">
+						<property name="halign">center</property>
+						<property name="vexpand">true</property>
+						<property name="label" translatable="yes">All updates are complete.</property>
+						<property name="wrap">true</property>
+						<property name="selectable">true</property>
+						<property name="can-focus">false</property>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_progress_dialog">
+		<property name="heading" translatable="yes">Progress</property>
+		<property name="extra-child">zenity_progress_box</property>
+	</object>
+	<object class="GtkBox" id="zenity_progress_box">
+		<property name="spacing">2</property>
+		<child>
+			<object class="GtkBox" id="vbox7">
+				<property name="orientation">vertical</property>
+				<property name="spacing">6</property>
+				<child>
+					<object class="GtkLabel" id="zenity_progress_text">
+						<property name="valign">center</property>
+						<property name="label" translatable="yes">Running...</property>
+						<property name="wrap">1</property>
+						<property name="xalign">0</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkProgressBar" id="zenity_progress_bar">
+						<property name="valign">center</property>
+						<property name="hexpand">true</property>
+						<property name="pulse_step">0.10000000149</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="zenity_progress_time">
+						<property name="valign">center</property>
+						<property name="xalign">0</property>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_question_dialog">
+		<property name="heading" translatable="yes">Question</property>
+		<property name="extra-child">zenity_question_box</property>
+		<responses>
+			<response id="no" translatable="yes">_No</response>
+			<response id="yes" translatable="yes">_Yes</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_question_box">
+		<property name="spacing">14</property>
+		<property name="margin-start">12</property>
+		<property name="margin-end">12</property>
+		<property name="margin-bottom">12</property>
+		<property name="margin-top">12</property>
+		<child>
+			<object class="GtkBox" id="hbox1">
+				<property name="spacing">12</property>
+				<child>
+					<object class="GtkImage" id="zenity_question_image">
+						<property name="icon_name">dialog-question</property>
+						<property name="icon_size">large</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="zenity_question_text">
+						<property name="halign">center</property>
+						<property name="vexpand">true</property>
+						<property name="label" translatable="yes">Are you sure you want to proceed?</property>
+						<property name="wrap">true</property>
+						<property name="selectable">true</property>
+						<property name="can-focus">false</property>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_tree_dialog">
+		<property name="heading" translatable="yes">Select items from the list</property>
+		<property name="default_width">480</property>
+		<property name="default_height">320</property>
+		<property name="extra-child">zenity_tree_box</property>
+		<property name="resizable">true</property>
+		<responses>
+			<response id="cancel" translatable="yes">_Cancel</response>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_tree_box">
+		<child>
+			<object class="GtkBox" id="vbox10">
+				<property name="orientation">vertical</property>
+				<property name="spacing">6</property>
+				<child>
+					<object class="GtkSearchBar" id="zenity_tree_search_bar">
+						<property name="show-close-button">true</property>
+						<property name="key-capture-widget">zenity_tree_cv</property>
+						<child>
+							<object class="GtkSearchEntry" id="zenity_tree_search_entry">
+								<property name="hexpand">true</property>
+							</object>
+						</child>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="zenity_tree_text">
+						<property name="valign">center</property>
+						<property name="label" translatable="yes">Select items from the list below.</property>
+						<property name="xalign">0</property>
+					</object>
+				</child>
+				<child>
+					<object class="ZenityTreeColumnView" id="zenity_tree_cv" />
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_warning_dialog">
+		<property name="heading" translatable="yes">Warning</property>
+		<property name="resizable">false</property>
+		<property name="extra-child">zenity_warning_box</property>
+		<responses>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_warning_box">
+		<property name="spacing">14</property>
+		<property name="margin-start">12</property>
+		<property name="margin-end">12</property>
+		<property name="margin-bottom">12</property>
+		<property name="margin-top">12</property>
+		<child>
+			<object class="GtkBox" id="hbox2">
+				<property name="spacing">12</property>
+				<child>
+					<object class="GtkImage" id="zenity_warning_image">
+						<property name="icon_name">dialog-warning</property>
+						<property name="icon_size">large</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="zenity_warning_text">
+						<property name="halign">center</property>
+						<property name="vexpand">true</property>
+						<property name="hexpand">true</property>
+						<property name="label" translatable="yes">Are you sure you want to proceed?</property>
+						<property name="wrap">true</property>
+						<property name="selectable">true</property>
+						<property name="can-focus">false</property>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+	<object class="AdwMessageDialog" id="zenity_password_dialog">
+		<property name="heading" translatable="yes">Warning</property>
+		<property name="resizable">false</property>
+		<property name="extra-child">zenity_password_box</property>
+		<responses>
+			<response id="cancel" translatable="yes">_Cancel</response>
+			<response id="ok" translatable="yes">_OK</response>
+		</responses>
+	</object>
+	<object class="GtkBox" id="zenity_password_box">
+		<property name="orientation">vertical</property>
+		<property name="spacing">14</property>
+		<property name="margin-start">12</property>
+		<property name="margin-end">12</property>
+		<property name="margin-bottom">12</property>
+		<property name="margin-top">12</property>
+		<child>
+			<object class="GtkBox">
+				<property name="orientation">horizontal</property>
+				<property name="spacing">12</property>
+				<child>
+					<object class="GtkImage" id="zenity_password_image">
+						<property name="icon_name">dialog-password</property>
+						<property name="icon_size">large</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkLabel" id="zenity_password_title">
+						<property name="label" translatable="yes">Type your password</property>
+					</object>
+				</child>
+			</object>
+		</child>
+		<child>
+			<object class="GtkGrid" id="zenity_password_grid">
+				<property name="column-spacing">12</property>
+				<property name="row-spacing">6</property>
+			</object>
+		</child>
+	</object> <!-- !vbox -->
 </interface>

More details

Full run details

Historical runs