diff --git a/po/eo.po b/po/eo.po
index cd5586c..d7b635c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,16 +1,15 @@
 # Esperanto translation for zenity
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the zenity package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&component=general\n"
-"POT-Creation-Date: 2010-11-24 16:38+0000\n"
-"PO-Revision-Date: 2010-12-11 18:54+0100\n"
+"product=zenity&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-31 12:38+0000\n"
+"PO-Revision-Date: 2011-04-02 19:40+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
 "Language: eo\n"
@@ -46,15 +45,13 @@ msgstr ""
 
 #: ../src/about.c:265
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Kristjan SCHMIDT https://launchpad.net/~kristjan-eo"
+msgstr "Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>"
 
 #: ../src/about.c:277
 msgid "Display dialog boxes from shell scripts"
 msgstr ""
 
-#: ../src/main.c:102
+#: ../src/main.c:105
 #, c-format
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
@@ -69,7 +66,7 @@ msgstr ""
 msgid "Could not parse message from stdin\n"
 msgstr ""
 
-#: ../src/notification.c:196
+#: ../src/notification.c:198
 msgid "Zenity notification"
 msgstr "Zenity-sciigo"
 
@@ -106,554 +103,600 @@ msgid "You should use only one List dialog type.\n"
 msgstr ""
 
 #: ../src/zenity.ui.h:1
+msgid "<b>Forms dialog</b>"
+msgstr ""
+
+#: ../src/zenity.ui.h:2
 msgid "Add a new entry"
 msgstr "Aldoni novan elementon"
 
-#: ../src/zenity.ui.h:2
+#: ../src/zenity.ui.h:3
 msgid "Adjust the scale value"
 msgstr ""
 
-#: ../src/zenity.ui.h:3
+#: ../src/zenity.ui.h:4
 msgid "All updates are complete."
 msgstr "Ĉiij ĝisdatigoj estas kompletaj."
 
-#: ../src/zenity.ui.h:4
+#: ../src/zenity.ui.h:5
 msgid "An error has occurred."
 msgstr "Eraro okazis."
 
-#: ../src/zenity.ui.h:5
+#: ../src/zenity.ui.h:6
 msgid "Are you sure you want to proceed?"
 msgstr ""
 
-#: ../src/zenity.ui.h:6
+#: ../src/zenity.ui.h:7
 msgid "C_alendar:"
 msgstr "K_alendaro:"
 
-#: ../src/zenity.ui.h:7
+#: ../src/zenity.ui.h:8
 msgid "Calendar selection"
 msgstr "Kalendaro-elekto"
 
-#: ../src/zenity.ui.h:8
+#: ../src/zenity.ui.h:9
 msgid "Error"
 msgstr "Eraro"
 
-#: ../src/zenity.ui.h:9
+#: ../src/zenity.ui.h:10
 msgid "Information"
 msgstr "Informo"
 
-#: ../src/zenity.ui.h:10
+#: ../src/zenity.ui.h:11
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/zenity.ui.h:11
+#: ../src/zenity.ui.h:12
 msgid "Question"
 msgstr "Demando"
 
-#: ../src/zenity.ui.h:12
+#: ../src/zenity.ui.h:13
 msgid "Running..."
 msgstr "Rulante..."
 
-#: ../src/zenity.ui.h:13
+#: ../src/zenity.ui.h:14
 msgid "Select a date from below."
 msgstr ""
 
-#: ../src/zenity.ui.h:14
+#: ../src/zenity.ui.h:15
 msgid "Select items from the list"
 msgstr "Elektu elementojn de la listo"
 
-#: ../src/zenity.ui.h:15
+#: ../src/zenity.ui.h:16
 msgid "Select items from the list below."
 msgstr ""
 
-#: ../src/zenity.ui.h:16
+#: ../src/zenity.ui.h:17
 msgid "Text View"
 msgstr "Tekst-vido"
 
-#: ../src/zenity.ui.h:17
+#: ../src/zenity.ui.h:18
 msgid "Warning"
 msgstr "Averto"
 
-#: ../src/zenity.ui.h:18
+#: ../src/zenity.ui.h:19
 msgid "_Enter new text:"
 msgstr "_Enigu novan tekston:"
 
-#: ../src/option.c:133
+#: ../src/option.c:144
 msgid "Set the dialog title"
 msgstr "Agordi la dialog-titolon"
 
-#: ../src/option.c:134
+#: ../src/option.c:145
 msgid "TITLE"
 msgstr "TITOLO"
 
-#: ../src/option.c:142
+#: ../src/option.c:153
 msgid "Set the window icon"
 msgstr ""
 
