[meld] Updated Swedish translation

From: Damned-Lies <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Swedish translation
Date: Sun, 1 Mar 2015 20:19:36 +0000 (UTC)
commit dfee21ba5cea1ca091e8ae7068b6535896a55d63
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date:   Sun Mar 1 20:19:31 2015 +0000

    Updated Swedish translation

 po/sv.po |  974 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 593 insertions(+), 381 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index 4f0d2f1..988faac 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,38 +1,46 @@
 # Swedish messages for meld.
-# Copyright © 2005-2014 Free Software Foundation, Inc.
+# Copyright © 2005-2015 Free Software Foundation, Inc.
 # Christian Rose <menthos menthos com>, 2005.
 # Daniel Nylander <po danielnylander se>, 2006, 2007, 2008, 2009, 2011.
 # Josef Andersson <josef andersson fripost org>, 2014.
+# Sebastian Rasmussen <sebras gmail com>, 2015.
 #
 msgid ""
 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: 2014-08-30 21:29+0000\n"
-"PO-Revision-Date: 2014-09-13 17:28+0100\n"
-"Last-Translator: Josef Andersson <josef andersson fripost org>\n"
+"POT-Creation-Date: 2015-03-01 11:14+0000\n"
+"PO-Revision-Date: 2015-02-08 17:15+0100\n"
+"Last-Translator: Sebastian Rasmussen <sebras gmail com>\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.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
 
-#: ../bin/meld:138
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Kan inte importera: "
 
-#: ../bin/meld:141
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld kräver %s eller högre."
 
-#: ../bin/meld:145
+#: ../bin/meld:151
 msgid "Meld does not support Python 3."
 msgstr "Meld stöder inte Python 3."
 
+#: ../bin/meld:201
+#, c-format
+msgid ""
+"Couldn't load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+
 #: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
@@ -84,11 +92,11 @@ msgstr "Standardtillstånd för fönster"
 
 #: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
-msgstr "Visa verktygsraden"
+msgstr "Visa verktygsfältet"
 
 #: ../data/org.gnome.meld.gschema.xml.h:4
 msgid "If true, the window toolbar is visible."
-msgstr "Om true så är fönsterverktygsraden synlig."
+msgstr "Om true så är fönsterverktygsfältet synlig."
 
 #: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
@@ -148,13 +156,23 @@ msgstr ""
 "markeringar är detta som standard av."
 
 #: ../data/org.gnome.meld.gschema.xml.h:17
+#, fuzzy
+#| msgid "Use s_yntax highlighting"
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Använd _syntaxmarkering"
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Displayed whitespace"
 msgstr "Visade tomrum"
 
 #
 # Detta är värden för gschema-nycklar, använd \" runt dem
 # http://listor.tp-sv.se/pipermail/tp-sv/2014-July/000779.html
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
@@ -162,11 +180,11 @@ msgstr ""
 "Väljare för individuella tomrumsteckentyper att visa. Möjliga värden är "
 "\"space\", \"tab\", \"newline\" och \"nbsp\"."
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Wrap mode"
 msgstr "Radbrytningsläge"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -176,33 +194,36 @@ msgstr ""
 "antingen inte alls (\"none\"), vid vilket tecken som helst (\"char\") eller "
 "bara vid slutet av ord (\"word\")."
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
 msgstr "Markera aktuell rad"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr "Om true kommer raden med markören att bli markerad i filjämförelser."
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Use the system default monospace font"
 msgstr "Använd systemets standard typsnitt med fast breddsteg"
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:26
+#, fuzzy
+#| msgid ""
+#| "If false, the defined custom font will be used instead of the system "
+#| "monospace font."
 msgid ""
-"If false, the defined custom font will be used instead of the system "
-"monospace font."
+"If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 "Om false kommer det definierade anpassade typsnittet att användas istället "
 "för systemets typsnitt med fast breddsteg."
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
 msgstr "Anpassat typsnitt"
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
@@ -210,33 +231,37 @@ msgstr ""
 "Det anpassade typsnittet att använda, lagrat som en sträng och tolkat som en "
 "som en Pango typsnittsbeskrivning."
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Ignore blank lines when comparing files"
 msgstr "Ignorera tomma rader vid filjämförelser"
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "Om true kommer tomma rader att tas bort när ändringar markeras mellan filer."
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "Use the system default editor"
 msgstr "Använd systemets standardredigerare"
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:32
+#, fuzzy
+#| msgid ""
+#| "If false, the defined custom editor will be used instead of the system "
+#| "editor when opening files externally."
 msgid ""
