diff --git a/po/nb.po b/po/nb.po
index c8837d6..4333c82 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: zenity 2.92.x\n"
+"Project-Id-Version: zenity 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-28 23:00+0200\n"
-"PO-Revision-Date: 2011-06-28 23:00+0200\n"
+"POT-Creation-Date: 2011-07-12 21:21+0200\n"
+"PO-Revision-Date: 2011-07-12 21:21+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -99,12 +99,12 @@ msgstr "Høyeste verdi må være større enn laveste verdi.\n"
 msgid "Value out of range.\n"
 msgstr "Verdi utenfor gyldig område.\n"
 
-#: ../src/tree.c:321
+#: ../src/tree.c:324
 #, c-format
 msgid "No column titles specified for List dialog.\n"
 msgstr "Ingen kolonnetittel oppgitt for listedialogen.\n"
 
-#: ../src/tree.c:327
+#: ../src/tree.c:330
 #, c-format
 msgid "You should use only one List dialog type.\n"
 msgstr "Du bør kun bruke en type listedialog.\n"
@@ -185,198 +185,203 @@ msgstr "Advarsel"
 msgid "_Enter new text:"
 msgstr "_Oppgi ny tekst:"
 
-#: ../src/option.c:145
+#: ../src/option.c:146
 msgid "Set the dialog title"
 msgstr "Sett tittel for dialog"
 
-#: ../src/option.c:146
+#: ../src/option.c:147
 msgid "TITLE"
 msgstr "TITTEL"
 
-#: ../src/option.c:154
+#: ../src/option.c:155
 msgid "Set the window icon"
 msgstr "Sett ikon for vindu"
 
-#: ../src/option.c:155
+#: ../src/option.c:156
 msgid "ICONPATH"
 msgstr "IKONSTI"
 
-#: ../src/option.c:163
+#: ../src/option.c:164
 msgid "Set the width"
 msgstr "Sett bredden"
 
-#: ../src/option.c:164
+#: ../src/option.c:165
 msgid "WIDTH"
 msgstr "BREDDE"
 
-#: ../src/option.c:172
+#: ../src/option.c:173
 msgid "Set the height"
 msgstr "Sett høyden"
 
-#: ../src/option.c:173
+#: ../src/option.c:174
 msgid "HEIGHT"
 msgstr "HØYDE"
 
-#: ../src/option.c:181
+#: ../src/option.c:182
 msgid "Set dialog timeout in seconds"
 msgstr "Sett tidsavbrudd for dialog i sekunder"
 
 #. Timeout for closing the dialog
-#: ../src/option.c:183
+#: ../src/option.c:184
 msgid "TIMEOUT"
 msgstr "TIDSAVBRUDD"
 
-#: ../src/option.c:197
+#: ../src/option.c:198
 msgid "Display calendar dialog"
 msgstr "Vis kalenderdialog"
 
-#: ../src/option.c:206 ../src/option.c:266 ../src/option.c:309
-#: ../src/option.c:342 ../src/option.c:454 ../src/option.c:596
-#: ../src/option.c:668 ../src/option.c:788 ../src/option.c:821
-#: ../src/option.c:926
+#: ../src/option.c:207 ../src/option.c:267 ../src/option.c:310
+#: ../src/option.c:351 ../src/option.c:471 ../src/option.c:613
+#: ../src/option.c:685 ../src/option.c:813 ../src/option.c:854
+#: ../src/option.c:959
 msgid "Set the dialog text"
 msgstr "Sett teksten i dialogen"
 
-#: ../src/option.c:207 ../src/option.c:267 ../src/option.c:276
-#: ../src/option.c:310 ../src/option.c:343 ../src/option.c:455
-#: ../src/option.c:562 ../src/option.c:597 ../src/option.c:669
-#: ../src/option.c:678 ../src/option.c:687 ../src/option.c:738
-#: ../src/option.c:747 ../src/option.c:756 ../src/option.c:765
-#: ../src/option.c:789 ../src/option.c:822 ../src/option.c:927
+#: ../src/option.c:208 ../src/option.c:268 ../src/option.c:277
+#: ../src/option.c:311 ../src/option.c:352 ../src/option.c:472
+#: ../src/option.c:579 ../src/option.c:614 ../src/option.c:686
+#: ../src/option.c:695 ../src/option.c:704 ../src/option.c:763
+#: ../src/option.c:772 ../src/option.c:781 ../src/option.c:790
+#: ../src/option.c:814 ../src/option.c:855 ../src/option.c:960
 msgid "TEXT"
 msgstr "TEKST"
 
