[meld] Updated Swedish translation

[Damned-Lies <translations src gnome org>]

commit 22c369e56bda36d136ca133dc1dfd7415fbccb73
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date:   Tue Feb 16 16:54:34 2016 +0000

    Updated Swedish translation

 po/sv.po |  420 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 222 insertions(+), 198 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index cea4102..98c518c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,16 +9,16 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-08-22 23:55+0000\n"
-"PO-Revision-Date: 2015-08-22 10:04+0100\n"
-"Last-Translator: Josef Andersson <josef andersson fripost org>\n"
+"POT-Creation-Date: 2016-01-27 13:29+0000\n"
+"PO-Revision-Date: 2016-01-27 22:56+0100\n"
+"Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.8.6\n"
 "X-Project-Style: gnome\n"
 
 #: ../bin/meld:144
@@ -34,7 +34,7 @@ msgstr "Meld kräver %s eller högre."
 msgid "Meld does not support Python 3."
 msgstr "Meld stöder inte Python 3."
 
-#: ../bin/meld:199
+#: ../bin/meld:200
 #, c-format
 msgid ""
 "Couldn't load Meld-specific CSS (%s)\n"
@@ -43,7 +43,8 @@ msgstr ""
 "Kunde inte läsa in Meld-specifik CSS (%s)\n"
 "%s"
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -55,11 +56,16 @@ msgstr "Diffvisare"
 msgid "Meld Diff Viewer"
 msgstr "Meld diffvisare"
 
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2
 msgid "Compare and merge your files"
 msgstr "Jämför och sammanfoga dina filer"
 
-#: ../data/meld.appdata.xml.in.h:1
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: ../data/meld.desktop.in.h:6
+msgid "diff;merge;"
+msgstr "diff;merge;sammanfogning;"
+
+#: ../data/meld.appdata.xml.in.h:3
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
@@ -72,7 +78,7 @@ msgstr ""
 "stöder många versionshanteringssystem som Git, Mercurial, Bazaar och "
 "Subversion."
 
-#: ../data/meld.appdata.xml.in.h:2
+#: ../data/meld.appdata.xml.in.h:4
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
@@ -109,16 +115,20 @@ msgid "If true, the window statusbar is visible."
 msgstr "Om true så är fönsterstatusraden synlig."
 
 #: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Automatically detected text encodings"
-msgstr "Upptäckte automatiskt textkodningar"
+msgid "Additional automatically detected text encodings"
+msgstr "Ytterligare automatiskt upptäckta textkodningar"
 
 #: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
-"These text encodings will be automatically used (in order) to try to decode "
-"loaded text files."
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user's locale."
 msgstr ""
-"Dessa textkodningar kommer automatiskt att användas (i ordning) för att "
-"försöka avkoda inlästa textfiler."
+"Meld kommer använda dessa textkodningar för att försöka avkoda inlästa "
+"textfiler innan andra kodningar provas. Utöver kodningarna i denna lista "
+"kommer UTF-8 och standardkodningen för aktuell lokal alltid att användas. "
+"Andra kodningar kan också provas beroende på användarens lokal."
 
 #: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
@@ -551,7 +561,7 @@ msgstr "Kopiera till höger"
 msgid "Delete selected"
 msgstr "Ta bort markerade"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1406
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1379
 msgid "Hide"
 msgstr "Dölj"
 
@@ -586,7 +596,7 @@ msgstr "Nya"
 msgid "Show new"
 msgstr "Visa nya"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:72
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:73
 msgid "Modified"
 msgstr "Ändrade"
 
@@ -619,7 +629,7 @@ msgid "_Add"
 msgstr "_Lägg till"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:647
