diff --git a/po/ChangeLog b/po/ChangeLog
index 310179e..fd4f1c6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-19  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
 2008-04-11  Marcel Telka  <marcel@telka.sk>
 
 	* sk.po: Updated Slovak translation.
diff --git a/po/sv.po b/po/sv.po
index ba28e96..37b62ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,15 +1,15 @@
 # Swedish messages for zenity.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the zenity package.
-# Daniel Nylander <po@danielnylander.se>, 2006, 2007.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008.
 # Christian Rose <menthos@menthos.com>, 2003, 2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-15 08:56+0200\n"
-"PO-Revision-Date: 2007-08-15 08:56+0100\n"
+"POT-Creation-Date: 2008-04-19 13:39+0200\n"
+"PO-Revision-Date: 2008-04-19 13:40+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -152,435 +152,451 @@ msgstr "Varning"
 msgid "_Enter new text:"
 msgstr "_Ange ny text:"
 
-#: ../src/option.c:117
+#: ../src/option.c:119
 msgid "Set the dialog title"
 msgstr "Ställ in dialogtiteln"
 
-#: ../src/option.c:118
+#: ../src/option.c:120
 msgid "TITLE"
 msgstr "TITEL"
 
-#: ../src/option.c:126
+#: ../src/option.c:128
 msgid "Set the window icon"
 msgstr "Ställ in fönsterikonen"
 
-#: ../src/option.c:127
+#: ../src/option.c:129
 msgid "ICONPATH"
 msgstr "IKONSÖKVÄG"
 
-#: ../src/option.c:135
+#: ../src/option.c:137
 msgid "Set the width"
 msgstr "Ställ in bredden"
 
-#: ../src/option.c:136
+#: ../src/option.c:138
 msgid "WIDTH"
 msgstr "BREDD"
 
-#: ../src/option.c:144
+#: ../src/option.c:146
 msgid "Set the height"
 msgstr "Ställ in höjden"
 
-#: ../src/option.c:145
+#: ../src/option.c:147
 msgid "HEIGHT"
 msgstr "HÖJD"
 
-#: ../src/option.c:153
+#: ../src/option.c:155
 msgid "Set dialog timeout in seconds"
 msgstr "Ställ in tidsgräns för dialogrutan i sekunder"
 
-#: ../src/option.c:168
+#. Timeout for closing the dialog
+#: ../src/option.c:157
+msgid "TIMEOUT"
+msgstr "TIDSGRÄNS"
+
+#: ../src/option.c:171
 msgid "Display calendar dialog"
 msgstr "Visa kalenderdialog"
 
-#: ../src/option.c:177
-#: ../src/option.c:237
-#: ../src/option.c:280
-#: ../src/option.c:313
-#: ../src/option.c:415
-#: ../src/option.c:544
-#: ../src/option.c:606
-#: ../src/option.c:672
-#: ../src/option.c:705
+#: ../src/option.c:180
+#: ../src/option.c:240
+#: ../src/option.c:283
+#: ../src/option.c:316
+#: ../src/option.c:418
+#: ../src/option.c:548
+#: ../src/option.c:610
+#: ../src/option.c:694
+#: ../src/option.c:727
 msgid "Set the dialog text"
 msgstr "Ställ in dialogtexten"
 
-#: ../src/option.c:178
-#: ../src/option.c:238
-#: ../src/option.c:247
-#: ../src/option.c:256
-#: ../src/option.c:281
-#: ../src/option.c:314
-#: ../src/option.c:416
-#: ../src/option.c:512
-#: ../src/option.c:545
-#: ../src/option.c:607
-#: ../src/option.c:673
-#: ../src/option.c:706
+#: ../src/option.c:181
+#: ../src/option.c:241
+#: ../src/option.c:250
+#: ../src/option.c:259
+#: ../src/option.c:284
+#: ../src/option.c:317
+#: ../src/option.c:419
+#: ../src/option.c:516
+#: ../src/option.c:549
+#: ../src/option.c:611
+#: ../src/option.c:620
+#: ../src/option.c:629
+#: ../src/option.c:695
+#: ../src/option.c:728
 msgid "TEXT"
 msgstr "TEXT"
 
-#: ../src/option.c:186
+#: ../src/option.c:189
 msgid "Set the calendar day"
 msgstr "Ställ in kalenderdagen"
 
-#: ../src/option.c:187
+#: ../src/option.c:190
 msgid "DAY"
 msgstr "DAG"
 
-#: ../src/option.c:195
+#: ../src/option.c:198
 msgid "Set the calendar month"
 msgstr "Ställ in kalendermånaden"
 