-#: ../src/option.c:143
+#: ../src/option.c:154
 msgid "ICONPATH"
 msgstr ""
 
-#: ../src/option.c:151
+#: ../src/option.c:162
 msgid "Set the width"
 msgstr "Agordi la larĝon"
 
-#: ../src/option.c:152
+#: ../src/option.c:163
 msgid "WIDTH"
 msgstr "LARĜO"
 
-#: ../src/option.c:160
+#: ../src/option.c:171
 msgid "Set the height"
 msgstr "Agordi la alton"
 
-#: ../src/option.c:161
+#: ../src/option.c:172
 msgid "HEIGHT"
 msgstr "ALTO"
 
-#: ../src/option.c:169
+#: ../src/option.c:180
 msgid "Set dialog timeout in seconds"
 msgstr ""
 
 #. Timeout for closing the dialog
-#: ../src/option.c:171
+#: ../src/option.c:182
 msgid "TIMEOUT"
 msgstr "TEMPOLIMO"
 
-#: ../src/option.c:185
+#: ../src/option.c:196
 msgid "Display calendar dialog"
 msgstr "Montri kalendardialogon"
 
-#: ../src/option.c:194 ../src/option.c:254 ../src/option.c:297
-#: ../src/option.c:330 ../src/option.c:442 ../src/option.c:584
-#: ../src/option.c:656 ../src/option.c:740 ../src/option.c:773
+#: ../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 "Agordi la dialogtekston"
 
-#: ../src/option.c:195 ../src/option.c:255 ../src/option.c:264
-#: ../src/option.c:298 ../src/option.c:331 ../src/option.c:443
-#: ../src/option.c:550 ../src/option.c:585 ../src/option.c:657
-#: ../src/option.c:666 ../src/option.c:675 ../src/option.c:741
-#: ../src/option.c:774
+#: ../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 "TEKSTO"
 
-#: ../src/option.c:203
+#: ../src/option.c:214
 msgid "Set the calendar day"
 msgstr "Agordi la kalendartagon"
 
-#: ../src/option.c:204
+#: ../src/option.c:215
 msgid "DAY"
 msgstr "TAGO"
 
-#: ../src/option.c:212
+#: ../src/option.c:223
 msgid "Set the calendar month"
 msgstr "Agordi la kalendarmonaton"
 
-#: ../src/option.c:213
+#: ../src/option.c:224
 msgid "MONTH"
 msgstr "MONATO"
 
-#: ../src/option.c:221
+#: ../src/option.c:232
 msgid "Set the calendar year"
 msgstr "Agordi la kalendarjaron"
 
-#: ../src/option.c:222
+#: ../src/option.c:233
 msgid "YEAR"
 msgstr "JARO"
 
-#: ../src/option.c:230
+#: ../src/option.c:241 ../src/option.c:916
 msgid "Set the format for the returned date"
 msgstr ""
 
-#: ../src/option.c:231
+#: ../src/option.c:242 ../src/option.c:917
 msgid "PATTERN"
 msgstr "ŜABLONO"
 
-#: ../src/option.c:245
+#: ../src/option.c:256
 msgid "Display text entry dialog"
 msgstr ""
 
-#: ../src/option.c:263
+#: ../src/option.c:274
 msgid "Set the entry text"
 msgstr ""
 
-#: ../src/option.c:272
+#: ../src/option.c:283
 msgid "Hide the entry text"
 msgstr ""
 
-#: ../src/option.c:288
+#: ../src/option.c:299
 msgid "Display error dialog"
 msgstr "Montri erardialogon"
 
-#: ../src/option.c:306 ../src/option.c:339 ../src/option.c:683
-#: ../src/option.c:749
+#: ../src/option.c:317 ../src/option.c:350 ../src/option.c:694
+#: ../src/option.c:769
 msgid "Do not enable text wrapping"
 msgstr ""
 
-#: ../src/option.c:321
+#: ../src/option.c:332
 msgid "Display info dialog"
 msgstr "Montri informdialogon"
 
-#: ../src/option.c:354
+#: ../src/option.c:365
 msgid "Display file selection dialog"
 msgstr "Montri dosierelekt-dialogon"
 
-#: ../src/option.c:363
+#: ../src/option.c:374
 msgid "Set the filename"
 msgstr "Agordi la dosiernomon"
 
-#: ../src/option.c:364 ../src/option.c:708
+#: ../src/option.c:375 ../src/option.c:719
 msgid "FILENAME"
 msgstr "DOSIERNOMO"
 
