diff --git a/po/en_GB.po b/po/en_GB.po
index 200a9cd..9c7c478 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,15 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# British English translation of zenity.
+# Copyright (C) 2011 zenity'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the zenity package.
 # Mike Newman <mikegtn@gnome.org>, 2003.
-# Bruce Cowan <bcowan@fastmail.co.uk>, 2010.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2010.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-31 16:06+0100\n"
-"PO-Revision-Date: 2010-08-31 16:09+0100\n"
+"POT-Creation-Date: 2011-03-13 15:53+0000\n"
+"PO-Revision-Date: 2011-03-13 15:54+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
@@ -71,22 +70,22 @@ msgstr ""
 msgid "Display dialog boxes from shell scripts"
 msgstr "Display dialogue boxes from shell scripts"
 
-#: ../src/main.c:100
+#: ../src/main.c:105
 #, 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:138
+#: ../src/notification.c:95
 #, c-format
 msgid "could not parse command from stdin\n"
 msgstr "could not parse command from stdin\n"
 
-#: ../src/notification.c:177
+#: ../src/notification.c:122
 #, c-format
 msgid "Could not parse message from stdin\n"
 msgstr "Could not parse message from stdin\n"
 
-#: ../src/notification.c:262 ../src/notification.c:279
+#: ../src/notification.c:198
 msgid "Zenity notification"
 msgstr "Zenity notification"
 
@@ -123,267 +122,272 @@ msgid "You should use only one List dialog type.\n"
 msgstr "You should use only one List dialogue type.\n"
 
 #: ../src/zenity.ui.h:1
+msgid "<b>Forms dialog</b>"
+msgstr "<b>Forms dialogue</b>"
+
+#: ../src/zenity.ui.h:2
 msgid "Add a new entry"
 msgstr "Add a new entry"
 
-#: ../src/zenity.ui.h:2
+#: ../src/zenity.ui.h:3
 msgid "Adjust the scale value"
 msgstr "Adjust the scale value"
 
-#: ../src/zenity.ui.h:3
+#: ../src/zenity.ui.h:4
 msgid "All updates are complete."
 msgstr "All updates are complete."
 
-#: ../src/zenity.ui.h:4
+#: ../src/zenity.ui.h:5
 msgid "An error has occurred."
 msgstr "An error has occurred."
 
-#: ../src/zenity.ui.h:5
+#: ../src/zenity.ui.h:6
 msgid "Are you sure you want to proceed?"
 msgstr "Are you sure you want to proceed?"
 
-#: ../src/zenity.ui.h:6
+#: ../src/zenity.ui.h:7
 msgid "C_alendar:"
 msgstr "C_alendar"
 
-#: ../src/zenity.ui.h:7
+#: ../src/zenity.ui.h:8
 msgid "Calendar selection"
 msgstr "Calendar selection"
 
-#: ../src/zenity.ui.h:8
+#: ../src/zenity.ui.h:9
 msgid "Error"
 msgstr "Error"
 
-#: ../src/zenity.ui.h:9
+#: ../src/zenity.ui.h:10
 msgid "Information"
 msgstr "Information"
 
-#: ../src/zenity.ui.h:10
+#: ../src/zenity.ui.h:11
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/zenity.ui.h:11
+#: ../src/zenity.ui.h:12
 msgid "Question"
 msgstr "Question"
 
-#: ../src/zenity.ui.h:12
+#: ../src/zenity.ui.h:13
 msgid "Running..."
 msgstr "Running…"
 
-#: ../src/zenity.ui.h:13
+#: ../src/zenity.ui.h:14
 msgid "Select a date from below."
 msgstr "Select a date from below."
 
-#: ../src/zenity.ui.h:14
+#: ../src/zenity.ui.h:15
 msgid "Select items from the list"
 msgstr "Select items from the list"
 