-#: ../src/option.c:196
+#: ../src/option.c:199
 msgid "MONTH"
 msgstr "MÅNAD"
 
-#: ../src/option.c:204
+#: ../src/option.c:207
 msgid "Set the calendar year"
 msgstr "Ställ in kalenderåret"
 
-#: ../src/option.c:205
+#: ../src/option.c:208
 msgid "YEAR"
 msgstr "ÅR"
 
-#: ../src/option.c:213
+#: ../src/option.c:216
 msgid "Set the format for the returned date"
 msgstr "Ställ in formatet på det returnerade datumet"
 
-#: ../src/option.c:214
+#: ../src/option.c:217
 msgid "PATTERN"
 msgstr "MÖNSTER"
 
-#: ../src/option.c:228
+#: ../src/option.c:231
 msgid "Display text entry dialog"
 msgstr "Visa textinmatningsdialog"
 
-#: ../src/option.c:246
+#: ../src/option.c:249
 msgid "Set the entry text"
 msgstr "Ställ in fälttexten"
 
-#: ../src/option.c:255
+#: ../src/option.c:258
 msgid "Hide the entry text"
 msgstr "Dölj fälttexten"
 
-#: ../src/option.c:271
+#: ../src/option.c:274
 msgid "Display error dialog"
 msgstr "Visa feldialog"
 
-#: ../src/option.c:289
-#: ../src/option.c:322
-#: ../src/option.c:615
-#: ../src/option.c:681
+#: ../src/option.c:292
+#: ../src/option.c:325
+#: ../src/option.c:637
+#: ../src/option.c:703
 msgid "Do not enable text wrapping"
 msgstr "Aktivera inte textradbrytning"
 
-#: ../src/option.c:304
+#: ../src/option.c:307
 msgid "Display info dialog"
 msgstr "Visa informationsdialog"
 
-#: ../src/option.c:337
+#: ../src/option.c:340
 msgid "Display file selection dialog"
 msgstr "Visa filväljardialog"
 
-#: ../src/option.c:346
+#: ../src/option.c:349
 msgid "Set the filename"
 msgstr "Ställ in filnamnet"
 
-#: ../src/option.c:347
-#: ../src/option.c:640
+#: ../src/option.c:350
+#: ../src/option.c:662
 msgid "FILENAME"
 msgstr "FILNAMN"
 
-#: ../src/option.c:355
+#: ../src/option.c:358
 msgid "Allow multiple files to be selected"
 msgstr "Tillåt att flera filer väljs"
 
-#: ../src/option.c:364
+#: ../src/option.c:367
 msgid "Activate directory-only selection"
 msgstr "Aktivera markering av endast kataloger"
 
-#: ../src/option.c:373
+#: ../src/option.c:376
 msgid "Activate save mode"
 msgstr "Aktivera sparläge"
 
-#: ../src/option.c:382
-#: ../src/option.c:451
+#: ../src/option.c:385
+#: ../src/option.c:454
 msgid "Set output separator character"
 msgstr "Ställ in åtskiljartecken för utdata"
 
-#: ../src/option.c:383
-#: ../src/option.c:452
+#: ../src/option.c:386
+#: ../src/option.c:455
 msgid "SEPARATOR"
 msgstr "AVGRÄNSARE"
 
-#: ../src/option.c:391
+#: ../src/option.c:394
 msgid "Confirm file selection if filename already exists"
 msgstr "Bekräfta filval om filnamnet redan finns"
 
-#: ../src/option.c:406
+#: ../src/option.c:409
 msgid "Display list dialog"
 msgstr "Visa listdialog"
 
-#: ../src/option.c:424
+#: ../src/option.c:427
 msgid "Set the column header"
 msgstr "Ställ in kolumnhuvudet"
 
-#: ../src/option.c:425
+#: ../src/option.c:428
 msgid "COLUMN"
 msgstr "KOLUMN"
 
-#: ../src/option.c:433
+#: ../src/option.c:436
 msgid "Use check boxes for first column"
 msgstr "Använd kryssrutor i första kolumnen"
 
-#: ../src/option.c:442
+#: ../src/option.c:445
 msgid "Use radio buttons for first column"
 msgstr "Använd radioknappar i första kolumnen"
 
-#: ../src/option.c:460
+#: ../src/option.c:463
 msgid "Allow multiple rows to be selected"
 msgstr "Tillåt att flera rader väljs"
 
-#: ../src/option.c:469
-#: ../src/option.c:648
+#: ../src/option.c:472
+#: ../src/option.c:670
 msgid "Allow changes to text"
 msgstr "Tillåt ändringar av text"
 