+#: ../meld/vcview.py:649
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -842,8 +852,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:947 ../meld/filediff.py:1472
-#: ../meld/filediff.py:1556 ../meld/filediff.py:1581
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1445
+#: ../meld/filediff.py:1513
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -880,7 +890,7 @@ msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Ändringar utförda i följande dokument kommer att gå förlorade för alltid:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:948 ../meld/filediff.py:1473
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1446
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -928,7 +938,7 @@ msgstr "Formatera som programfix"
 msgid "Copy to Clipboard"
 msgstr "Kopiera till Urklipp"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149
 msgid "Save Patch"
 msgstr "Spara programfix"
 
@@ -1152,7 +1162,7 @@ msgstr ""
 msgid "Text Filters"
 msgstr "Textfilter"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:659
 msgid "New comparison"
 msgstr "Ny jämförelse"
 
@@ -1300,7 +1310,7 @@ msgstr "O_versionerade"
 msgid "Show unversioned files"
 msgstr "Visa filer som inte versionshanteras"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:65
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:66
 msgid "Ignored"
 msgstr "Ignorerade"
 
@@ -1328,7 +1338,7 @@ msgstr "Föregående loggar:"
 msgid "Co_mmit"
 msgstr "Che_cka in"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:336
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
 msgid "Location"
 msgstr "Plats"
 
@@ -1356,15 +1366,15 @@ msgstr "Incheckningar att trycka bestäms av ditt versionshanteringssystem."
 msgid "_Push commits"
 msgstr "_Tryck incheckningar"
 
-#: ../meld/const.py:10
+#: ../meld/const.py:12
 msgid "UNIX (LF)"
 msgstr "UNIX (LF)"
 
-#: ../meld/const.py:11
+#: ../meld/const.py:13
 msgid "DOS/Windows (CR-LF)"
 msgstr "DOS/Windows (CR-LF)"
 
-#: ../meld/const.py:12
+#: ../meld/const.py:14
 msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
@@ -1421,9 +1431,8 @@ msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: ../meld/dirdiff.py:858 ../meld/dirdiff.py:911 ../meld/filediff.py:1061
-#: ../meld/filediff.py:1213 ../meld/filediff.py:1408 ../meld/filediff.py:1438
-#: ../meld/filediff.py:1440
+#: ../meld/dirdiff.py:858 ../meld/filediff.py:1381 ../meld/filediff.py:1411
+#: ../meld/filediff.py:1413 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Dölj"
 
@@ -1458,12 +1467,12 @@ msgstr ""
 msgid "'%s' hidden by '%s'"
 msgstr "”%s” dolda av ”%s”"
 
-#: ../meld/dirdiff.py:951
+#: ../meld/dirdiff.py:942
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: ../meld/dirdiff.py:953
+#: ../meld/dirdiff.py:944
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1472,11 +1481,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: ../meld/dirdiff.py:966
+#: ../meld/dirdiff.py:957
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: ../meld/dirdiff.py:967
+#: ../meld/dirdiff.py:958
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1489,35 +1498,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:990
+#: ../meld/dirdiff.py:981
 #, python-format
 msgid "Error deleting %s"
 msgstr "Fel vid borttagning av %s"
 
-#: ../meld/dirdiff.py:1495
+#: ../meld/dirdiff.py:1486
 msgid "No folder"
 msgstr "Ingen mapp"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:368
+#: ../meld/filediff.py:359
 msgid "INS"
 msgstr "INF"
 
-#: ../meld/filediff.py:368
+#: ../meld/filediff.py:359
 msgid "OVR"
 msgstr "ÖVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:370
+#: ../meld/filediff.py:361
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rad %i, kolumn %i"
 
-#: ../meld/filediff.py:783
+#: ../meld/filediff.py:792
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: ../meld/filediff.py:785
+#: ../meld/filediff.py:794
 #, python-format
 msgid ""
 "Filter “%s” changed the number of lines in the file, which is unsupported. "
@@ -1526,76 +1535,64 @@ msgstr ""
 "Filtret ”%s” ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: ../meld/filediff.py:842
+#: ../meld/filediff.py:852
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: ../meld/filediff.py:844
+#: ../meld/filediff.py:854
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Om konflikten gick att lösa kan du markera den som löst nu."
 