-#: ../src/option.c:215
+#: ../src/option.c:216
 msgid "Set the calendar day"
 msgstr "Sett dag i kalenderen"
 
-#: ../src/option.c:216
+#: ../src/option.c:217
 msgid "DAY"
 msgstr "DAG"
 
-#: ../src/option.c:224
+#: ../src/option.c:225
 msgid "Set the calendar month"
 msgstr "Sett måned i kalenderen"
 
-#: ../src/option.c:225
+#: ../src/option.c:226
 msgid "MONTH"
 msgstr "MÅNED"
 
-#: ../src/option.c:233
+#: ../src/option.c:234
 msgid "Set the calendar year"
 msgstr "Sett år i kalenderen"
 
-#: ../src/option.c:234
+#: ../src/option.c:235
 msgid "YEAR"
 msgstr "ÅR"
 
-#: ../src/option.c:242 ../src/option.c:944
+#: ../src/option.c:243 ../src/option.c:977
 msgid "Set the format for the returned date"
 msgstr "Sett format for returnert dato"
 
-#: ../src/option.c:243 ../src/option.c:945
+#: ../src/option.c:244 ../src/option.c:978
 msgid "PATTERN"
 msgstr "MØNSTER"
 
-#: ../src/option.c:257
+#: ../src/option.c:258
 msgid "Display text entry dialog"
 msgstr "Vis tekstoppføringsdialog"
 
-#: ../src/option.c:275
+#: ../src/option.c:276
 msgid "Set the entry text"
 msgstr "Sett tekst i oppføringen"
 
-#: ../src/option.c:284
+#: ../src/option.c:285
 msgid "Hide the entry text"
 msgstr "Skjul tekst i oppføringen"
 
-#: ../src/option.c:300
+#: ../src/option.c:301
 msgid "Display error dialog"
 msgstr "Vis feildialog"
 
-#: ../src/option.c:318 ../src/option.c:351 ../src/option.c:695
-#: ../src/option.c:797
+#: ../src/option.c:319 ../src/option.c:360 ../src/option.c:712
+#: ../src/option.c:822
 msgid "Do not enable text wrapping"
 msgstr "Ikke aktiver tekstbryting"
 
-#: ../src/option.c:333
+#: ../src/option.c:328 ../src/option.c:369 ../src/option.c:721
+#: ../src/option.c:831
+msgid "Do not enable pango markup"
+msgstr "Ikke aktiver tekstmerking med pango"
+
+#: ../src/option.c:342
 msgid "Display info dialog"
 msgstr "Vis informasjonsdialog"
 
-#: ../src/option.c:366
+#: ../src/option.c:383
 msgid "Display file selection dialog"
 msgstr "Vis dialog for filvalg"
 
-#: ../src/option.c:375
+#: ../src/option.c:392
 msgid "Set the filename"
 msgstr "Sett filnavnet"
 
-#: ../src/option.c:376 ../src/option.c:720
+#: ../src/option.c:393 ../src/option.c:745
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: ../src/option.c:384
+#: ../src/option.c:401
 msgid "Allow multiple files to be selected"
 msgstr "Tillat valg av flere filer"
 
-#: ../src/option.c:393
+#: ../src/option.c:410
 msgid "Activate directory-only selection"
 msgstr "Aktiver utvalg kun på katalog"
 
-#: ../src/option.c:402
+#: ../src/option.c:419
 msgid "Activate save mode"
 msgstr "Aktiver lagre-modus"
 
-#: ../src/option.c:411 ../src/option.c:490 ../src/option.c:935
+#: ../src/option.c:428 ../src/option.c:507 ../src/option.c:968
 msgid "Set output separator character"
 msgstr "Sett skilletegn for utdata"
 
-#: ../src/option.c:412 ../src/option.c:491 ../src/option.c:936
+#: ../src/option.c:429 ../src/option.c:508 ../src/option.c:969
 msgid "SEPARATOR"
 msgstr "SKILLETEGN"
 
-#: ../src/option.c:420
+#: ../src/option.c:437
 msgid "Confirm file selection if filename already exists"
 msgstr "Bekreft filutvalget hvis filnavnet allerede eksisterer"
 
-#: ../src/option.c:429
+#: ../src/option.c:446
 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:431
+#: ../src/option.c:448
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAVN | MØNSTER1 MØNSTER2 …"
 
-#: ../src/option.c:445
+#: ../src/option.c:462
 msgid "Display list dialog"
 msgstr "Vis listedialog"
 