-#: ../src/option.c:478
+#: ../src/option.c:481
 msgid "Print a specific column (Default is 1. 'ALL' can be used to print all columns)"
 msgstr "Skriv ut en specifik kolumn (Standardvärdet är 1. \"ALL\" kan användas för att skriva ut alla kolumner)"
 
-#: ../src/option.c:479
-#: ../src/option.c:488
+#. Column index number to print out on a list dialog
+#: ../src/option.c:483
+#: ../src/option.c:492
 msgid "NUMBER"
 msgstr "NUMMER"
 
-#: ../src/option.c:487
+#: ../src/option.c:491
 msgid "Hide a specific column"
 msgstr "Dölj en specifik kolumn"
 
-#: ../src/option.c:502
+#: ../src/option.c:506
 msgid "Display notification"
 msgstr "Visa notifiering"
 
-#: ../src/option.c:511
+#: ../src/option.c:515
 msgid "Set the notification text"
 msgstr "Ställ in notifieringstexten"
 
-#: ../src/option.c:520
+#: ../src/option.c:524
 msgid "Listen for commands on stdin"
 msgstr "Lyssna efter kommandon på standard in"
 
-#: ../src/option.c:535
+#: ../src/option.c:539
 msgid "Display progress indication dialog"
 msgstr "Visa förloppsmätardialog"
 
-#: ../src/option.c:553
+#: ../src/option.c:557
 msgid "Set initial percentage"
 msgstr "Ställ in initialt procenttal"
 
-#: ../src/option.c:554
+#: ../src/option.c:558
 msgid "PERCENTAGE"
 msgstr "PROCENTTAL"
 
-#: ../src/option.c:562
+#: ../src/option.c:566
 msgid "Pulsate progress bar"
 msgstr "Pulsera förloppsmätaren"
 
-#: ../src/option.c:572
+#: ../src/option.c:576
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Stäng dialogfönstret då 100% har nåtts"
 
-#: ../src/option.c:582
+#: ../src/option.c:586
 #, no-c-format
 msgid "Kill parent process if cancel button is pressed"
 msgstr "Döda föräldraprocessen om avbrytsknappen trycks"
 
-#: ../src/option.c:597
+#: ../src/option.c:601
 msgid "Display question dialog"
 msgstr "Visa frågedialog"
 
-#: ../src/option.c:630
+#: ../src/option.c:619
+msgid "Sets the label of the Ok button"
+msgstr "Ställer in etiketten för knappen OK"
+
+#: ../src/option.c:628
+msgid "Sets the label of the Cancel button"
+msgstr "Ställer in etiketten för knappen Avbryt"
+
+#: ../src/option.c:652
 msgid "Display text information dialog"
 msgstr "Visa textinformationsdialog"
 
-#: ../src/option.c:639
+#: ../src/option.c:661
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: ../src/option.c:663
+#: ../src/option.c:685
 msgid "Display warning dialog"
 msgstr "Visa varningsdialog"
 
-#: ../src/option.c:696
+#: ../src/option.c:718
 msgid "Display scale dialog"
 msgstr "Visa skaldialog"
 
-#: ../src/option.c:714
+#: ../src/option.c:736
 msgid "Set initial value"
 msgstr "Ställ in initialt värde"
 
-#: ../src/option.c:715
-#: ../src/option.c:724
-#: ../src/option.c:733
-#: ../src/option.c:742
+#: ../src/option.c:737
+#: ../src/option.c:746
+#: ../src/option.c:755
+#: ../src/option.c:764
 msgid "VALUE"
 msgstr "VÄRDE"
 
-#: ../src/option.c:723
+#: ../src/option.c:745
 msgid "Set minimum value"
 msgstr "Ställ in minimivärde"
 
-#: ../src/option.c:732
+#: ../src/option.c:754
 msgid "Set maximum value"
 msgstr "Ställ in maximivärde"
 
-#: ../src/option.c:741
+#: ../src/option.c:763
 msgid "Set step size"
 msgstr "Ställ in stegstorlek"
 
-#: ../src/option.c:750
+#: ../src/option.c:772
 msgid "Print partial values"
 msgstr "Skriv ut partiella värden"
 
-#: ../src/option.c:759
+#: ../src/option.c:781
 msgid "Hide value"
 msgstr "Dölj värde"
 
-#: ../src/option.c:774
+#: ../src/option.c:796
 msgid "About zenity"
 msgstr "Om zenity"
 
-#: ../src/option.c:783
+#: ../src/option.c:805
 msgid "Print version"
 msgstr "Skriv ut versionsnummer"
 
