[meld] Updated sv translation

[Daniel Nylander <dnylande src gnome org>]

commit 8fd45c25ee76e841a958974f05e71130fc165876
Author: Daniel Nylander <po danielnylander se>
Date:   Mon Apr 20 17:05:49 2009 +0200

    Updated sv translation
---
 po/ChangeLog |    4 +
 po/sv.po     |  496 ++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 293 insertions(+), 207 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index dc5a661..25d26d9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-20  Daniel Nylander <po danielnylander se>
+
+	* sv.po: Updated Swedish translation.
+	
 2009-04-19  Mario Blättermann  <mariobl gnome org>
 
 	* de.po: Updated German translation
diff --git a/po/sv.po b/po/sv.po
index f6cfb08..96525bd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2009-03-24 10:12+0100\n"
-"PO-Revision-Date: 2009-03-24 10:15+0100\n"
+"POT-Creation-Date: 2009-04-20 17:01+0200\n"
+"PO-Revision-Date: 2009-04-20 17:05+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"
@@ -16,118 +16,118 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../dirdiff.py:175
-#: ../vcview.py:115
+#: ../dirdiff.py:173
+#: ../vcview.py:124
 msgid "_Compare"
 msgstr "_Jämför"
 
-#: ../dirdiff.py:175
-#: ../vcview.py:115
+#: ../dirdiff.py:173
+#: ../vcview.py:124
 msgid "Compare selected"
 msgstr "Jämför markerade"
 
-#: ../dirdiff.py:176
+#: ../dirdiff.py:174
 msgid "Left"
 msgstr "Vänster"
 
-#: ../dirdiff.py:176
-#: ../filediff.py:147
+#: ../dirdiff.py:174
+#: ../filediff.py:120
 msgid "Copy To Left"
 msgstr "Kopiera till vänster"
 
-#: ../dirdiff.py:177
+#: ../dirdiff.py:175
 msgid "Right"
 msgstr "Höger"
 
-#: ../dirdiff.py:177
-#: ../filediff.py:148
+#: ../dirdiff.py:175
+#: ../filediff.py:121
 msgid "Copy To Right"
 msgstr "Kopiera till höger"
 
-#: ../dirdiff.py:178
+#: ../dirdiff.py:176
 msgid "Delete selected"
 msgstr "Ta bort markerade"
 
-#: ../dirdiff.py:179
+#: ../dirdiff.py:177
 msgid "Hide"
 msgstr "Dölj"
 
-#: ../dirdiff.py:179
+#: ../dirdiff.py:177
 msgid "Hide selected"
 msgstr "Dölj markerade"
 
-#: ../dirdiff.py:181
-#: ../filediff.py:145
-#: ../vcview.py:116
+#: ../dirdiff.py:179
+#: ../filediff.py:118
+#: ../vcview.py:125
 msgid "Open selected"
 msgstr "Ã?ppna markerade"
 
-#: ../dirdiff.py:185
+#: ../dirdiff.py:183
 msgid "Case"
 msgstr "Skiftläge"
 
-#: ../dirdiff.py:185
+#: ../dirdiff.py:183
 msgid "Ignore case of entries"
 msgstr "Ignorera skillnad på gemener/VERSALER i poster"
 
-#: ../dirdiff.py:186
+#: ../dirdiff.py:184
 msgid "Same"
 msgstr "Samma"
 
-#: ../dirdiff.py:186
+#: ../dirdiff.py:184
 msgid "Show identical"
 msgstr "Visa identiska"
 
-#: ../dirdiff.py:187
+#: ../dirdiff.py:185
 msgid "New"
 msgstr "Ny"
 
-#: ../dirdiff.py:187
+#: ../dirdiff.py:185
 msgid "Show new"
 msgstr "Visa nya"
 
-#: ../dirdiff.py:188
+#: ../dirdiff.py:186
 msgid "Modified"
 msgstr "Ã?ndrad"
 
