diff --git a/po/nb.po b/po/nb.po
index 494f648..1aa6850 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: zenity 3.5.x\n"
+"Project-Id-Version: zenity 3.6.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 16:34+0200\n"
-"PO-Revision-Date: 2012-07-25 16:34+0200\n"
+"POT-Creation-Date: 2012-10-13 12:55+0200\n"
+"PO-Revision-Date: 2012-10-13 12:55+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -185,215 +185,229 @@ msgstr "Velg oppføringer fra listen under."
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/option.c:155
+#: ../src/option.c:157
 msgid "Set the dialog title"
 msgstr "Sett tittel for dialog"
 
-#: ../src/option.c:156
+#: ../src/option.c:158
 msgid "TITLE"
 msgstr "TITTEL"
 
-#: ../src/option.c:164
+#: ../src/option.c:166
 msgid "Set the window icon"
 msgstr "Sett ikon for vindu"
 
-#: ../src/option.c:165
+#: ../src/option.c:167
 msgid "ICONPATH"
 msgstr "IKONSTI"
 
-#: ../src/option.c:173
+#: ../src/option.c:175
 msgid "Set the width"
 msgstr "Sett bredden"
 
-#: ../src/option.c:174
+#: ../src/option.c:176
 msgid "WIDTH"
 msgstr "BREDDE"
 
-#: ../src/option.c:182
+#: ../src/option.c:184
 msgid "Set the height"
 msgstr "Sett høyden"
 
-#: ../src/option.c:183
+#: ../src/option.c:185
 msgid "HEIGHT"
 msgstr "HØYDE"
 
-#: ../src/option.c:191
+#: ../src/option.c:193
 msgid "Set dialog timeout in seconds"
 msgstr "Sett tidsavbrudd for dialog i sekunder"
 
 #. Timeout for closing the dialog
-#: ../src/option.c:193
+#: ../src/option.c:195
 msgid "TIMEOUT"
 msgstr "TIDSAVBRUDD"
 
-#: ../src/option.c:201
+#: ../src/option.c:203
 msgid "Sets the label of the Ok button"
 msgstr "Setter etiketten for Ok-knappen"
 
-#: ../src/option.c:202 ../src/option.c:211 ../src/option.c:235
-#: ../src/option.c:295 ../src/option.c:304 ../src/option.c:338
-#: ../src/option.c:379 ../src/option.c:499 ../src/option.c:615
-#: ../src/option.c:650 ../src/option.c:722 ../src/option.c:781
-#: ../src/option.c:790 ../src/option.c:834 ../src/option.c:875
-#: ../src/option.c:1026
+#: ../src/option.c:204 ../src/option.c:213 ../src/option.c:246
+#: ../src/option.c:306 ../src/option.c:315 ../src/option.c:349
+#: ../src/option.c:399 ../src/option.c:528 ../src/option.c:644
+#: ../src/option.c:679 ../src/option.c:751 ../src/option.c:819
+#: ../src/option.c:828 ../src/option.c:872 ../src/option.c:922
+#: ../src/option.c:1073
 msgid "TEXT"
 msgstr "TEKST"
 
-#: ../src/option.c:210
+#: ../src/option.c:212
 msgid "Sets the label of the Cancel button"
 msgstr "Setter etiketten for Avbryt-knappen"
 
-#: ../src/option.c:225
+#: ../src/option.c:221
+msgid "Set the modal hint"
+msgstr "Sett modalt hint"
+
+#: ../src/option.c:236
 msgid "Display calendar dialog"
 msgstr "Vis kalenderdialog"
 
-#: ../src/option.c:234 ../src/option.c:294 ../src/option.c:337
-#: ../src/option.c:378 ../src/option.c:498 ../src/option.c:649
-#: ../src/option.c:721 ../src/option.c:833 ../src/option.c:874
-#: ../src/option.c:1025
+#: ../src/option.c:245 ../src/option.c:305 ../src/option.c:348
+#: ../src/option.c:398 ../src/option.c:527 ../src/option.c:678
+#: ../src/option.c:750 ../src/option.c:871 ../src/option.c:921
+#: ../src/option.c:1072
 msgid "Set the dialog text"
 msgstr "Sett teksten i dialogen"
 