-#: ../src/option.c:372
+#: ../src/option.c:383
 msgid "Allow multiple files to be selected"
 msgstr "Permesi elekton de pluraj dosieroj"
 
-#: ../src/option.c:381
+#: ../src/option.c:392
 msgid "Activate directory-only selection"
 msgstr ""
 
-#: ../src/option.c:390
+#: ../src/option.c:401
 msgid "Activate save mode"
 msgstr ""
 
-#: ../src/option.c:399 ../src/option.c:478
+#: ../src/option.c:410 ../src/option.c:489 ../src/option.c:907
 msgid "Set output separator character"
 msgstr ""
 
-#: ../src/option.c:400 ../src/option.c:479
+#: ../src/option.c:411 ../src/option.c:490 ../src/option.c:908
 msgid "SEPARATOR"
 msgstr "APARTIGILO"
 
-#: ../src/option.c:408
+#: ../src/option.c:419
 msgid "Confirm file selection if filename already exists"
 msgstr ""
 
-#: ../src/option.c:417
+#: ../src/option.c:428
 msgid "Sets a filename filter"
 msgstr ""
 
 #. Help for file-filter argument (name and patterns for file selection)
-#: ../src/option.c:419
+#: ../src/option.c:430
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr ""
 
-#: ../src/option.c:433
+#: ../src/option.c:444
 msgid "Display list dialog"
 msgstr "Montri listdialogon"
 
-#: ../src/option.c:451
+#: ../src/option.c:462
 msgid "Set the column header"
 msgstr "Agordi la kolumnotitolon"
 
-#: ../src/option.c:452
+#: ../src/option.c:463
 msgid "COLUMN"
 msgstr "KOLUMNO"
 
-#: ../src/option.c:460
+#: ../src/option.c:471
 msgid "Use check boxes for first column"
 msgstr ""
 
-#: ../src/option.c:469
+#: ../src/option.c:480
 msgid "Use radio buttons for first column"
 msgstr ""
 
-#: ../src/option.c:487
+#: ../src/option.c:498
 msgid "Allow multiple rows to be selected"
 msgstr "Permesi elekton de pluraj vicoj"
 
-#: ../src/option.c:496 ../src/option.c:716
+#: ../src/option.c:507 ../src/option.c:727
 msgid "Allow changes to text"
 msgstr "Permesi ŝanĝon de teksto"
 
-#: ../src/option.c:505
+#: ../src/option.c:516
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
 msgstr ""
 
 #. Column index number to print out on a list dialog
-#: ../src/option.c:507 ../src/option.c:516
+#: ../src/option.c:518 ../src/option.c:527
 msgid "NUMBER"
 msgstr "NOMBRO"
 
-#: ../src/option.c:515
+#: ../src/option.c:526
 msgid "Hide a specific column"
 msgstr "Kaŝi specifan kolumnon"
 
-#: ../src/option.c:524
+#: ../src/option.c:535
 msgid "Hides the column headers"
 msgstr "Kaŝi kolumnotitolojn"
 
-#: ../src/option.c:540
+#: ../src/option.c:551
 msgid "Display notification"
 msgstr "Montri sciigon"
 
-#: ../src/option.c:549
+#: ../src/option.c:560
 msgid "Set the notification text"
 msgstr "Agordi la sciigotekston"
 
-#: ../src/option.c:558
+#: ../src/option.c:569
 msgid "Listen for commands on stdin"
 msgstr ""
 
-#: ../src/option.c:575
+#: ../src/option.c:586
 msgid "Display progress indication dialog"
 msgstr ""
 
-#: ../src/option.c:593
+#: ../src/option.c:604
 msgid "Set initial percentage"
 msgstr "Agordi komencan elcenton"
 
-#: ../src/option.c:594
+#: ../src/option.c:605
 msgid "PERCENTAGE"
 msgstr "ELCENTO"
 
-#: ../src/option.c:602
+#: ../src/option.c:613
 msgid "Pulsate progress bar"
 msgstr ""
 
-#: ../src/option.c:612
+#: ../src/option.c:623
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr ""
 
-#: ../src/option.c:622
+#: ../src/option.c:633
 #, no-c-format
 msgid "Kill parent process if Cancel button is pressed"
 msgstr ""
 
-#: ../src/option.c:632
+#: ../src/option.c:643
 #, no-c-format
 msgid "Hide Cancel button"
 msgstr "Kaŝi \"Rezigni\"-butonon"
 
-#: ../src/option.c:647
+#: ../src/option.c:658
 msgid "Display question dialog"
 msgstr "Montri demand-dialogon"
 