-#: ../dirdiff.py:188
-#: ../vcview.py:128
+#: ../dirdiff.py:186
+#: ../vcview.py:137
 msgid "Show modified"
 msgstr "Visa ändrade"
 
-#: ../dirdiff.py:190
+#: ../dirdiff.py:188
 msgid "Filters"
 msgstr "Filter"
 
-#: ../dirdiff.py:190
+#: ../dirdiff.py:188
 msgid "Set active filters"
 msgstr "Ställ in aktiva filter"
 
-#: ../dirdiff.py:243
-#: ../dirdiff.py:289
+#: ../dirdiff.py:241
+#: ../dirdiff.py:287
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
 msgstr "Fel vid konvertering av mönstret \"%s\" till reguljärt uttryck"
 
-#: ../dirdiff.py:300
+#: ../dirdiff.py:298
 #, python-format
 msgid "Hide %s"
 msgstr "Dölj %s"
 
-#: ../dirdiff.py:384
-#: ../dirdiff.py:394
-#: ../vcview.py:244
-#: ../vcview.py:272
+#: ../dirdiff.py:383
+#: ../dirdiff.py:393
+#: ../vcview.py:265
+#: ../vcview.py:293
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Genomsöker %s"
 
-#: ../dirdiff.py:423
+#: ../dirdiff.py:422
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" dolda av \"%s\""
 
-#: ../dirdiff.py:429
+#: ../dirdiff.py:428
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive filesystem. Some files are not visible:\n"
@@ -136,12 +136,12 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. En del filer syns inte:\n"
 "%s"
 
-#: ../dirdiff.py:502
+#: ../dirdiff.py:501
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Klar"
 
-#: ../dirdiff.py:548
+#: ../dirdiff.py:547
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -150,7 +150,7 @@ msgstr ""
 "\"%s\" finns redan.\n"
 "Skriva över?"
 
-#: ../dirdiff.py:555
+#: ../dirdiff.py:554
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -161,8 +161,8 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:573
-#: ../vcview.py:433
+#: ../dirdiff.py:572
+#: ../vcview.py:455
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -171,8 +171,8 @@ msgstr ""
 "\"%s\" är en katalog.\n"
 "Ta bort rekursivt?"
 
-#: ../dirdiff.py:580
-#: ../vcview.py:438
+#: ../dirdiff.py:579
+#: ../vcview.py:460
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -183,117 +183,117 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:591
+#: ../dirdiff.py:590
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i sekund"
 msgstr[1] "%i sekunder"
 
-#: ../dirdiff.py:592
+#: ../dirdiff.py:591
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minut"
 msgstr[1] "%i minuter"
 
-#: ../dirdiff.py:593
+#: ../dirdiff.py:592
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i timme"
 msgstr[1] "%i timmar"
 
-#: ../dirdiff.py:594
+#: ../dirdiff.py:593
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dag"
 msgstr[1] "%i dagar"
 
-#: ../dirdiff.py:595
+#: ../dirdiff.py:594
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i vecka"
 msgstr[1] "%i veckor"
 
-#: ../dirdiff.py:596
+#: ../dirdiff.py:595
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i månad"
 msgstr[1] "%i månader"
 
-#: ../dirdiff.py:597
+#: ../dirdiff.py:596
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i år"
 msgstr[1] "%i år"
 
-#: ../filediff.py:146
+#: ../filediff.py:119
 #: ../glade2/filediff.glade.h:4
 msgid "Create Patch"
 msgstr "Skapa programfix"
 
-#: ../filediff.py:146
+#: ../filediff.py:119
 msgid "Create a patch"
 msgstr "Skapa en programfix"
 
-#: ../filediff.py:147
+#: ../filediff.py:120
 msgid "Copy all changes from right pane to left pane"
 msgstr "Kopiera alla ändringar från högra till vänstra panelen"
 
-#: ../filediff.py:148
+#: ../filediff.py:121
 msgid "Copy all changes from left pane to right pane"
 msgstr "Kopiera alla ändringar från vänstra till högra panelen"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:197