-#: ../src/option.c:243
+#: ../src/option.c:254
 msgid "Set the calendar day"
 msgstr "Sett dag i kalenderen"
 
-#: ../src/option.c:244
+#: ../src/option.c:255
 msgid "DAY"
 msgstr "DAG"
 
-#: ../src/option.c:252
+#: ../src/option.c:263
 msgid "Set the calendar month"
 msgstr "Sett måned i kalenderen"
 
-#: ../src/option.c:253
+#: ../src/option.c:264
 msgid "MONTH"
 msgstr "MÅNED"
 
-#: ../src/option.c:261
+#: ../src/option.c:272
 msgid "Set the calendar year"
 msgstr "Sett år i kalenderen"
 
-#: ../src/option.c:262
+#: ../src/option.c:273
 msgid "YEAR"
 msgstr "ÅR"
 
-#: ../src/option.c:270 ../src/option.c:1043
+#: ../src/option.c:281 ../src/option.c:1090
 msgid "Set the format for the returned date"
 msgstr "Sett format for returnert dato"
 
-#: ../src/option.c:271 ../src/option.c:1044
+#: ../src/option.c:282 ../src/option.c:1091
 msgid "PATTERN"
 msgstr "MØNSTER"
 
-#: ../src/option.c:285
+#: ../src/option.c:296
 msgid "Display text entry dialog"
 msgstr "Vis tekstoppføringsdialog"
 
-#: ../src/option.c:303
+#: ../src/option.c:314
 msgid "Set the entry text"
 msgstr "Sett tekst i oppføringen"
 
-#: ../src/option.c:312
+#: ../src/option.c:323
 msgid "Hide the entry text"
 msgstr "Skjul tekst i oppføringen"
 
-#: ../src/option.c:328
+#: ../src/option.c:339
 msgid "Display error dialog"
 msgstr "Vis feildialog"
 
-#: ../src/option.c:346 ../src/option.c:387 ../src/option.c:730
-#: ../src/option.c:842
+#: ../src/option.c:357 ../src/option.c:407 ../src/option.c:759
+#: ../src/option.c:880
+msgid "Set the dialog icon"
+msgstr "Sett ikon for dialog"
+
+#: ../src/option.c:358 ../src/option.c:408 ../src/option.c:760
+#: ../src/option.c:881
+msgid "ICON-NAME"
+msgstr "IKONNAVN"
+
+#: ../src/option.c:366 ../src/option.c:416 ../src/option.c:768
+#: ../src/option.c:889
 msgid "Do not enable text wrapping"
 msgstr "Ikke aktiver tekstbryting"
 
-#: ../src/option.c:355 ../src/option.c:396 ../src/option.c:739
-#: ../src/option.c:851
+#: ../src/option.c:375 ../src/option.c:425 ../src/option.c:777
+#: ../src/option.c:898
 msgid "Do not enable pango markup"
 msgstr "Ikke aktiver tekstmerking med pango"
 
-#: ../src/option.c:369
+#: ../src/option.c:389
 msgid "Display info dialog"
 msgstr "Vis informasjonsdialog"
 
-#: ../src/option.c:410
+#: ../src/option.c:439
 msgid "Display file selection dialog"
 msgstr "Vis dialog for filvalg"
 
-#: ../src/option.c:419
+#: ../src/option.c:448
 msgid "Set the filename"
 msgstr "Sett filnavnet"
 
-#: ../src/option.c:420 ../src/option.c:763
+#: ../src/option.c:449 ../src/option.c:801
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: ../src/option.c:428
+#: ../src/option.c:457
 msgid "Allow multiple files to be selected"
 msgstr "Tillat valg av flere filer"
 
-#: ../src/option.c:437
+#: ../src/option.c:466
 msgid "Activate directory-only selection"
 msgstr "Aktiver utvalg kun på katalog"
 