-#: ../meld/filediff.py:846
+#: ../meld/filediff.py:856
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../meld/filediff.py:847
+#: ../meld/filediff.py:857
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1097
 #, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] Ställ in numrerade paneler"
+msgid "There was a problem opening the file “%s”."
+msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: ../meld/filediff.py:1055
+#: ../meld/filediff.py:1105
 #, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] Öppnar filer"
+msgid "File %s appears to be a binary file."
+msgstr "Filen %s verkar vara en binärfil."
 
-#: ../meld/filediff.py:1078 ../meld/filediff.py:1088 ../meld/filediff.py:1101
 #: ../meld/filediff.py:1107
-msgid "Could not read file"
-msgstr "Kunde inte läsa filen"
+msgid "Do you want to open the file using the default application?"
+msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: ../meld/filediff.py:1079
-#, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] Läser filer"
+#: ../meld/filediff.py:1109
+msgid "Open"
+msgstr "Öppna"
 
-#: ../meld/filediff.py:1089
-#, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s verkar vara en binärfil."
-
-#: ../meld/filediff.py:1102
-#, python-format
-msgid "%s is not in encodings: %s"
-msgstr "%s finns inte i teckenkodningar: %s"
-
-#: ../meld/filediff.py:1140
+#: ../meld/filediff.py:1125
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: ../meld/filediff.py:1208
+#: ../meld/filediff.py:1190
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: ../meld/filediff.py:1209
+#: ../meld/filediff.py:1191
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: ../meld/filediff.py:1212
+#: ../meld/filediff.py:1193
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: ../meld/filediff.py:1371
+#: ../meld/filediff.py:1344
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1357
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1603,11 +1600,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: ../meld/filediff.py:1389
+#: ../meld/filediff.py:1362
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1364
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1616,15 +1613,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: ../meld/filediff.py:1411
+#: ../meld/filediff.py:1384
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: ../meld/filediff.py:1433
+#: ../meld/filediff.py:1406
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: ../meld/filediff.py:1434
+#: ../meld/filediff.py:1407
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1633,20 +1630,20 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: ../meld/filediff.py:1442
+#: ../meld/filediff.py:1415
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: ../meld/filediff.py:1444
+#: ../meld/filediff.py:1417
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1449
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ersätt filen ”%s”?"
 
-#: ../meld/filediff.py:1478
+#: ../meld/filediff.py:1451
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1655,72 +1652,45 @@ msgstr ""
 "En fil med detta namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig fil kommer dess innehåll att gå förlorat."
 
-#: ../meld/filediff.py:1496
-#, python-format
-msgid "Could not save file %s."
-msgstr "Kunde inte spara filen %s."
-
-#: ../meld/filediff.py:1497
-#, python-format
-msgid ""
-"Couldn't save file due to:\n"
-"%s"
-msgstr ""
-"Kunde in spara fil beroende på:\n"
-"%s"
-
-#: ../meld/filediff.py:1509
+#: ../meld/filediff.py:1468
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: ../meld/filediff.py:1511
+#: ../meld/filediff.py:1470
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: ../meld/filediff.py:1513
+#: ../meld/filediff.py:1472
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: ../meld/filediff.py:1527
+#: ../meld/filediff.py:1486
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s har ändrats på disk sedan den öppnades"
 
-#: ../meld/filediff.py:1529
+#: ../meld/filediff.py:1488
 msgid "If you save it, any external changes will be lost."
 msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade."
 
-#: ../meld/filediff.py:1532
+#: ../meld/filediff.py:1491
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: ../meld/filediff.py:1533
+#: ../meld/filediff.py:1492
 msgid "Don't Save"
 msgstr "Spara inte"
 