-#: ../src/option.c:463
+#: ../src/option.c:480
 msgid "Set the column header"
 msgstr "Sett kolonnetopptekst"
 
-#: ../src/option.c:464
+#: ../src/option.c:481
 msgid "COLUMN"
 msgstr "KOLONNE"
 
-#: ../src/option.c:472
+#: ../src/option.c:489
 msgid "Use check boxes for first column"
 msgstr "Bruk avkrysningsbokser for første kolonne"
 
-#: ../src/option.c:481
+#: ../src/option.c:498
 msgid "Use radio buttons for first column"
 msgstr "Bruk radioknapper for første kolonne"
 
-#: ../src/option.c:499
+#: ../src/option.c:516
 msgid "Allow multiple rows to be selected"
 msgstr "Tillat valg av flere rader"
 
-#: ../src/option.c:508 ../src/option.c:728
+#: ../src/option.c:525 ../src/option.c:753
 msgid "Allow changes to text"
 msgstr "Tillat endringer i tekst"
 
-#: ../src/option.c:517
+#: ../src/option.c:534
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -385,315 +390,315 @@ msgstr ""
 "alle kolonner)"
 
 #. Column index number to print out on a list dialog
-#: ../src/option.c:519 ../src/option.c:528
+#: ../src/option.c:536 ../src/option.c:545
 msgid "NUMBER"
 msgstr "TALL"
 
-#: ../src/option.c:527
+#: ../src/option.c:544
 msgid "Hide a specific column"
 msgstr "Skjul en bestemt kolonne"
 
-#: ../src/option.c:536
+#: ../src/option.c:553
 msgid "Hides the column headers"
 msgstr "Skjuler kolonnetopptekst"
 
-#: ../src/option.c:552
+#: ../src/option.c:569
 msgid "Display notification"
 msgstr "Vis melding"
 
-#: ../src/option.c:561
+#: ../src/option.c:578
 msgid "Set the notification text"
 msgstr "Sett meldingsteksten"
 
-#: ../src/option.c:570
+#: ../src/option.c:587
 msgid "Listen for commands on stdin"
 msgstr "Lytt etter kommandoer på stdin"
 
-#: ../src/option.c:587
+#: ../src/option.c:604
 msgid "Display progress indication dialog"
 msgstr "Vis dialog for indikering av fremgang"
 
-#: ../src/option.c:605
+#: ../src/option.c:622
 msgid "Set initial percentage"
 msgstr "Sett startprosent"
 
-#: ../src/option.c:606
+#: ../src/option.c:623
 msgid "PERCENTAGE"
 msgstr "PROSENT"
 
-#: ../src/option.c:614
+#: ../src/option.c:631
 msgid "Pulsate progress bar"
 msgstr "Pulserende fremgangslinje"
 
-#: ../src/option.c:624
+#: ../src/option.c:641
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Lukk dialogen når 100% er nådd"
 
-#: ../src/option.c:634
+#: ../src/option.c:651
 #, no-c-format
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Terminer opphavsprosess hvis Avbryt-knappen trykkes"
 
-#: ../src/option.c:644
+#: ../src/option.c:661
 #, no-c-format
 msgid "Hide Cancel button"
 msgstr "Skjul Avbryt-knapp"
 
-#: ../src/option.c:659
+#: ../src/option.c:676
 msgid "Display question dialog"
 msgstr "Vis spørsmålsdialog"
 
-#: ../src/option.c:677 ../src/option.c:746
+#: ../src/option.c:694 ../src/option.c:771
 msgid "Sets the label of the Ok button"
 msgstr "Setter etiketten for Ok-knappen"
 
-#: ../src/option.c:686 ../src/option.c:755
+#: ../src/option.c:703 ../src/option.c:780
 msgid "Sets the label of the Cancel button"
 msgstr "Setter etiketten for Avbryt-knappen"
 
-#: ../src/option.c:710
+#: ../src/option.c:735
 msgid "Display text information dialog"
 msgstr "Vis dialog med tekstinformasjon"
 
-#: ../src/option.c:719
+#: ../src/option.c:744
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: ../src/option.c:737
+#: ../src/option.c:762
 msgid "Set the text font"
 msgstr "Sett skrift for tekst"
 
-#: ../src/option.c:764
+#: ../src/option.c:789
 msgid "Enable a I read and agree checkbox"
 msgstr "Slå på en avkryssingsboks for «Lest og godtatt»"
 
-#: ../src/option.c:779
+#: ../src/option.c:804
 msgid "Display warning dialog"
 msgstr "Vis advarselsdialog"
 