-"If false, the defined custom editor will be used instead of the system "
-"editor when opening files externally."
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
 msgstr ""
 "Om false kommer den definierade anpassade redigeraren att användas istället "
 "för systemredigeraren när filer öppnas externt."
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "The custom editor launch command"
 msgstr "Kommandot för att starta anpassad redigerare"
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -244,21 +269,21 @@ msgstr ""
 "Kommandot för att starta en anpassad redigerare. Begränsat mallstöd här; för "
 "tillfället är ”{file}” och ”{line}” igenkända informationsbärare."
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:35
 msgid "Columns to display"
 msgstr "Kolumner att visa"
 
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr "Lista av kolumnnamn vid mappjämförelse och huruvida de ska visas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
 msgid "Ignore symbolic links"
 msgstr "Ignorera symboliska länkar"
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -266,11 +291,11 @@ msgstr ""
 "Om true följer inte mappjämförelser symboliska länkar när mappträdet "
 "genomsöks."
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "Use shallow comparison"
 msgstr "Använd ytlig jämförelse"
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -279,11 +304,11 @@ msgstr ""
 "Om true sker mappjämförelser endast baserat på storlek och mtime och bedömer "
 "filerna identiska om deras storlek och mtime matchar, annars inte."
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:41
 msgid "File timestamp resolution"
 msgstr "Tidsstämpelupplösning på filen"
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:42
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they're considered to have different mtimes. This "
@@ -295,21 +320,32 @@ msgstr ""
 "användbart när filer jämförs på olika filsystem med olika "
 "tidsstämpelupplösningar."
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "File status filters"
 msgstr "Filstatusfilter"
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Lista över statusar använda till att filtrera synliga filer vid "
 "mappjämförelse."
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Show the version control console output"
 msgstr "Visa versionshanterarens konsolutmatning"
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -317,11 +353,11 @@ msgstr ""
 "Om true kommer en konsolutmatning att visas i versionshanteringsvyer, "
 "visandes de kommandon som körs vid versionshanteringsåtgärder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
 msgstr "Position för versionshanteringspanelen"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
@@ -329,11 +365,11 @@ msgstr ""
 "Detta är höjden på huvudträdet för versionshanteringen när konsolpanelen "
 "visas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Visa versionsjämförelser som vänster-lokal/höger-fjärr"
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -344,13 +380,19 @@ msgstr ""
 "presenteras i paneler. Annars används ett vänster-är-deras-, höger-är-mitt-"
 "schema."
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Sortering för filer i trevägsjämförelser med versionshantering"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:54
+#, fuzzy
+#| msgid ""
+#| "Choices for file order are remote/merge/local and local/merged/remote. "
+#| "This preference only affects three-way comparisons launched from the "
+#| "version control view, so is used solely for merges/conflict resolution "
+#| "within Meld."
 msgid ""
-"Choices for file order are remote/merge/local and local/merged/remote. This "
+"Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
@@ -359,26 +401,23 @@ msgstr ""
 "versionshanteringsvyn, och används endast för sammanfogning/konfliktlösning "
 "i Meld."
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
 msgstr "Visa marginal i redigeraren för incheckningsmeddelanden"
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
 "Om true så visas en guide för marginalens kolumn i "
-"versionshanteringsredigeraren för incheckningsmeddelanden. "
+"versionshanteringsredigeraren för incheckningsmeddelanden."
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Margin column in commit message editor"
 msgstr "Marginalkolumn i redigeraren för incheckningsmeddelanden"
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
-#| msgid ""
-#| "The column of the margin is at in the version control commit message "
-#| "editor."
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
@@ -386,34 +425,38 @@ msgstr ""
 "Kolumnen i vilken marginalen ska visas i versionshanteringsredigeraren för "
 "incheckningsmeddelanden."
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr "Automatisk radbrytning av incheckningsmeddelanden"
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:60
+#, fuzzy
+#| msgid ""
+#| "If true, the version control commit message editor will hard-wrap (i.e., "
+#| "insert line breaks) at the defined commit margin before commit."
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
-"insert line breaks) at the defined commit margin before commit."
+"insert line breaks) at the commit margin before commit."
 msgstr ""
 "Om true kommer versionshanteringsredigeraren för incheckningsmeddelanden att "
 "radbrytas vid den definierade marginalen före incheckning."
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Version control status filters"
 msgstr "Statusfilter för versionshantering"
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Statuslista använd för att filtrera synliga filer vid "
 "versionshanteringsjämförelse."
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
 msgstr "Filnamnsbaserade filter"
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:64
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -421,11 +464,11 @@ msgstr ""
 "Lista över fördefinierade filnamnsbaserade filter som, om aktiva, kommer att "
 "ta bort matchande filer vid en mappjämförelse."
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Text-based filters"
 msgstr "Textbaserade filter"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:66
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -486,16 +529,20 @@ msgid "Compare selected files"
 msgstr "Jämför markerade filer"
 
 #: ../data/ui/dirdiff.ui.h:3