-#: ../meld/filediff.py:1559
-msgid "Inconsistent line endings found"
-msgstr "Inkonsekventa radavslut funna"
-
-#: ../meld/filediff.py:1561
-#, python-format
-msgid ""
-"'%s' contains a mixture of line endings. Select the line ending format to "
-"use."
-msgstr ""
-"Filen ”%s” innehåller olika typer av radslut. Välj radavslutsformat att "
-"använda."
-
-#: ../meld/filediff.py:1582
+#: ../meld/filediff.py:1514
 msgid "_Save as UTF-8"
 msgstr "_Spara som UTF-8"
 
-#: ../meld/filediff.py:1585
+#: ../meld/filediff.py:1517
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Kunde inte koda text som ”%s”"
 
-#: ../meld/filediff.py:1587
+#: ../meld/filediff.py:1519
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1729,11 +1699,25 @@ msgstr ""
 "Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n"
 "Vill du spara som UTF-8?"
 
-#: ../meld/filediff.py:1939
+#: ../meld/filediff.py:1556 ../meld/patchdialog.py:125
+#, python-format
+msgid "Could not save file %s."
+msgstr "Kunde inte spara filen %s."
+
+#: ../meld/filediff.py:1557 ../meld/patchdialog.py:126
+#, python-format
+msgid ""
+"Couldn't save file due to:\n"
+"%s"
+msgstr ""
+"Kunde in spara fil beroende på:\n"
+"%s"
+
+#: ../meld/filediff.py:1903
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: ../meld/filediff.py:1940
+#: ../meld/filediff.py:1904
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1744,7 +1728,7 @@ msgstr ""
 "manuellt, och uppdateringar i realtid kommer att fortsätta när "
 "synkroniseringspunkterna är rensade."
 
-#: ../meld/filemerge.py:48
+#: ../meld/filemerge.py:37
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
@@ -1757,103 +1741,103 @@ msgstr "Kopiera _upp"
 msgid "Copy _down"
 msgstr "Kopiera _ned"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "felaktigt antal argument angavs för --diff"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Starta med ett tomt fönster"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "fil"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "mapp"
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Starta en versionshanterad jämförelse"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Starta med en två- eller trevägs filjämförelse"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Starta med en två- eller trevägs mappjämförelse"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: ../meld/meldapp.py:236
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld är ett verktyg för att jämföra filer och kataloger."
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Sätt etikett att använda istället för filnamn"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Öppna en ny flik i en redan körande instans"
 
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Ignorerad för kompatibilitet"
 
-#: ../meld/meldapp.py:253
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Ställ in målfilen för att spara sammanfogat resultat"
 
-#: ../meld/meldapp.py:256
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Sammanfoga automatiskt filer"
 
-#: ../meld/meldapp.py:260
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Läs in en sparad jämförelse från en Meld jämförelsefil"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Skapar en diff-tabell för angivna filer eller mappar"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "för många argument (ville ha 0-3, fick %d)"
 
-#: ../meld/meldapp.py:287
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "kan inte auto-sammanfoga mindre är tre filer"
 
-#: ../meld/meldapp.py:289
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "kan inte auto-sammanfoga kataloger"
 
-#: ../meld/meldapp.py:303
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Fel vid läsning av den sparade konfigurationsfilen"
 
-#: ../meld/meldapp.py:330
+#: ../meld/meldapp.py:332
 #, python-format
 msgid "invalid path or URI \"%s\""
 msgstr "ogiltig sökväg eller URI ”%s”"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:138
+#: ../meld/meldbuffer.py:127
 msgid "<unnamed>"
 msgstr "<namnlös>"
 
-#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
+#: ../meld/melddoc.py:83 ../meld/melddoc.py:84
 msgid "untitled"
 msgstr "namnlös"
 
@@ -2041,52 +2025,52 @@ msgstr "Ver_ktygsfält"
 msgid "Show or hide the toolbar"
 msgstr "Visa eller dölj verktygsfältet"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:142
 msgid "Open Recent"
 msgstr "Öppna senaste"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:143
 msgid "Open recent files"
 msgstr "Öppna senaste filer"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "_Meld"
 msgstr "_Meld"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "Quit the program"
 msgstr "Avsluta programmet"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
 msgid "Prefere_nces"
 msgstr "Inställ_ningar"
 
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
 msgid "Configure the application"
 msgstr "Konfigurera programmet"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "Open the Meld manual"
 msgstr "Öppna handboken för Meld"
 