-#: ../src/option.c:446
+#: ../src/option.c:475
 msgid "Activate save mode"
 msgstr "Aktiver lagre-modus"
 
-#: ../src/option.c:455 ../src/option.c:543 ../src/option.c:1034
+#: ../src/option.c:484 ../src/option.c:572 ../src/option.c:1081
 msgid "Set output separator character"
 msgstr "Sett skilletegn for utdata"
 
-#: ../src/option.c:456 ../src/option.c:544 ../src/option.c:1035
+#: ../src/option.c:485 ../src/option.c:573 ../src/option.c:1082
 msgid "SEPARATOR"
 msgstr "SKILLETEGN"
 
-#: ../src/option.c:464
+#: ../src/option.c:493
 msgid "Confirm file selection if filename already exists"
 msgstr "Bekreft filutvalget hvis filnavnet allerede eksisterer"
 
-#: ../src/option.c:473
+#: ../src/option.c:502
 msgid "Sets a filename filter"
 msgstr "Setter et filter for filnavn"
 
 #. Help for file-filter argument (name and patterns for file selection)
-#: ../src/option.c:475
+#: ../src/option.c:504
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAVN | MØNSTER1 MØNSTER2 …"
 
-#: ../src/option.c:489
+#: ../src/option.c:518
 msgid "Display list dialog"
 msgstr "Vis listedialog"
 
-#: ../src/option.c:507
+#: ../src/option.c:536
 msgid "Set the column header"
 msgstr "Sett kolonnetopptekst"
 
-#: ../src/option.c:508
+#: ../src/option.c:537
 msgid "COLUMN"
 msgstr "KOLONNE"
 
-#: ../src/option.c:516
+#: ../src/option.c:545
 msgid "Use check boxes for first column"
 msgstr "Bruk avkrysningsbokser for første kolonne"
 
-#: ../src/option.c:525
+#: ../src/option.c:554
 msgid "Use radio buttons for first column"
 msgstr "Bruk radioknapper for første kolonne"
 
-#: ../src/option.c:534
+#: ../src/option.c:563
 msgid "Use an image for first column"
 msgstr "Bruk et bilde for første kolonne"
 
-#: ../src/option.c:552
+#: ../src/option.c:581
 msgid "Allow multiple rows to be selected"
 msgstr "Tillat valg av flere rader"
 
-#: ../src/option.c:561 ../src/option.c:771
+#: ../src/option.c:590 ../src/option.c:809
 msgid "Allow changes to text"
 msgstr "Tillat endringer i tekst"
 
-#: ../src/option.c:570
+#: ../src/option.c:599
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -402,344 +416,344 @@ msgstr ""
 "alle kolonner)"
 
 #. Column index number to print out on a list dialog
-#: ../src/option.c:572 ../src/option.c:581
+#: ../src/option.c:601 ../src/option.c:610
 msgid "NUMBER"
 msgstr "TALL"
 
-#: ../src/option.c:580
+#: ../src/option.c:609
 msgid "Hide a specific column"
 msgstr "Skjul en bestemt kolonne"
 
-#: ../src/option.c:589
+#: ../src/option.c:618
 msgid "Hides the column headers"
 msgstr "Skjuler kolonnetopptekst"
 
-#: ../src/option.c:605
+#: ../src/option.c:634
 msgid "Display notification"
 msgstr "Vis melding"
 
-#: ../src/option.c:614
+#: ../src/option.c:643
 msgid "Set the notification text"
 msgstr "Sett meldingsteksten"
 
-#: ../src/option.c:623
+#: ../src/option.c:652
 msgid "Listen for commands on stdin"
 msgstr "Lytt etter kommandoer på stdin"
 
-#: ../src/option.c:640
+#: ../src/option.c:669
 msgid "Display progress indication dialog"
 msgstr "Vis dialog for indikering av fremgang"
 
-#: ../src/option.c:658
+#: ../src/option.c:687
 msgid "Set initial percentage"
 msgstr "Sett startprosent"
 
-#: ../src/option.c:659
+#: ../src/option.c:688
 msgid "PERCENTAGE"
 msgstr "PROSENT"
 