-msgid "Copy _Left"
-msgstr "Kopiera _vänster"
+#, fuzzy
+#| msgid "Copy to left"
+msgid "Copy to _Left"
+msgstr "Kopiera till vänster"
 
 #: ../data/ui/dirdiff.ui.h:4
 msgid "Copy to left"
 msgstr "Kopiera till vänster"
 
 #: ../data/ui/dirdiff.ui.h:5
-msgid "Copy _Right"
-msgstr "Kopiera _höger"
+#, fuzzy
+#| msgid "Copy to right"
+msgid "Copy to _Right"
+msgstr "Kopiera till höger"
 
 #: ../data/ui/dirdiff.ui.h:6
 msgid "Copy to right"
@@ -505,7 +552,7 @@ msgstr "Kopiera till höger"
 msgid "Delete selected"
 msgstr "Ta bort markerade"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1449
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:876 ../meld/filediff.py:1460
 msgid "Hide"
 msgstr "Dölj"
 
@@ -522,7 +569,7 @@ msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
 msgstr ""
-"Behandla filnamn som lika om de skiljer i skiftläge men annars är identiska "
+"Behandla filnamn som lika om de skiljer i skiftläge men annars är identiska"
 
 #: ../data/ui/dirdiff.ui.h:12
 msgid "Same"
@@ -594,7 +641,7 @@ msgid "Move _Down"
 msgstr "Flytta _nedåt"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
 #: ../meld/vcview.py:203
 msgid "Name"
 msgstr "Namn"
@@ -612,26 +659,210 @@ msgid "Remove selected filter"
 msgstr "Ta bort markerat filter"
 
 #: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch..."
+msgstr "Formatera som programfix…"
+
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Skapa en programfix med skillnaderna mellan filer"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "Spara _alla"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "Spara alla filer i den aktuella jämförelsen"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "Återställ filer till deras sparade versioner"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Lägg till synkroniseringspunkt"
+
+#: ../data/ui/filediff.ui.h:7
+#, fuzzy
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Add a synchronization point for changes between files"
+msgstr "Lägg till en manuell punkt för att synkronisera ändringar mellan filer"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Rensa synkroniseringspunkter"
+
+#: ../data/ui/filediff.ui.h:9
+#, fuzzy
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Clear sychronization points for changes between files"
+msgstr "Lägg till en manuell punkt för att synkronisera ändringar mellan filer"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Föregående konflikt"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Gå till föregående konflikt"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Nästa konflikt"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Gå till nästa konflikt"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Tryck åt vänster"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Tryck aktuell ändring till vänster"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Tryck åt höger"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Tryck aktuell ändring till höger"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Dra från vänster"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Dra ändring från vänster"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Dra från höger"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Dra ändring från höger"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Kopiera ovan vänster"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Kopiera ändringar ovanför vänstra stycket"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Kopiera under vänster"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Kopiera ändringar under vänstra stycket"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Kopiera ovan höger"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Kopiera ändringar ovanför högra stycket"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Kopiera under höger"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Kopiera ändringar under högra stycket"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Ta bort ändring"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Sammanfoga allt från vänster"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Sammanfoga alla ändringar utan konflikter från vänster"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Sammanfoga allt från höger"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Sammanfoga alla ändringar utan konflikter från höger"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Sammanfoga alla"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+"Sammanfoga alla ändringar utan konflikter från vänstra och högra panelen"
+
+#: ../data/ui/filediff.ui.h:38
+#, fuzzy
+#| msgid "Previous Change"
+msgid "Previous Pane"
+msgstr "Föregående ändring"
+
+#: ../data/ui/filediff.ui.h:39
+#, fuzzy
+#| msgid "Move keyboard focus to the next document in this comparison"
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr "Flytta tangentbordsfokus till nästa dokument i denna jämförelse"
+
+#: ../data/ui/filediff.ui.h:40
+#, fuzzy
+#| msgid "Next Change"
+msgid "Next Pane"
+msgstr "Nästa ändring"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "Flytta tangentbordsfokus till nästa dokument i denna jämförelse"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Lås rullning"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Lås rullning för alla paneler"
+
+#: ../data/ui/filediff.ui.h:44
 msgid "Save changes to documents before closing?"
 msgstr "Spara ändringar till dokument innan stängning?"
 