-#: ../src/option.c:812
+#: ../src/option.c:845
 msgid "Display scale dialog"
 msgstr "Vis skaleringsdialog"
 
-#: ../src/option.c:830
+#: ../src/option.c:863
 msgid "Set initial value"
 msgstr "Sett startverdi"
 
-#: ../src/option.c:831 ../src/option.c:840 ../src/option.c:849
-#: ../src/option.c:858 ../src/option.c:993
+#: ../src/option.c:864 ../src/option.c:873 ../src/option.c:882
+#: ../src/option.c:891 ../src/option.c:1026
 msgid "VALUE"
 msgstr "VERDI"
 
-#: ../src/option.c:839
+#: ../src/option.c:872
 msgid "Set minimum value"
 msgstr "Sett minste verdi"
 
-#: ../src/option.c:848
+#: ../src/option.c:881
 msgid "Set maximum value"
 msgstr "Set høyeste verdi"
 
-#: ../src/option.c:857
+#: ../src/option.c:890
 msgid "Set step size"
 msgstr "Sett størrelse på steg"
 
-#: ../src/option.c:866
+#: ../src/option.c:899
 msgid "Print partial values"
 msgstr "Skriv ut delverdier"
 
-#: ../src/option.c:875
+#: ../src/option.c:908
 msgid "Hide value"
 msgstr "Skjul verdi"
 
-#: ../src/option.c:890
+#: ../src/option.c:923
 msgid "Display forms dialog"
 msgstr "Vis skjemadialog"
 
-#: ../src/option.c:899
+#: ../src/option.c:932
 msgid "Add a new Entry in forms dialog"
 msgstr "Legg til en ny oppføring i skjemadialog"
 
-#: ../src/option.c:900 ../src/option.c:909
+#: ../src/option.c:933 ../src/option.c:942
 msgid "Field name"
 msgstr "Feltnavn"
 
-#: ../src/option.c:908
+#: ../src/option.c:941
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Legg til en ny passordoppføring i skjemadialog"
 
-#: ../src/option.c:917
+#: ../src/option.c:950
 msgid "Add a new Calendar in forms dialog"
 msgstr "Legg til en ny kalender i skjemadialog"
 
-#: ../src/option.c:918
+#: ../src/option.c:951
 msgid "Calendar field name"
 msgstr "Feltnavn for kalender"
 
-#: ../src/option.c:959
+#: ../src/option.c:992
 msgid "Display password dialog"
 msgstr "Vis passorddialog"
 
-#: ../src/option.c:968
+#: ../src/option.c:1001
 msgid "Display the username option"
 msgstr "Vis brukernavnalternativet"
 
-#: ../src/option.c:983
+#: ../src/option.c:1016
 msgid "Display color selection dialog"
 msgstr "Vis dialog for fargevalg"
 
-#: ../src/option.c:992
+#: ../src/option.c:1025
 msgid "Set the color"
 msgstr "Sett farge"
 
-#: ../src/option.c:1001
+#: ../src/option.c:1034
 msgid "Show the palette"
 msgstr "Vis palett"
 
-#: ../src/option.c:1016
+#: ../src/option.c:1049
 msgid "About zenity"
 msgstr "Om Zenity"
 
-#: ../src/option.c:1025
+#: ../src/option.c:1058
 msgid "Print version"
 msgstr "Skriv ut versjon"
 
-#: ../src/option.c:1843
+#: ../src/option.c:1881
 msgid "General options"
 msgstr "Generelle alternativer"
 
-#: ../src/option.c:1844
+#: ../src/option.c:1882
 msgid "Show general options"
 msgstr "Vis generelle alternativer"
 
-#: ../src/option.c:1854
+#: ../src/option.c:1892
 msgid "Calendar options"
 msgstr "Alternativer for kalender"
 
-#: ../src/option.c:1855
+#: ../src/option.c:1893
 msgid "Show calendar options"
 msgstr "Vis alternativer for kalender"
 
-#: ../src/option.c:1865
+#: ../src/option.c:1903
 msgid "Text entry options"
 msgstr "Alternativer for tekstoppføring"
 
-#: ../src/option.c:1866
+#: ../src/option.c:1904
 msgid "Show text entry options"
 msgstr "Vis alternativer for tekstoppføring"
 
-#: ../src/option.c:1876
+#: ../src/option.c:1914
 msgid "Error options"
 msgstr "Alternativer for feil"
 
-#: ../src/option.c:1877
+#: ../src/option.c:1915
 msgid "Show error options"
 msgstr "Vis alternativer for feil"
 