+#: ../filediff.py:170
 msgid "INS,OVR"
 msgstr "INF,Ã?VR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:199
+#: ../filediff.py:172
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rad %i, kolumn %i"
 
-#: ../filediff.py:254
+#: ../filediff.py:230
 #, python-format
 msgid "Regular expression '%s' changed the number of lines in the file. Comparison will be incorrect. See the user manual for more details."
 msgstr "Det reguljära uttrycket \"%s\" ändrade antalet rader i filen. Jämförelsen kommer att vara felaktig. Se användarhandboken för mer information."
 
-#: ../filediff.py:522
+#: ../filediff.py:500
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ställ in numrerade paneler"
 
-#: ../filediff.py:528
+#: ../filediff.py:506
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ã?ppnar filer"
 
-#: ../filediff.py:546
-#: ../filediff.py:560
-#: ../filediff.py:576
-#: ../filediff.py:583
+#: ../filediff.py:524
+#: ../filediff.py:538
+#: ../filediff.py:554
+#: ../filediff.py:561
 #, python-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: ../filediff.py:547
-#: ../filediff.py:584
+#: ../filediff.py:525
+#: ../filediff.py:562
 msgid "The error was:"
 msgstr "Felet var:"
 
-#: ../filediff.py:552
+#: ../filediff.py:530
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Läser filer"
 
-#: ../filediff.py:561
+#: ../filediff.py:539
 msgid ""
 "It contains ascii nulls.\n"
 "Perhaps it is a binary file."
@@ -301,17 +301,17 @@ msgstr ""
 "Den innehåller ascii-nulltecken.\n"
 "Den kanske är en binär fil."
 
-#: ../filediff.py:577
+#: ../filediff.py:555
 #, python-format
 msgid "I tried encodings %s."
 msgstr "Jag provade med kodningar %s."
 
-#: ../filediff.py:606
+#: ../filediff.py:582
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: ../filediff.py:733
+#: ../filediff.py:709
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -320,7 +320,7 @@ msgstr ""
 "\"%s\" finns redan!\n"
 "Skriva över?"
 
-#: ../filediff.py:746
+#: ../filediff.py:722
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -331,12 +331,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../filediff.py:755
+#: ../filediff.py:731
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Välj ett namn för buffert %i."
 
-#: ../filediff.py:768
+#: ../filediff.py:745
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -347,7 +347,7 @@ msgstr ""
 "\n"
 "Vilket format vill du använda?"
 
-#: ../filediff.py:784
+#: ../filediff.py:761
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -357,11 +357,11 @@ msgstr ""
 "Vill du spara som UTF-8?"
 
 #. save as
-#: ../filediff.py:832
+#: ../filediff.py:801
 msgid "Save patch as..."
 msgstr "Spara programfix som..."
 
-#: ../filediff.py:899
+#: ../filediff.py:868
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -374,6 +374,15 @@ msgstr ""
 "\n"
 "Du kan inte ångra denna åtgärd."
 
+#: ../findbar.py:120
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"Fel i reguljärt uttryck\n"
+"\"%s\""
+
 #: ../glade2/filediff.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
@@ -398,6 +407,43 @@ msgstr "_Förkasta ändringar"
 msgid "_Save Selected"
 msgstr "_Spara markerade"
 
+#: ../glade2/findbar.glade.h:1
+msgid "Regular E_xpression"
+msgstr "Reguljärt _uttryck"
+
+#: ../glade2/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "Ersätt _alla"
+
+#: ../glade2/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "Ersätt _med"
+
+#: ../glade2/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "He_la ord"
+
+#: ../glade2/findbar.glade.h:5
+msgid "_Match Case"
+msgstr "_Gör skillnad på gemener/VERSALER"
+
+#: ../glade2/findbar.glade.h:6
+msgid "_Next"
+msgstr "_Nästa"
+
+#: ../glade2/findbar.glade.h:7
+msgid "_Previous"
+msgstr "_Föregående"
+
+#: ../glade2/findbar.glade.h:8
+#: ../meldapp.py:522
+msgid "_Replace"
+msgstr "_Ersätt"
+
+#: ../glade2/findbar.glade.h:9
+msgid "_Search for"
+msgstr "_Sök efter"
+
 #: ../glade2/meldapp.glade.h:1
 msgid "<b>Edit Menu</b>"
 msgstr "<b>Redigera meny</b>"