-#: ../data/ui/filediff.ui.h:2
+#: ../data/ui/filediff.ui.h:45
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 
-#: ../data/ui/filediff.ui.h:3
+#: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:967 ../meld/filediff.py:1629
+#: ../meld/filediff.py:1713 ../meld/filediff.py:1738
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/ui/filediff.ui.h:5
+#: ../data/ui/filediff.ui.h:48
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../data/ui/filediff.ui.h:6
+#: ../data/ui/filediff.ui.h:49
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -639,28 +870,28 @@ msgstr ""
 "Kan inte skriva till denna fil. Du kan klicka här för att låsa upp denna fil "
 "och göra ändringar ändå, men dessa ändringar måste sparas till en ny fil."
 
-#: ../data/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:50
 msgid "File 3"
 msgstr "Fil tre"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:51
 msgid "File 2"
 msgstr "Fil två"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:52
 msgid "File 1"
 msgstr "Fil ett"
 
-#: ../data/ui/filediff.ui.h:10
+#: ../data/ui/filediff.ui.h:53
 msgid "Revert unsaved changes to documents?"
 msgstr "Återställ osparade ändringar i dokumenten?"
 
-#: ../data/ui/filediff.ui.h:11
+#: ../data/ui/filediff.ui.h:54
 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
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:968 ../meld/filediff.py:1630
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -705,29 +936,29 @@ msgid "Format as Patch"
 msgstr "Formatera som programfix"
 
 #: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Kopiera till Urklipp"
+
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+msgid "Save Patch"
+msgstr "Spara programfix"
+
+#: ../data/ui/patch-dialog.ui.h:4
 msgid "Use differences between:"
 msgstr "Använd skillnader mellan:"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:5
 msgid "Left and middle panes"
 msgstr "Vänster- och mittenpaneler"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:6
 msgid "Middle and right panes"
 msgstr "Mitten- och högerpaneler"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "_Omvänd programfixriktning"
 
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Copy to Clipboard"
-msgstr "Kopiera till Urklipp"
-
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
-msgid "Save Patch"
-msgstr "Spara programfix"
-
 #: ../data/ui/preferences.ui.h:1
 msgid "Left is remote, right is local"
 msgstr "Vänster är fjärr, höger är lokal"
@@ -813,78 +1044,84 @@ msgid "Use s_yntax highlighting"
 msgstr "Använd _syntaxmarkering"
 
 #: ../data/ui/preferences.ui.h:22
+#, fuzzy
+#| msgid "Change highlighting incomplete"
+msgid "Syntax highlighting color scheme:"
+msgstr "Ändra markering av ofärdiga"
+
+#: ../data/ui/preferences.ui.h:23
 msgid "External Editor"
 msgstr "Extern redigerare"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:24
 msgid "Use _default system editor"
 msgstr "Använd systemets standardred_igerare"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:25
 msgid "Edito_r command:"
 msgstr "Kommando för re_digerare:"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:26
 msgid "Editor"
 msgstr "Redigerare"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:27
 msgid "Shallow Comparison"
 msgstr "Ytlig jämförelse"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:28
 msgid "C_ompare files based only on size and timestamp"
 msgstr "J_ämför filer enbart baserat på storlek och tidsstämpel"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:29
 msgid "_Timestamp resolution:"
 msgstr "_Tidsstämpelupplösning:"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Symboliska länkar"
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Synliga kolumner"
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Mappjämförelser"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Versionsjämförelser"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:36
 msgid "_Order when comparing file revisions:"
 msgstr "_Sortering vid jämförelse av filrevisioner:"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:37
 msgid "Order when _merging files:"
 msgstr "Sortering när filer _sammanfogas:"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Incheckningsmeddelanden"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Visa _högermarginal vid:"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Radbryt automatiskt vid högermarginal under incheckning"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Versionshantering"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:42
 msgid "Filename filters"
 msgstr "Filnamnsfilter"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:43
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -894,23 +1131,23 @@ msgstr ""
 "deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda "
 "med blanksteg."
 
-#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Filfilter"
 
-#: ../data/ui/preferences.ui.h:43
+#: ../data/ui/preferences.ui.h:45
 msgid "Change trimming"
 msgstr "Ändra borttagning av blanksteg"
 
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:46
 msgid "Trim blank line differences from the start and end of changes"
 msgstr "Ta bort tomma radskillnader från början och slutet av ändringar"
 