-#: ../meld/meldwindow.py:173
+#: ../meld/meldwindow.py:174
 msgid "About this application"
 msgstr "Om detta program"
 
-#: ../meld/meldwindow.py:548
+#: ../meld/meldwindow.py:578
 msgid "Switch to this tab"
 msgstr "Växla till denna flik"
 
-#: ../meld/meldwindow.py:659
+#: ../meld/meldwindow.py:693
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Behöver tre filer för att auto-sammanfoga, fick: %r"
 
-#: ../meld/meldwindow.py:673
+#: ../meld/meldwindow.py:707
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan inte jämföra en blandning av filer och kataloger"
 
@@ -2110,11 +2094,11 @@ msgstr "etikett"
 msgid "pattern"
 msgstr "mönster"
 
-#: ../meld/recent.py:114
+#: ../meld/recent.py:115
 msgid "Version control:"
 msgstr "Versionshantering:"
 
-#: ../meld/ui/notebooklabel.py:65
+#: ../meld/ui/notebooklabel.py:68
 msgid "Close tab"
 msgstr "Stäng flik"
 
@@ -2124,172 +2108,180 @@ msgstr "Inga filer kommer att checkas in"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:89
+#: ../meld/vc/git.py:95
 #, python-format
 msgid "%s in %s"
 msgstr "%s i %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:90 ../meld/vc/git.py:97
+#: ../meld/vc/git.py:96 ../meld/vc/git.py:103
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d ej tryckt incheckning"
 msgstr[1] "%d ej tryckta incheckningar"
 
-#: ../meld/vc/git.py:92
+#: ../meld/vc/git.py:98
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d gren"
 msgstr[1] "%d grenar"
 
-#: ../meld/vc/git.py:307
+#: ../meld/vc/git.py:350
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Läge ändrat från %s till %s"
 
+#: ../meld/vc/git.py:358
+msgid "Partially staged"
+msgstr "Delvis köad"
+
+#: ../meld/vc/git.py:358
+msgid "Staged"
+msgstr "Köad"
+
 #. Translators: This is the displayed name of a version control system
 #. when no version control system is actually found.
 #: ../meld/vc/_null.py:38
 msgid "None"
 msgstr "Ingen"
 
-#: ../meld/vc/svn.py:215
+#: ../meld/vc/svn.py:216
 #, python-format
 msgid "Rev %s"
 msgstr "Rev %s"
 
-#: ../meld/vc/_vc.py:50
+#: ../meld/vc/_vc.py:51
 msgid "Merged"
 msgstr "Sammanfogade"
 
-#: ../meld/vc/_vc.py:50
+#: ../meld/vc/_vc.py:51
 msgid "Base"
 msgstr "Bas"
 
-#: ../meld/vc/_vc.py:50
+#: ../meld/vc/_vc.py:51
 msgid "Local"
 msgstr "Lokal"
 
-#: ../meld/vc/_vc.py:50
+#: ../meld/vc/_vc.py:51
 msgid "Remote"
 msgstr "Fjärr"
 
-#: ../meld/vc/_vc.py:66
+#: ../meld/vc/_vc.py:67
 msgid "Unversioned"
 msgstr "Oversionerad"
 
-#: ../meld/vc/_vc.py:69
+#: ../meld/vc/_vc.py:70
 msgid "Error"
 msgstr "Fel"
 
-#: ../meld/vc/_vc.py:71
+#: ../meld/vc/_vc.py:72
 msgid "Newly added"
 msgstr "Nyligen tillagt"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Renamed"
 msgstr "Bytt namn"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:75
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Removed"
 msgstr "Borttagen"
 
-#: ../meld/vc/_vc.py:76
+#: ../meld/vc/_vc.py:77
 msgid "Missing"
 msgstr "Saknas"
 