-#: ../src/option.c:667
+#: ../src/option.c:696
 msgid "Pulsate progress bar"
 msgstr "Pulserende fremgangslinje"
 
-#: ../src/option.c:677
+#: ../src/option.c:706
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Lukk dialogen når 100% er nådd"
 
-#: ../src/option.c:687
+#: ../src/option.c:716
 #, no-c-format
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Terminer opphavsprosess hvis Avbryt-knappen trykkes"
 
-#: ../src/option.c:697
+#: ../src/option.c:726
 #, no-c-format
 msgid "Hide Cancel button"
 msgstr "Skjul Avbryt-knapp"
 
-#: ../src/option.c:712
+#: ../src/option.c:741
 msgid "Display question dialog"
 msgstr "Vis spørsmålsdialog"
 
-#: ../src/option.c:753
+#: ../src/option.c:791
 msgid "Display text information dialog"
 msgstr "Vis dialog med tekstinformasjon"
 
-#: ../src/option.c:762
+#: ../src/option.c:800
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: ../src/option.c:780
+#: ../src/option.c:818
 msgid "Set the text font"
 msgstr "Sett skrift for tekst"
 
-#: ../src/option.c:789
+#: ../src/option.c:827
 msgid "Enable an I read and agree checkbox"
 msgstr "Slå på en avkryssingsboks for «Lest og godtatt»"
 
-#: ../src/option.c:799
+#: ../src/option.c:837
 msgid "Enable html support"
 msgstr "Slå på støtte for HTML"
 
-#: ../src/option.c:808
+#: ../src/option.c:846
 msgid "Sets an url instead of a file. Only works if you use --html option"
 msgstr ""
 "Setter en URL i stedet for en fil. Virker kun hvis du bruker flagget --html"
 
-#: ../src/option.c:809
+#: ../src/option.c:847
 msgid "URL"
 msgstr "URL"
 
-#: ../src/option.c:824
+#: ../src/option.c:862
 msgid "Display warning dialog"
 msgstr "Vis advarselsdialog"
 
-#: ../src/option.c:865
+#: ../src/option.c:912
 msgid "Display scale dialog"
 msgstr "Vis skaleringsdialog"
 
-#: ../src/option.c:883
+#: ../src/option.c:930
 msgid "Set initial value"
 msgstr "Sett startverdi"
 
-#: ../src/option.c:884 ../src/option.c:893 ../src/option.c:902
-#: ../src/option.c:911 ../src/option.c:1092
+#: ../src/option.c:931 ../src/option.c:940 ../src/option.c:949
+#: ../src/option.c:958 ../src/option.c:1139
 msgid "VALUE"
 msgstr "VERDI"
 
-#: ../src/option.c:892
+#: ../src/option.c:939
 msgid "Set minimum value"
 msgstr "Sett minste verdi"
 
-#: ../src/option.c:901
+#: ../src/option.c:948
 msgid "Set maximum value"
 msgstr "Set høyeste verdi"
 
-#: ../src/option.c:910
+#: ../src/option.c:957
 msgid "Set step size"
 msgstr "Sett størrelse på steg"
 
-#: ../src/option.c:919
+#: ../src/option.c:966
 msgid "Print partial values"
 msgstr "Skriv ut delverdier"
 
-#: ../src/option.c:928
+#: ../src/option.c:975
 msgid "Hide value"
 msgstr "Skjul verdi"
 
-#: ../src/option.c:943
+#: ../src/option.c:990
 msgid "Display forms dialog"
 msgstr "Vis skjemadialog"
 
-#: ../src/option.c:952
+#: ../src/option.c:999
 msgid "Add a new Entry in forms dialog"
 msgstr "Legg til en ny oppføring i skjemadialog"
 
-#: ../src/option.c:953 ../src/option.c:962
+#: ../src/option.c:1000 ../src/option.c:1009
 msgid "Field name"
 msgstr "Feltnavn"
 
-#: ../src/option.c:961
+#: ../src/option.c:1008
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Legg til en ny passordoppføring i skjemadialog"
 