-#: ../data/ui/preferences.ui.h:45
+#: ../data/ui/preferences.ui.h:47
 msgid "Text filters"
 msgstr "Textfilter"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../data/ui/preferences.ui.h:48
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -924,11 +1161,11 @@ msgstr ""
 "grupper kommer endast grupperna att ersättas. Se användarhandboken för mer "
 "information."
 
-#: ../data/ui/preferences.ui.h:47
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
 msgstr "Textfilter"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625
 msgid "New comparison"
 msgstr "Ny jämförelse"
 
@@ -1120,55 +1357,101 @@ msgstr "Incheckningar att trycka bestäms av ditt versionshanteringssystem."
 msgid "_Push commits"
 msgstr "_Tryck incheckningar"
 
+#: ../meld/const.py:10
+msgid "UNIX (LF)"
+msgstr ""
+
+#: ../meld/const.py:11
+msgid "DOS/Windows (CR-LF)"
+msgstr ""
+
+#: ../meld/const.py:12
+msgid "Mac OS (CR)"
+msgstr ""
+
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: ../meld/dirdiff.py:543
+#: ../meld/dirdiff.py:558
 #, python-format
 msgid "Hide %s"
 msgstr "Dölj %s"
 
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
+#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Söker igenom %s"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:843
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Klar"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:851
+msgid "Folders have no differences"
+msgstr ""
+
+#: ../meld/dirdiff.py:853
+msgid "Contents of scanned files in folders are identical."
+msgstr ""
+
+#: ../meld/dirdiff.py:855
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+
+#: ../meld/dirdiff.py:858
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+
+#: ../meld/dirdiff.py:860
+#, fuzzy
+#| msgid ""
+#| "Text filters are being used, and may be masking differences between "
+#| "files. Would you like to compare the unfiltered files?"
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
+"Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
+"ofiltrerade filerna?"
+
+#: ../meld/dirdiff.py:878 ../meld/dirdiff.py:931 ../meld/filediff.py:1115
+#: ../meld/filediff.py:1267 ../meld/filediff.py:1462 ../meld/filediff.py:1492
+#: ../meld/filediff.py:1494
+msgid "Hi_de"
+msgstr "_Dölj"
+
+#: ../meld/dirdiff.py:888
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:889
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:891
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:893
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:895
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1176,30 +1459,28 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:906
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "”%s” dolda av ”%s”"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1124 ../meld/filediff.py:1275
-#: ../meld/filediff.py:1451 ../meld/filediff.py:1481 ../meld/filediff.py:1483
-msgid "Hi_de"
-msgstr "_Dölj"
+#: ../meld/dirdiff.py:971
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr ""
 
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:973
 #, python-format
 msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
 msgstr ""
-"”%s” finns redan.\n"
-"Skriv över?"
 
-#: ../meld/dirdiff.py:912
+#: ../meld/dirdiff.py:986
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: ../meld/dirdiff.py:913
+#: ../meld/dirdiff.py:987
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1212,266 +1493,118 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:1010
 #, python-format
 msgid "Error deleting %s"
 msgstr "Fel vid borttagning av %s"
 