-#: ../src/zenity.ui.h:15
+#: ../src/zenity.ui.h:16
 msgid "Select items from the list below."
 msgstr "Select items from the list below."
 
-#: ../src/zenity.ui.h:16
+#: ../src/zenity.ui.h:17
 msgid "Text View"
 msgstr "Text View"
 
-#: ../src/zenity.ui.h:17
+#: ../src/zenity.ui.h:18
 msgid "Warning"
 msgstr "Warning"
 
-#: ../src/zenity.ui.h:18
+#: ../src/zenity.ui.h:19
 msgid "_Enter new text:"
 msgstr "_Enter new text"
 
-#: ../src/option.c:131
+#: ../src/option.c:144
 msgid "Set the dialog title"
 msgstr "Set the dialogue title"
 
-#: ../src/option.c:132
+#: ../src/option.c:145
 msgid "TITLE"
 msgstr "TITLE"
 
-#: ../src/option.c:140
+#: ../src/option.c:153
 msgid "Set the window icon"
 msgstr "Set the window icon"
 
-#: ../src/option.c:141
+#: ../src/option.c:154
 msgid "ICONPATH"
 msgstr "ICONPATH"
 
-#: ../src/option.c:149
+#: ../src/option.c:162
 msgid "Set the width"
 msgstr "Set the width"
 
-#: ../src/option.c:150
+#: ../src/option.c:163
 msgid "WIDTH"
 msgstr "WIDTH"
 
-#: ../src/option.c:158
+#: ../src/option.c:171
 msgid "Set the height"
 msgstr "Set the height"
 
-#: ../src/option.c:159
+#: ../src/option.c:172
 msgid "HEIGHT"
 msgstr "HEIGHT"
 
-#: ../src/option.c:167
+#: ../src/option.c:180
 msgid "Set dialog timeout in seconds"
 msgstr "Set dialogue timeout in seconds"
 
 #. Timeout for closing the dialog
-#: ../src/option.c:169
+#: ../src/option.c:182
 msgid "TIMEOUT"
 msgstr "TIMEOUT"
 
-#: ../src/option.c:183
+#: ../src/option.c:196
 msgid "Display calendar dialog"
 msgstr "Display calendar dialogue"
 
-#: ../src/option.c:192 ../src/option.c:252 ../src/option.c:295
-#: ../src/option.c:328 ../src/option.c:440 ../src/option.c:579
-#: ../src/option.c:651 ../src/option.c:735 ../src/option.c:768
+#: ../src/option.c:205 ../src/option.c:265 ../src/option.c:308
+#: ../src/option.c:341 ../src/option.c:453 ../src/option.c:595
+#: ../src/option.c:667 ../src/option.c:760 ../src/option.c:793
+#: ../src/option.c:898
 msgid "Set the dialog text"
 msgstr "Set the dialogue text"
 
-#: ../src/option.c:193 ../src/option.c:253 ../src/option.c:262
-#: ../src/option.c:296 ../src/option.c:329 ../src/option.c:441
-#: ../src/option.c:547 ../src/option.c:580 ../src/option.c:652
-#: ../src/option.c:661 ../src/option.c:670 ../src/option.c:736
-#: ../src/option.c:769
+#: ../src/option.c:206 ../src/option.c:266 ../src/option.c:275
+#: ../src/option.c:309 ../src/option.c:342 ../src/option.c:454
+#: ../src/option.c:561 ../src/option.c:596 ../src/option.c:668
+#: ../src/option.c:677 ../src/option.c:686 ../src/option.c:737
+#: ../src/option.c:761 ../src/option.c:794 ../src/option.c:899
 msgid "TEXT"
 msgstr "TEXT"
 
-#: ../src/option.c:201
+#: ../src/option.c:214
 msgid "Set the calendar day"
 msgstr "Set the calendar day"
 
-#: ../src/option.c:202
+#: ../src/option.c:215
 msgid "DAY"
 msgstr "DAY"
 