-#: ../src/option.c:665
+#: ../src/option.c:676
 msgid "Sets the label of the Ok button"
 msgstr ""
 
-#: ../src/option.c:674
+#: ../src/option.c:685
 msgid "Sets the label of the Cancel button"
 msgstr ""
 
-#: ../src/option.c:698
+#: ../src/option.c:709
 msgid "Display text information dialog"
 msgstr ""
 
-#: ../src/option.c:707
+#: ../src/option.c:718
 msgid "Open file"
 msgstr "Malfermi dosieron"
 
-#: ../src/option.c:731
+#: ../src/option.c:736
+msgid "Set the text font"
+msgstr "Agordi la teksttiparon"
+
+#: ../src/option.c:751
 msgid "Display warning dialog"
 msgstr "Montri avert-dialogon"
 
-#: ../src/option.c:764
+#: ../src/option.c:784
 msgid "Display scale dialog"
 msgstr ""
 
-#: ../src/option.c:782
+#: ../src/option.c:802
 msgid "Set initial value"
 msgstr "Agordi komencan valoron"
 
-#: ../src/option.c:783 ../src/option.c:792 ../src/option.c:801
-#: ../src/option.c:810 ../src/option.c:876
+#: ../src/option.c:803 ../src/option.c:812 ../src/option.c:821
+#: ../src/option.c:830 ../src/option.c:965
 msgid "VALUE"
 msgstr "VALORO"
 
-#: ../src/option.c:791
+#: ../src/option.c:811
 msgid "Set minimum value"
 msgstr "Agordi minimuman valoron"
 
-#: ../src/option.c:800
+#: ../src/option.c:820
 msgid "Set maximum value"
 msgstr "Agordi maksimuman valoron"
 
-#: ../src/option.c:809
+#: ../src/option.c:829
 msgid "Set step size"
 msgstr "Agordi paŝ-grandon"
 
-#: ../src/option.c:818
+#: ../src/option.c:838
 msgid "Print partial values"
 msgstr ""
 
-#: ../src/option.c:827
+#: ../src/option.c:847
 msgid "Hide value"
 msgstr "Kaŝi valoron"
 
-#: ../src/option.c:842
+#: ../src/option.c:862
+#, fuzzy
+msgid "Display forms dialog"
+msgstr "Montri informdialogon"
+
+#: ../src/option.c:871
+#, fuzzy
+msgid "Add a new Entry in forms dialog"
+msgstr "Aldoni novan elementon"
+
+#: ../src/option.c:872 ../src/option.c:881
+msgid "Field name"
+msgstr ""
+
+#: ../src/option.c:880
+msgid "Add a new Password Entry in forms dialog"
+msgstr ""
+
+#: ../src/option.c:889
+msgid "Add a new Calendar in forms dialog"
+msgstr ""
+
+#: ../src/option.c:890
+#, fuzzy
+msgid "Calendar field name"
+msgstr "Kalendarkamponomo"
+
+#: ../src/option.c:931
 msgid "Display password dialog"
 msgstr "Montri pasvort-dialogon"
 
-#: ../src/option.c:851
+#: ../src/option.c:940
 msgid "Display the username option"
 msgstr "Montri la unzantonom-agordon"
 
-#: ../src/option.c:866
+#: ../src/option.c:955
 msgid "Display color selection dialog"
 msgstr "Montriu la kolor-elektad-dialogon"
 
-#: ../src/option.c:875
+#: ../src/option.c:964
 msgid "Set the color"
 msgstr "Agordi la koloron"
 
-#: ../src/option.c:884
+#: ../src/option.c:973
 msgid "Show the palette"
 msgstr "Montri la paletron"
 
-#: ../src/option.c:899
+#: ../src/option.c:988
 msgid "About zenity"
 msgstr "Pri Zenity"
 
-#: ../src/option.c:908
+#: ../src/option.c:997
 msgid "Print version"
 msgstr "Pres-versio"
 
-#: ../src/option.c:1654
+#: ../src/option.c:1813
 msgid "General options"
 msgstr "Ĝeneralaj agordoj"
 
-#: ../src/option.c:1655
+#: ../src/option.c:1814
 msgid "Show general options"
 msgstr "Montri ĝeneralajn agordojn"
 
-#: ../src/option.c:1665
+#: ../src/option.c:1824
 msgid "Calendar options"
 msgstr "Kalendar-agordoj"
 
-#: ../src/option.c:1666
+#: ../src/option.c:1825
 msgid "Show calendar options"
 msgstr "Montri kalendar-agordojn"
 
-#: ../src/option.c:1676
+#: ../src/option.c:1835
 msgid "Text entry options"
 msgstr ""
 