-#: ../meld/filediff.py:243
-msgid "Format as Patch..."
-msgstr "Formatera som programfix…"
-
-#: ../meld/filediff.py:244
-msgid "Create a patch using differences between files"
-msgstr "Skapa en programfix med skillnaderna mellan filer"
-
-#: ../meld/filediff.py:246
-msgid "Save A_ll"
-msgstr "Spara _alla"
-
-#: ../meld/filediff.py:247
-msgid "Save all files in the current comparison"
-msgstr "Spara alla filer i den aktuella jämförelsen"
-
-#: ../meld/filediff.py:250
-msgid "Revert files to their saved versions"
-msgstr "Återställ filer till deras sparade versioner"
-
-#: ../meld/filediff.py:252
-msgid "Add Synchronization Point"
-msgstr "Lägg till synkroniseringspunkt"
-
-#: ../meld/filediff.py:253
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Lägg till en manuell punkt för att synkronisera ändringar mellan filer"
-
-#: ../meld/filediff.py:256
-msgid "Clear Synchronization Points"
-msgstr "Rensa synkroniseringspunkter"
-
-#: ../meld/filediff.py:257
-msgid "Clear manual change sychronization points"
-msgstr "Rensa manuella ändringar av synkroniseringspunkter"
-
-#: ../meld/filediff.py:259
-msgid "Previous Conflict"
-msgstr "Föregående konflikt"
-
-#: ../meld/filediff.py:260
-msgid "Go to the previous conflict"
-msgstr "Gå till föregående konflikt"
-
-#: ../meld/filediff.py:262
-msgid "Next Conflict"
-msgstr "Nästa konflikt"
-
-#: ../meld/filediff.py:263
-msgid "Go to the next conflict"
-msgstr "Gå till nästa konflikt"
-
-#: ../meld/filediff.py:265
-msgid "Push to Left"
-msgstr "Tryck åt vänster"
-
-#: ../meld/filediff.py:266
-msgid "Push current change to the left"
-msgstr "Tryck aktuell ändring till vänster"
-
-#: ../meld/filediff.py:269
-msgid "Push to Right"
-msgstr "Tryck åt höger"
-
-#: ../meld/filediff.py:270
-msgid "Push current change to the right"
-msgstr "Tryck aktuell ändring till höger"
-
-#: ../meld/filediff.py:274
-msgid "Pull from Left"
-msgstr "Dra från vänster"
-
-#: ../meld/filediff.py:275
-msgid "Pull change from the left"
-msgstr "Dra ändring från vänster"
-
-#: ../meld/filediff.py:278
-msgid "Pull from Right"
-msgstr "Dra från höger"
-
-#: ../meld/filediff.py:279
-msgid "Pull change from the right"
-msgstr "Dra ändring från höger"
-
-#: ../meld/filediff.py:281
-msgid "Copy Above Left"
-msgstr "Kopiera ovan vänster"
-
-#: ../meld/filediff.py:282
-msgid "Copy change above the left chunk"
-msgstr "Kopiera ändringar ovanför vänstra stycket"
-
-#: ../meld/filediff.py:284
-msgid "Copy Below Left"
-msgstr "Kopiera under vänster"
-
-#: ../meld/filediff.py:285
-msgid "Copy change below the left chunk"
-msgstr "Kopiera ändringar under vänstra stycket"
-
-#: ../meld/filediff.py:287
-msgid "Copy Above Right"
-msgstr "Kopiera ovan höger"
-
-#: ../meld/filediff.py:288
-msgid "Copy change above the right chunk"
-msgstr "Kopiera ändringar ovanför högra stycket"
-
-#: ../meld/filediff.py:290
-msgid "Copy Below Right"
-msgstr "Kopiera under höger"
-
-#: ../meld/filediff.py:291
-msgid "Copy change below the right chunk"
-msgstr "Kopiera ändringar under högra stycket"
-
-#: ../meld/filediff.py:293
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../meld/filediff.py:294
-msgid "Delete change"
-msgstr "Ta bort ändring"
-
-#: ../meld/filediff.py:296
-msgid "Merge All from Left"
-msgstr "Sammanfoga allt från vänster"
-
-#: ../meld/filediff.py:297
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Sammanfoga alla ändringar utan konflikter från vänster"
-
-#: ../meld/filediff.py:299
-msgid "Merge All from Right"
-msgstr "Sammanfoga allt från höger"
-
-#: ../meld/filediff.py:300
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Sammanfoga alla ändringar utan konflikter från höger"
-
-#: ../meld/filediff.py:302
-msgid "Merge All"
-msgstr "Sammanfoga alla"
-
-#: ../meld/filediff.py:303
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr ""
-"Sammanfoga alla ändringar utan konflikter från vänstra och högra panelen"
-
-#: ../meld/filediff.py:307
-msgid "Cycle Through Documents"
-msgstr "Bläddra genom dokumenten"
-
-#: ../meld/filediff.py:308
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Flytta tangentbordsfokus till nästa dokument i denna jämförelse"
-
-#: ../meld/filediff.py:314
-msgid "Lock Scrolling"
-msgstr "Lås rullning"
-
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
-msgstr "Lås rullning för alla paneler"
+#: ../meld/dirdiff.py:1515
+#, fuzzy
+#| msgid "folder"
+msgid "No folder"
+msgstr "mapp"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:406
 msgid "INS"
 msgstr "INF"
 
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:406
 msgid "OVR"
 msgstr "ÖVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:408
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rad %i, kolumn %i"
 
 #: ../meld/filediff.py:821
-#, python-format
+msgid "Comparison results will be inaccurate"
+msgstr ""
+
+#: ../meld/filediff.py:823
+#, fuzzy, python-format
+#| msgid ""
+#| "Filter '%s' changed the number of lines in the file. Comparison will be "
+#| "incorrect. See the user manual for more details."
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"Filter “%s” changed the number of lines in the file, which is unsupported. "
+"The comparison will not be accurate."
 msgstr ""
 "Filtret ”%s” ändrade antalet rader i filen. Jämförelsen kommer att vara "
 "felaktig. Se användarhandboken för mer information."
 