-#: ../src/option.c:210
+#: ../src/option.c:223
 msgid "Set the calendar month"
 msgstr "Set the calendar month"
 
-#: ../src/option.c:211
+#: ../src/option.c:224
 msgid "MONTH"
 msgstr "MONTH"
 
-#: ../src/option.c:219
+#: ../src/option.c:232
 msgid "Set the calendar year"
 msgstr "Set the calendar year"
 
-#: ../src/option.c:220
+#: ../src/option.c:233
 msgid "YEAR"
 msgstr "YEAR"
 
-#: ../src/option.c:228
+#: ../src/option.c:241 ../src/option.c:916
 msgid "Set the format for the returned date"
 msgstr "Set the format for the returned date"
 
-#: ../src/option.c:229
+#: ../src/option.c:242 ../src/option.c:917
 msgid "PATTERN"
 msgstr "PATTERN"
 
-#: ../src/option.c:243
+#: ../src/option.c:256
 msgid "Display text entry dialog"
 msgstr "Display text entry dialogue"
 
-#: ../src/option.c:261
+#: ../src/option.c:274
 msgid "Set the entry text"
 msgstr "Set the entry text"
 
-#: ../src/option.c:270
+#: ../src/option.c:283
 msgid "Hide the entry text"
 msgstr "Hide the entry text"
 
-#: ../src/option.c:286
+#: ../src/option.c:299
 msgid "Display error dialog"
 msgstr "Display error dialogue"
 
-#: ../src/option.c:304 ../src/option.c:337 ../src/option.c:678
-#: ../src/option.c:744
+#: ../src/option.c:317 ../src/option.c:350 ../src/option.c:694
+#: ../src/option.c:769
 msgid "Do not enable text wrapping"
 msgstr "Do not enable text wrapping"
 
-#: ../src/option.c:319
+#: ../src/option.c:332
 msgid "Display info dialog"
 msgstr "Display info dialogue"
 
-#: ../src/option.c:352
+#: ../src/option.c:365
 msgid "Display file selection dialog"
 msgstr "Display file selection dialogue"
 
-#: ../src/option.c:361
+#: ../src/option.c:374
 msgid "Set the filename"
 msgstr "Set the filename"
 
-#: ../src/option.c:362 ../src/option.c:703
+#: ../src/option.c:375 ../src/option.c:719
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: ../src/option.c:370
+#: ../src/option.c:383
 msgid "Allow multiple files to be selected"
 msgstr "Allow multiple files to be selected"
 
-#: ../src/option.c:379
+#: ../src/option.c:392
 msgid "Activate directory-only selection"
 msgstr "Activate directory-only selection"
 
-#: ../src/option.c:388
+#: ../src/option.c:401
 msgid "Activate save mode"
 msgstr "Activate save mode"
 
-#: ../src/option.c:397 ../src/option.c:476
+#: ../src/option.c:410 ../src/option.c:489 ../src/option.c:907
 msgid "Set output separator character"
 msgstr "Set output separator character"
 
-#: ../src/option.c:398 ../src/option.c:477
+#: ../src/option.c:411 ../src/option.c:490 ../src/option.c:908
 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 
-#: ../src/option.c:406
+#: ../src/option.c:419
 msgid "Confirm file selection if filename already exists"
 msgstr "Confirm file selection if filename already exists"
 
-#: ../src/option.c:415
+#: ../src/option.c:428
 msgid "Sets a filename filter"
 msgstr "Sets a filename filter"
 
 #. Help for file-filter argument (name and patterns for file selection)
-#: ../src/option.c:417
+#: ../src/option.c:430
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAME | PATTERN1 PATTERN2 …"
 
-#: ../src/option.c:431
+#: ../src/option.c:444
 msgid "Display list dialog"
 msgstr "Display list dialogue"
 
-#: ../src/option.c:449
+#: ../src/option.c:462
 msgid "Set the column header"
 msgstr "Set the column header"
 