-#: ../src/option.c:1677
+#: ../src/option.c:1836
 msgid "Show text entry options"
 msgstr ""
 
-#: ../src/option.c:1687
+#: ../src/option.c:1846
 msgid "Error options"
 msgstr "Erar-agordoj"
 
-#: ../src/option.c:1688
+#: ../src/option.c:1847
 msgid "Show error options"
 msgstr "Montri erar-agordojn"
 
-#: ../src/option.c:1698
+#: ../src/option.c:1857
 msgid "Info options"
 msgstr "Informo-agordoj"
 
-#: ../src/option.c:1699
+#: ../src/option.c:1858
 msgid "Show info options"
 msgstr "Montri inform-agordojn"
 
-#: ../src/option.c:1709
+#: ../src/option.c:1868
 msgid "File selection options"
 msgstr "Dosierelekt-agordoj"
 
-#: ../src/option.c:1710
+#: ../src/option.c:1869
 msgid "Show file selection options"
 msgstr "Montri dosierelekt-agordojn"
 
-#: ../src/option.c:1720
+#: ../src/option.c:1879
 msgid "List options"
 msgstr "List-agordoj"
 
-#: ../src/option.c:1721
+#: ../src/option.c:1880
 msgid "Show list options"
 msgstr "Montri list-agordojn"
 
-#: ../src/option.c:1732
+#: ../src/option.c:1891
 msgid "Notification icon options"
 msgstr ""
 
-#: ../src/option.c:1733
+#: ../src/option.c:1892
 msgid "Show notification icon options"
 msgstr ""
 
-#: ../src/option.c:1744
+#: ../src/option.c:1903
 msgid "Progress options"
 msgstr ""
 
-#: ../src/option.c:1745
+#: ../src/option.c:1904
 msgid "Show progress options"
 msgstr ""
 
-#: ../src/option.c:1755
+#: ../src/option.c:1914
 msgid "Question options"
 msgstr "Demand-agordoj"
 
-#: ../src/option.c:1756
+#: ../src/option.c:1915
 msgid "Show question options"
 msgstr "Montri demand-agordojn"
 
-#: ../src/option.c:1766
+#: ../src/option.c:1925
 msgid "Warning options"
 msgstr "Avert-agordoj"
 
-#: ../src/option.c:1767
+#: ../src/option.c:1926
 msgid "Show warning options"
 msgstr "Montri avert-agordojn"
 
-#: ../src/option.c:1777
+#: ../src/option.c:1936
 msgid "Scale options"
 msgstr ""
 
-#: ../src/option.c:1778
+#: ../src/option.c:1937
 msgid "Show scale options"
 msgstr ""
 
-#: ../src/option.c:1788
+#: ../src/option.c:1947
 msgid "Text information options"
 msgstr ""
 
-#: ../src/option.c:1789
+#: ../src/option.c:1948
 msgid "Show text information options"
 msgstr ""
 
-#: ../src/option.c:1799
+#: ../src/option.c:1958
 msgid "Color selection options"
 msgstr "Kolorelekt-agordoj"
 
-#: ../src/option.c:1800
+#: ../src/option.c:1959
 msgid "Show color selection options"
 msgstr "Montri kolorelekt-agordojn"
 
-#: ../src/option.c:1810
+#: ../src/option.c:1969
 msgid "Password dialog options"
 msgstr "Pasvortdialog-agordoj"
 
-#: ../src/option.c:1811
+#: ../src/option.c:1970
 msgid "Show password dialog options"
 msgstr "Montri pasvortdialog-agordojn"
 
-#: ../src/option.c:1821
+#: ../src/option.c:1980
+#, fuzzy
+msgid "Forms dialog options"
+msgstr "Pasvortdialog-agordoj"
+
+#: ../src/option.c:1981
+#, fuzzy
+msgid "Show forms dialog options"
+msgstr "Montri pasvortdialog-agordojn"
+
+#: ../src/option.c:1991
 msgid "Miscellaneous options"
 msgstr "Diversaj agordoj"
 
-#: ../src/option.c:1822
+#: ../src/option.c:1992
 msgid "Show miscellaneous options"
 msgstr "Montri diversajn agordojn"
 
-#: ../src/option.c:1847
+#: ../src/option.c:2017
 #, c-format
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Tiu agordo ne estas disponebla. Bonvole rigardu --help por eblaj uzadoj.\n"
 
-#: ../src/option.c:1851
+#: ../src/option.c:2021
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr ""
 
-#: ../src/option.c:1855
+#: ../src/option.c:2025
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr ""