diff --git a/po/ChangeLog b/po/ChangeLog
index aa6edab..5ed3b89 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
 2006-12-04  Lucas Rocha  <lucasr@gnome.org>
 
 	* 2.17.1 version marker.
diff --git a/po/nb.po b/po/nb.po
index 10f8f41..1043317 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zenity 2.13.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-17 15:32+0200\n"
-"PO-Revision-Date: 2006-10-17 15:30+0200\n"
+"POT-Creation-Date: 2006-12-11 01:53+0100\n"
+"PO-Revision-Date: 2006-12-11 01:54+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -92,221 +92,244 @@ msgid "Adjust the scale value"
 msgstr "Juster verdi for skalering"
 
 #: ../src/zenity.glade.h:3
-msgid "Adjust the scale value."
-msgstr "Juster verdi for skalering."
-
-#: ../src/zenity.glade.h:4
 msgid "All updates are complete."
 msgstr "Alle oppdateringer er fullført."
 
-#: ../src/zenity.glade.h:5
+#: ../src/zenity.glade.h:4
 msgid "An error has occurred."
 msgstr "En feil har oppstått."
 
-#: ../src/zenity.glade.h:6
+#: ../src/zenity.glade.h:5
 msgid "Are you sure you want to proceed?"
 msgstr "Er du sikker på at du vil fortsette?"
 
-#: ../src/zenity.glade.h:7
+#: ../src/zenity.glade.h:6
 msgid "C_alendar:"
 msgstr "K_alender:"
 
-#: ../src/zenity.glade.h:8
+#: ../src/zenity.glade.h:7
 msgid "Calendar selection"
 msgstr "Kalenderutvalg"
 
-#: ../src/zenity.glade.h:9
+#: ../src/zenity.glade.h:8
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/zenity.glade.h:10
+#: ../src/zenity.glade.h:9
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../src/zenity.glade.h:11
+#: ../src/zenity.glade.h:10
 msgid "Progress"
 msgstr "Fremgang"
 
-#: ../src/zenity.glade.h:12
+#: ../src/zenity.glade.h:11
 msgid "Question"
 msgstr "Spørsmål"
 
-#: ../src/zenity.glade.h:13
+#: ../src/zenity.glade.h:12
 msgid "Running..."
 msgstr "Kjører..."
 
-#: ../src/zenity.glade.h:14
+#: ../src/zenity.glade.h:13
 msgid "Select a date from below."
 msgstr "Velg en dato under."
 
-#: ../src/zenity.glade.h:15
+#: ../src/zenity.glade.h:14
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../src/zenity.glade.h:16
+#: ../src/zenity.glade.h:15
 msgid "Select items from the list"
 msgstr "Velg oppføringer fra listen"
 
-#: ../src/zenity.glade.h:17
+#: ../src/zenity.glade.h:16
 msgid "Select items from the list below."
 msgstr "Velg oppføringer fra listen under."
 
-#: ../src/zenity.glade.h:18
+#: ../src/zenity.glade.h:17
 msgid "Text View"
 msgstr "Tekstvisning"
 
-#: ../src/zenity.glade.h:19
+#: ../src/zenity.glade.h:18
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/zenity.glade.h:20
+#: ../src/zenity.glade.h:19
 msgid "_Enter new text:"
 msgstr "_Oppgi ny tekst:"
 
-#: ../src/option.c:115
+#: ../src/option.c:116
 msgid "Set the dialog title"
 msgstr "Sett tittel for dialog"
 
-#: ../src/option.c:116
+#: ../src/option.c:117
 msgid "TITLE"
 msgstr "TITTEL"
 
-#: ../src/option.c:124
+#: ../src/option.c:125
 msgid "Set the window icon"
 msgstr "Sett ikon for vindu"
 
-#: ../src/option.c:125
+#: ../src/option.c:126
 msgid "ICONPATH"
 msgstr "IKONSTI"
 
-#: ../src/option.c:133
+#: ../src/option.c:134
 msgid "Set the width"
 msgstr "Sett bredden"
 
-#: ../src/option.c:134
+#: ../src/option.c:135
 msgid "WIDTH"
 msgstr "BREDDE"
 
-#: ../src/option.c:142
+#: ../src/option.c:143
 msgid "Set the height"
 msgstr "Sett høyden"
 
-#: ../src/option.c:143
+#: ../src/option.c:144
 msgid "HEIGHT"
 msgstr "HØYDE"
 
-#: ../src/option.c:157
+#: ../src/option.c:158
 msgid "Display calendar dialog"
 msgstr "Vis kalenderdialog"
 