-#: ../src/option.c:450
+#: ../src/option.c:463
 msgid "COLUMN"
 msgstr "COLUMN"
 
-#: ../src/option.c:458
+#: ../src/option.c:471
 msgid "Use check boxes for first column"
 msgstr "Use tick boxes for first column"
 
-#: ../src/option.c:467
+#: ../src/option.c:480
 msgid "Use radio buttons for first column"
 msgstr "Use radio buttons for first column"
 
-#: ../src/option.c:485
+#: ../src/option.c:498
 msgid "Allow multiple rows to be selected"
 msgstr "Allow multiple rows to be selected"
 
-#: ../src/option.c:494 ../src/option.c:711
+#: ../src/option.c:507 ../src/option.c:727
 msgid "Allow changes to text"
 msgstr "Allow changes to text"
 
-#: ../src/option.c:503
+#: ../src/option.c:516
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -392,287 +396,323 @@ msgstr ""
 "columns)"
 
 #. Column index number to print out on a list dialog
-#: ../src/option.c:505 ../src/option.c:514
+#: ../src/option.c:518 ../src/option.c:527
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../src/option.c:513
+#: ../src/option.c:526
 msgid "Hide a specific column"
 msgstr "Hide a specific column"
 
-#: ../src/option.c:522
+#: ../src/option.c:535
 msgid "Hides the column headers"
 msgstr "Hides the column headers"
 
-#: ../src/option.c:537
+#: ../src/option.c:551
 msgid "Display notification"
 msgstr "Display notification"
 
-#: ../src/option.c:546
+#: ../src/option.c:560
 msgid "Set the notification text"
 msgstr "Set the notification text"
 
-#: ../src/option.c:555
+#: ../src/option.c:569
 msgid "Listen for commands on stdin"
 msgstr "Listen for commands on stdin"
 
-#: ../src/option.c:570
+#: ../src/option.c:586
 msgid "Display progress indication dialog"
 msgstr "Display progress indication dialogue"
 
-#: ../src/option.c:588
+#: ../src/option.c:604
 msgid "Set initial percentage"
 msgstr "Set initial percentage"
 
-#: ../src/option.c:589
+#: ../src/option.c:605
 msgid "PERCENTAGE"
 msgstr "PERCENTAGE"
 
-#: ../src/option.c:597
+#: ../src/option.c:613
 msgid "Pulsate progress bar"
 msgstr "Pulsate progress bar"
 
-#: ../src/option.c:607
+#: ../src/option.c:623
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Dismiss the dialogue when 100% has been reached"
 
-#: ../src/option.c:617
+#: ../src/option.c:633
 #, no-c-format
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Kill parent process if Cancel button is pressed"
 
-#: ../src/option.c:627
+#: ../src/option.c:643
 #, no-c-format
 msgid "Hide Cancel button"
 msgstr "Hide Cancel button"
 
-#: ../src/option.c:642
+#: ../src/option.c:658
 msgid "Display question dialog"
 msgstr "Display question dialogue"
 
-#: ../src/option.c:660
+#: ../src/option.c:676
 msgid "Sets the label of the Ok button"
 msgstr "Sets the label of the OK button"
 
-#: ../src/option.c:669
+#: ../src/option.c:685
 msgid "Sets the label of the Cancel button"
 msgstr "Sets the label of the Cancel button"
 
-#: ../src/option.c:693
+#: ../src/option.c:709
 msgid "Display text information dialog"
 msgstr "Display text information dialogue"
 
-#: ../src/option.c:702
+#: ../src/option.c:718
 msgid "Open file"
 msgstr "Open file"
 
-#: ../src/option.c:726
+#: ../src/option.c:736
+msgid "Set the text font"
+msgstr "Set the text font"
+
+#: ../src/option.c:751
 msgid "Display warning dialog"
 msgstr "Display warning dialogue"
 