-#: ../meld/filediff.py:890
+#: ../meld/filediff.py:894
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:896
 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:894
+#: ../meld/filediff.py:898
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../meld/filediff.py:895
+#: ../meld/filediff.py:899
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1102
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ställ in numrerade paneler"
 
-#: ../meld/filediff.py:1118
+#: ../meld/filediff.py:1109
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Öppnar filer"
 
-#: ../meld/filediff.py:1141 ../meld/filediff.py:1151 ../meld/filediff.py:1164
-#: ../meld/filediff.py:1170
+#: ../meld/filediff.py:1132 ../meld/filediff.py:1142 ../meld/filediff.py:1155
+#: ../meld/filediff.py:1161
 msgid "Could not read file"
 msgstr "Kunde inte läsa filen"
 
-#: ../meld/filediff.py:1142
+#: ../meld/filediff.py:1133
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Läser filer"
 
-#: ../meld/filediff.py:1152
+#: ../meld/filediff.py:1143
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s verkar vara en binärfil."
 
-#: ../meld/filediff.py:1165
+#: ../meld/filediff.py:1156
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s finns inte i teckenkodningar: %s"
 
-#: ../meld/filediff.py:1203
+#: ../meld/filediff.py:1194
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: ../meld/filediff.py:1270
+#: ../meld/filediff.py:1262
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: ../meld/filediff.py:1271
+#: ../meld/filediff.py:1263
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: ../meld/filediff.py:1274
+#: ../meld/filediff.py:1266
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: ../meld/filediff.py:1440
+#: ../meld/filediff.py:1425
+msgid "Files are identical"
+msgstr "Filerna är identiska"
+
+#: ../meld/filediff.py:1438
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1479,19 +1612,28 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: ../meld/filediff.py:1446
-msgid "Files are identical"
-msgstr "Filerna är identiska"
+#: ../meld/filediff.py:1443
+#, fuzzy
+#| msgid "Files with invalid encodings found"
+msgid "Files differ in line endings only"
+msgstr "Filer med ogiltiga teckenkodningar hittades"
+
+#: ../meld/filediff.py:1445
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1465
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1487
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: ../meld/filediff.py:1477
+#: ../meld/filediff.py:1488
 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."
@@ -1500,88 +1642,114 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: ../meld/filediff.py:1485
+#: ../meld/filediff.py:1496
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1498
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: ../meld/filediff.py:1618
+#: ../meld/filediff.py:1633
+#, python-format
+msgid "Replace file “%s”?"
+msgstr ""
+
+#: ../meld/filediff.py:1635
 #, python-format
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"”%s” finns redan!\n"
-"Skriv över?"
 
-#: ../meld/filediff.py:1631
+#: ../meld/filediff.py:1653
+#, fuzzy, python-format
+#| msgid "Could not read file"
+msgid "Could not save file %s."
+msgstr "Kunde inte läsa filen"
+
+#: ../meld/filediff.py:1654
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"Fel vid skrivning till %s\n"
-"\n"
-"%s."
 
-#: ../meld/filediff.py:1642
+#: ../meld/filediff.py:1666
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: ../meld/filediff.py:1644
+#: ../meld/filediff.py:1668
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: ../meld/filediff.py:1646
+#: ../meld/filediff.py:1670
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: ../meld/filediff.py:1659
+#: ../meld/filediff.py:1684
 #, 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:1661
+#: ../meld/filediff.py:1686
 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:1664
+#: ../meld/filediff.py:1689
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: ../meld/filediff.py:1665
+#: ../meld/filediff.py:1690
 msgid "Don't Save"
 msgstr "Spara inte"
 
-#: ../meld/filediff.py:1689
-#, python-format
+#: ../meld/filediff.py:1716
+#, fuzzy
+#| msgid "Files with invalid encodings found"
+msgid "Inconsistent line endings found"
+msgstr "Filer med ogiltiga teckenkodningar hittades"
+
+#: ../meld/filediff.py:1718
+#, fuzzy, python-format
+#| msgid ""
+#| "This file '%s' contains a mixture of line endings.\n"
+#| "\n"
+#| "Which format would you like to use?"
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"'%s' contains a mixture of line endings. Select the line ending format to "
+"use."
 msgstr ""
 "Filen ”%s” innehåller olika typer av radslut.\n"
 "\n"
 "Vilket format vill du använda?"
 