-#: ../src/option.c:970
+#: ../src/option.c:1017
 msgid "Add a new Calendar in forms dialog"
 msgstr "Legg til en ny kalender i skjemadialog"
 
-#: ../src/option.c:971
+#: ../src/option.c:1018
 msgid "Calendar field name"
 msgstr "Feltnavn for kalender"
 
-#: ../src/option.c:979
+#: ../src/option.c:1026
 msgid "Add a new List in forms dialog"
 msgstr "Legg til en ny liste i skjemadialog"
 
-#: ../src/option.c:980
+#: ../src/option.c:1027
 msgid "List field and header name"
 msgstr "Felt i liste og navn på topptekst"
 
-#: ../src/option.c:988
+#: ../src/option.c:1035
 msgid "List of values for List"
 msgstr "Liste med verdier for en liste"
 
-#: ../src/option.c:989 ../src/option.c:998
+#: ../src/option.c:1036 ../src/option.c:1045
 msgid "List of values separated by |"
 msgstr "Liste med verdier adskilt med |"
 
-#: ../src/option.c:997
+#: ../src/option.c:1044
 msgid "List of values for columns"
 msgstr "Liste med verdier for kolonner"
 
-#: ../src/option.c:1016
+#: ../src/option.c:1063
 msgid "Show the columns header"
 msgstr "Vis kolonnetopptekst"
 
-#: ../src/option.c:1058
+#: ../src/option.c:1105
 msgid "Display password dialog"
 msgstr "Vis passorddialog"
 
-#: ../src/option.c:1067
+#: ../src/option.c:1114
 msgid "Display the username option"
 msgstr "Vis brukernavnalternativet"
 
-#: ../src/option.c:1082
+#: ../src/option.c:1129
 msgid "Display color selection dialog"
 msgstr "Vis dialog for fargevalg"
 
-#: ../src/option.c:1091
+#: ../src/option.c:1138
 msgid "Set the color"
 msgstr "Sett farge"
 
-#: ../src/option.c:1100
+#: ../src/option.c:1147
 msgid "Show the palette"
 msgstr "Vis palett"
 
-#: ../src/option.c:1115
+#: ../src/option.c:1162
 msgid "About zenity"
 msgstr "Om Zenity"
 
-#: ../src/option.c:1124
+#: ../src/option.c:1171
 msgid "Print version"
 msgstr "Skriv ut versjon"
 
-#: ../src/option.c:2006
+#: ../src/option.c:2059
 msgid "General options"
 msgstr "Generelle alternativer"
 
-#: ../src/option.c:2007
+#: ../src/option.c:2060
 msgid "Show general options"
 msgstr "Vis generelle alternativer"
 
-#: ../src/option.c:2017
+#: ../src/option.c:2070
 msgid "Calendar options"
 msgstr "Alternativer for kalender"
 
-#: ../src/option.c:2018
+#: ../src/option.c:2071
 msgid "Show calendar options"
 msgstr "Vis alternativer for kalender"
 
-#: ../src/option.c:2028
+#: ../src/option.c:2081
 msgid "Text entry options"
 msgstr "Alternativer for tekstoppføring"
 
-#: ../src/option.c:2029
+#: ../src/option.c:2082
 msgid "Show text entry options"
 msgstr "Vis alternativer for tekstoppføring"
 
-#: ../src/option.c:2039
+#: ../src/option.c:2092
 msgid "Error options"
 msgstr "Alternativer for feil"
 
-#: ../src/option.c:2040
+#: ../src/option.c:2093
 msgid "Show error options"
 msgstr "Vis alternativer for feil"
 
-#: ../src/option.c:2050
+#: ../src/option.c:2103
 msgid "Info options"
 msgstr "Alternativer for informasjon"
 
-#: ../src/option.c:2051
+#: ../src/option.c:2104
 msgid "Show info options"
 msgstr "Vis alternativer for infosider"
 
-#: ../src/option.c:2061
+#: ../src/option.c:2114
 msgid "File selection options"
 msgstr "Alternativer for filvalg"
 