@@ -607,7 +653,7 @@ msgid "Previous Logs"
 msgstr "Föregående loggar"
 
 #: ../glade2/vcview.glade.h:8
-#: ../vcview.py:172
+#: ../vcview.py:181
 msgid "Tag"
 msgstr "Tagg"
 
@@ -615,6 +661,30 @@ msgstr "Tagg"
 msgid "VC Log"
 msgstr "VK-logg"
 
+#: ../historyentry.py:247
+msgid "_Browse..."
+msgstr "_Bläddra..."
+
+#: ../historyentry.py:255
+msgid "Path"
+msgstr "Sökväg"
+
+#: ../historyentry.py:256
+msgid "Path to file"
+msgstr "Sökväg till fil"
+
+#: ../historyentry.py:257
+msgid "Pop up a file selector to choose a file"
+msgstr "Visa en filväljare för att välja en fil"
+
+#: ../historyentry.py:378
+msgid "Select directory"
+msgstr "Välj katalog"
+
+#: ../historyentry.py:382
+msgid "Select file"
+msgstr "Välj fil"
+
 #: ../meld:47
 #, c-format
 msgid "Meld requires %s or higher."
@@ -628,65 +698,66 @@ msgstr "Jämför och slå samman dina filer"
 msgid "Meld Diff Viewer"
 msgstr "Diffvisaren Meld"
 
-#: ../meldapp.py:155
+#: ../meldapp.py:153
 msgid "label"
 msgstr "etikett"
 
-#: ../meldapp.py:155
+#: ../meldapp.py:153
 msgid "pattern"
 msgstr "mönster"
 
-#: ../meldapp.py:223
+#: ../meldapp.py:221
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Endast tillgängligt om du har gnome-python-desktop installerat"
 
 #. file filters
 #. text filters
-#: ../meldapp.py:233
-#: ../meldapp.py:238
-#: ../vcview.py:152
+#: ../meldapp.py:231
+#: ../meldapp.py:236
+#: ../vcview.py:161
 msgid "Name"
 msgstr "Namn"
 
-#: ../meldapp.py:233
-#: ../meldapp.py:238
+#: ../meldapp.py:231
+#: ../meldapp.py:236
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../meldapp.py:233
+#: ../meldapp.py:231
 msgid "Pattern"
 msgstr "Mönster"
 
-#: ../meldapp.py:238
+#: ../meldapp.py:236
 msgid "Regex"
 msgstr "Reguljärt uttryck"
 
-#: ../meldapp.py:342
+#: ../meldapp.py:340
 msgid "Close tab"
 msgstr "Stäng flik"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:414
+#: ../meldapp.py:412
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Säkerhetskopior\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:416
-msgid "Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
-msgstr "Versionskontroll\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+#: ../meldapp.py:414
+#, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "Versionskontroll\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:418
+#: ../meldapp.py:416
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgstr "Binärer\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:420
+#: ../meldapp.py:418
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:422
+#: ../meldapp.py:420
 msgid ""
 "CVS keywords\t0\t\\$\\w+(:[^\\n"
 "$]+)?\\$\n"
@@ -695,170 +766,202 @@ msgstr ""
 "$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:424
+#: ../meldapp.py:422
 msgid "C++ comment\t0\t//.*\n"
 msgstr "C++-kommentar\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:426
+#: ../meldapp.py:424
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "C-kommentar\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:428
+#: ../meldapp.py:426
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Alla blanktecken\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:430
+#: ../meldapp.py:428
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "Inledande blanktecken\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:432
+#: ../meldapp.py:430
 msgid "Script comment\t0\t#.*"
 msgstr "Skriptkommentar\t0\t#.*"
 