-#: ../meld/filediff.py:1705
+#: ../meld/filediff.py:1739
+msgid "_Save as UTF-8"
+msgstr ""
+
+#: ../meld/filediff.py:1742
 #, python-format
+msgid "Couldn't encode text as “%s”"
+msgstr ""
+
+#: ../meld/filediff.py:1744
+#, fuzzy, python-format
+#| msgid ""
+#| "'%s' contains characters not encodable with '%s'\n"
+#| "Would you like to save as UTF-8?"
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
+"File “%s” contains characters that can't be encoded using encoding “%s”.\n"
 "Would you like to save as UTF-8?"
 msgstr ""
 "”%s” innehåller tecken som inte kan kodas med ”%s”\n"
 "Vill du spara som UTF-8?"
 
-#: ../meld/filediff.py:2068
+#: ../meld/filediff.py:2096
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: ../meld/filediff.py:2069
+#: ../meld/filediff.py:2097
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1597,11 +1765,11 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
 
-#: ../meld/gutterrendererchunk.py:90
+#: ../meld/gutterrendererchunk.py:93
 msgid "Copy _up"
 msgstr "Kopiera _upp"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:94
 msgid "Copy _down"
 msgstr "Kopiera _ned"
 
@@ -1691,8 +1859,13 @@ msgstr "kan inte auto-sammanfoga kataloger"
 msgid "Error reading saved comparison file"
 msgstr "Fel vid läsning av den sparade konfigurationsfilen"
 
+#: ../meld/meldapp.py:326
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr ""
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:131
+#: ../meld/meldbuffer.py:137
 msgid "<unnamed>"
 msgstr "<namnlös>"
 
@@ -1878,11 +2051,11 @@ msgstr "Visa jämförelsen i helskärmsläge"
 
 #: ../meld/meldwindow.py:131
 msgid "_Toolbar"
-msgstr "Ver_ktygsrad"
+msgstr "Ver_ktygsfält"
 
 #: ../meld/meldwindow.py:132
 msgid "Show or hide the toolbar"
-msgstr "Visa eller dölj verktygsraden"
+msgstr "Visa eller dölj verktygsfältet"
 
 #: ../meld/meldwindow.py:141
 msgid "Open Recent"
@@ -1920,16 +2093,21 @@ msgstr "Öppna handboken för Meld"
 msgid "About this application"
 msgstr "Om detta program"
 
-#: ../meld/meldwindow.py:546
+#: ../meld/meldwindow.py:548
 msgid "Switch to this tab"
 msgstr "Växla till denna flik"
 
-#: ../meld/meldwindow.py:669
+#: ../meld/meldwindow.py:659
+#, 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
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan inte jämföra en blandning av filer och kataloger"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:213
+#: ../meld/misc.py:178
 msgid "[None]"
 msgstr "[Ingen]"
 
@@ -1945,10 +2123,6 @@ msgstr "mönster"
 msgid "Version control:"
 msgstr "Versionshantering:"
 
-#: ../meld/ui/findbar.py:144
-msgid "Regular expression error"
-msgstr "Fel i reguljärt uttryck"
-
 #: ../meld/ui/notebooklabel.py:65
 msgid "Close tab"
 msgstr "Stäng flik"
@@ -1959,28 +2133,28 @@ 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:126
+#: ../meld/vc/git.py:129
 #, 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:127 ../meld/vc/git.py:134
+#: ../meld/vc/git.py:130 ../meld/vc/git.py:137
 #, 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:129
+#: ../meld/vc/git.py:132
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d gren"
 msgstr[1] "%d grenar"
 
-#: ../meld/vc/git.py:348
+#: ../meld/vc/git.py:360
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Läge ändrat från %s till %s"
@@ -2149,3 +2323,41 @@ msgstr ""
 #, python-format
 msgid "Error removing %s"
 msgstr "Fel vid borttagning av %s"
+
+#~ msgid "Copy _Left"
+#~ msgstr "Kopiera _vänster"
+
+#~ msgid "Copy _Right"
+#~ msgstr "Kopiera _höger"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "”%s” finns redan.\n"
+#~ "Skriv över?"
+
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Rensa manuella ändringar av synkroniseringspunkter"
+
+#~ msgid "Cycle Through Documents"
+#~ msgstr "Bläddra genom dokumenten"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "”%s” finns redan!\n"
+#~ "Skriv över?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Fel vid skrivning till %s\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid "Regular expression error"
+#~ msgstr "Fel i reguljärt uttryck"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]