-#: ../src/option.c:2062
+#: ../src/option.c:2115
 msgid "Show file selection options"
 msgstr "Vis alternativer for filvalg"
 
-#: ../src/option.c:2072
+#: ../src/option.c:2125
 msgid "List options"
 msgstr "Alternativer for liste"
 
-#: ../src/option.c:2073
+#: ../src/option.c:2126
 msgid "Show list options"
 msgstr "Vis alternativer for liste"
 
-#: ../src/option.c:2084
+#: ../src/option.c:2137
 msgid "Notification icon options"
 msgstr "Alternativer for varselikon"
 
-#: ../src/option.c:2085
+#: ../src/option.c:2138
 msgid "Show notification icon options"
 msgstr "Vis alternativer for varselikon"
 
-#: ../src/option.c:2096
+#: ../src/option.c:2149
 msgid "Progress options"
 msgstr "Alternativer for fremgang"
 
-#: ../src/option.c:2097
+#: ../src/option.c:2150
 msgid "Show progress options"
 msgstr "Vis alternativer for fremgang"
 
-#: ../src/option.c:2107
+#: ../src/option.c:2160
 msgid "Question options"
 msgstr "Alternativer for spørsmål"
 
-#: ../src/option.c:2108
+#: ../src/option.c:2161
 msgid "Show question options"
 msgstr "Vis alternativer for spørsmål"
 
-#: ../src/option.c:2118
+#: ../src/option.c:2171
 msgid "Warning options"
 msgstr "Alternativer for advarsel"
 
-#: ../src/option.c:2119
+#: ../src/option.c:2172
 msgid "Show warning options"
 msgstr "Vis alternativer for advarsel"
 
-#: ../src/option.c:2129
+#: ../src/option.c:2182
 msgid "Scale options"
 msgstr "Alternativer for skalering"
 
-#: ../src/option.c:2130
+#: ../src/option.c:2183
 msgid "Show scale options"
 msgstr "Vis alternativer for skalering"
 
-#: ../src/option.c:2140
+#: ../src/option.c:2193
 msgid "Text information options"
 msgstr "Alternativer for tekstinformasjon"
 
-#: ../src/option.c:2141
+#: ../src/option.c:2194
 msgid "Show text information options"
 msgstr "Vis alternativer for tekstinformasjon"
 
-#: ../src/option.c:2151
+#: ../src/option.c:2204
 msgid "Color selection options"
 msgstr "Alternativer for fargevalg"
 
-#: ../src/option.c:2152
+#: ../src/option.c:2205
 msgid "Show color selection options"
 msgstr "Vis alternativer for fargevalg"
 
-#: ../src/option.c:2162
+#: ../src/option.c:2215
 msgid "Password dialog options"
 msgstr "Alternativer for passorddialog"
 
-#: ../src/option.c:2163
+#: ../src/option.c:2216
 msgid "Show password dialog options"
 msgstr "Vis alternativer for passorddialog"
 
-#: ../src/option.c:2173
+#: ../src/option.c:2226
 msgid "Forms dialog options"
 msgstr "Alternativer for skjemadialog"
 
-#: ../src/option.c:2174
+#: ../src/option.c:2227
 msgid "Show forms dialog options"
 msgstr "Vis alternativer for skjemadialog"
 
-#: ../src/option.c:2184
+#: ../src/option.c:2237
 msgid "Miscellaneous options"
 msgstr "Forskjellige alternativer"
 
-#: ../src/option.c:2185
+#: ../src/option.c:2238
 msgid "Show miscellaneous options"
 msgstr "Vis forskjellige alternativer"
 
-#: ../src/option.c:2210
+#: ../src/option.c:2263
 #, c-format
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
@@ -747,12 +761,12 @@ msgstr ""
 "Dette flagget er ikke tilgjengelig. Vennligst bruk --help for å se mulige "
 "flagg.\n"
 
-#: ../src/option.c:2214
+#: ../src/option.c:2267
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s er ikke støttet for denne dialogen\n"
 
-#: ../src/option.c:2218
+#: ../src/option.c:2271
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "To eller flere dialogflagg oppgitt\n"