-#: ../meldapp.py:510
+#: ../meldapp.py:508
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../meldapp.py:510
+#: ../meldapp.py:508
 msgid "Start a new comparison"
 msgstr "Starta en ny jämförelse"
 
-#: ../meldapp.py:511
+#: ../meldapp.py:509
 msgid "Save the current file"
 msgstr "Spara den aktuella filen"
 
-#: ../meldapp.py:513
+#: ../meldapp.py:511
 msgid "Close the current file"
 msgstr "Stäng den aktuella filen"
 
-#: ../meldapp.py:514
+#: ../meldapp.py:512
 msgid "Quit the program"
 msgstr "Avsluta programmet"
 
-#: ../meldapp.py:517
+#: ../meldapp.py:515
 msgid "Undo the last action"
 msgstr "�ngra den senaste åtgärden"
 
-#: ../meldapp.py:518
+#: ../meldapp.py:516
 msgid "Redo the last undone action"
 msgstr "Gör om senaste ångrade åtgärden"
 
-#: ../meldapp.py:519
+#: ../meldapp.py:517
 msgid "Cut the selection"
 msgstr "Klipp ut markering"
 
-#: ../meldapp.py:520
+#: ../meldapp.py:518
 msgid "Copy the selection"
 msgstr "Kopiera markering"
 
-#: ../meldapp.py:521
+#: ../meldapp.py:519
 msgid "Paste the clipboard"
 msgstr "Klistra in urklipp"
 
-#: ../meldapp.py:522
+#: ../meldapp.py:520
 msgid "Search for text"
 msgstr "Sök efter text"
 
-#: ../meldapp.py:523
+#: ../meldapp.py:521
 msgid "Find Ne_xt"
 msgstr "Sök _nästa"
 
-#: ../meldapp.py:523
+#: ../meldapp.py:521
 msgid "Search forwards for the same text"
 msgstr "Sök framåt efter samma text"
 
-#: ../meldapp.py:524
-msgid "_Replace"
-msgstr "_Ersätt"
-
-#: ../meldapp.py:524
+#: ../meldapp.py:522
 msgid "Find and replace text"
 msgstr "Sök och ersätt text"
 
-#: ../meldapp.py:525
+#: ../meldapp.py:523
 msgid "Go to the next difference"
 msgstr "Gå till nästa skillnad"
 
-#: ../meldapp.py:526
+#: ../meldapp.py:524
 msgid "Go to the previous difference"
 msgstr "Gå till föregående skillnad"
 
-#: ../meldapp.py:527
+#: ../meldapp.py:525
 msgid "Prefere_nces"
 msgstr "Inställ_ningar"
 
-#: ../meldapp.py:527
+#: ../meldapp.py:525
 msgid "Configure the application"
 msgstr "Konfigurera programmet"
 
-#: ../meldapp.py:533
+#: ../meldapp.py:531
 msgid "Stop the current action"
 msgstr "Stoppa den aktuella åtgärden"
 
-#: ../meldapp.py:534
+#: ../meldapp.py:532
 msgid "Refresh the view"
 msgstr "Uppdatera vyn"
 
-#: ../meldapp.py:535
+#: ../meldapp.py:533
 msgid "Reload"
 msgstr "Läs om"
 
-#: ../meldapp.py:535
+#: ../meldapp.py:533
 msgid "Reload the comparison"
 msgstr "Läs om jämförelsen"
 
-#: ../meldapp.py:538
+#: ../meldapp.py:536
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../meldapp.py:538
+#: ../meldapp.py:536
 msgid "Open the Meld manual"
 msgstr "�ppna handboken för Meld"
 
-#: ../meldapp.py:539
+#: ../meldapp.py:537
 msgid "Report _Bug"
 msgstr "Rapportera _fel"
 
-#: ../meldapp.py:539
+#: ../meldapp.py:537
 msgid "Report a bug in Meld"
 msgstr "Rapportera ett fel i Meld"
 