-#: ../src/option.c:166 ../src/option.c:226 ../src/option.c:269
-#: ../src/option.c:302 ../src/option.c:404 ../src/option.c:533
-#: ../src/option.c:585 ../src/option.c:651 ../src/option.c:684
+#: ../src/option.c:167 ../src/option.c:227 ../src/option.c:270
+#: ../src/option.c:303 ../src/option.c:405 ../src/option.c:534
+#: ../src/option.c:596 ../src/option.c:662 ../src/option.c:695
 msgid "Set the dialog text"
 msgstr "Sett teksten i dialogen"
 
-#: ../src/option.c:175
+#: ../src/option.c:168 ../src/option.c:228 ../src/option.c:237
+#: ../src/option.c:246 ../src/option.c:271 ../src/option.c:304
+#: ../src/option.c:406 ../src/option.c:502 ../src/option.c:535
+#: ../src/option.c:597 ../src/option.c:663 ../src/option.c:696
+msgid "TEXT"
+msgstr "TEKST"
+
+#: ../src/option.c:176
 msgid "Set the calendar day"
 msgstr "Sett dag i kalenderen"
 
-#: ../src/option.c:184
+#: ../src/option.c:177
+msgid "DAY"
+msgstr "DAG"
+
+#: ../src/option.c:185
 msgid "Set the calendar month"
 msgstr "Sett måned i kalenderen"
 
-#: ../src/option.c:193
+#: ../src/option.c:186
+msgid "MONTH"
+msgstr "MÅNED"
+
+#: ../src/option.c:194
 msgid "Set the calendar year"
 msgstr "Sett år i kalenderen"
 
-#: ../src/option.c:202
+#: ../src/option.c:195
+msgid "YEAR"
+msgstr "ÅR"
+
+#: ../src/option.c:203
 msgid "Set the format for the returned date"
 msgstr "Sett format for returnert dato"
 
-#: ../src/option.c:217
+#: ../src/option.c:204
+msgid "PATTERN"
+msgstr "MØNSTER"
+
+#: ../src/option.c:218
 msgid "Display text entry dialog"
 msgstr "Vis tekstoppføringsdialog"
 
-#: ../src/option.c:235
+#: ../src/option.c:236
 msgid "Set the entry text"
 msgstr "Sett tekst i oppføringen"
 
-#: ../src/option.c:244
+#: ../src/option.c:245
 msgid "Hide the entry text"
 msgstr "Skjul tekst i oppføringen"
 
-#: ../src/option.c:260
+#: ../src/option.c:261
 msgid "Display error dialog"
 msgstr "Vis feildialog"
 
-#: ../src/option.c:278 ../src/option.c:311 ../src/option.c:594
-#: ../src/option.c:660
+#: ../src/option.c:279 ../src/option.c:312 ../src/option.c:605
+#: ../src/option.c:671
 msgid "Do not enable text wrapping"
 msgstr "Ikke aktiver tekstbryting"
 
-#: ../src/option.c:293
+#: ../src/option.c:294
 msgid "Display info dialog"
 msgstr "Vis informasjonsdialog"
 
-#: ../src/option.c:326
+#: ../src/option.c:327
 msgid "Display file selection dialog"
 msgstr "Vis dialog for filvalg"
 
-#: ../src/option.c:335
+#: ../src/option.c:336
 msgid "Set the filename"
 msgstr "Sett filnavnet"
 
-#: ../src/option.c:336 ../src/option.c:619
+#: ../src/option.c:337 ../src/option.c:630
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: ../src/option.c:344
+#: ../src/option.c:345
 msgid "Allow multiple files to be selected"
 msgstr "Tillat valg av flere filer"
 
-#: ../src/option.c:353
+#: ../src/option.c:354
 msgid "Activate directory-only selection"
 msgstr "Aktiver utvalg kun på katalog"
 
-#: ../src/option.c:362
+#: ../src/option.c:363
 msgid "Activate save mode"
 msgstr "Aktiver lagre-modus"
 
-#: ../src/option.c:371 ../src/option.c:440
+#: ../src/option.c:372 ../src/option.c:441
 msgid "Set output separator character"
 msgstr "Sett skilletegn for utdata"
 
-#: ../src/option.c:372 ../src/option.c:441
+#: ../src/option.c:373 ../src/option.c:442
 msgid "SEPARATOR"
 msgstr "SKILLETEGN"
 
-#: ../src/option.c:380
+#: ../src/option.c:381
 msgid "Confirm file selection if filename already exists"
 msgstr "Bekreft filutvalget hvis filnavnet allerede eksisterer"
 
-#: ../src/option.c:395
+#: ../src/option.c:396
 msgid "Display list dialog"
 msgstr "Vis listedialog"
 
-#: ../src/option.c:413
+#: ../src/option.c:414
 msgid "Set the column header"
 msgstr "Sett kolonnetopptekst"
 