-#: ../src/option.c:759
+#: ../src/option.c:784
 msgid "Display scale dialog"
 msgstr "Display scale dialogue"
 
-#: ../src/option.c:777
+#: ../src/option.c:802
 msgid "Set initial value"
 msgstr "Set initial value"
 
-#: ../src/option.c:778 ../src/option.c:787 ../src/option.c:796
-#: ../src/option.c:805 ../src/option.c:871
+#: ../src/option.c:803 ../src/option.c:812 ../src/option.c:821
+#: ../src/option.c:830 ../src/option.c:965
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/option.c:786
+#: ../src/option.c:811
 msgid "Set minimum value"
 msgstr "Set minimum value"
 
-#: ../src/option.c:795
+#: ../src/option.c:820
 msgid "Set maximum value"
 msgstr "Set maximum value"
 
-#: ../src/option.c:804
+#: ../src/option.c:829
 msgid "Set step size"
 msgstr "Set step size"
 
-#: ../src/option.c:813
+#: ../src/option.c:838
 msgid "Print partial values"
 msgstr "Print partial values"
 
-#: ../src/option.c:822
+#: ../src/option.c:847
 msgid "Hide value"
 msgstr "Hide value"
 
-#: ../src/option.c:837
+#: ../src/option.c:862
+msgid "Display forms dialog"
+msgstr "Display forms dialogue"
+
+#: ../src/option.c:871
+msgid "Add a new Entry in forms dialog"
+msgstr "Add a new Entry in forms dialogue"
+
+#: ../src/option.c:872 ../src/option.c:881
+msgid "Field name"
+msgstr "Field name"
+
+#: ../src/option.c:880
+msgid "Add a new Password Entry in forms dialog"
+msgstr "Add a new Password Entry in forms dialogue"
+
+#: ../src/option.c:889
+msgid "Add a new Calendar in forms dialog"
+msgstr "Add a new Calendar in forms dialogue"
+
+#: ../src/option.c:890
+msgid "Calendar field name"
+msgstr "Calendar field name"
+
+#: ../src/option.c:931
 msgid "Display password dialog"
 msgstr "Display password dialogue"
 
-#: ../src/option.c:846
+#: ../src/option.c:940
 msgid "Display the username option"
 msgstr "Display the username option"
 
-#: ../src/option.c:861
+#: ../src/option.c:955
 msgid "Display color selection dialog"
 msgstr "Display colour selection dialogue"
 
-#: ../src/option.c:870
+#: ../src/option.c:964
 msgid "Set the color"
 msgstr "Set the colour"
 
-#: ../src/option.c:879
+#: ../src/option.c:973
 msgid "Show the palette"
 msgstr "Show the palette"
 
-#: ../src/option.c:894
+#: ../src/option.c:988
 msgid "About zenity"
 msgstr "About zenity"
 
-#: ../src/option.c:903
+#: ../src/option.c:997
 msgid "Print version"
 msgstr "Print version"
 
-#: ../src/option.c:1643
+#: ../src/option.c:1813
 msgid "General options"
 msgstr "General options"
 
-#: ../src/option.c:1644
+#: ../src/option.c:1814
 msgid "Show general options"
 msgstr "Show general options"
 
-#: ../src/option.c:1654
+#: ../src/option.c:1824
 msgid "Calendar options"
 msgstr "Calendar options"
 
-#: ../src/option.c:1655
+#: ../src/option.c:1825
 msgid "Show calendar options"
 msgstr "Show calendar options"
 
-#: ../src/option.c:1665
+#: ../src/option.c:1835
 msgid "Text entry options"
 msgstr "Text entry options"
 
-#: ../src/option.c:1666
+#: ../src/option.c:1836
 msgid "Show text entry options"
 msgstr "Show text entry options"
 
-#: ../src/option.c:1676
+#: ../src/option.c:1846
 msgid "Error options"
 msgstr "Error options"
 