-#: ../meldapp.py:540
+#: ../meldapp.py:538
 msgid "About this program"
 msgstr "Om programmet"
 
-#: ../meldapp.py:857
+#: ../meldapp.py:856
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Kan inte jämföra en blandning av filer och kataloger.\n"
 
-#: ../meldapp.py:910
+#: ../meldapp.py:899
+#: ../meldapp.py:907
+msgid "file"
+msgstr "fil"
+
+#: ../meldapp.py:900
+#: ../meldapp.py:906
+msgid "dir"
+msgstr "katalog"
+
+#: ../meldapp.py:905
+msgid "Start with no window open"
+msgstr "Starta med inget fönster öppnat"
+
+#: ../meldapp.py:906
+#, python-format
+msgid "Start with Version Control browser in '%s'"
+msgstr "Starta med versionskontrollbläddrare i \"%s\""
+
+#: ../meldapp.py:907
+#, python-format
+msgid "Start with Version Control diff of '%s'"
+msgstr "Starta med diff för versionskontroll av \"%s\""
+
+#: ../meldapp.py:908
+msgid "Start with 2 or 3 way file comparison"
+msgstr "Starta med en 2 eller 3-vägs filjämförelse"
+
+#: ../meldapp.py:909
+msgid "Start with 2 or 3 way directory comparison"
+msgstr "Starta med en 2 eller 3-vägs katalogjämförelse"
+
+#: ../meldapp.py:916
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld är ett verktyg för jämförelser av filer och kataloger."
+
+#: ../meldapp.py:919
 msgid "Set label to use instead of file name"
 msgstr "Sätt etikett för att använda istället för filnamn"
 
-#: ../meldapp.py:911
+#: ../meldapp.py:921
 msgid "Automatically compare all differing files on startup"
 msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart"
 
-#: ../meldapp.py:912
-#: ../meldapp.py:913
-#: ../meldapp.py:914
-#: ../meldapp.py:915
+#: ../meldapp.py:922
+#: ../meldapp.py:923
+#: ../meldapp.py:924
+#: ../meldapp.py:925
 msgid "Ignored for compatibility"
 msgstr "Ignorerad för kompatibilitet"
 
-#: ../meldapp.py:918
-msgid "Creates a diff tab for up to 3 supplied files."
-msgstr "Skapar en diff-tabell för upp till 3 angivna filer."
+#: ../meldapp.py:928
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr "Skapar en diff-tabell för upp till 3 angivna filer eller kataloger."
 
-#: ../meldapp.py:922
+#: ../meldapp.py:932
 msgid "Invalid number of arguments supplied for --diff."
 msgstr "Ogiltigt antal argument angavs för --diff."
 
-#: ../meldapp.py:950
+#: ../meldapp.py:935
 #, python-format
 msgid "Wrong number of arguments (Got %i)"
 msgstr "Felaktigt antal argument (fick %i)"
@@ -868,146 +971,146 @@ msgid "untitled"
 msgstr "namnlös"
 
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:174
+#: ../misc.py:173
 msgid "[None]"
 msgstr "[Ingen]"
 
-#: ../vcview.py:117
+#: ../vcview.py:126
 msgid "_Commit"
 msgstr "_Verkställ"
 
-#: ../vcview.py:117
+#: ../vcview.py:126
 msgid "Commit"
 msgstr "Verkställ"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:118
+#: ../vcview.py:127
 msgid "_Update"
 msgstr "_Uppdatera"
 
-#: ../vcview.py:118
+#: ../vcview.py:127
 msgid "Update"
 msgstr "Uppdatera"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:119
+#: ../vcview.py:128
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: ../vcview.py:119
+#: ../vcview.py:128
 msgid "Add to VC"
 msgstr "Lägg till i VK"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:120
+#: ../vcview.py:129
 msgid "Add _Binary"
 msgstr "Lägg till _binär"
 
-#: ../vcview.py:120
+#: ../vcview.py:129
 msgid "Add binary to VC"
 msgstr "Lägg till binär till VK"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:121