-#: ../src/option.c:422
+#: ../src/option.c:415
+msgid "COLUMN"
+msgstr "KOLONNE"
+
+#: ../src/option.c:423
 msgid "Use check boxes for first column"
 msgstr "Bruk avkrysningsbokser for første kolonne"
 
-#: ../src/option.c:431
+#: ../src/option.c:432
 msgid "Use radio buttons for first column"
 msgstr "Bruk radioknapper for første kolonne"
 
-#: ../src/option.c:449
+#: ../src/option.c:450
 msgid "Allow multiple rows to be selected"
 msgstr "Tillat valg av flere rader"
 
-#: ../src/option.c:458 ../src/option.c:627
+#: ../src/option.c:459 ../src/option.c:638
 msgid "Allow changes to text"
 msgstr "Tillat endringer i tekst"
 
-#: ../src/option.c:467
+#: ../src/option.c:468
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -314,215 +337,233 @@ msgstr ""
 "Skriv ut en bestemt kolonne (Forvalg er 1. «ALL» kan brukes for å skrive ut "
 "alle kolonner)"
 
-#: ../src/option.c:476
+#: ../src/option.c:469 ../src/option.c:478
+msgid "NUMBER"
+msgstr "TALL"
+
+#: ../src/option.c:477
 msgid "Hide a specific column"
 msgstr "Skjul en bestemt kolonne"
 
-#: ../src/option.c:491
+#: ../src/option.c:492
 msgid "Display notification"
 msgstr "Vis melding"
 
-#: ../src/option.c:500
+#: ../src/option.c:501
 msgid "Set the notification text"
 msgstr "Sett meldingsteksten"
 
-#: ../src/option.c:509
+#: ../src/option.c:510
 msgid "Listen for commands on stdin"
 msgstr "Lytt etter kommandoer på stdin"
 
-#: ../src/option.c:524
+#: ../src/option.c:525
 msgid "Display progress indication dialog"
 msgstr "Vis dialog for indikering av fremgang"
 
-#: ../src/option.c:542
+#: ../src/option.c:543
 msgid "Set initial percentage"
 msgstr "Sett startprosent"
 
-#: ../src/option.c:551
+#: ../src/option.c:544
+msgid "PERCENTAGE"
+msgstr "PROSENT"
+
+#: ../src/option.c:552
 msgid "Pulsate progress bar"
 msgstr "Pulserende fremgangslinje"
 
-#: ../src/option.c:561
+#: ../src/option.c:562
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Lukk dialogen når 100% er nådd"
 
-#: ../src/option.c:576
+#: ../src/option.c:572
+#, no-c-format
+msgid "Kill parent process if cancel button is pressed"
+msgstr "Terminer opphavsprosess hvis avbryt trykkes"
+
+#: ../src/option.c:587
 msgid "Display question dialog"
 msgstr "Vis spørsmålsdialog"
 
-#: ../src/option.c:609
+#: ../src/option.c:620
 msgid "Display text information dialog"
 msgstr "Vis dialog med tekstinformasjon"
 
-#: ../src/option.c:618
+#: ../src/option.c:629
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: ../src/option.c:642
+#: ../src/option.c:653
 msgid "Display warning dialog"
 msgstr "Vis advarselsdialog"
 
-#: ../src/option.c:675
+#: ../src/option.c:686
 msgid "Display scale dialog"
 msgstr "Vis skaleringsdialog"
 
-#: ../src/option.c:693
+#: ../src/option.c:704
 msgid "Set initial value"
 msgstr "Sett startverdi"
 
-#: ../src/option.c:702
+#: ../src/option.c:705 ../src/option.c:714 ../src/option.c:723
+#: ../src/option.c:732
+msgid "VALUE"
+msgstr "VERDI"
+
+#: ../src/option.c:713
 msgid "Set minimum value"
 msgstr "Sett minste verdi"
 
-#: ../src/option.c:711
+#: ../src/option.c:722
 msgid "Set maximum value"
 msgstr "Set høyeste verdi"
 
-#: ../src/option.c:720
+#: ../src/option.c:731
 msgid "Set step size"
 msgstr "Sett størrelse på steg"
 
-#: ../src/option.c:729
+#: ../src/option.c:740
 msgid "Print partial values"
 msgstr "Skriv ut delverdier"
 
-#: ../src/option.c:738
+#: ../src/option.c:749
 msgid "Hide value"
 msgstr "Skjul verdi"
 
-#: ../src/option.c:753
+#: ../src/option.c:764
 msgid "About zenity"
 msgstr "Om Zenity"
 
-#: ../src/option.c:762
+#: ../src/option.c:773
 msgid "Print version"
 msgstr "Skriv ut versjon"
 