-#: ../src/option.c:1677
+#: ../src/option.c:1847
 msgid "Show error options"
 msgstr "Show error options"
 
-#: ../src/option.c:1687
+#: ../src/option.c:1857
 msgid "Info options"
 msgstr "Info options"
 
-#: ../src/option.c:1688
+#: ../src/option.c:1858
 msgid "Show info options"
 msgstr "Show info options"
 
-#: ../src/option.c:1698
+#: ../src/option.c:1868
 msgid "File selection options"
 msgstr "File selection options"
 
-#: ../src/option.c:1699
+#: ../src/option.c:1869
 msgid "Show file selection options"
 msgstr "Show file selection options"
 
-#: ../src/option.c:1709
+#: ../src/option.c:1879
 msgid "List options"
 msgstr "List options"
 
-#: ../src/option.c:1710
+#: ../src/option.c:1880
 msgid "Show list options"
 msgstr "Show list options"
 
-#: ../src/option.c:1720
+#: ../src/option.c:1891
 msgid "Notification icon options"
 msgstr "Notification icon options"
 
-#: ../src/option.c:1721
+#: ../src/option.c:1892
 msgid "Show notification icon options"
 msgstr "Show notification icon options"
 
-#: ../src/option.c:1731
+#: ../src/option.c:1903
 msgid "Progress options"
 msgstr "Progress options"
 
-#: ../src/option.c:1732
+#: ../src/option.c:1904
 msgid "Show progress options"
 msgstr "Show progress options"
 
-#: ../src/option.c:1742
+#: ../src/option.c:1914
 msgid "Question options"
 msgstr "Question options"
 
-#: ../src/option.c:1743
+#: ../src/option.c:1915
 msgid "Show question options"
 msgstr "Show question options"
 
-#: ../src/option.c:1753
+#: ../src/option.c:1925
 msgid "Warning options"
 msgstr "Warning options"
 
-#: ../src/option.c:1754
+#: ../src/option.c:1926
 msgid "Show warning options"
 msgstr "Show warning options"
 
-#: ../src/option.c:1764
+#: ../src/option.c:1936
 msgid "Scale options"
 msgstr "Scale options"
 
-#: ../src/option.c:1765
+#: ../src/option.c:1937
 msgid "Show scale options"
 msgstr "Show scale options"
 
-#: ../src/option.c:1775
+#: ../src/option.c:1947
 msgid "Text information options"
 msgstr "Text information options"
 
-#: ../src/option.c:1776
+#: ../src/option.c:1948
 msgid "Show text information options"
 msgstr "Show text information options"
 
-#: ../src/option.c:1786
+#: ../src/option.c:1958
 msgid "Color selection options"
 msgstr "Colour selection options"
 
-#: ../src/option.c:1787
+#: ../src/option.c:1959
 msgid "Show color selection options"
 msgstr "Show colour selection options"
 
-#: ../src/option.c:1797
+#: ../src/option.c:1969
 msgid "Password dialog options"
 msgstr "Password dialogue options"
 
-#: ../src/option.c:1798
+#: ../src/option.c:1970
 msgid "Show password dialog options"
 msgstr "Show password dialogue options"
 
-#: ../src/option.c:1808
+#: ../src/option.c:1980
+msgid "Forms dialog options"
+msgstr "Forms dialogue options"
+
+#: ../src/option.c:1981
+msgid "Show forms dialog options"
+msgstr "Show forms dialogue options"
+
+#: ../src/option.c:1991
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-#: ../src/option.c:1809
+#: ../src/option.c:1992
 msgid "Show miscellaneous options"
 msgstr "Show miscellaneous options"
 
-#: ../src/option.c:1834
+#: ../src/option.c:2017
 #, 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:1838
+#: ../src/option.c:2021
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s is not supported for this dialogue\n"
 
-#: ../src/option.c:1842
+#: ../src/option.c:2025
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "Two or more dialogue options specified\n"