-#: ../src/option.c:1887
+#: ../src/option.c:1925
 msgid "Info options"
 msgstr "Alternativer for informasjon"
 
-#: ../src/option.c:1888
+#: ../src/option.c:1926
 msgid "Show info options"
 msgstr "Vis alternativer for infosider"
 
-#: ../src/option.c:1898
+#: ../src/option.c:1936
 msgid "File selection options"
 msgstr "Alternativer for filvalg"
 
-#: ../src/option.c:1899
+#: ../src/option.c:1937
 msgid "Show file selection options"
 msgstr "Vis alternativer for filvalg"
 
-#: ../src/option.c:1909
+#: ../src/option.c:1947
 msgid "List options"
 msgstr "Alternativer for liste"
 
-#: ../src/option.c:1910
+#: ../src/option.c:1948
 msgid "Show list options"
 msgstr "Vis alternativer for liste"
 
-#: ../src/option.c:1921
+#: ../src/option.c:1959
 msgid "Notification icon options"
 msgstr "Alternativer for varselikon"
 
-#: ../src/option.c:1922
+#: ../src/option.c:1960
 msgid "Show notification icon options"
 msgstr "Vis alternativer for varselikon"
 
-#: ../src/option.c:1933
+#: ../src/option.c:1971
 msgid "Progress options"
 msgstr "Alternativer for fremgang"
 
-#: ../src/option.c:1934
+#: ../src/option.c:1972
 msgid "Show progress options"
 msgstr "Vis alternativer for fremgang"
 
-#: ../src/option.c:1944
+#: ../src/option.c:1982
 msgid "Question options"
 msgstr "Alternativer for spørsmål"
 
-#: ../src/option.c:1945
+#: ../src/option.c:1983
 msgid "Show question options"
 msgstr "Vis alternativer for spørsmål"
 
-#: ../src/option.c:1955
+#: ../src/option.c:1993
 msgid "Warning options"
 msgstr "Alternativer for advarsel"
 
-#: ../src/option.c:1956
+#: ../src/option.c:1994
 msgid "Show warning options"
 msgstr "Vis alternativer for advarsel"
 
-#: ../src/option.c:1966
+#: ../src/option.c:2004
 msgid "Scale options"
 msgstr "Alternativer for skalering"
 
-#: ../src/option.c:1967
+#: ../src/option.c:2005
 msgid "Show scale options"
 msgstr "Vis alternativer for skalering"
 
-#: ../src/option.c:1977
+#: ../src/option.c:2015
 msgid "Text information options"
 msgstr "Alternativer for tekstinformasjon"
 
-#: ../src/option.c:1978
+#: ../src/option.c:2016
 msgid "Show text information options"
 msgstr "Vis alternativer for tekstinformasjon"
 
-#: ../src/option.c:1988
+#: ../src/option.c:2026
 msgid "Color selection options"
 msgstr "Alternativer for fargevalg"
 
-#: ../src/option.c:1989
+#: ../src/option.c:2027
 msgid "Show color selection options"
 msgstr "Vis alternativer for fargevalg"
 
-#: ../src/option.c:1999
+#: ../src/option.c:2037
 msgid "Password dialog options"
 msgstr "Alternativer for passorddialog"
 
-#: ../src/option.c:2000
+#: ../src/option.c:2038
 msgid "Show password dialog options"
 msgstr "Vis alternativer for passorddialog"
 
-#: ../src/option.c:2010
+#: ../src/option.c:2048
 msgid "Forms dialog options"
 msgstr "Alternativer for skjemadialog"
 
-#: ../src/option.c:2011
+#: ../src/option.c:2049
 msgid "Show forms dialog options"
 msgstr "Vis alternativer for skjemadialog"
 
-#: ../src/option.c:2021
+#: ../src/option.c:2059
 msgid "Miscellaneous options"
 msgstr "Forskjellige alternativer"
 
-#: ../src/option.c:2022
+#: ../src/option.c:2060
 msgid "Show miscellaneous options"
 msgstr "Vis forskjellige alternativer"
 
-#: ../src/option.c:2047
+#: ../src/option.c:2085
 #, c-format
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
@@ -701,12 +706,12 @@ msgstr ""
 "Dette flagget er ikke tilgjengelig. Vennligst bruk --help for å se mulige "
 "flagg.\n"
 
-#: ../src/option.c:2051
+#: ../src/option.c:2089
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s er ikke støttet for denne dialogen\n"
 
-#: ../src/option.c:2055
+#: ../src/option.c:2093
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "To eller flere dialogflagg oppgitt\n"