+#: ../vcview.py:130
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../vcview.py:121
+#: ../vcview.py:130
 msgid "Remove from VC"
 msgstr "Ta bort från VK"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:122
+#: ../vcview.py:131
 msgid "Revert to original"
 msgstr "�tergå till original"
 
-#: ../vcview.py:123
+#: ../vcview.py:132
 msgid "Delete locally"
 msgstr "Ta bort lokalt"
 
-#: ../vcview.py:127
+#: ../vcview.py:136
 msgid "_Flatten"
 msgstr "_Platta till"
 
-#: ../vcview.py:127
+#: ../vcview.py:136
 msgid "Flatten directories"
 msgstr "Platta till kataloger"
 
-#: ../vcview.py:128
+#: ../vcview.py:137
 msgid "_Modified"
 msgstr "_Ã?ndrad"
 
-#: ../vcview.py:129
+#: ../vcview.py:138
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../vcview.py:129
+#: ../vcview.py:138
 msgid "Show normal"
 msgstr "Visa normal"
 
-#: ../vcview.py:130
+#: ../vcview.py:139
 msgid "Non _VC"
 msgstr "Icke-_VK"
 
-#: ../vcview.py:130
+#: ../vcview.py:139
 msgid "Show unversioned files"
 msgstr "Visa filer som inte versionskontrolleras"
 
-#: ../vcview.py:131
+#: ../vcview.py:140
 msgid "Ignored"
 msgstr "Ignorerad"
 
-#: ../vcview.py:131
+#: ../vcview.py:140
 msgid "Show ignored files"
 msgstr "Visa ignorerade filer"
 
-#: ../vcview.py:169
+#: ../vcview.py:178
 msgid "Location"
 msgstr "Plats"
 
-#: ../vcview.py:170
+#: ../vcview.py:179
 msgid "Status"
 msgstr "Status"
 
-#: ../vcview.py:171
+#: ../vcview.py:180
 msgid "Rev"
 msgstr "Rev"
 
-#: ../vcview.py:173
+#: ../vcview.py:182
 msgid "Options"
 msgstr "Alternativ"
 
-#: ../vcview.py:209
+#: ../vcview.py:228
 msgid "Choose one Version Control"
 msgstr "Välj en versionskontroll"
 
-#: ../vcview.py:210
+#: ../vcview.py:229
 msgid "Only one Version Control in this directory"
 msgstr "Endast en versionskontroll i denna katalog"
 
-#: ../vcview.py:288
+#: ../vcview.py:309
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../vcview.py:321
+#: ../vcview.py:342
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Hämtar skillnader"
 
-#: ../vcview.py:328
+#: ../vcview.py:349
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Verkställer programfix"
 
-#: ../vcview.py:332
+#: ../vcview.py:353
 msgid "No differences found."
 msgstr "Inga skillnader hittades."
 
-#: ../vcview.py:410
+#: ../vcview.py:432
 msgid "Select some files first."
 msgstr "Välj några filer först."
 
-#: ../vcview.py:476
+#: ../vcview.py:496
 #, python-format
 msgid ""
 "\n"
@@ -1015,7 +1118,7 @@ msgid ""
 "                    \n"
 "                    Maybe you don't have 'GNU patch' installed,\n"
 "                    or you use an untested version of %s.\n"
-"            \n"
+"                    \n"
 "                    Please send email bug report to:\n"
 "                    meld-list gnome org\n"
 "                    \n"
@@ -1033,7 +1136,7 @@ msgstr ""
 "                    \n"
 "                    Kanske har du inte \"GNU patch\" installerat,\n"
 "                    eller du använder en otestad version av %s.\n"
-"            \n"
+"                    \n"
 "                    Skicka en felrapport via e-post till:\n"
 "                    meld-list gnome org\n"
 "                    \n"
@@ -1047,11 +1150,11 @@ msgstr ""
 "                    "
 
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:40
+#: ../vc/_vc.py:39
 msgid "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
 msgstr "Ignorerad:Icke versionskontrollerad:::Fel::Nyligen tillagd:Ã?ndrad:<b>Konflikt</b>:Borttagen:Saknas"
 