-#: ../meld/vc/_vc.py:77
+#: ../meld/vc/_vc.py:78
 msgid "Not present"
 msgstr "Inte närvarande"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:254
+#: ../meld/vcview.py:255
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s inte installerad)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:258
+#: ../meld/vcview.py:259
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Ogiltigt förråd)"
 
-#: ../meld/vcview.py:279
+#: ../meld/vcview.py:280
 msgid "No valid version control system found in this folder"
 msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp"
 
-#: ../meld/vcview.py:281
+#: ../meld/vcview.py:282
 msgid "Only one version control system found in this folder"
 msgstr "Endast ett versionshanteringssystem hittades i denna mapp"
 
-#: ../meld/vcview.py:283
+#: ../meld/vcview.py:284
 msgid "Choose which version control system to use"
 msgstr "Välj vilket versionshanteringssystem som ska användas"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:336
+#: ../meld/vcview.py:337
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:356
+#: ../meld/vcview.py:357
 #, python-format
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
 
-#: ../meld/vcview.py:395
+#: ../meld/vcview.py:396
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../meld/vcview.py:439
+#: ../meld/vcview.py:440
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:441
 #, python-format
 msgid "%s — remote"
 msgstr "%s — fjärr"
 
-#: ../meld/vcview.py:448
+#: ../meld/vcview.py:449
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, sammanfoga, fjärr)"
 
-#: ../meld/vcview.py:453
+#: ../meld/vcview.py:454
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (fjärr, sammanfoga, lokal)"
 
-#: ../meld/vcview.py:464
+#: ../meld/vcview.py:465
 #, python-format
 msgid "%s — repository"
 msgstr "%s — förråd"
 
-#: ../meld/vcview.py:470
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (arbetskopia, förråd)"
 
-#: ../meld/vcview.py:474
+#: ../meld/vcview.py:475
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (förråd, arbetskopia)"
 
-#: ../meld/vcview.py:641
+#: ../meld/vcview.py:643
 msgid "Remove folder and all its files?"
 msgstr "Ta bort mapp och dess filer?"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:645
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2297,15 +2289,47 @@ msgstr ""
 "Det här kommer att ta bort alla markerade filer och mappar samt alla filer i "
 "markerade mappar från versionshantering."
 
-#: ../meld/vcview.py:668
+#: ../meld/vcview.py:670
 #, python-format
 msgid "Error removing %s"
 msgstr "Fel vid borttagning av %s"
 
-#: ../meld/vcview.py:748
+#: ../meld/vcview.py:750
 msgid "Clear"
 msgstr "Töm"
 
+#~ msgid ""
+#~ "These text encodings will be automatically used (in order) to try to "
+#~ "decode loaded text files."
+#~ msgstr ""
+#~ "Dessa textkodningar kommer automatiskt att användas (i ordning) för att "
+#~ "försöka avkoda inlästa textfiler."
+
+#~ msgid "[%s] Set num panes"
+#~ msgstr "[%s] Ställ in numrerade paneler"
+
+#~ msgid "[%s] Opening files"
+#~ msgstr "[%s] Öppnar filer"
+
+#~ msgid "Could not read file"
+#~ msgstr "Kunde inte läsa filen"
+
+#~ msgid "[%s] Reading files"
+#~ msgstr "[%s] Läser filer"
+
+#~ msgid "%s is not in encodings: %s"
+#~ msgstr "%s finns inte i teckenkodningar: %s"
+
+#~ msgid "Inconsistent line endings found"
+#~ msgstr "Inkonsekventa radavslut funna"
+
+#~ msgid ""
+#~ "'%s' contains a mixture of line endings. Select the line ending format to "
+#~ "use."
+#~ msgstr ""
+#~ "Filen ”%s” innehåller olika typer av radslut. Välj radavslutsformat att "
+#~ "använda."
+
 #~ msgid "Revision"
 #~ msgstr "Version"