-#: ../src/option.c:1397
+#: ../src/option.c:1414
 msgid "General options"
 msgstr "Generelle alternativer"
 
-#: ../src/option.c:1398
+#: ../src/option.c:1415
 msgid "Show general options"
 msgstr "Vis generelle alternativer"
 
-#: ../src/option.c:1408
+#: ../src/option.c:1425
 msgid "Calendar options"
 msgstr "Alternativer for kalender"
 
-#: ../src/option.c:1409
+#: ../src/option.c:1426
 msgid "Show calendar options"
 msgstr "Vis alternativer for kalender"
 
-#: ../src/option.c:1419
+#: ../src/option.c:1436
 msgid "Text entry options"
 msgstr "Alternativer for tekstoppføring"
 
-#: ../src/option.c:1420
+#: ../src/option.c:1437
 msgid "Show text entry options"
 msgstr "Vis alternativer for tekstoppføring"
 
-#: ../src/option.c:1430
+#: ../src/option.c:1447
 msgid "Error options"
 msgstr "Alternativer for feil"
 
-#: ../src/option.c:1431
+#: ../src/option.c:1448
 msgid "Show error options"
 msgstr "Vis alternativer for feil"
 
-#: ../src/option.c:1441
+#: ../src/option.c:1458
 msgid "Info options"
 msgstr "Alternativer for informasjon"
 
-#: ../src/option.c:1442
+#: ../src/option.c:1459
 msgid "Show info options"
 msgstr "Vis alternativer for infosider"
 
-#: ../src/option.c:1452
+#: ../src/option.c:1469
 msgid "File selection options"
 msgstr "Alternativer for filvalg"
 
-#: ../src/option.c:1453
+#: ../src/option.c:1470
 msgid "Show file selection options"
 msgstr "Vis alternativer for filvalg"
 
-#: ../src/option.c:1463
+#: ../src/option.c:1480
 msgid "List options"
 msgstr "Alternativer for liste"
 
-#: ../src/option.c:1464
+#: ../src/option.c:1481
 msgid "Show list options"
 msgstr "Vis alternativer for liste"
 
-#: ../src/option.c:1474
+#: ../src/option.c:1491
 msgid "Notification icon options"
 msgstr "Alternativer for varselikon"
 
-#: ../src/option.c:1475
+#: ../src/option.c:1492
 msgid "Show notification icon options"
 msgstr "Vis alternativer for varselikon"
 
-#: ../src/option.c:1485
+#: ../src/option.c:1502
 msgid "Progress options"
 msgstr "Alternativer for fremgang"
 
-#: ../src/option.c:1486
+#: ../src/option.c:1503
 msgid "Show progress options"
 msgstr "Vis alternativer for fremgang"
 
-#: ../src/option.c:1496
+#: ../src/option.c:1513
 msgid "Question options"
 msgstr "Alternativer for spørsmål"
 
-#: ../src/option.c:1497
+#: ../src/option.c:1514
 msgid "Show question options"
 msgstr "Vis alternativer for spørsmål"
 
-#: ../src/option.c:1507
+#: ../src/option.c:1524
 msgid "Warning options"
 msgstr "Alternativer for advarsel"
 
-#: ../src/option.c:1508
+#: ../src/option.c:1525
 msgid "Show warning options"
 msgstr "Vis alternativer for advarsel"
 
-#: ../src/option.c:1518
+#: ../src/option.c:1535
 msgid "Scale options"
 msgstr "Alternativer for skalering"
 
-#: ../src/option.c:1519
+#: ../src/option.c:1536
 msgid "Show scale options"
 msgstr "Vis alternativer for skalering"
 
-#: ../src/option.c:1529
+#: ../src/option.c:1546
 msgid "Text information options"
 msgstr "Alternativer for tekstinformasjon"
 
-#: ../src/option.c:1530
+#: ../src/option.c:1547
 msgid "Show text information options"
 msgstr "Vis alternativer for tekstinformasjon"
 
-#: ../src/option.c:1540
+#: ../src/option.c:1557
 msgid "Miscellaneous options"
 msgstr "Forskjellige alternativer"
 
-#: ../src/option.c:1541
+#: ../src/option.c:1558
 msgid "Show miscellaneous options"
 msgstr "Vis forskjellige alternativer"
 
-#: ../src/option.c:1566
+#: ../src/option.c:1583
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Dette flagget er ikke tilgjengelig. Vennligst bruk --help for å se mulige "
 "flagg.\n"
 
-#: ../src/option.c:1570
+#: ../src/option.c:1587
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s er ikke støttet for denne dialogen\n"
 
-#: ../src/option.c:1574
+#: ../src/option.c:1591
 msgid "Two or more dialog options specified\n"
 msgstr "To eller flere dialogflagg oppgitt\n"