-#: ../vc/cvs.py:156
+#: ../vc/cvs.py:152
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1063,11 +1166,10 @@ msgstr ""
 "Felet var \"%s\""
 
 #~ msgid ""
-#~ "Regular expression error\n"
-#~ "'%s'"
+#~ "Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
 #~ msgstr ""
-#~ "Fel i reguljärt uttryck\n"
-#~ "\"%s\""
+#~ "Versionskontroll\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory "
+#~ "RCS\n"
 #~ msgid "The regular expression '%s' was not found."
 #~ msgstr "Det reguljära uttrycket \"%s\" hittades inte."
 #~ msgid "The text '%s' was not found."
@@ -1076,12 +1178,6 @@ msgstr ""
 #~ msgstr "Sök"
 #~ msgid "Match _entire word only"
 #~ msgstr "Sök endast _hela ord"
-#~ msgid "Regular e_xpression"
-#~ msgstr "Reguljärt _uttryck"
-#~ msgid "Search for:"
-#~ msgstr "Sök efter:"
-#~ msgid "_Match case"
-#~ msgstr "_Gör skillnad på gemener/VERSALER"
 #~ msgid "_Wrap around"
 #~ msgstr "_Börja om från början"
 #~ msgid "VC chooser"
@@ -1241,8 +1337,6 @@ msgstr ""
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
 #~ msgid "CVS"
 #~ msgstr "CVS"
-#~ msgid "CVS Directory"
-#~ msgstr "CVS-katalog"
 #~ msgid "CVS binary"
 #~ msgstr "CVS-binär"
 #~ msgid "Create missing directories (-d)"
@@ -1341,8 +1435,6 @@ msgstr ""
 #~ msgstr "Starta _jämförelse"
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Diff</span>"
-#~ msgid "C_VS Browser"
-#~ msgstr "C_VS-visare"
 #~ msgid "SVN Directory"
 #~ msgstr "SVN-katalog"
 #~ msgid "SVN view"
@@ -1389,16 +1481,12 @@ msgstr ""
 #~ msgstr "Meld kräver pygtk-%s eller högre (hittade %s)."
 #~ msgid "folder"
 #~ msgstr "mapp"
-#~ msgid "file"
-#~ msgstr "fil"
 #~ msgid "nonexistant"
 #~ msgstr "ickeexisterande"
 #~ msgid "CVS Browser"
 #~ msgstr "CVS-visare"
 #~ msgid "Directory Comparison"
 #~ msgstr "Katalogjämförelse"
-#~ msgid "Save all files"
-#~ msgstr "Spara alla filer"
 #~ msgid "Pane 1"
 #~ msgstr "Panel 1"
 #~ msgid "Pane 2"
@@ -1417,8 +1505,6 @@ msgstr ""
 #~ msgstr "Upprepa den senaste sökningen"
 #~ msgid "Cu_t"
 #~ msgstr "Klipp _ut"
-#~ msgid "_Paste"
-#~ msgstr "Klistra _in"
 #~ msgid "One Pane"
 #~ msgstr "En panel"
 #~ msgid "Two Panes"
@@ -1433,8 +1519,6 @@ msgstr ""
 #~ msgstr "Beräkna om skillnader"
 #~ msgid "Pr_ev"
 #~ msgstr "Före_g"
-#~ msgid "_Next"
-#~ msgstr "_Nästa"
 #~ msgid "Copy contents left"
 #~ msgstr "Kopiera innehåll vänster"
 #~ msgid "Copy contents right"
@@ -1502,8 +1586,6 @@ msgstr ""
 #~ msgstr "Visa kommandoradsutdata"
 #~ msgid "*"
 #~ msgstr "*"
-#~ msgid "Replace _All"
-#~ msgstr "Ersätt _alla"
 #~ msgid "_Replace..."
 #~ msgstr "_Ersätt..."
 #~ msgid "_Replace:"