-#: ../src/option.c:1425
+#: ../src/option.c:1454
 msgid "General options"
 msgstr "Allmänna flaggor"
 
-#: ../src/option.c:1426
+#: ../src/option.c:1455
 msgid "Show general options"
 msgstr "Visa allmänna flaggor"
 
-#: ../src/option.c:1436
+#: ../src/option.c:1465
 msgid "Calendar options"
 msgstr "Kalenderflaggor"
 
-#: ../src/option.c:1437
+#: ../src/option.c:1466
 msgid "Show calendar options"
 msgstr "Visa kalenderflaggor"
 
-#: ../src/option.c:1447
+#: ../src/option.c:1476
 msgid "Text entry options"
 msgstr "Flaggor för textinmatning"
 
-#: ../src/option.c:1448
+#: ../src/option.c:1477
 msgid "Show text entry options"
 msgstr "Visa flaggor för textinmatning"
 
-#: ../src/option.c:1458
+#: ../src/option.c:1487
 msgid "Error options"
 msgstr "Felflaggor"
 
-#: ../src/option.c:1459
+#: ../src/option.c:1488
 msgid "Show error options"
 msgstr "Visa felflaggor"
 
-#: ../src/option.c:1469
+#: ../src/option.c:1498
 msgid "Info options"
 msgstr "Informationsflaggor"
 
-#: ../src/option.c:1470
+#: ../src/option.c:1499
 msgid "Show info options"
 msgstr "Visa informationsflaggor"
 
-#: ../src/option.c:1480
+#: ../src/option.c:1509
 msgid "File selection options"
 msgstr "Flaggor för filväljare"
 
-#: ../src/option.c:1481
+#: ../src/option.c:1510
 msgid "Show file selection options"
 msgstr "Visa flaggor för filväljare"
 
-#: ../src/option.c:1491
+#: ../src/option.c:1520
 msgid "List options"
 msgstr "Listflaggor"
 
-#: ../src/option.c:1492
+#: ../src/option.c:1521
 msgid "Show list options"
 msgstr "Visa listflaggor"
 
-#: ../src/option.c:1502
+#: ../src/option.c:1531
 msgid "Notification icon options"
 msgstr "Flaggor för notifieringsikon"
 
-#: ../src/option.c:1503
+#: ../src/option.c:1532
 msgid "Show notification icon options"
 msgstr "Visa flaggor för notifieringsikon"
 
-#: ../src/option.c:1513
+#: ../src/option.c:1542
 msgid "Progress options"
 msgstr "Förloppsflaggor"
 
-#: ../src/option.c:1514
+#: ../src/option.c:1543
 msgid "Show progress options"
 msgstr "Visa förloppsflaggor"
 
-#: ../src/option.c:1524
+#: ../src/option.c:1553
 msgid "Question options"
 msgstr "Frågeflaggor"
 
-#: ../src/option.c:1525
+#: ../src/option.c:1554
 msgid "Show question options"
 msgstr "Visa frågeflaggor"
 
-#: ../src/option.c:1535
+#: ../src/option.c:1564
 msgid "Warning options"
 msgstr "Varningsflaggor"
 
-#: ../src/option.c:1536
+#: ../src/option.c:1565
 msgid "Show warning options"
 msgstr "Visa varningsflaggor"
 
-#: ../src/option.c:1546
+#: ../src/option.c:1575
 msgid "Scale options"
 msgstr "Skalflaggor"
 
-#: ../src/option.c:1547
+#: ../src/option.c:1576
 msgid "Show scale options"
 msgstr "Visa skalflaggor"
 
-#: ../src/option.c:1557
+#: ../src/option.c:1586
 msgid "Text information options"
 msgstr "Textinformationsflaggor"
 
-#: ../src/option.c:1558
+#: ../src/option.c:1587
 msgid "Show text information options"
 msgstr "Visa textinformationsflaggor"
 
-#: ../src/option.c:1568
+#: ../src/option.c:1597
 msgid "Miscellaneous options"
 msgstr "Diverse flaggor"
 
-#: ../src/option.c:1569
+#: ../src/option.c:1598
 msgid "Show miscellaneous options"
 msgstr "Visa diverse flaggor"
 
-#: ../src/option.c:1594
+#: ../src/option.c:1623
 #, c-format
 msgid "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "Denna flagga är inte tillgänglig. Se --help för alla möjliga\n"
 "användningsfall.\n"
 
-#: ../src/option.c:1598
+#: ../src/option.c:1627
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s stöds inte för denna dialog\n"
 
-#: ../src/option.c:1602
+#: ../src/option.c:1631
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "Två eller fler dialogflaggor angavs\n"