[meld] Update Swedish translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Swedish translation
- Date: Mon, 7 Jan 2019 22:26:47 +0000 (UTC)
commit 277bd37c9b4061ee45d179845b05d34e44988542
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date: Mon Jan 7 22:26:35 2019 +0000
Update Swedish translation
po/sv.po | 1964 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 982 insertions(+), 982 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index d23038fe..fa53a7f5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-01-07 09:44+0000\n"
-"PO-Revision-Date: 2019-01-07 23:23+0100\n"
+"POT-Creation-Date: 2019-01-07 22:25+0000\n"
+"PO-Revision-Date: 2019-01-07 23:25+0100\n"
"Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"Language: sv\n"
@@ -22,16 +22,16 @@ msgstr ""
"X-Generator: Poedit 2.2\n"
"X-Project-Style: gnome\n"
-#: ../bin/meld:194
+#: ../bin/meld:190
msgid "Cannot import: "
msgstr "Kan inte importera: "
-#: ../bin/meld:197
+#: ../bin/meld:193
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld kräver %s eller högre."
-#: ../bin/meld:243
+#: ../bin/meld:249
#, c-format
msgid ""
"Couldn’t load Meld-specific CSS (%s)\n"
@@ -41,7 +41,8 @@ msgstr ""
"%s"
#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../data/org.gnome.meld.appdata.xml.in.h:1
+#: ../meld/resources/ui/appwindow.ui.h:1
msgid "Meld"
msgstr "Meld"
@@ -109,26 +110,10 @@ msgid "Default window fullscreen state"
msgstr "Helskärmstillstånd för standardfönster"
#: ../data/org.gnome.meld.gschema.xml.h:5
-msgid "Show toolbar"
-msgstr "Visa verktygsfältet"
-
-#: ../data/org.gnome.meld.gschema.xml.h:6
-msgid "If true, the window toolbar is visible."
-msgstr "Om true så är fönsterverktygsfältet synlig."
-
-#: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Show statusbar"
-msgstr "Visa statusraden"
-
-#: ../data/org.gnome.meld.gschema.xml.h:8
-msgid "If true, the window statusbar is visible."
-msgstr "Om true så är fönsterstatusraden synlig."
-
-#: ../data/org.gnome.meld.gschema.xml.h:9
msgid "Additional automatically detected text encodings"
msgstr "Ytterligare automatiskt upptäckta textkodningar"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:6
msgid ""
"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 "
@@ -140,36 +125,36 @@ msgstr ""
"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:11
+#: ../data/org.gnome.meld.gschema.xml.h:7
msgid "Width of an indentation step"
msgstr "Bredden på ett indenteringssteg"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:8
msgid "The number of spaces to use for a single indent step"
msgstr "Antalet blanksteg att använda för ett ensamt indenteringssteg"
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:9
msgid "Whether to indent using spaces or tabs"
msgstr "Huruvida indentering sker med blanksteg eller tabb"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:10
msgid "If true, any new indentation will use spaces instead of tabs."
msgstr ""
"Om true kommer nya indenteringar att använda blanksteg istället för tabbar."
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:11
msgid "Show line numbers"
msgstr "Visa radnummer"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:12
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr "Om true visas radnummer i marginalen på filjämförelserna."
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:13
msgid "Highlight syntax"
msgstr "Markera syntax"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:14
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
@@ -177,23 +162,23 @@ msgstr ""
"Huruvida syntax ska markeras i jämförelser. På grund av Melds egna "
"färgmarkeringar är detta som standard av."
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:15
msgid "Color scheme to use for syntax highlighting"
msgstr "Färgschema att använda för syntaxmarkering"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:16
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr ""
"Används av GtkSourceView för att bestämma färger för färgmarkering av syntax"
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:17
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:22
+#: ../data/org.gnome.meld.gschema.xml.h:18
msgid ""
"Selector for individual whitespace character types to be shown. Possible "
"values are 'space', 'tab', 'newline' and 'nbsp'."
@@ -201,11 +186,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:23
+#: ../data/org.gnome.meld.gschema.xml.h:19
msgid "Wrap mode"
msgstr "Radbrytningsläge"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:20
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 "
@@ -215,32 +200,32 @@ 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:25
+#: ../data/org.gnome.meld.gschema.xml.h:21
msgid "Highlight current line"
msgstr "Markera aktuell rad"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:22
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:27
+#: ../data/org.gnome.meld.gschema.xml.h:23
msgid "Use the system default monospace font"
msgstr "Använd systemets standard typsnitt med fast breddsteg"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:24
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
"Om false kommer det anpassade typsnittet att användas istället för systemets "
"monospace-typsnitt."
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:25
msgid "Custom font"
msgstr "Anpassat typsnitt"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:26
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
@@ -248,21 +233,21 @@ 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:31
+#: ../data/org.gnome.meld.gschema.xml.h:27
msgid "Ignore blank lines when comparing files"
msgstr "Ignorera tomma rader vid filjämförelser"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:28
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:33
+#: ../data/org.gnome.meld.gschema.xml.h:29
msgid "Use the system default editor"
msgstr "Använd systemets standardredigerare"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:30
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -270,11 +255,11 @@ msgstr ""
"Om false kommer den anpassade redigeraren att användas istället för "
"systemredigeraren när filer öppnas externt."
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:31
msgid "The custom editor launch command"
msgstr "Kommandot för att starta anpassad redigerare"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:32
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -282,21 +267,22 @@ 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:37
+#: ../data/org.gnome.meld.gschema.xml.h:33
msgid "Columns to display"
msgstr "Kolumner att visa"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:34
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:39 ../data/ui/preferences.ui.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../meld/resources/ui/preferences.ui.h:25
msgid "Ignore symbolic links"
msgstr "Ignorera symboliska länkar"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:36
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
@@ -304,11 +290,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:41
+#: ../data/org.gnome.meld.gschema.xml.h:37
msgid "Use shallow comparison"
msgstr "Använd ytlig jämförelse"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:38
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 "
@@ -317,11 +303,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:43
+#: ../data/org.gnome.meld.gschema.xml.h:39
msgid "File timestamp resolution"
msgstr "Tidsstämpelupplösning på filen"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:40
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 "
@@ -333,11 +319,12 @@ msgstr ""
"användbart när filer jämförs på olika filsystem med olika "
"tidsstämpelupplösningar."
-#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../meld/resources/ui/preferences.ui.h:22
msgid "Apply text filters during folder comparisons"
msgstr "Verkställ textfilter vid mappjämförelser"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:42
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -347,21 +334,21 @@ msgstr ""
"aktiva textfilter och alternativet att trimma tomma rader samt ignorera "
"nyradsskillnader."
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:43
msgid "File status filters"
msgstr "Filstatusfilter"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:44
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:49
+#: ../data/org.gnome.meld.gschema.xml.h:45
msgid "Show the version control console output"
msgstr "Visa versionshanterarens konsolutmatning"
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:46
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
@@ -369,11 +356,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:51
+#: ../data/org.gnome.meld.gschema.xml.h:47
msgid "Version control pane position"
msgstr "Position för versionshanteringspanelen"
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:48
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
@@ -381,11 +368,11 @@ msgstr ""
"Detta är höjden på huvudträdet för versionshanteringen när konsolpanelen "
"visas."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:49
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:54
+#: ../data/org.gnome.meld.gschema.xml.h:50
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, "
@@ -396,11 +383,11 @@ msgstr ""
"presenteras i paneler. Annars används ett vänster-är-deras-, höger-är-mitt-"
"schema."
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:51
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:56
+#: ../data/org.gnome.meld.gschema.xml.h:52
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
@@ -411,11 +398,11 @@ msgstr ""
"versionshanteringsvyn, och används endast för sammanfogning/konfliktlösning "
"i Meld."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:53
msgid "Show margin in commit message editor"
msgstr "Visa marginal i redigeraren för incheckningsmeddelanden"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:54
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
@@ -423,11 +410,11 @@ msgstr ""
"Om true så visas en guide för marginalens kolumn i "
"versionshanteringsredigeraren för incheckningsmeddelanden."
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:55
msgid "Margin column in commit message editor"
msgstr "Marginalkolumn i redigeraren för incheckningsmeddelanden"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:56
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -435,11 +422,11 @@ msgstr ""
"Kolumnen i vilken marginalen ska visas i versionshanteringsredigeraren för "
"incheckningsmeddelanden."
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:57
msgid "Automatically hard-wrap commit messages"
msgstr "Automatisk radbrytning av incheckningsmeddelanden"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:58
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
@@ -448,22 +435,22 @@ msgstr ""
"radbrytas (d.v.s. infoga radbrytning) vid incheckningsmarginalen före "
"incheckning."
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: ../data/org.gnome.meld.gschema.xml.h:59
msgid "Version control status filters"
msgstr "Statusfilter för versionshantering"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: ../data/org.gnome.meld.gschema.xml.h:60
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:65
+#: ../data/org.gnome.meld.gschema.xml.h:61
msgid "Filename-based filters"
msgstr "Filnamnsbaserade filter"
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: ../data/org.gnome.meld.gschema.xml.h:62
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -471,11 +458,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:67
+#: ../data/org.gnome.meld.gschema.xml.h:63
msgid "Text-based filters"
msgstr "Textbaserade filter"
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: ../data/org.gnome.meld.gschema.xml.h:64
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, "
@@ -501,401 +488,626 @@ msgstr "Meld mörkt schema"
msgid "Dark color scheme for Meld highlighting"
msgstr "Mörkt färgschema att använda för syntaxmarkering"
-#: ../data/ui/application.ui.h:1
-msgid "About Meld"
-msgstr "Om Meld"
+#: ../meld/resources/gtk/help-overlay.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Allmänt"
-#: ../data/ui/application.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-msgstr ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+#: ../meld/resources/gtk/help-overlay.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Ny jämförelse"
-#: ../data/ui/application.ui.h:4
-msgid "Website"
-msgstr "Webbplats"
+#: ../meld/resources/gtk/help-overlay.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Stäng en jämförelse"
-#: ../data/ui/application.ui.h:5
-msgid "translator-credits"
-msgstr ""
-"Josef Andersson <josef andersson fripost org>\n"
-"Daniel Nylander <po danielnylander se>\n"
-"Christian Rose\n"
-"\n"
-"Skicka synpunkter på översättningen till\n"
-"<tp-sv listor tp-sv se>."
+#: ../meld/resources/gtk/help-overlay.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Avsluta Meld"
-#: ../data/ui/application.ui.h:6
-msgid "_Preferences"
-msgstr "Inställ_ningar"
+#: ../meld/resources/gtk/help-overlay.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Stoppa den aktuella åtgärden"
-#: ../data/ui/application.ui.h:7
-msgid "_Help"
-msgstr "_Hjälp"
+#: ../meld/resources/gtk/help-overlay.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Uppdatera jämförelse"
-#: ../data/ui/application.ui.h:8
-msgid "Keyboard Shortcuts"
-msgstr "Tangentbordsgenvägar"
+#: ../meld/resources/gtk/help-overlay.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Helskärm"
-#: ../data/ui/application.ui.h:9
-msgid "_About"
-msgstr "_Om"
+#: ../meld/resources/gtk/help-overlay.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Flikar"
-#: ../data/ui/application.ui.h:10
-msgid "_Quit"
-msgstr "_Avsluta"
+#: ../meld/resources/gtk/help-overlay.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Gå till föregående flik"
-#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Jämför"
+#: ../meld/resources/gtk/help-overlay.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Gå till nästa flik"
-#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Jämför markerade filer"
+#: ../meld/resources/gtk/help-overlay.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Växla till flik"
-#: ../data/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr "Fäll ihop rekursivt"
+#: ../meld/resources/gtk/help-overlay.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Flytta flik åt vänster"
-#: ../data/ui/dirdiff.ui.h:4
-msgid "Collapse selected folder and all subfolders"
-msgstr "Fäll ihop markerad mapp och alla undermappar"
+#: ../meld/resources/gtk/help-overlay.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Flytta flik åt höger"
-#: ../data/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr "Expandera rekursivt"
+#: ../meld/resources/gtk/help-overlay.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Ändringar"
-#: ../data/ui/dirdiff.ui.h:6
-msgid "Expand selected folder and all subfolders"
-msgstr "Expandera markerad mapp och alla undermappar"
+#: ../meld/resources/gtk/help-overlay.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Gå till föregående ändring"
-#: ../data/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "Kopiera till _vänster"
+#: ../meld/resources/gtk/help-overlay.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Gå till nästa ändring"
-#: ../data/ui/dirdiff.ui.h:8
-msgid "Copy to left"
-msgstr "Kopiera till vänster"
+#: ../meld/resources/gtk/help-overlay.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Redigering"
-#: ../data/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "Kopiera till _höger"
+#: ../meld/resources/gtk/help-overlay.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Ångra"
-#: ../data/ui/dirdiff.ui.h:10
-msgid "Copy to right"
-msgstr "Kopiera till höger"
+#: ../meld/resources/gtk/help-overlay.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Gör om"
-#: ../data/ui/dirdiff.ui.h:11
-msgid "Delete selected"
-msgstr "Ta bort markerade"
+#: ../meld/resources/gtk/help-overlay.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Klipp ut"
-#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497
-msgid "Hide"
-msgstr "Dölj"
+#: ../meld/resources/gtk/help-overlay.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Kopiera"
-#: ../data/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "Dölj markerade"
+#: ../meld/resources/gtk/help-overlay.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Klistra in"
-#: ../data/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "Ignorera skiftlägeskänslighet för filnamn"
+#: ../meld/resources/gtk/help-overlay.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Sök"
-#: ../data/ui/dirdiff.ui.h:15
-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"
+#: ../meld/resources/gtk/help-overlay.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Sök nästa"
-#: ../data/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "Samma"
+#: ../meld/resources/gtk/help-overlay.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Sök föregående"
-#: ../data/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Visa identiska"
+#: ../meld/resources/gtk/help-overlay.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Ersätt"
-#: ../data/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Nya"
+#: ../meld/resources/gtk/help-overlay.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Filjämförelse"
-#: ../data/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Visa nya"
+#: ../meld/resources/gtk/help-overlay.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Spara den aktuella filen"
-#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "Ändrade"
+#: ../meld/resources/gtk/help-overlay.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Spara den aktuella filen till ny sökväg"
-#: ../data/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Visa ändrade"
+#: ../meld/resources/gtk/help-overlay.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Spara alla filer i jämförelse"
-#: ../data/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filter"
+#: ../meld/resources/gtk/help-overlay.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Föregående konflikt"
-#: ../data/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Ställ in aktiva filter"
+#: ../meld/resources/gtk/help-overlay.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Nästa konflikt"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Tryck över ändring till vänster"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Tryck över ändring till höger"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Dra ändring från vänster"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Dra ändring från höger"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopiera ändringar ovanför vänster"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopiera ändringar under vänster"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Kopiera ändringar ovanför höger"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Kopiera ändringar under höger"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Ta bort ändring"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Föregående jämförelsepanel"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Nästa jämförelsepanel"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Mappjämförelse"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopiera till vänster"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopiera till höger"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Versionshanterad jämförelse"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Checka in i versionshanteraren"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Visa/dölj konsolutskrift"
+
+#: ../meld/resources/gtk/menus.ui.h:1
+msgid "_Preferences"
+msgstr "Inställ_ningar"
+
+#: ../meld/resources/gtk/menus.ui.h:2
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../meld/resources/gtk/menus.ui.h:3
+msgid "Keyboard Shortcuts"
+msgstr "Tangentbordsgenvägar"
+
+#: ../meld/resources/gtk/menus.ui.h:4
+msgid "_About"
+msgstr "_Om"
+
+#: ../meld/resources/gtk/menus.ui.h:5
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: ../meld/resources/ui/about-dialog.ui.h:1
+msgid "About Meld"
+msgstr "Om Meld"
+
+#: ../meld/resources/ui/about-dialog.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
+msgstr ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "Redigerbar lista"
+#: ../meld/resources/ui/about-dialog.ui.h:4
+msgid "Website"
+msgstr "Webbplats"
+
+#: ../meld/resources/ui/about-dialog.ui.h:5
+msgid "translator-credits"
+msgstr ""
+"Josef Andersson <josef andersson fripost org>\n"
+"Daniel Nylander <po danielnylander se>\n"
+"Christian Rose\n"
+"\n"
+"Skicka synpunkter på översättningen till\n"
+"<tp-sv listor tp-sv se>."
-#: ../data/ui/EditableList.ui.h:2
+#: ../meld/resources/ui/column-list.ui.h:1
+#: ../meld/resources/ui/filter-list.ui.h:1
msgid "Active"
msgstr "Aktiv"
-#: ../data/ui/EditableList.ui.h:3
+#: ../meld/resources/ui/column-list.ui.h:2
msgid "Column Name"
msgstr "Kolumnnamn"
-#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "_Lägg till"
-
-#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:680
+#: ../meld/resources/ui/column-list.ui.h:3
+#: ../meld/resources/ui/filter-list.ui.h:7 ../meld/resources/ui/vcview.ui.h:11
+#: ../meld/vcview.py:694
msgid "_Remove"
msgstr "_Ta bort"
-#: ../data/ui/EditableList.ui.h:6
+#: ../meld/resources/ui/column-list.ui.h:4
+#: ../meld/resources/ui/filter-list.ui.h:8
msgid "Move item up"
msgstr "Flytta objektet uppåt"
-#: ../data/ui/EditableList.ui.h:7
+#: ../meld/resources/ui/column-list.ui.h:5
+#: ../meld/resources/ui/filter-list.ui.h:9
msgid "Move _Up"
msgstr "Flytta _uppåt"
-#: ../data/ui/EditableList.ui.h:8
+#: ../meld/resources/ui/column-list.ui.h:6
+#: ../meld/resources/ui/filter-list.ui.h:10
msgid "Move item down"
msgstr "Flytta objektet nedåt"
-#: ../data/ui/EditableList.ui.h:9
+#: ../meld/resources/ui/column-list.ui.h:7
+#: ../meld/resources/ui/filter-list.ui.h:11
msgid "Move _Down"
msgstr "Flytta _nedåt"
-#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:407
-msgid "Name"
-msgstr "Namn"
+#: ../meld/resources/ui/commit-dialog.ui.h:1
+msgid "Commit"
+msgstr "Checka in"
-#: ../data/ui/EditableList.ui.h:11
-msgid "Pattern"
-msgstr "Mönster"
+#: ../meld/resources/ui/commit-dialog.ui.h:2
+msgid "Commit Files"
+msgstr "Checka in filer"
-#: ../data/ui/EditableList.ui.h:12
-msgid "Add new filter"
-msgstr "Lägg till nytt filter"
+#: ../meld/resources/ui/commit-dialog.ui.h:3
+msgid "Log Message"
+msgstr "Loggmeddelande"
-#: ../data/ui/EditableList.ui.h:13
-msgid "Remove selected filter"
-msgstr "Ta bort markerat filter"
+#: ../meld/resources/ui/commit-dialog.ui.h:4
+msgid "Previous logs:"
+msgstr "Föregående loggar:"
+
+#: ../meld/resources/ui/commit-dialog.ui.h:5
+msgid "Co_mmit"
+msgstr "Che_cka in"
+
+#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Jämför"
+
+#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Jämför markerade filer"
+
+#: ../meld/resources/ui/dirdiff.ui.h:3
+msgid "Collapse Recursively"
+msgstr "Fäll ihop rekursivt"
+
+#: ../meld/resources/ui/dirdiff.ui.h:4
+msgid "Collapse selected folder and all subfolders"
+msgstr "Fäll ihop markerad mapp och alla undermappar"
+
+#: ../meld/resources/ui/dirdiff.ui.h:5
+msgid "Expand Recursively"
+msgstr "Expandera rekursivt"
+
+#: ../meld/resources/ui/dirdiff.ui.h:6
+msgid "Expand selected folder and all subfolders"
+msgstr "Expandera markerad mapp och alla undermappar"
+
+#: ../meld/resources/ui/dirdiff.ui.h:7
+msgid "Copy to _Left"
+msgstr "Kopiera till _vänster"
+
+#: ../meld/resources/ui/dirdiff.ui.h:8
+msgid "Copy to left"
+msgstr "Kopiera till vänster"
+
+#: ../meld/resources/ui/dirdiff.ui.h:9
+msgid "Copy to _Right"
+msgstr "Kopiera till _höger"
+
+#: ../meld/resources/ui/dirdiff.ui.h:10
+msgid "Copy to right"
+msgstr "Kopiera till höger"
-#: ../data/ui/encoding-selector.ui.h:1
+#: ../meld/resources/ui/dirdiff.ui.h:11
+msgid "Delete selected"
+msgstr "Ta bort markerade"
+
+#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958
+#: ../meld/filediff.py:1586
+msgid "Hide"
+msgstr "Dölj"
+
+#: ../meld/resources/ui/dirdiff.ui.h:13
+msgid "Hide selected"
+msgstr "Dölj markerade"
+
+#: ../meld/resources/ui/dirdiff.ui.h:14
+msgid "Ignore Filename Case"
+msgstr "Ignorera skiftlägeskänslighet för filnamn"
+
+#: ../meld/resources/ui/dirdiff.ui.h:15
+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"
+
+#: ../meld/resources/ui/dirdiff.ui.h:16
+msgid "Same"
+msgstr "Samma"
+
+#: ../meld/resources/ui/dirdiff.ui.h:17
+msgid "Show identical"
+msgstr "Visa identiska"
+
+#: ../meld/resources/ui/dirdiff.ui.h:18
+msgid "New"
+msgstr "Nya"
+
+#: ../meld/resources/ui/dirdiff.ui.h:19
+msgid "Show new"
+msgstr "Visa nya"
+
+#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Ändrade"
+
+#: ../meld/resources/ui/dirdiff.ui.h:21
+msgid "Show modified"
+msgstr "Visa ändrade"
+
+#: ../meld/resources/ui/dirdiff.ui.h:22
+msgid "Filters"
+msgstr "Filter"
+
+#: ../meld/resources/ui/dirdiff.ui.h:23
+msgid "Set active filters"
+msgstr "Ställ in aktiva filter"
+
+#: ../meld/resources/ui/encoding-selector.ui.h:1
msgid "Search text encoding…"
msgstr "Sök textkodning…"
-#: ../data/ui/filediff.ui.h:1
+#: ../meld/resources/ui/filediff.ui.h:1
msgid "Format as Patch…"
msgstr "Formatera som programfix…"
-#: ../data/ui/filediff.ui.h:2
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:3
msgid "Save A_ll"
msgstr "Spara _alla"
-#: ../data/ui/filediff.ui.h:4
+#: ../meld/resources/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
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:6
msgid "Add Synchronization Point"
msgstr "Lägg till synkroniseringspunkt"
-#: ../data/ui/filediff.ui.h:7
+#: ../meld/resources/ui/filediff.ui.h:7
msgid "Add a synchronization point for changes between files"
msgstr "Lägg till en synkroniseringspunkt för ändringar mellan filer"
-#: ../data/ui/filediff.ui.h:8
+#: ../meld/resources/ui/filediff.ui.h:8
msgid "Clear Synchronization Points"
msgstr "Rensa synkroniseringspunkter"
-#: ../data/ui/filediff.ui.h:9
+#: ../meld/resources/ui/filediff.ui.h:9
msgid "Clear sychronization points for changes between files"
msgstr "Rensa synkroniseringspunkter för ändringar mellan filer"
-#: ../data/ui/filediff.ui.h:10
+#: ../meld/resources/ui/filediff.ui.h:10
msgid "Previous Conflict"
msgstr "Föregående konflikt"
-#: ../data/ui/filediff.ui.h:11
+#: ../meld/resources/ui/filediff.ui.h:11
msgid "Go to the previous conflict"
msgstr "Gå till föregående konflikt"
-#: ../data/ui/filediff.ui.h:12
+#: ../meld/resources/ui/filediff.ui.h:12
msgid "Next Conflict"
msgstr "Nästa konflikt"
-#: ../data/ui/filediff.ui.h:13
+#: ../meld/resources/ui/filediff.ui.h:13
msgid "Go to the next conflict"
msgstr "Gå till nästa konflikt"
-#: ../data/ui/filediff.ui.h:14
+#: ../meld/resources/ui/filediff.ui.h:14
msgid "Push to Left"
msgstr "Tryck över åt vänster"
-#: ../data/ui/filediff.ui.h:15
+#: ../meld/resources/ui/filediff.ui.h:15
msgid "Push current change to the left"
msgstr "Tryck över aktuell ändring till vänster"
-#: ../data/ui/filediff.ui.h:16
+#: ../meld/resources/ui/filediff.ui.h:16
msgid "Push to Right"
msgstr "Tryck över åt höger"
-#: ../data/ui/filediff.ui.h:17
+#: ../meld/resources/ui/filediff.ui.h:17
msgid "Push current change to the right"
msgstr "Tryck över aktuell ändring till höger"
-#: ../data/ui/filediff.ui.h:18
+#: ../meld/resources/ui/filediff.ui.h:18
msgid "Pull from Left"
msgstr "Dra från vänster"
-#: ../data/ui/filediff.ui.h:19
+#: ../meld/resources/ui/filediff.ui.h:19
msgid "Pull change from the left"
msgstr "Dra ändring från vänster"
-#: ../data/ui/filediff.ui.h:20
+#: ../meld/resources/ui/filediff.ui.h:20
msgid "Pull from Right"
msgstr "Dra från höger"
-#: ../data/ui/filediff.ui.h:21
+#: ../meld/resources/ui/filediff.ui.h:21
msgid "Pull change from the right"
msgstr "Dra ändring från höger"
-#: ../data/ui/filediff.ui.h:22
+#: ../meld/resources/ui/filediff.ui.h:22
msgid "Copy Above Left"
msgstr "Kopiera ovan vänster"
-#: ../data/ui/filediff.ui.h:23
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:24
msgid "Copy Below Left"
msgstr "Kopiera under vänster"
-#: ../data/ui/filediff.ui.h:25
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:26
msgid "Copy Above Right"
msgstr "Kopiera ovan höger"
-#: ../data/ui/filediff.ui.h:27
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:28
msgid "Copy Below Right"
msgstr "Kopiera under höger"
-#: ../data/ui/filediff.ui.h:29
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:30
msgid "Delete"
msgstr "Ta bort"
-#: ../data/ui/filediff.ui.h:31
+#: ../meld/resources/ui/filediff.ui.h:31
msgid "Delete change"
msgstr "Ta bort ändring"
-#: ../data/ui/filediff.ui.h:32
+#: ../meld/resources/ui/filediff.ui.h:32
msgid "Merge All from Left"
msgstr "Sammanfoga allt från vänster"
-#: ../data/ui/filediff.ui.h:33
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:34
msgid "Merge All from Right"
msgstr "Sammanfoga allt från höger"
-#: ../data/ui/filediff.ui.h:35
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:36
msgid "Merge All"
msgstr "Sammanfoga alla"
-#: ../data/ui/filediff.ui.h:37
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:38
msgid "Previous Pane"
msgstr "Föregående panel"
-#: ../data/ui/filediff.ui.h:39
+#: ../meld/resources/ui/filediff.ui.h:39
msgid "Move keyboard focus to the previous document in this comparison"
msgstr "Flytta tangentbordsfokus till föregående dokument i denna jämförelse"
-#: ../data/ui/filediff.ui.h:40
+#: ../meld/resources/ui/filediff.ui.h:40
msgid "Next Pane"
msgstr "Nästa panel"
-#: ../data/ui/filediff.ui.h:41
+#: ../meld/resources/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
+#: ../meld/resources/ui/filediff.ui.h:42
msgid "Lock Scrolling"
msgstr "Lås rullning"
-#: ../data/ui/filediff.ui.h:43
+#: ../meld/resources/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: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:46
-msgid "Close _without Saving"
-msgstr "Stäng _utan att spara"
-
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:50
-#: ../meld/iohelpers.py:100
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#: ../data/ui/filediff.ui.h:48
-msgid "_Save"
-msgstr "_Spara"
-
-#: ../data/ui/filediff.ui.h:49
+#: ../meld/resources/ui/filediff.ui.h:44
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."
@@ -903,763 +1115,546 @@ 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:50
+#: ../meld/resources/ui/filediff.ui.h:45
msgid "File 3"
msgstr "Fil tre"
-#: ../data/ui/filediff.ui.h:51
+#: ../meld/resources/ui/filediff.ui.h:46
msgid "File 2"
msgstr "Fil två"
-#: ../data/ui/filediff.ui.h:52
+#: ../meld/resources/ui/filediff.ui.h:47
msgid "File 1"
msgstr "Fil ett"
-#: ../data/ui/filediff.ui.h:53
-msgid "Discard unsaved changes to documents?"
-msgstr "Förkasta osparade ändringar i dokumenten?"
+#. Create icon and filename CellRenderer
+#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
+#: ../meld/dirdiff.py:454
+msgid "Name"
+msgstr "Namn"
-#: ../data/ui/filediff.ui.h:54
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr ""
-"Ändringar utförda i följande dokument kommer att gå förlorade för alltid:"
+#: ../meld/resources/ui/filter-list.ui.h:3
+msgid "Pattern"
+msgstr "Mönster"
-#: ../data/ui/filediff.ui.h:55
-msgid "_Discard"
-msgstr "_Förkasta"
+#: ../meld/resources/ui/filter-list.ui.h:4
+msgid "Add new filter"
+msgstr "Lägg till nytt filter"
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101
+#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "_Lägg till"
+
+#: ../meld/resources/ui/filter-list.ui.h:6
+msgid "Remove selected filter"
+msgstr "Ta bort markerat filter"
+
+#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040
+#: ../meld/iohelpers.py:107
msgid "_Replace"
msgstr "_Ersätt"
-#: ../data/ui/findbar.ui.h:2
+#: ../meld/resources/ui/findbar.ui.h:2
msgid "Replace _All"
msgstr "Ersätt _alla"
-#: ../data/ui/findbar.ui.h:3
+#: ../meld/resources/ui/findbar.ui.h:3
msgid "_Previous"
msgstr "_Föregående"
-#: ../data/ui/findbar.ui.h:4
+#: ../meld/resources/ui/findbar.ui.h:4
msgid "_Next"
msgstr "_Nästa"
-#: ../data/ui/findbar.ui.h:5
+#: ../meld/resources/ui/findbar.ui.h:5
msgid "Find:"
msgstr "Sök:"
-#: ../data/ui/findbar.ui.h:6
+#: ../meld/resources/ui/findbar.ui.h:6
msgid "Replace _with:"
msgstr "Ersätt _med:"
-#: ../data/ui/findbar.ui.h:7
+#: ../meld/resources/ui/findbar.ui.h:7
msgid "_Match case"
msgstr "_Skiftlägeskänslig"
-#: ../data/ui/findbar.ui.h:8
+#: ../meld/resources/ui/findbar.ui.h:8
msgid "Who_le word"
msgstr "He_la ord"
-#: ../data/ui/findbar.ui.h:9
+#: ../meld/resources/ui/findbar.ui.h:9
msgid "Regular e_xpression"
msgstr "Reguljärt _uttryck"
-#: ../data/ui/findbar.ui.h:10
+#: ../meld/resources/ui/findbar.ui.h:10
msgid "Wrapped"
msgstr "Radbruten"
-#: ../data/ui/language-selector.ui.h:1
+#: ../meld/resources/ui/language-selector.ui.h:1
msgid "Search highlight mode…"
msgstr "Sök färgmarkeringsläge…"
-#: ../data/ui/patch-dialog.ui.h:1
+#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
+#: ../meld/newdifftab.py:53
+msgid "New comparison"
+msgstr "Ny jämförelse"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:2
+msgid "File comparison"
+msgstr "Filjämförelse"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:3
+msgid "Directory comparison"
+msgstr "Katalogjämförelse"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:4
+msgid "Version control view"
+msgstr "Versionshanteringsvy"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:5
+msgid "_3-way comparison"
+msgstr "_Trevägsjämförelse"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:6
+msgid "Select Third File"
+msgstr "Välj tredje filen"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:7
+msgid "Select Second File"
+msgstr "Välj andra filen"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:8
+msgid "Select First File"
+msgstr "Välj första filen"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:9
+msgid "Select First Folder"
+msgstr "Välj första mappen"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:10
+msgid "Select Second Folder"
+msgstr "Välj andra mappen"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:11
+msgid "Select Third Folder"
+msgstr "Välj tredje filen"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Välj en versionshanterad mapp"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:13
+msgid "_Blank comparison"
+msgstr "_Tom jämförelse"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:14
+msgid "C_ompare"
+msgstr "_Jämför"
+
+#: ../meld/resources/ui/notebook-label.ui.h:1
+msgid "Close Tab"
+msgstr "Stäng flik"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:1
msgid "Format as Patch"
msgstr "Formatera som programfix"
-#: ../data/ui/patch-dialog.ui.h:2
+#: ../meld/resources/ui/patch-dialog.ui.h:2
msgid "Copy to Clipboard"
msgstr "Kopiera till Urklipp"
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
+#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163
msgid "Save Patch"
msgstr "Spara programfix"
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../meld/resources/ui/patch-dialog.ui.h:4
msgid "Use differences between:"
msgstr "Använd skillnader mellan:"
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../meld/resources/ui/patch-dialog.ui.h:5
msgid "Left and middle panes"
msgstr "Vänster- och mittenpaneler"
-#: ../data/ui/patch-dialog.ui.h:6
+#: ../meld/resources/ui/patch-dialog.ui.h:6
msgid "Middle and right panes"
msgstr "Mitten- och högerpaneler"
-#: ../data/ui/patch-dialog.ui.h:7
+#: ../meld/resources/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
msgstr "_Omvänd programfixriktning"
-#: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Inställningar för Meld"
+#: ../meld/resources/ui/preferences.ui.h:1
+msgid "Preferences"
+msgstr "Inställningar"
-#: ../data/ui/preferences.ui.h:2
+#: ../meld/resources/ui/preferences.ui.h:2
msgid "Font"
msgstr "Typsnitt"
-#: ../data/ui/preferences.ui.h:3
+#: ../meld/resources/ui/preferences.ui.h:3
msgid "_Use the system fixed width font"
msgstr "_Använd systemets typsnitt med fast bredd"
-#: ../data/ui/preferences.ui.h:4
+#: ../meld/resources/ui/preferences.ui.h:4
msgid "_Editor font:"
msgstr "_Typsnitt för redigerare:"
-#: ../data/ui/preferences.ui.h:5
+#: ../meld/resources/ui/preferences.ui.h:5
msgid "Display"
msgstr "Visa"
-#: ../data/ui/preferences.ui.h:6
+#: ../meld/resources/ui/preferences.ui.h:6
msgid "_Tab width:"
msgstr "_Tabulatorbredd:"
-#: ../data/ui/preferences.ui.h:7
+#: ../meld/resources/ui/preferences.ui.h:7
msgid "_Insert spaces instead of tabs"
msgstr "_Infoga blanksteg istället för tabbar"
-#: ../data/ui/preferences.ui.h:8
+#: ../meld/resources/ui/preferences.ui.h:8
msgid "Enable text _wrapping"
msgstr "Aktivera text_radbrytning"
-#: ../data/ui/preferences.ui.h:9
+#: ../meld/resources/ui/preferences.ui.h:9
msgid "Do not _split words over two lines"
msgstr "Dela inte _ord över två rader"
-#: ../data/ui/preferences.ui.h:10
+#: ../meld/resources/ui/preferences.ui.h:10
msgid "Highlight _current line"
msgstr "Markera _aktuell rad"
-#: ../data/ui/preferences.ui.h:11
+#: ../meld/resources/ui/preferences.ui.h:11
msgid "Show _line numbers"
msgstr "Visa _radnummer"
-#: ../data/ui/preferences.ui.h:12
+#: ../meld/resources/ui/preferences.ui.h:12
msgid "Show w_hitespace"
msgstr "Visa tom_rum"
-#: ../data/ui/preferences.ui.h:13
+#: ../meld/resources/ui/preferences.ui.h:13
msgid "Use s_yntax highlighting"
msgstr "Använd _syntaxmarkering"
-#: ../data/ui/preferences.ui.h:14
+#: ../meld/resources/ui/preferences.ui.h:14
msgid "Syntax highlighting color scheme:"
msgstr "Färgschema för syntaxmarkering:"
-#: ../data/ui/preferences.ui.h:15
+#: ../meld/resources/ui/preferences.ui.h:15
msgid "External Editor"
msgstr "Extern redigerare"
-#: ../data/ui/preferences.ui.h:16
+#: ../meld/resources/ui/preferences.ui.h:16
msgid "Use _default system editor"
msgstr "Använd systemets standardred_igerare"
-#: ../data/ui/preferences.ui.h:17
+#: ../meld/resources/ui/preferences.ui.h:17
msgid "Edito_r command:"
msgstr "Kommando för re_digerare:"
-#: ../data/ui/preferences.ui.h:18
+#: ../meld/resources/ui/preferences.ui.h:18
msgid "Editor"
msgstr "Redigerare"
-#: ../data/ui/preferences.ui.h:19
+#: ../meld/resources/ui/preferences.ui.h:19
msgid "Shallow Comparison"
msgstr "Ytlig jämförelse"
-#: ../data/ui/preferences.ui.h:20
+#: ../meld/resources/ui/preferences.ui.h:20
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:21
+#: ../meld/resources/ui/preferences.ui.h:21
msgid "_Timestamp resolution:"
msgstr "_Tidsstämpelupplösning:"
-#: ../data/ui/preferences.ui.h:23
+#: ../meld/resources/ui/preferences.ui.h:23
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr ""
"Observera: att aktivera textfilter kan göra att jämförelse av stora filer "
"blir mycket långsammare"
-#: ../data/ui/preferences.ui.h:24
+#: ../meld/resources/ui/preferences.ui.h:24
msgid "Symbolic Links"
msgstr "Symboliska länkar"
-#: ../data/ui/preferences.ui.h:26
+#: ../meld/resources/ui/preferences.ui.h:26
msgid "Visible Columns"
msgstr "Synliga kolumner"
-#: ../data/ui/preferences.ui.h:27
+#: ../meld/resources/ui/preferences.ui.h:27
msgid "Folder Comparisons"
msgstr "Mappjämförelser"
-#: ../data/ui/preferences.ui.h:28
+#: ../meld/resources/ui/preferences.ui.h:28
msgid "Version Comparisons"
msgstr "Versionsjämförelser"
-#: ../data/ui/preferences.ui.h:29
-msgid "_Order when comparing file revisions:"
-msgstr "_Sortering vid jämförelse av filrevisioner:"
-
-#: ../data/ui/preferences.ui.h:30
-msgid "Order when _merging files:"
-msgstr "Sortering när filer _sammanfogas:"
-
-#: ../data/ui/preferences.ui.h:31
-msgid "Commit Messages"
-msgstr "Incheckningsmeddelanden"
-
-#: ../data/ui/preferences.ui.h:32
-msgid "Show _right margin at:"
-msgstr "Visa _högermarginal vid:"
-
-#: ../data/ui/preferences.ui.h:33
-msgid "Automatically _break lines at right margin on commit"
-msgstr "_Radbryt automatiskt vid högermarginal under incheckning"
-
-#: ../data/ui/preferences.ui.h:34
-msgid "Version Control"
-msgstr "Versionshantering"
-
-#: ../data/ui/preferences.ui.h:35
-msgid "Filename filters"
-msgstr "Filnamnsfilter"
-
-#: ../data/ui/preferences.ui.h:36
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
-msgstr ""
-"När du jämför kataloger kan du filtrera ut filer och kataloger med hjälp av "
-"deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda "
-"med blanksteg."
-
-#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
-msgid "File Filters"
-msgstr "Filfilter"
-
-#: ../data/ui/preferences.ui.h:38
-msgid "Change trimming"
-msgstr "Ändra borttagning av blanksteg"
-
-#: ../data/ui/preferences.ui.h:39
-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:40
-msgid "Text filters"
-msgstr "Textfilter"
-
-#: ../data/ui/preferences.ui.h:41
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"När du jämför filer kan du välja att ignorera vissa typer av ändringar. "
-"Varje mönster här är ett reguljärt python-uttryck som ersätter den text som "
-"matchar med en tom sträng innan jämförelsen utförs. Om uttrycket innehåller "
-"grupper kommer endast grupperna att ersättas. Se användarhandboken för mer "
-"information."
-
-#: ../data/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Textfilter"
-
-#: ../data/ui/preferences.ui.h:43
-msgid "Left is remote, right is local"
-msgstr "Vänster är fjärr, höger är lokal"
-
-#: ../data/ui/preferences.ui.h:44
-msgid "Left is local, right is remote"
-msgstr "Vänster är lokal, höger är fjärr"
-
-#: ../data/ui/preferences.ui.h:45
-msgid "Remote, merge, local"
-msgstr "Fjärr, sammanfoga, lokal"
-
-#: ../data/ui/preferences.ui.h:46
-msgid "Local, merge, remote"
-msgstr "Lokal, sammanfoga, fjärr"
-
-#: ../data/ui/preferences.ui.h:47
-msgid "1ns (ext4)"
-msgstr "1ns (ext4)"
-
-#: ../data/ui/preferences.ui.h:48
-msgid "100ns (NTFS)"
-msgstr "100ns (NTFS)"
-
-#: ../data/ui/preferences.ui.h:49
-msgid "1s (ext2/ext3)"
-msgstr "1s (ext2/ext3)"
-
-#: ../data/ui/preferences.ui.h:50
-msgid "2s (VFAT)"
-msgstr "2s (VFAT)"
-
-#: ../data/ui/shortcuts.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Allmänt"
-
-#: ../data/ui/shortcuts.ui.h:2
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "Ny jämförelse"
-
-#: ../data/ui/shortcuts.ui.h:3
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "Stäng en jämförelse"
-
-#: ../data/ui/shortcuts.ui.h:4
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "Avsluta Meld"
-
-#: ../data/ui/shortcuts.ui.h:5
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "Stoppa den aktuella åtgärden"
-
-#: ../data/ui/shortcuts.ui.h:6
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "Uppdatera jämförelse"
-
-#: ../data/ui/shortcuts.ui.h:7
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "Helskärm"
-
-#: ../data/ui/shortcuts.ui.h:8
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "Flikar"
-
-#: ../data/ui/shortcuts.ui.h:9
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "Gå till föregående flik"
-
-#: ../data/ui/shortcuts.ui.h:10
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "Gå till nästa flik"
-
-#: ../data/ui/shortcuts.ui.h:11
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "Växla till flik"
-
-#: ../data/ui/shortcuts.ui.h:12
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "Flytta flik åt vänster"
-
-#: ../data/ui/shortcuts.ui.h:13
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "Flytta flik åt höger"
-
-#: ../data/ui/shortcuts.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Ändringar"
-
-#: ../data/ui/shortcuts.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Gå till föregående ändring"
-
-#: ../data/ui/shortcuts.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Gå till nästa ändring"
-
-#: ../data/ui/shortcuts.ui.h:17
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "Redigering"
-
-#: ../data/ui/shortcuts.ui.h:18
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "Ångra"
-
-#: ../data/ui/shortcuts.ui.h:19
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "Gör om"
-
-#: ../data/ui/shortcuts.ui.h:20
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: ../data/ui/shortcuts.ui.h:21
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "Kopiera"
-
-#: ../data/ui/shortcuts.ui.h:22
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "Klistra in"
-
-#: ../data/ui/shortcuts.ui.h:23
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "Sök"
-
-#: ../data/ui/shortcuts.ui.h:24
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "Sök nästa"
-
-#: ../data/ui/shortcuts.ui.h:25
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "Sök föregående"
-
-#: ../data/ui/shortcuts.ui.h:26
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "Ersätt"
-
-#: ../data/ui/shortcuts.ui.h:27
-msgctxt "shortcut window"
-msgid "File comparison"
-msgstr "Filjämförelse"
-
-#: ../data/ui/shortcuts.ui.h:28
-msgctxt "shortcut window"
-msgid "Save current file"
-msgstr "Spara den aktuella filen"
-
-#: ../data/ui/shortcuts.ui.h:29
-msgctxt "shortcut window"
-msgid "Save current file to new path"
-msgstr "Spara den aktuella filen till ny sökväg"
-
-#: ../data/ui/shortcuts.ui.h:30
-msgctxt "shortcut window"
-msgid "Save all files in comparison"
-msgstr "Spara alla filer i jämförelse"
-
-#: ../data/ui/shortcuts.ui.h:31
-msgctxt "shortcut window"
-msgid "Previous conflict"
-msgstr "Föregående konflikt"
+#: ../meld/resources/ui/preferences.ui.h:29
+msgid "_Order when comparing file revisions:"
+msgstr "_Sortering vid jämförelse av filrevisioner:"
-#: ../data/ui/shortcuts.ui.h:32
-msgctxt "shortcut window"
-msgid "Next conflict"
-msgstr "Nästa konflikt"
+#: ../meld/resources/ui/preferences.ui.h:30
+msgid "Order when _merging files:"
+msgstr "Sortering när filer _sammanfogas:"
-#: ../data/ui/shortcuts.ui.h:33
-msgctxt "shortcut window"
-msgid "Push change to left"
-msgstr "Tryck över ändring till vänster"
+#: ../meld/resources/ui/preferences.ui.h:31
+msgid "Commit Messages"
+msgstr "Incheckningsmeddelanden"
-#: ../data/ui/shortcuts.ui.h:34
-msgctxt "shortcut window"
-msgid "Push change to right"
-msgstr "Tryck över ändring till höger"
+#: ../meld/resources/ui/preferences.ui.h:32
+msgid "Show _right margin at:"
+msgstr "Visa _högermarginal vid:"
-#: ../data/ui/shortcuts.ui.h:35
-msgctxt "shortcut window"
-msgid "Pull change from left"
-msgstr "Dra ändring från vänster"
+#: ../meld/resources/ui/preferences.ui.h:33
+msgid "Automatically _break lines at right margin on commit"
+msgstr "_Radbryt automatiskt vid högermarginal under incheckning"
-#: ../data/ui/shortcuts.ui.h:36
-msgctxt "shortcut window"
-msgid "Pull change from right"
-msgstr "Dra ändring från höger"
+#: ../meld/resources/ui/preferences.ui.h:34
+msgid "Version Control"
+msgstr "Versionshantering"
-#: ../data/ui/shortcuts.ui.h:37
-msgctxt "shortcut window"
-msgid "Copy change above left"
-msgstr "Kopiera ändringar ovanför vänster"
+#: ../meld/resources/ui/preferences.ui.h:35
+msgid "Filename filters"
+msgstr "Filnamnsfilter"
-#: ../data/ui/shortcuts.ui.h:38
-msgctxt "shortcut window"
-msgid "Copy change below left"
-msgstr "Kopiera ändringar under vänster"
+#: ../meld/resources/ui/preferences.ui.h:36
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"När du jämför kataloger kan du filtrera ut filer och kataloger med hjälp av "
+"deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda "
+"med blanksteg."
-#: ../data/ui/shortcuts.ui.h:39
-msgctxt "shortcut window"
-msgid "Copy change above right"
-msgstr "Kopiera ändringar ovanför höger"
+#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
+msgid "File Filters"
+msgstr "Filfilter"
-#: ../data/ui/shortcuts.ui.h:40
-msgctxt "shortcut window"
-msgid "Copy change below right"
-msgstr "Kopiera ändringar under höger"
+#: ../meld/resources/ui/preferences.ui.h:38
+msgid "Change trimming"
+msgstr "Ändra borttagning av blanksteg"
-#: ../data/ui/shortcuts.ui.h:41
-msgctxt "shortcut window"
-msgid "Delete change"
-msgstr "Ta bort ändring"
+#: ../meld/resources/ui/preferences.ui.h:39
+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/shortcuts.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Föregående jämförelsepanel"
+#: ../meld/resources/ui/preferences.ui.h:40
+msgid "Text filters"
+msgstr "Textfilter"
-#: ../data/ui/shortcuts.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Nästa jämförelsepanel"
+#: ../meld/resources/ui/preferences.ui.h:41
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"När du jämför filer kan du välja att ignorera vissa typer av ändringar. "
+"Varje mönster här är ett reguljärt python-uttryck som ersätter den text som "
+"matchar med en tom sträng innan jämförelsen utförs. Om uttrycket innehåller "
+"grupper kommer endast grupperna att ersättas. Se användarhandboken för mer "
+"information."
-#: ../data/ui/shortcuts.ui.h:44
-msgctxt "shortcut window"
-msgid "Folder comparison"
-msgstr "Mappjämförelse"
+#: ../meld/resources/ui/preferences.ui.h:42
+msgid "Text Filters"
+msgstr "Textfilter"
-#: ../data/ui/shortcuts.ui.h:45
-msgctxt "shortcut window"
-msgid "Copy to left"
-msgstr "Kopiera till vänster"
+#: ../meld/resources/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr "Vänster är fjärr, höger är lokal"
-#: ../data/ui/shortcuts.ui.h:46
-msgctxt "shortcut window"
-msgid "Copy to right"
-msgstr "Kopiera till höger"
+#: ../meld/resources/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr "Vänster är lokal, höger är fjärr"
-#: ../data/ui/shortcuts.ui.h:47
-msgctxt "shortcut window"
-msgid "Version control comparison"
-msgstr "Versionshanterad jämförelse"
+#: ../meld/resources/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
+msgstr "Fjärr, sammanfoga, lokal"
-#: ../data/ui/shortcuts.ui.h:48
-msgctxt "shortcut window"
-msgid "Commit to version control"
-msgstr "Checka in i versionshanteraren"
+#: ../meld/resources/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
+msgstr "Lokal, sammanfoga, fjärr"
-#: ../data/ui/shortcuts.ui.h:49
-msgctxt "shortcut window"
-msgid "Show/hide console output"
-msgstr "Visa/dölj konsolutskrift"
+#: ../meld/resources/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
-#: ../meld/newdifftab.py:49
-msgid "New comparison"
-msgstr "Ny jämförelse"
+#: ../meld/resources/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
-#: ../data/ui/tab-placeholder.ui.h:2
-msgid "File comparison"
-msgstr "Filjämförelse"
+#: ../meld/resources/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "Katalogjämförelse"
+#: ../meld/resources/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
-#: ../data/ui/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "Versionshanteringsvy"
+#: ../meld/resources/ui/push-dialog.ui.h:1
+msgid "Push local commits to remote?"
+msgstr "Tryck lokala incheckningar till fjärr?"
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "_Trevägsjämförelse"
+#: ../meld/resources/ui/push-dialog.ui.h:2
+msgid "The commits to be pushed are determined by your version control system."
+msgstr "Incheckningar att trycka bestäms av ditt versionshanteringssystem."
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "Välj tredje filen"
+#: ../meld/resources/ui/push-dialog.ui.h:3
+msgid "_Push commits"
+msgstr "_Tryck incheckningar"
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "Välj andra filen"
+#: ../meld/resources/ui/revert-dialog.ui.h:1
+msgid "Discard unsaved changes to documents?"
+msgstr "Förkasta osparade ändringar i dokumenten?"
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "Välj första filen"
+#: ../meld/resources/ui/revert-dialog.ui.h:2
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr ""
+"Ändringar utförda i följande dokument kommer att gå förlorade för alltid:"
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "Välj första mappen"
+#: ../meld/resources/ui/revert-dialog.ui.h:3
+msgid "_Discard"
+msgstr "_Förkasta"
-#: ../data/ui/tab-placeholder.ui.h:10
-msgid "Select Second Folder"
-msgstr "Välj andra mappen"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+msgid "Save changes to documents before closing?"
+msgstr "Spara ändringar till dokument innan stängning?"
-#: ../data/ui/tab-placeholder.ui.h:11
-msgid "Select Third Folder"
-msgstr "Välj tredje filen"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+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/tab-placeholder.ui.h:12
-msgid "Select A Version-Controlled Folder"
-msgstr "Välj en versionshanterad mapp"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+msgid "Close _without Saving"
+msgstr "Stäng _utan att spara"
-#: ../data/ui/tab-placeholder.ui.h:13
-msgid "_Blank comparison"
-msgstr "_Tom jämförelse"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039
+#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106
+msgid "_Cancel"
+msgstr "_Avbryt"
-#: ../data/ui/tab-placeholder.ui.h:14
-msgid "C_ompare"
-msgstr "_Jämför"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+msgid "_Save"
+msgstr "_Spara"
-#: ../data/ui/vcview.ui.h:3
+#: ../meld/resources/ui/vcview.ui.h:3
msgid "Co_mmit…"
msgstr "Che_cka in…"
-#: ../data/ui/vcview.ui.h:4
+#: ../meld/resources/ui/vcview.ui.h:4
msgid "Commit changes to version control"
msgstr "Checka in ändringar till versionshanteraren"
-#: ../data/ui/vcview.ui.h:5
+#: ../meld/resources/ui/vcview.ui.h:5
msgid "_Update"
msgstr "_Uppdatera"
-#: ../data/ui/vcview.ui.h:6
+#: ../meld/resources/ui/vcview.ui.h:6
msgid "Update working copy from version control"
msgstr "Uppdatera arbetskopian från versionshanteraren"
-#: ../data/ui/vcview.ui.h:7
+#: ../meld/resources/ui/vcview.ui.h:7
msgid "_Push"
msgstr "_Tryck"
-#: ../data/ui/vcview.ui.h:8
+#: ../meld/resources/ui/vcview.ui.h:8
msgid "Push local changes to remote"
msgstr "Tryck lokala ändringar till fjärr"
-#: ../data/ui/vcview.ui.h:10
+#: ../meld/resources/ui/vcview.ui.h:10
msgid "Add to version control"
msgstr "Lägg till för versionshantering"
-#: ../data/ui/vcview.ui.h:12
+#: ../meld/resources/ui/vcview.ui.h:12
msgid "Remove from version control"
msgstr "Ta bort från versionshantering"
-#: ../data/ui/vcview.ui.h:13
+#: ../meld/resources/ui/vcview.ui.h:13
msgid "Mar_k as Resolved"
msgstr "Markera som _löst"
-#: ../data/ui/vcview.ui.h:14
+#: ../meld/resources/ui/vcview.ui.h:14
msgid "Mark as resolved in version control"
msgstr "Markera som löst i versionshanteraren"
-#: ../data/ui/vcview.ui.h:15
+#: ../meld/resources/ui/vcview.ui.h:15
msgid "Re_vert"
msgstr "Åter_ställ"
-#: ../data/ui/vcview.ui.h:16
+#: ../meld/resources/ui/vcview.ui.h:16
msgid "Revert working copy to original state"
msgstr "Återställ arbetskopian till ursprungligt tillstånd"
-#: ../data/ui/vcview.ui.h:17
+#: ../meld/resources/ui/vcview.ui.h:17
msgid "Delete from working copy"
msgstr "Ta bort från arbetskopia"
-#: ../data/ui/vcview.ui.h:18
+#: ../meld/resources/ui/vcview.ui.h:18
msgid "Console"
msgstr "Konsol"
-#: ../data/ui/vcview.ui.h:19
+#: ../meld/resources/ui/vcview.ui.h:19
msgid "Show or hide the version control console output pane"
msgstr "Visa eller dölj konsolutmatningspanelen för versionshanteringen"
-#: ../data/ui/vcview.ui.h:20
+#: ../meld/resources/ui/vcview.ui.h:20
msgid "_Flatten"
msgstr "_Platta till"
-#: ../data/ui/vcview.ui.h:21
+#: ../meld/resources/ui/vcview.ui.h:21
msgid "Flatten directories"
msgstr "Platta till kataloger"
-#: ../data/ui/vcview.ui.h:22
+#: ../meld/resources/ui/vcview.ui.h:22
msgid "_Modified"
msgstr "_Ändrade"
-#: ../data/ui/vcview.ui.h:23
+#: ../meld/resources/ui/vcview.ui.h:23
msgid "Show modified files"
msgstr "Visa ändrade filer"
-#: ../data/ui/vcview.ui.h:24
+#: ../meld/resources/ui/vcview.ui.h:24
msgid "_Normal"
msgstr "_Normala"
-#: ../data/ui/vcview.ui.h:25
+#: ../meld/resources/ui/vcview.ui.h:25
msgid "Show normal files"
msgstr "Visa normala filer"
-#: ../data/ui/vcview.ui.h:26
+#: ../meld/resources/ui/vcview.ui.h:26
msgid "Un_versioned"
msgstr "O_versionerade"
-#: ../data/ui/vcview.ui.h:27
+#: ../meld/resources/ui/vcview.ui.h:27
msgid "Show unversioned files"
msgstr "Visa filer som inte versionshanteras"
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
msgid "Ignored"
msgstr "Ignorerade"
-#: ../data/ui/vcview.ui.h:29
+#: ../meld/resources/ui/vcview.ui.h:29
msgid "Show ignored files"
msgstr "Visa ignorerade filer"
-#: ../data/ui/vcview.ui.h:30
-msgid "Commit"
-msgstr "Checka in"
-
-#: ../data/ui/vcview.ui.h:31
-msgid "Commit Files"
-msgstr "Checka in filer"
-
-#: ../data/ui/vcview.ui.h:32
-msgid "Log Message"
-msgstr "Loggmeddelande"
-
-#: ../data/ui/vcview.ui.h:33
-msgid "Previous logs:"
-msgstr "Föregående loggar:"
-
-#: ../data/ui/vcview.ui.h:34
-msgid "Co_mmit"
-msgstr "Che_cka in"
-
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
+#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
msgid "Location"
msgstr "Plats"
-#: ../data/ui/vcview.ui.h:37
+#: ../meld/resources/ui/vcview.ui.h:32
msgid "Status"
msgstr "Status"
-#: ../data/ui/vcview.ui.h:38
+#: ../meld/resources/ui/vcview.ui.h:33
msgid "Extra"
msgstr "Extra"
-#: ../data/ui/vcview.ui.h:39
+#: ../meld/resources/ui/vcview.ui.h:34
msgid "Console output"
msgstr "Konsolutskrift"
-#: ../data/ui/vcview.ui.h:40
-msgid "Push local commits to remote?"
-msgstr "Tryck lokala incheckningar till fjärr?"
-
-#: ../data/ui/vcview.ui.h:41
-msgid "The commits to be pushed are determined by your version control system."
-msgstr "Incheckningar att trycka bestäms av ditt versionshanteringssystem."
-
-#: ../data/ui/vcview.ui.h:42
-msgid "_Push commits"
-msgstr "_Tryck incheckningar"
-
#: ../meld/const.py:12
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
@@ -1673,82 +1668,82 @@ msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:428 ../meld/preferences.py:81
+#: ../meld/dirdiff.py:475 ../meld/preferences.py:138
msgid "Size"
msgstr "Storlek"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:436 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:483 ../meld/preferences.py:139
msgid "Modification time"
msgstr "Ändringstid"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:444 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:491 ../meld/preferences.py:140
msgid "Permissions"
msgstr "Rättigheter"
-#: ../meld/dirdiff.py:575
+#: ../meld/dirdiff.py:625
#, python-format
msgid "Hide %s"
msgstr "Dölj %s"
-#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739
+#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Söker igenom %s"
-#: ../meld/dirdiff.py:874
+#: ../meld/dirdiff.py:925
#, python-format
msgid "[%s] Done"
msgstr "[%s] Klar"
-#: ../meld/dirdiff.py:882
+#: ../meld/dirdiff.py:933
msgid "Folders have no differences"
msgstr "Mapparna skiljer sig inte åt"
-#: ../meld/dirdiff.py:884
+#: ../meld/dirdiff.py:935
msgid "Contents of scanned files in folders are identical."
msgstr "Innehållet i mapparnas avsökta filer är identiskt."
-#: ../meld/dirdiff.py:886
+#: ../meld/dirdiff.py:937
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
msgstr ""
"Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:940
msgid "File filters are in use, so not all files have been scanned."
msgstr "Filfilter används, och därför har inte alla filer genomsökts."
-#: ../meld/dirdiff.py:891
+#: ../meld/dirdiff.py:942
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:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529
-#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618
+#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
msgid "Hi_de"
msgstr "_Dölj"
-#: ../meld/dirdiff.py:918
+#: ../meld/dirdiff.py:969
msgid "Multiple errors occurred while scanning this folder"
msgstr "Flera fel inträffade vid avsökning av denna mapp"
-#: ../meld/dirdiff.py:919
+#: ../meld/dirdiff.py:970
msgid "Files with invalid encodings found"
msgstr "Filer med ogiltiga teckenkodningar hittades"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:921
+#: ../meld/dirdiff.py:972
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:923
+#: ../meld/dirdiff.py:974
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:925
+#: ../meld/dirdiff.py:976
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1756,17 +1751,17 @@ 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:936
+#: ../meld/dirdiff.py:987
#, python-format
msgid "“%s” hidden by “%s”"
msgstr "”%s” dolda av ”%s”"
-#: ../meld/dirdiff.py:992
+#: ../meld/dirdiff.py:1043
#, python-format
msgid "Replace folder “%s”?"
msgstr "Ersätt mappen ”%s”?"
-#: ../meld/dirdiff.py:994
+#: ../meld/dirdiff.py:1045
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1775,11 +1770,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:1007
+#: ../meld/dirdiff.py:1058
msgid "Error copying file"
msgstr "Fel vid filkopiering"
-#: ../meld/dirdiff.py:1008
+#: ../meld/dirdiff.py:1059
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1792,19 +1787,19 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703
+#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720
msgid "Error deleting {}"
msgstr "Fel vid borttagning av {}"
-#: ../meld/dirdiff.py:1546
+#: ../meld/dirdiff.py:1593
msgid "No folder"
msgstr "Ingen mapp"
-#: ../meld/filediff.py:834
+#: ../meld/filediff.py:905
msgid "Comparison results will be inaccurate"
msgstr "Jämförelseresultat kommer att bli osäkra"
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:907
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1812,64 +1807,64 @@ msgstr ""
"Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
"kommer att vara osäker."
-#: ../meld/filediff.py:905
+#: ../meld/filediff.py:979
msgid "Mark conflict as resolved?"
msgstr "Markera konflikten som löst?"
-#: ../meld/filediff.py:907
+#: ../meld/filediff.py:981
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:909
+#: ../meld/filediff.py:983
msgid "Cancel"
msgstr "Avbryt"
-#: ../meld/filediff.py:910
+#: ../meld/filediff.py:984
msgid "Mark _Resolved"
msgstr "Markera som _löst"
-#: ../meld/filediff.py:1214
+#: ../meld/filediff.py:1303
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
-#: ../meld/filediff.py:1222
+#: ../meld/filediff.py:1311
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Filen %s verkar vara en binärfil."
-#: ../meld/filediff.py:1224
+#: ../meld/filediff.py:1313
msgid "Do you want to open the file using the default application?"
msgstr "Vill du öppna filen med standardprogrammet?"
-#: ../meld/filediff.py:1226
+#: ../meld/filediff.py:1315
msgid "Open"
msgstr "Öppna"
-#: ../meld/filediff.py:1242
+#: ../meld/filediff.py:1331
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Beräknar skillnader"
-#: ../meld/filediff.py:1303
+#: ../meld/filediff.py:1392
#, python-format
msgid "File %s has changed on disk"
msgstr "Filen %s har ändrats på disk"
-#: ../meld/filediff.py:1304
+#: ../meld/filediff.py:1393
msgid "Do you want to reload the file?"
msgstr "Vill du läsa om filen?"
-#: ../meld/filediff.py:1306
+#: ../meld/filediff.py:1395
msgid "_Reload"
msgstr "_Läs om"
-#: ../meld/filediff.py:1462
+#: ../meld/filediff.py:1551
msgid "Files are identical"
msgstr "Filerna är identiska"
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1564
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1877,11 +1872,11 @@ msgstr ""
"Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
"ofiltrerade filerna?"
-#: ../meld/filediff.py:1480
+#: ../meld/filediff.py:1569
msgid "Files differ in line endings only"
msgstr "Filer skiljer sig endast vad gäller radslut"
-#: ../meld/filediff.py:1482
+#: ../meld/filediff.py:1571
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1890,15 +1885,15 @@ msgstr ""
"Filerna är identiska förutom radavsluten:\n"
"%s"
-#: ../meld/filediff.py:1502
+#: ../meld/filediff.py:1591
msgid "Show without filters"
msgstr "Visa utan filer"
-#: ../meld/filediff.py:1524
+#: ../meld/filediff.py:1613
msgid "Change highlighting incomplete"
msgstr "Ändra markering av ofärdiga"
-#: ../meld/filediff.py:1525
+#: ../meld/filediff.py:1614
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."
@@ -1907,19 +1902,19 @@ msgstr ""
"Meld till att längre tid på sig att markera större ändringar, men det kan "
"bli långsamt."
-#: ../meld/filediff.py:1533
+#: ../meld/filediff.py:1622
msgid "Keep highlighting"
msgstr "Använd markering"
-#: ../meld/filediff.py:1535
+#: ../meld/filediff.py:1624
msgid "_Keep highlighting"
msgstr "_Använd markering"
-#: ../meld/filediff.py:1548
+#: ../meld/filediff.py:1637
msgid "Saving failed"
msgstr "Misslyckades med att spara"
-#: ../meld/filediff.py:1549
+#: ../meld/filediff.py:1638
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1927,36 +1922,36 @@ msgstr ""
"Överväg att kopiera kritiska ändringar till ett annat program eller en annan "
"fil för att undvika förlust av data."
-#: ../meld/filediff.py:1558
+#: ../meld/filediff.py:1647
msgid "Save Left Pane As"
msgstr "Spara vänsterpanel som"
-#: ../meld/filediff.py:1560
+#: ../meld/filediff.py:1649
msgid "Save Middle Pane As"
msgstr "Spara mittenpanel som"
-#: ../meld/filediff.py:1562
+#: ../meld/filediff.py:1651
msgid "Save Right Pane As"
msgstr "Spara högerpanel som"
-#: ../meld/filediff.py:1575
+#: ../meld/filediff.py:1664
#, 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:1577
+#: ../meld/filediff.py:1666
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:1580
+#: ../meld/filediff.py:1669
msgid "Save Anyway"
msgstr "Spara ändå"
-#: ../meld/filediff.py:1581
+#: ../meld/filediff.py:1670
msgid "Don’t Save"
msgstr "Spara inte"
-#: ../meld/filediff.py:1623
+#: ../meld/filediff.py:1712
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
@@ -1964,7 +1959,7 @@ msgstr ""
"Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
"”{}”."
-#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131
+#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1973,16 +1968,16 @@ msgstr ""
"Kunde in spara fil beroende på:\n"
"%s"
-#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130
+#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141
#, python-format
msgid "Could not save file %s."
msgstr "Kunde inte spara filen %s."
-#: ../meld/filediff.py:2014
+#: ../meld/filediff.py:2113
msgid "Live comparison updating disabled"
msgstr "Inaktivera realtidsuppdateringar av jämförelser"
-#: ../meld/filediff.py:2015
+#: ../meld/filediff.py:2114
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1998,41 +1993,41 @@ msgstr ""
msgid "[%s] Merging files"
msgstr "[%s] Sammanfogar filer"
-#: ../meld/gutterrendererchunk.py:216
+#: ../meld/gutterrendererchunk.py:220
msgid "Copy _up"
msgstr "Kopiera _upp"
-#: ../meld/gutterrendererchunk.py:217
+#: ../meld/gutterrendererchunk.py:221
msgid "Copy _down"
msgstr "Kopiera _ned"
-#: ../meld/iohelpers.py:35
+#: ../meld/iohelpers.py:37
msgid "Deleting remote folders is not supported"
msgstr "Att ta bort fjärrmappar stöds ej"
-#: ../meld/iohelpers.py:37
+#: ../meld/iohelpers.py:39
msgid "Not a file or directory"
msgstr "Inte en fil eller katalog"
-#: ../meld/iohelpers.py:41
+#: ../meld/iohelpers.py:43
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
msgstr ""
"Kan inte flytta ”{}” till papperskorgen. Vill du ta bort den omedelbart?"
-#: ../meld/iohelpers.py:46
+#: ../meld/iohelpers.py:48
msgid "This remote location does not support sending items to the trash."
msgstr "Denna fjärrplats stöder inte att lägga objekt i papperskorgen."
-#: ../meld/iohelpers.py:51
+#: ../meld/iohelpers.py:53
msgid "_Delete Permanently"
msgstr "_Ta bort permanent"
-#: ../meld/iohelpers.py:94
+#: ../meld/iohelpers.py:100
#, python-format
msgid "Replace file “%s”?"
msgstr "Ersätt filen ”%s”?"
-#: ../meld/iohelpers.py:96
+#: ../meld/iohelpers.py:102
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2041,98 +2036,98 @@ 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/meldapp.py:181
+#: ../meld/meldapp.py:169
msgid "wrong number of arguments supplied to --diff"
msgstr "felaktigt antal argument angavs för --diff"
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:174
msgid "Start with an empty window"
msgstr "Starta med ett tomt fönster"
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:189
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
msgid "file"
msgstr "fil"
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:191
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
msgid "folder"
msgstr "mapp"
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:176
msgid "Start a version control comparison"
msgstr "Starta en versionshanterad jämförelse"
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:178
msgid "Start a 2- or 3-way file comparison"
msgstr "Starta med en två- eller trevägs filjämförelse"
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:180
msgid "Start a 2- or 3-way folder comparison"
msgstr "Starta med en två- eller trevägs mappjämförelse"
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:223
#, python-format
msgid "Error: %s\n"
msgstr "Fel: %s\n"
-#: ../meld/meldapp.py:242
+#: ../meld/meldapp.py:230
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:246
+#: ../meld/meldapp.py:234
msgid "Set label to use instead of file name"
msgstr "Sätt etikett att använda istället för filnamn"
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:237
msgid "Open a new tab in an already running instance"
msgstr "Öppna en ny flik i en redan körande instans"
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:240
msgid "Automatically compare all differing files on startup"
msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart"
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:243
msgid "Ignored for compatibility"
msgstr "Ignorerad för kompatibilitet"
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:247
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:262
+#: ../meld/meldapp.py:250
msgid "Automatically merge files"
msgstr "Sammanfoga automatiskt filer"
-#: ../meld/meldapp.py:266
+#: ../meld/meldapp.py:254
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:270
+#: ../meld/meldapp.py:258
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:290
+#: ../meld/meldapp.py:278
#, 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:293
+#: ../meld/meldapp.py:281
msgid "can’t auto-merge less than 3 files"
msgstr "kan inte automatiskt sammanfoga mindre är tre filer"
-#: ../meld/meldapp.py:295
+#: ../meld/meldapp.py:283
msgid "can’t auto-merge directories"
msgstr "kan inte automatiskt sammanfoga kataloger"
-#: ../meld/meldapp.py:309
+#: ../meld/meldapp.py:297
msgid "Error reading saved comparison file"
msgstr "Fel vid läsning av den sparade konfigurationsfilen"
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:314
#, python-format
msgid "invalid path or URI “%s”"
msgstr "ogiltig sökväg eller URI ”%s”"
-#: ../meld/meldapp.py:332
+#: ../meld/meldapp.py:320
msgid "remote folder “{}” not supported"
msgstr "fjärrmapp ”{}” stöds ej"
@@ -2141,212 +2136,176 @@ msgstr "fjärrmapp ”{}” stöds ej"
msgid "<unnamed>"
msgstr "<namnlös>"
-#: ../meld/melddoc.py:68
+#: ../meld/melddoc.py:63
msgid "untitled"
msgstr "namnlös"
-#: ../meld/meldwindow.py:47
+#: ../meld/meldwindow.py:56
msgid "_File"
msgstr "_Arkiv"
-#: ../meld/meldwindow.py:48
+#: ../meld/meldwindow.py:57
msgid "_New Comparison…"
msgstr "_Ny jämförelse…"
-#: ../meld/meldwindow.py:49
+#: ../meld/meldwindow.py:58
msgid "Start a new comparison"
msgstr "Starta en ny jämförelse"
-#: ../meld/meldwindow.py:52
+#: ../meld/meldwindow.py:61
msgid "Save the current file"
msgstr "Spara den aktuella filen"
-#: ../meld/meldwindow.py:54
+#: ../meld/meldwindow.py:63
msgid "Save As…"
msgstr "Spara som…"
-#: ../meld/meldwindow.py:55
+#: ../meld/meldwindow.py:64
msgid "Save the current file with a different name"
msgstr "Spara den aktuella filen med ett annat namn"
-#: ../meld/meldwindow.py:58
+#: ../meld/meldwindow.py:67
msgid "Close the current file"
msgstr "Stäng den aktuella filen"
-#: ../meld/meldwindow.py:61
+#: ../meld/meldwindow.py:70
msgid "_Edit"
msgstr "_Redigera"
-#: ../meld/meldwindow.py:63
+#: ../meld/meldwindow.py:72
msgid "Undo the last action"
msgstr "Ångra den senaste åtgärden"
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:75
msgid "Redo the last undone action"
msgstr "Gör om den senaste ångrade åtgärden"
-#: ../meld/meldwindow.py:68
+#: ../meld/meldwindow.py:77
msgid "Cut the selection"
msgstr "Klipp ut markering"
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:79
msgid "Copy the selection"
msgstr "Kopiera markering"
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:81
msgid "Paste the clipboard"
msgstr "Klistra in Urklipp"
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:83
msgid "Find…"
msgstr "Sök…"
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:83
msgid "Search for text"
msgstr "Sök efter text"
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:85
msgid "Find Ne_xt"
msgstr "Sök _nästa"
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:86
msgid "Search forwards for the same text"
msgstr "Sök framåt efter samma text"
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:88
msgid "Find _Previous"
msgstr "Sök _Föregående"
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:89
msgid "Search backwards for the same text"
msgstr "Sök bakåt efter samma text"
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:92
msgid "_Replace…"
msgstr "_Ersätt…"
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:93
msgid "Find and replace text"
msgstr "Sök och ersätt text"
-#: ../meld/meldwindow.py:86
+#: ../meld/meldwindow.py:95
msgid "Go to _Line"
msgstr "Gå till _rad"
-#: ../meld/meldwindow.py:87
+#: ../meld/meldwindow.py:96
msgid "Go to a specific line"
msgstr "Gå till en specifik rad"
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:99
msgid "_Changes"
msgstr "Än_dringar"
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:100
msgid "Next Change"
msgstr "Nästa ändring"
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:101
msgid "Go to the next change"
msgstr "Gå till nästa ändring"
-#: ../meld/meldwindow.py:94
+#: ../meld/meldwindow.py:103
msgid "Previous Change"
msgstr "Föregående ändring"
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:104
msgid "Go to the previous change"
msgstr "Gå till föregående ändring"
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:106
msgid "Open Externally"
msgstr "Öppna externt"
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:107
msgid "Open selected file or directory in the default external application"
msgstr "Öppna markerad fil eller katalog i det externa standardprogrammet"
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:111
msgid "_View"
msgstr "_Visa"
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:112
msgid "File Status"
msgstr "Filstatus"
-#: ../meld/meldwindow.py:104
+#: ../meld/meldwindow.py:113
msgid "Version Status"
msgstr "Versionsstatus"
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:116
msgid "Stop the current action"
msgstr "Stoppa den aktuella åtgärden"
-#: ../meld/meldwindow.py:110
+#: ../meld/meldwindow.py:119
msgid "Refresh the view"
msgstr "Uppdatera vyn"
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:123
msgid "Fullscreen"
msgstr "Helskärm"
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:124
msgid "View the comparison in fullscreen"
msgstr "Visa jämförelsen i helskärmsläge"
-#: ../meld/meldwindow.py:117
-msgid "_Toolbar"
-msgstr "Ver_ktygsfält"
-
-#: ../meld/meldwindow.py:118
-msgid "Show or hide the toolbar"
-msgstr "Visa eller dölj verktygsfältet"
-
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Open Recent"
msgstr "Öppna senaste"
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:134
msgid "Open recent files"
msgstr "Öppna senaste filer"
-#: ../meld/meldwindow.py:150
-msgid "_Meld"
-msgstr "_Meld"
-
-#: ../meld/meldwindow.py:151
-msgid "Quit the program"
-msgstr "Avsluta programmet"
-
-#: ../meld/meldwindow.py:153
-msgid "Prefere_nces"
-msgstr "Inställ_ningar"
-
-#: ../meld/meldwindow.py:154
-msgid "Configure the application"
-msgstr "Konfigurera programmet"
-
-#: ../meld/meldwindow.py:156
-msgid "_Contents"
-msgstr "_Innehåll"
-
-#: ../meld/meldwindow.py:157
-msgid "Open the Meld manual"
-msgstr "Öppna handboken för Meld"
-
-#: ../meld/meldwindow.py:159
-msgid "About this application"
-msgstr "Om detta program"
-
-#: ../meld/meldwindow.py:602
+#: ../meld/meldwindow.py:567
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr "Behöver tre filer för att sammanfoga automatiskt, fick: %r"
-#: ../meld/meldwindow.py:623
+#: ../meld/meldwindow.py:588
msgid "Cannot compare a mixture of files and directories"
msgstr "Kan inte jämföra en blandning av filer och kataloger"
-#: ../meld/misc.py:135
+#: ../meld/misc.py:155
msgid ""
"{}\n"
"\n"
@@ -2358,42 +2317,38 @@ msgstr ""
"Meld stötte på ett kritiskt fel under körning:\n"
"<tt>{}</tt>"
-#: ../meld/misc.py:254
+#: ../meld/misc.py:237
#, python-format
msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
msgstr ""
"Kunde inte hitta färgschemadetaljer för %s-%s; detta är en felaktig "
"installation"
-#: ../meld/misc.py:325
+#: ../meld/misc.py:311
msgid "[None]"
msgstr "[Ingen]"
-#: ../meld/preferences.py:33
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
msgid "label"
msgstr "etikett"
-#: ../meld/preferences.py:33
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
msgid "pattern"
msgstr "mönster"
-#: ../meld/recent.py:105
+#: ../meld/recent.py:106
msgid "Version control:"
msgstr "Versionshantering:"
-#: ../meld/ui/bufferselectors.py:32
+#: ../meld/ui/bufferselectors.py:114
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
msgid "Plain Text"
msgstr "Vanlig text"
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "Stäng flik"
-
#. Abbreviation for line, column so that it will fit in the status bar
#: ../meld/ui/statusbar.py:124
#, python-format
@@ -2404,7 +2359,7 @@ msgstr "Rad %i, kolumn %i"
msgid "Line you want to move the cursor to"
msgstr "Rad du vill flytta markören till"
-#: ../meld/ui/vcdialogs.py:48
+#: ../meld/ui/vcdialogs.py:55
msgid "No files will be committed"
msgstr "Inga filer kommer att checkas in"
@@ -2505,91 +2460,91 @@ msgstr "Inte närvarande"
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:248
+#: ../meld/vcview.py:282
#, 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:252
+#: ../meld/vcview.py:286
#, python-format
msgid "%(name)s (Invalid repository)"
msgstr "%(name)s (Ogiltigt förråd)"
-#: ../meld/vcview.py:273
+#: ../meld/vcview.py:307
msgid "No valid version control system found in this folder"
msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp"
-#: ../meld/vcview.py:275
+#: ../meld/vcview.py:309
msgid "Only one version control system found in this folder"
msgstr "Endast ett versionshanteringssystem hittades i denna mapp"
-#: ../meld/vcview.py:277
+#: ../meld/vcview.py:311
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:331
+#: ../meld/vcview.py:366
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:338
+#: ../meld/vcview.py:373
msgid "Scanning repository"
msgstr "Söker igenom förråd"
-#: ../meld/vcview.py:367
+#: ../meld/vcview.py:402
#, python-format
msgid "Scanning %s"
msgstr "Söker igenom %s"
-#: ../meld/vcview.py:406
+#: ../meld/vcview.py:441
msgid "(Empty)"
msgstr "(Tom)"
-#: ../meld/vcview.py:450
+#: ../meld/vcview.py:487
#, python-format
msgid "%s — local"
msgstr "%s — lokal"
-#: ../meld/vcview.py:451
+#: ../meld/vcview.py:488
#, python-format
msgid "%s — remote"
msgstr "%s — fjärr"
-#: ../meld/vcview.py:459
+#: ../meld/vcview.py:496
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (lokal, sammanfoga, fjärr)"
-#: ../meld/vcview.py:464
+#: ../meld/vcview.py:501
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (fjärr, sammanfoga, lokal)"
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:512
#, python-format
msgid "%s — repository"
msgstr "%s — förråd"
-#: ../meld/vcview.py:481
+#: ../meld/vcview.py:518
#, python-format
msgid "%s (working, repository)"
msgstr "%s (arbetskopia, förråd)"
-#: ../meld/vcview.py:485
+#: ../meld/vcview.py:522
#, python-format
msgid "%s (repository, working)"
msgstr "%s (förråd, arbetskopia)"
-#: ../meld/vcview.py:674
+#: ../meld/vcview.py:688
msgid "Remove folder and all its files?"
msgstr "Ta bort mapp och dess filer?"
-#: ../meld/vcview.py:676
+#: ../meld/vcview.py:690
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2597,10 +2552,55 @@ 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:785
+#: ../meld/vcview.py:804
msgid "Clear"
msgstr "Töm"
+#~ msgid "Show toolbar"
+#~ msgstr "Visa verktygsfältet"
+
+#~ msgid "If true, the window toolbar is visible."
+#~ msgstr "Om true så är fönsterverktygsfältet synlig."
+
+#~ msgid "Show statusbar"
+#~ msgstr "Visa statusraden"
+
+#~ msgid "If true, the window statusbar is visible."
+#~ msgstr "Om true så är fönsterstatusraden synlig."
+
+#~ msgid "Editable List"
+#~ msgstr "Redigerbar lista"
+
+#~ msgid "Meld Preferences"
+#~ msgstr "Inställningar för Meld"
+
+#~ msgid "_Toolbar"
+#~ msgstr "Ver_ktygsfält"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "Visa eller dölj verktygsfältet"
+
+#~ msgid "_Meld"
+#~ msgstr "_Meld"
+
+#~ msgid "Quit the program"
+#~ msgstr "Avsluta programmet"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "Inställ_ningar"
+
+#~ msgid "Configure the application"
+#~ msgstr "Konfigurera programmet"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innehåll"
+
+#~ msgid "Open the Meld manual"
+#~ msgstr "Öppna handboken för Meld"
+
+#~ msgid "About this application"
+#~ msgstr "Om detta program"
+
#~ msgid "_Save as UTF-8"
#~ msgstr "_Spara som UTF-8"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
