[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: Tue, 31 Dec 2019 21:30:30 +0000 (UTC)
commit a0f41e85590b77a8a99dab582fa5f064aa2242df
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date: Tue Dec 31 21:31:33 2019 +0000
Update Swedish translation
po/sv.po | 2116 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 1103 insertions(+), 1013 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index be806b2e..06eeff23 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-20 20:13+0000\n"
-"PO-Revision-Date: 2019-01-20 21:27+0100\n"
+"POT-Creation-Date: 2019-12-31 07:47+0000\n"
+"PO-Revision-Date: 2019-12-31 22:28+0100\n"
"Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"Language: sv\n"
@@ -19,52 +19,28 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Poedit 2.2.4\n"
"X-Project-Style: gnome\n"
-#: ../bin/meld:190
-msgid "Cannot import: "
-msgstr "Kan inte importera: "
-
-#: ../bin/meld:193
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld kräver %s eller högre."
-
-#: ../bin/meld:262
-#, c-format
-msgid ""
-"Couldn’t load Meld-specific CSS (%s)\n"
-"%s"
-msgstr ""
-"Kunde inte läsa in Meld-specifik CSS (%s)\n"
-"%s"
-
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1
-#: ../meld/resources/ui/appwindow.ui.h:1
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9
msgid "Meld"
msgstr "Meld"
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
msgid "Diff Viewer"
msgstr "Diffvisare"
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld diffvisare"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
msgid "Compare and merge your files"
msgstr "Jämför och sammanfoga dina filer"
#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in.in:7
msgid "diff;merge;"
msgstr "diff;merge;sammanfogning;"
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in.in:14
msgid ""
"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
"compare files, directories, and version controlled projects. It provides "
@@ -77,7 +53,7 @@ msgstr ""
"stöder många versionshanteringssystem som Git, Mercurial, Bazaar och "
"Subversion."
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in.in:21
msgid ""
"Meld helps you review code changes, understand patches, and makes enormous "
"merge conflicts slightly less painful."
@@ -85,35 +61,35 @@ msgstr ""
"Meld hjälper dig att granska kodändringar, förstå programfixar och göra "
"enorma sammanfogningskonflikter något mindre smärtsamma."
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in.in:51
msgid "The GNOME Project"
msgstr "GNOME-projektet"
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
msgid "Meld comparison description"
msgstr "Meld jämförelsebeskrivning"
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
msgid "Default window width"
msgstr "Standardbredd för fönster"
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
msgid "Default window height"
msgstr "Standardhöjd för fönster"
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
msgid "Default window maximised state"
msgstr "Maximeringstillstånd för standardfönster"
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
msgid "Default window fullscreen state"
msgstr "Helskärmstillstånd för standardfönster"
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: data/org.gnome.meld.gschema.xml:58
msgid "Additional automatically detected text encodings"
msgstr "Ytterligare automatiskt upptäckta textkodningar"
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: data/org.gnome.meld.gschema.xml:59
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 "
@@ -125,37 +101,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:7
+#: data/org.gnome.meld.gschema.xml:66
msgid "Width of an indentation step"
msgstr "Bredden på ett indenteringssteg"
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: data/org.gnome.meld.gschema.xml:67
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:9
+#: data/org.gnome.meld.gschema.xml:71
msgid "Whether to indent using spaces or tabs"
msgstr "Huruvida indentering sker med blanksteg eller tabb"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:72
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:11
-#: ../meld/resources/ui/statusbar-menu.ui.h:1
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
msgid "Show line numbers"
msgstr "Visa radnummer"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:77
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:13
+#: data/org.gnome.meld.gschema.xml:81
msgid "Highlight syntax"
msgstr "Markera syntax"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:82
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
@@ -163,35 +138,32 @@ 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:15
+#: data/org.gnome.meld.gschema.xml:86
msgid "Color scheme to use for syntax highlighting"
msgstr "Färgschema att använda för syntaxmarkering"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:87
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:17
-msgid "Displayed whitespace"
-msgstr "Visade tomrum"
+#: data/org.gnome.meld.gschema.xml:91
+msgid "Draw whitespace"
+msgstr "Rita ut tomrum"
-#
-# Detta är värden för gschema-nycklar, använd \" runt dem
-# http://listor.tp-sv.se/pipermail/tp-sv/2014-July/000779.html
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:92
msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
msgstr ""
-"Väljare för individuella tomrumsteckentyper att visa. Möjliga värden är "
-"\"space\", \"tab\", \"newline\" och \"nbsp\"."
+"Om true (sant), kommer tomrumstecken att ritas ut i jämförelser även om de "
+"inte är i ett ändrat område."
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:101
msgid "Wrap mode"
msgstr "Radbrytningsläge"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:102
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 "
@@ -201,33 +173,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:21
-#: ../meld/resources/ui/statusbar-menu.ui.h:3
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
msgid "Highlight current line"
msgstr "Markera aktuell rad"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:110
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
msgstr "Om true kommer raden med markören att bli markerad i filjämförelser."
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:114
msgid "Use the system default monospace font"
msgstr "Använd systemets standard typsnitt med fast breddsteg"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:115
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:25
+#: data/org.gnome.meld.gschema.xml:119
msgid "Custom font"
msgstr "Anpassat typsnitt"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:120
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
@@ -235,21 +206,40 @@ msgstr ""
"Det anpassade typsnittet att använda, lagrat som en sträng och tolkat som en "
"som en Pango typsnittsbeskrivning."
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:126
+msgid "Show overview source map"
+msgstr "Visa översiktskällkodskarta"
+
+#: data/org.gnome.meld.gschema.xml:127
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+"Om true (sant), kommer filjämförelser ha ihopparade källkodskartor för "
+"jämförda filer."
+
+#: data/org.gnome.meld.gschema.xml:132
+msgid "Style of overview map"
+msgstr "Stil för översiktskarta"
+
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Style options for how the overview map is displayed."
+msgstr "Stilalternativ för hur översiktskartan visas."
+
+#: data/org.gnome.meld.gschema.xml:139
msgid "Ignore blank lines when comparing files"
msgstr "Ignorera tomma rader vid filjämförelser"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:140
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr ""
"Om true kommer tomma rader att tas bort när ändringar markeras mellan filer."
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: data/org.gnome.meld.gschema.xml:147
msgid "Use the system default editor"
msgstr "Använd systemets standardredigerare"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:148
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -257,11 +247,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:31
+#: data/org.gnome.meld.gschema.xml:152
msgid "The custom editor launch command"
msgstr "Kommandot för att starta anpassad redigerare"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:153
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -269,22 +259,21 @@ msgstr ""
"Kommandot för att starta en anpassad redigerare. Begränsat mallstöd här; för "
"tillfället är ”{file}” och ”{line}” igenkända informationsbärare."
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:159
msgid "Columns to display"
msgstr "Kolumner att visa"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:160
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
msgstr "Lista av kolumnnamn vid mappjämförelse och huruvida de ska visas."
-#: ../data/org.gnome.meld.gschema.xml.h:35
-#: ../meld/resources/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
msgid "Ignore symbolic links"
msgstr "Ignorera symboliska länkar"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:165
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
@@ -292,11 +281,11 @@ msgstr ""
"Om true följer inte mappjämförelser symboliska länkar när mappträdet "
"genomsöks."
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:169
msgid "Use shallow comparison"
msgstr "Använd ytlig jämförelse"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:170
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 "
@@ -305,11 +294,11 @@ msgstr ""
"Om true sker mappjämförelser endast baserat på storlek och mtime och bedömer "
"filerna identiska om deras storlek och mtime matchar, annars inte."
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: data/org.gnome.meld.gschema.xml:174
msgid "File timestamp resolution"
msgstr "Tidsstämpelupplösning på filen"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:175
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 "
@@ -321,12 +310,11 @@ msgstr ""
"användbart när filer jämförs på olika filsystem med olika "
"tidsstämpelupplösningar."
-#: ../data/org.gnome.meld.gschema.xml.h:41
-#: ../meld/resources/ui/preferences.ui.h:22
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
msgid "Apply text filters during folder comparisons"
msgstr "Verkställ textfilter vid mappjämförelser"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:180
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -336,21 +324,21 @@ msgstr ""
"aktiva textfilter och alternativet att trimma tomma rader samt ignorera "
"nyradsskillnader."
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:184
msgid "File status filters"
msgstr "Filstatusfilter"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:185
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:45
+#: data/org.gnome.meld.gschema.xml:191
msgid "Show the version control console output"
msgstr "Visa versionshanterarens konsolutmatning"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:192
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
@@ -358,11 +346,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:47
+#: data/org.gnome.meld.gschema.xml:196
msgid "Version control pane position"
msgstr "Position för versionshanteringspanelen"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:197
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
@@ -370,11 +358,11 @@ msgstr ""
"Detta är höjden på huvudträdet för versionshanteringen när konsolpanelen "
"visas."
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:201
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:50
+#: data/org.gnome.meld.gschema.xml:202
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, "
@@ -385,11 +373,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:51
+#: data/org.gnome.meld.gschema.xml:206
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:52
+#: data/org.gnome.meld.gschema.xml:207
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
@@ -400,11 +388,11 @@ msgstr ""
"versionshanteringsvyn, och används endast för sammanfogning/konfliktlösning "
"i Meld."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:211
msgid "Show margin in commit message editor"
msgstr "Visa marginal i redigeraren för incheckningsmeddelanden"
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:212
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
@@ -412,11 +400,11 @@ msgstr ""
"Om true så visas en guide för marginalens kolumn i "
"versionshanteringsredigeraren för incheckningsmeddelanden."
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: data/org.gnome.meld.gschema.xml:216
msgid "Margin column in commit message editor"
msgstr "Marginalkolumn i redigeraren för incheckningsmeddelanden"
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:217
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -424,11 +412,11 @@ msgstr ""
"Kolumnen i vilken marginalen ska visas i versionshanteringsredigeraren för "
"incheckningsmeddelanden."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:221
msgid "Automatically hard-wrap commit messages"
msgstr "Automatisk radbrytning av incheckningsmeddelanden"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:222
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
@@ -437,22 +425,22 @@ msgstr ""
"radbrytas (d.v.s. infoga radbrytning) vid incheckningsmarginalen före "
"incheckning."
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: data/org.gnome.meld.gschema.xml:226
msgid "Version control status filters"
msgstr "Statusfilter för versionshantering"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:227
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:61
+#: data/org.gnome.meld.gschema.xml:241
msgid "Filename-based filters"
msgstr "Filnamnsbaserade filter"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:242
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -460,11 +448,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:63
+#: data/org.gnome.meld.gschema.xml:256
msgid "Text-based filters"
msgstr "Textbaserade filter"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:257
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, "
@@ -474,306 +462,418 @@ msgstr ""
"att ta bort text från att användas vid filjämförelse. Texten kommer "
"fortfarande att visas, men inte bidra till själva jämförelsen."
-#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Meld basschema"
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr "Klassiskt (Meld)"
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
msgid "Base color scheme for Meld highlighting"
msgstr "Basfärgschema att använda för syntaxmarkering"
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
msgid "Meld dark scheme"
msgstr "Meld mörkt schema"
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
msgid "Dark color scheme for Meld highlighting"
msgstr "Mörkt färgschema att använda för syntaxmarkering"
-#: ../meld/resources/gtk/help-overlay.ui.h:1
+#: meld/resources/gtk/help-overlay.ui:14
msgctxt "shortcut window"
msgid "General"
msgstr "Allmänt"
-#: ../meld/resources/gtk/help-overlay.ui.h:2
+#: meld/resources/gtk/help-overlay.ui:19
msgctxt "shortcut window"
msgid "New comparison"
msgstr "Ny jämförelse"
-#: ../meld/resources/gtk/help-overlay.ui.h:3
+#: meld/resources/gtk/help-overlay.ui:26
msgctxt "shortcut window"
msgid "Close a comparison"
msgstr "Stäng en jämförelse"
-#: ../meld/resources/gtk/help-overlay.ui.h:4
+#: meld/resources/gtk/help-overlay.ui:33
msgctxt "shortcut window"
msgid "Quit Meld"
msgstr "Avsluta Meld"
-#: ../meld/resources/gtk/help-overlay.ui.h:5
+#: meld/resources/gtk/help-overlay.ui:40
msgctxt "shortcut window"
msgid "Stop the current action"
msgstr "Stoppa den aktuella åtgärden"
-#: ../meld/resources/gtk/help-overlay.ui.h:6
+#: meld/resources/gtk/help-overlay.ui:47
msgctxt "shortcut window"
msgid "Refresh comparison"
msgstr "Uppdatera jämförelse"
-#: ../meld/resources/gtk/help-overlay.ui.h:7
+#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Helskärm"
-#: ../meld/resources/gtk/help-overlay.ui.h:8
+#: meld/resources/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "Paneler"
+
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Föregående jämförelsepanel"
+
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Nästa jämförelsepanel"
+
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Ändringar"
+
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Gå till föregående ändring"
+
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Gå till nästa ändring"
+
+#: meld/resources/gtk/help-overlay.ui:105
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Flikar"
-#: ../meld/resources/gtk/help-overlay.ui.h:9
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Gå till föregående flik"
-#: ../meld/resources/gtk/help-overlay.ui.h:10
+#: meld/resources/gtk/help-overlay.ui:117
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Gå till nästa flik"
-#: ../meld/resources/gtk/help-overlay.ui.h:11
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Växla till flik"
-#: ../meld/resources/gtk/help-overlay.ui.h:12
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Flytta flik åt vänster"
-#: ../meld/resources/gtk/help-overlay.ui.h:13
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Flytta flik åt höger"
-#: ../meld/resources/gtk/help-overlay.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Ändringar"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Gå till föregående ändring"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Gå till nästa ändring"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:17
+#: meld/resources/gtk/help-overlay.ui:147
msgctxt "shortcut window"
msgid "Editing"
msgstr "Redigering"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Undo"
msgstr "Ångra"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
+#: meld/resources/gtk/help-overlay.ui:159
msgctxt "shortcut window"
msgid "Redo"
msgstr "Gör om"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Cut"
msgstr "Klipp ut"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Copy"
msgstr "Kopiera"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Paste"
msgstr "Klistra in"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Find"
msgstr "Sök"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Sök nästa"
-#: ../meld/resources/gtk/help-overlay.ui.h:25
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Sök föregående"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Replace"
msgstr "Ersätt"
-#: ../meld/resources/gtk/help-overlay.ui.h:27
+#: meld/resources/gtk/help-overlay.ui:217
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Filjämförelse"
-#: ../meld/resources/gtk/help-overlay.ui.h:28
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Spara den aktuella filen"
-#: ../meld/resources/gtk/help-overlay.ui.h:29
+#: meld/resources/gtk/help-overlay.ui:229
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Spara den aktuella filen till ny sökväg"
-#: ../meld/resources/gtk/help-overlay.ui.h:30
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Spara alla filer i jämförelse"
-#: ../meld/resources/gtk/help-overlay.ui.h:31
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Föregående konflikt"
-#: ../meld/resources/gtk/help-overlay.ui.h:32
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Nästa konflikt"
-#: ../meld/resources/gtk/help-overlay.ui.h:33
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Tryck över ändring till vänster"
-#: ../meld/resources/gtk/help-overlay.ui.h:34
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Tryck över ändring till höger"
-#: ../meld/resources/gtk/help-overlay.ui.h:35
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Dra ändring från vänster"
-#: ../meld/resources/gtk/help-overlay.ui.h:36
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Dra ändring från höger"
-#: ../meld/resources/gtk/help-overlay.ui.h:37
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Kopiera ändringar ovanför vänster"
-#: ../meld/resources/gtk/help-overlay.ui.h:38
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Kopiera ändringar under vänster"
-#: ../meld/resources/gtk/help-overlay.ui.h:39
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Kopiera ändringar ovanför höger"
-#: ../meld/resources/gtk/help-overlay.ui.h:40
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Kopiera ändringar under höger"
-#: ../meld/resources/gtk/help-overlay.ui.h:41
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
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
+#: meld/resources/gtk/help-overlay.ui:322
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Mappjämförelse"
-#: ../meld/resources/gtk/help-overlay.ui.h:45
+#: meld/resources/gtk/help-overlay.ui:327
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Kopiera till vänster"
-#: ../meld/resources/gtk/help-overlay.ui.h:46
+#: meld/resources/gtk/help-overlay.ui:334
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Kopiera till höger"
-#: ../meld/resources/gtk/help-overlay.ui.h:47
+#: meld/resources/gtk/help-overlay.ui:350
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Versionshanterad jämförelse"
-#: ../meld/resources/gtk/help-overlay.ui.h:48
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Checka in i versionshanteraren"
-#: ../meld/resources/gtk/help-overlay.ui.h:49
+#: meld/resources/gtk/help-overlay.ui:362
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Visa/dölj konsolutskrift"
-#: ../meld/resources/gtk/menus.ui.h:1
+#: meld/resources/gtk/menus.ui:7
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: meld/resources/gtk/menus.ui:12
+msgid "Stop"
+msgstr "Stoppa"
+
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "Helskärm"
+
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "Spara som…"
+
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "Spara _alla"
+
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "Återställ filer…"
+
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "Öppna externt"
+
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "_Sök…"
+
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "_Ersätt…"
+
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "Visa"
+
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "Översiktskarta"
+
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "Versionshanteringskonsol"
+
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "Lås rullning"
+
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "Jämförelse"
+
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "Sammanfoga allt från vänster"
+
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "Sammanfoga allt från höger"
+
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "Sammanfoga alla"
+
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+msgid "Add Synchronization Point"
+msgstr "Lägg till synkroniseringspunkt"
+
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+msgid "Clear Synchronization Points"
+msgstr "Rensa synkroniseringspunkter"
+
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "Formatera som programfix…"
+
+#: meld/resources/gtk/menus.ui:112
msgid "_Preferences"
msgstr "Inställ_ningar"
-#: ../meld/resources/gtk/menus.ui.h:2
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "Tangentbordsgenvägar"
+
+#: meld/resources/gtk/menus.ui:120
msgid "_Help"
msgstr "_Hjälp"
-#: ../meld/resources/gtk/menus.ui.h:3
-msgid "Keyboard Shortcuts"
-msgstr "Tangentbordsgenvägar"
+#: meld/resources/gtk/menus.ui:125
+msgid "_About Meld"
+msgstr "_Om Meld"
+
+#: meld/resources/gtk/menus.ui:138
+msgid "File status"
+msgstr "Filstatus"
+
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "Samma"
+
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "Nya"
+
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Ändrade"
+
+#: meld/resources/gtk/menus.ui:158
+msgid "Ignore filename case"
+msgstr "Ignorera skiftlägeskänslighet för filnamn"
+
+#: meld/resources/gtk/menus.ui:171
+msgid "Normal"
+msgstr "Normala"
-#: ../meld/resources/gtk/menus.ui.h:4
-msgid "_About"
-msgstr "_Om"
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Oversionerade"
-#: ../meld/resources/gtk/menus.ui.h:5
-msgid "_Quit"
-msgstr "_Avsluta"
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Ignorerade"
-#: ../meld/resources/ui/about-dialog.ui.h:1
-msgid "About Meld"
-msgstr "Om Meld"
+#: meld/resources/gtk/menus.ui:186
+msgid "Flatten folders"
+msgstr "Platta till mappar"
-#: ../meld/resources/ui/about-dialog.ui.h:2
+#: meld/resources/ui/about-dialog.ui:8
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2019 Kai Willadsen"
msgstr ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2019 Kai Willadsen"
-#: ../meld/resources/ui/about-dialog.ui.h:4
-msgid "Website"
-msgstr "Webbplats"
-
-#: ../meld/resources/ui/about-dialog.ui.h:5
+#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
msgstr ""
+"Anders Jonsson <anders jonsson norsjovallen se>\n"
"Josef Andersson <josef andersson fripost org>\n"
"Daniel Nylander <po danielnylander se>\n"
"Christian Rose\n"
@@ -781,335 +881,189 @@ msgstr ""
"Skicka synpunkter på översättningen till\n"
"<tp-sv listor tp-sv se>."
-#: ../meld/resources/ui/column-list.ui.h:1
-#: ../meld/resources/ui/filter-list.ui.h:1
+#: meld/resources/ui/appwindow.ui:29
+msgid "Start a new comparison"
+msgstr "Starta en ny jämförelse"
+
+#: meld/resources/ui/appwindow.ui:45
+msgid "Open a recent comparison"
+msgstr "Öppna en tidigare jämförelse"
+
+#: meld/resources/ui/appwindow.ui:73
+msgid "Go to the previous change"
+msgstr "Gå till föregående ändring"
+
+#: meld/resources/ui/appwindow.ui:93
+msgid "Go to the next change"
+msgstr "Gå till nästa ändring"
+
+#: meld/resources/ui/appwindow.ui:123
+msgid "Go to the previous conflict"
+msgstr "Gå till föregående konflikt"
+
+#: meld/resources/ui/appwindow.ui:143
+msgid "Go to the next conflict"
+msgstr "Gå till nästa konflikt"
+
+#: meld/resources/ui/appwindow.ui:191
+msgid "Version Filters"
+msgstr "Versionsfilter"
+
+#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
+msgid "File Filters"
+msgstr "Filfilter"
+
+#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
+msgid "Text Filters"
+msgstr "Textfilter"
+
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
msgid "Active"
msgstr "Aktiv"
-#: ../meld/resources/ui/column-list.ui.h:2
+#: meld/resources/ui/column-list.ui:50
msgid "Column Name"
msgstr "Kolumnnamn"
-#: ../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
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:735
msgid "_Remove"
msgstr "_Ta bort"
-#: ../meld/resources/ui/column-list.ui.h:4
-#: ../meld/resources/ui/filter-list.ui.h:8
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
msgid "Move item up"
msgstr "Flytta objektet uppåt"
-#: ../meld/resources/ui/column-list.ui.h:5
-#: ../meld/resources/ui/filter-list.ui.h:9
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
msgid "Move _Up"
msgstr "Flytta _uppåt"
-#: ../meld/resources/ui/column-list.ui.h:6
-#: ../meld/resources/ui/filter-list.ui.h:10
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
msgid "Move item down"
msgstr "Flytta objektet nedåt"
-#: ../meld/resources/ui/column-list.ui.h:7
-#: ../meld/resources/ui/filter-list.ui.h:11
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
msgid "Move _Down"
msgstr "Flytta _nedåt"
-#: ../meld/resources/ui/commit-dialog.ui.h:1
+#: meld/resources/ui/commit-dialog.ui:8
msgid "Commit"
msgstr "Checka in"
-#: ../meld/resources/ui/commit-dialog.ui.h:2
+#: meld/resources/ui/commit-dialog.ui:36
msgid "Commit Files"
msgstr "Checka in filer"
-#: ../meld/resources/ui/commit-dialog.ui.h:3
+#: meld/resources/ui/commit-dialog.ui:117
msgid "Log Message"
msgstr "Loggmeddelande"
-#: ../meld/resources/ui/commit-dialog.ui.h:4
+#: meld/resources/ui/commit-dialog.ui:181
msgid "Previous logs:"
msgstr "Föregående loggar:"
-#: ../meld/resources/ui/commit-dialog.ui.h:5
+#: meld/resources/ui/commit-dialog.ui:259
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
+#: meld/resources/ui/dirdiff-actions.ui:20
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
+#: meld/resources/ui/dirdiff-actions.ui:42
msgid "Copy to right"
msgstr "Kopiera till höger"
-#: ../meld/resources/ui/dirdiff.ui.h:11
+#: meld/resources/ui/dirdiff-actions.ui:66
msgid "Delete selected"
msgstr "Ta bort markerade"
-#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959
-#: ../meld/filediff.py:1601
-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-menus.ui:7
+msgid "_Compare selected files"
+msgstr "_Jämför markerade filer"
-#: ../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-menus.ui:14
+msgid "Copy to _left"
+msgstr "Kopiera till _vänster"
-#: ../meld/resources/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Visa nya"
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Copy to _right"
+msgstr "Kopiera till _höger"
-#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77
-msgid "Modified"
-msgstr "Ändrade"
+#: meld/resources/ui/dirdiff-menus.ui:22
+msgid "_Delete selected"
+msgstr "_Ta bort markerade"
-#: ../meld/resources/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Visa ändrade"
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Collapse Recursively"
+msgstr "Fäll ihop rekursivt"
-#: ../meld/resources/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filter"
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "Expand Recursively"
+msgstr "Expandera rekursivt"
-#: ../meld/resources/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Ställ in aktiva filter"
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "_Open Externally"
+msgstr "Ö_ppna externt"
-#: ../meld/resources/ui/encoding-selector.ui.h:1
+#: meld/resources/ui/encoding-selector.ui:31
msgid "Search text encoding…"
msgstr "Sök textkodning…"
-#: ../meld/resources/ui/filediff.ui.h:1
-msgid "Format as Patch…"
-msgstr "Formatera som programfix…"
-
-#: ../meld/resources/ui/filediff.ui.h:2
-msgid "Create a patch using differences between files"
-msgstr "Skapa en programfix med skillnaderna mellan filer"
-
-#: ../meld/resources/ui/filediff.ui.h:3
-msgid "Save A_ll"
-msgstr "Spara _alla"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:5
-msgid "Revert files to their saved versions"
-msgstr "Återställ filer till deras sparade versioner"
-
-#: ../meld/resources/ui/filediff.ui.h:6
-msgid "Add Synchronization Point"
-msgstr "Lägg till synkroniseringspunkt"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:8
-msgid "Clear Synchronization Points"
-msgstr "Rensa synkroniseringspunkter"
-
-#: ../meld/resources/ui/filediff.ui.h:9
-msgid "Clear sychronization points for changes between files"
-msgstr "Rensa synkroniseringspunkter för ändringar mellan filer"
-
-#: ../meld/resources/ui/filediff.ui.h:10
-msgid "Previous Conflict"
-msgstr "Föregående konflikt"
-
-#: ../meld/resources/ui/filediff.ui.h:11
-msgid "Go to the previous conflict"
-msgstr "Gå till föregående konflikt"
-
-#: ../meld/resources/ui/filediff.ui.h:12
-msgid "Next Conflict"
-msgstr "Nästa konflikt"
-
-#: ../meld/resources/ui/filediff.ui.h:13
-msgid "Go to the next conflict"
-msgstr "Gå till nästa konflikt"
-
-#: ../meld/resources/ui/filediff.ui.h:14
-msgid "Push to Left"
-msgstr "Tryck över åt vänster"
-
-#: ../meld/resources/ui/filediff.ui.h:15
+#: meld/resources/ui/filediff-actions.ui:20
msgid "Push current change to the left"
msgstr "Tryck över aktuell ändring till vänster"
-#: ../meld/resources/ui/filediff.ui.h:16
-msgid "Push to Right"
-msgstr "Tryck över åt höger"
-
-#: ../meld/resources/ui/filediff.ui.h:17
+#: meld/resources/ui/filediff-actions.ui:42
msgid "Push current change to the right"
msgstr "Tryck över aktuell ändring till höger"
-#: ../meld/resources/ui/filediff.ui.h:18
-msgid "Pull from Left"
-msgstr "Dra från vänster"
-
-#: ../meld/resources/ui/filediff.ui.h:19
-msgid "Pull change from the left"
-msgstr "Dra ändring från vänster"
-
-#: ../meld/resources/ui/filediff.ui.h:20
-msgid "Pull from Right"
-msgstr "Dra från höger"
-
-#: ../meld/resources/ui/filediff.ui.h:21
-msgid "Pull change from the right"
-msgstr "Dra ändring från höger"
+#: meld/resources/ui/filediff-actions.ui:65
+msgid "Copy chunks"
+msgstr "Kopiera bitar"
-#: ../meld/resources/ui/filediff.ui.h:22
-msgid "Copy Above Left"
-msgstr "Kopiera ovan vänster"
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Ta bort ändring"
-#: ../meld/resources/ui/filediff.ui.h:23
+#: meld/resources/ui/filediff-menus.ui:7
msgid "Copy change above the left chunk"
msgstr "Kopiera ändringar ovanför vänstra stycket"
-#: ../meld/resources/ui/filediff.ui.h:24
-msgid "Copy Below Left"
-msgstr "Kopiera under vänster"
-
-#: ../meld/resources/ui/filediff.ui.h:25
+#: meld/resources/ui/filediff-menus.ui:11
msgid "Copy change below the left chunk"
msgstr "Kopiera ändringar under vänstra stycket"
-#: ../meld/resources/ui/filediff.ui.h:26
-msgid "Copy Above Right"
-msgstr "Kopiera ovan höger"
-
-#: ../meld/resources/ui/filediff.ui.h:27
+#: meld/resources/ui/filediff-menus.ui:15
msgid "Copy change above the right chunk"
msgstr "Kopiera ändringar ovanför högra stycket"
-#: ../meld/resources/ui/filediff.ui.h:28
-msgid "Copy Below Right"
-msgstr "Kopiera under höger"
-
-#: ../meld/resources/ui/filediff.ui.h:29
+#: meld/resources/ui/filediff-menus.ui:19
msgid "Copy change below the right chunk"
msgstr "Kopiera ändringar under högra stycket"
-#: ../meld/resources/ui/filediff.ui.h:30
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../meld/resources/ui/filediff.ui.h:31
-msgid "Delete change"
-msgstr "Ta bort ändring"
-
-#: ../meld/resources/ui/filediff.ui.h:32
-msgid "Merge All from Left"
-msgstr "Sammanfoga allt från vänster"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:34
-msgid "Merge All from Right"
-msgstr "Sammanfoga allt från höger"
-
-#: ../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"
+#: meld/resources/ui/filediff-menus.ui:28
+msgid "_Undo"
+msgstr "Å_ngra"
-#: ../meld/resources/ui/filediff.ui.h:36
-msgid "Merge All"
-msgstr "Sammanfoga alla"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:38
-msgid "Previous Pane"
-msgstr "Föregående panel"
+#: meld/resources/ui/filediff-menus.ui:32
+msgid "_Redo"
+msgstr "Gör _om"
-#: ../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"
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "Klipp u_t"
-#: ../meld/resources/ui/filediff.ui.h:40
-msgid "Next Pane"
-msgstr "Nästa panel"
+#: meld/resources/ui/filediff-menus.ui:43
+msgid "_Copy"
+msgstr "_Kopiera"
-#: ../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"
+#: meld/resources/ui/filediff-menus.ui:47
+msgid "_Paste"
+msgstr "K_listra in"
-#: ../meld/resources/ui/filediff.ui.h:42
-msgid "Lock Scrolling"
-msgstr "Lås rullning"
-
-#: ../meld/resources/ui/filediff.ui.h:43
-msgid "Lock scrolling of all panes"
-msgstr "Lås rullning för alla paneler"
-
-#: ../meld/resources/ui/filediff.ui.h:44
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:99
+#: meld/resources/ui/filediff.ui:165
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."
@@ -1117,311 +1071,310 @@ 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."
-#: ../meld/resources/ui/filediff.ui.h:45
+#: meld/resources/ui/filediff.ui:71
msgid "File 3"
msgstr "Fil tre"
-#: ../meld/resources/ui/filediff.ui.h:46
+#: meld/resources/ui/filediff.ui:137
msgid "File 2"
msgstr "Fil två"
-#: ../meld/resources/ui/filediff.ui.h:47
+#: meld/resources/ui/filediff.ui:199
msgid "File 1"
msgstr "Fil ett"
#. Create icon and filename CellRenderer
-#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
-#: ../meld/dirdiff.py:455
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:507
msgid "Name"
msgstr "Namn"
-#: ../meld/resources/ui/filter-list.ui.h:3
+#: meld/resources/ui/filter-list.ui:68
msgid "Pattern"
msgstr "Mönster"
-#: ../meld/resources/ui/filter-list.ui.h:4
+#: meld/resources/ui/filter-list.ui:110
msgid "Add new filter"
msgstr "Lägg till nytt filter"
-#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
msgid "_Add"
msgstr "_Lägg till"
-#: ../meld/resources/ui/filter-list.ui.h:6
+#: meld/resources/ui/filter-list.ui:126
msgid "Remove selected filter"
msgstr "Ta bort markerat filter"
-#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041
-#: ../meld/iohelpers.py:113
-msgid "_Replace"
-msgstr "_Ersätt"
-
-#: ../meld/resources/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Ersätt _alla"
-
-#: ../meld/resources/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "_Föregående"
-
-#: ../meld/resources/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "_Nästa"
-
-#: ../meld/resources/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Sök:"
-
-#: ../meld/resources/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "Ersätt _med:"
-
-#: ../meld/resources/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:103
msgid "_Match case"
msgstr "_Skiftlägeskänslig"
-#: ../meld/resources/ui/findbar.ui.h:8
+#: meld/resources/ui/findbar.ui:119
msgid "Who_le word"
msgstr "He_la ord"
-#: ../meld/resources/ui/findbar.ui.h:9
+#: meld/resources/ui/findbar.ui:135
msgid "Regular e_xpression"
msgstr "Reguljärt _uttryck"
-#: ../meld/resources/ui/findbar.ui.h:10
+#: meld/resources/ui/findbar.ui:175
msgid "Wrapped"
msgstr "Radbruten"
-#: ../meld/resources/ui/language-selector.ui.h:1
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Ersätt _alla"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1040 meld/iohelpers.py:115
+msgid "_Replace"
+msgstr "_Ersätt"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Växla mellan Sök och Sök-och-ersätt"
+
+#: meld/resources/ui/language-selector.ui:31
msgid "Search highlight mode…"
msgstr "Sök färgmarkeringsläge…"
-#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
-#: ../meld/newdifftab.py:53
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:345
+#: meld/newdifftab.py:49
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:72
+msgid "File"
+msgstr "Fil"
-#: ../meld/resources/ui/new-diff-tab.ui.h:3
-msgid "Directory comparison"
-msgstr "Katalogjämförelse"
+#: meld/resources/ui/new-diff-tab.ui:121
+msgid "Folder"
+msgstr "Mapp"
-#: ../meld/resources/ui/new-diff-tab.ui.h:4
-msgid "Version control view"
-msgstr "Versionshanteringsvy"
+#: meld/resources/ui/new-diff-tab.ui:170
+msgid "Version control"
+msgstr "Versionshantering"
-#: ../meld/resources/ui/new-diff-tab.ui.h:5
+#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
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:254
+msgid "Select First File"
+msgstr "Välj första filen"
-#: ../meld/resources/ui/new-diff-tab.ui.h:7
+#: meld/resources/ui/new-diff-tab.ui:267
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:281
+msgid "Select Third File"
+msgstr "Välj tredje filen"
-#: ../meld/resources/ui/new-diff-tab.ui.h:9
+#: meld/resources/ui/new-diff-tab.ui:316
msgid "Select First Folder"
msgstr "Välj första mappen"
-#: ../meld/resources/ui/new-diff-tab.ui.h:10
+#: meld/resources/ui/new-diff-tab.ui:329
msgid "Select Second Folder"
msgstr "Välj andra mappen"
-#: ../meld/resources/ui/new-diff-tab.ui.h:11
+#: meld/resources/ui/new-diff-tab.ui:343
msgid "Select Third Folder"
msgstr "Välj tredje filen"
-#: ../meld/resources/ui/new-diff-tab.ui.h:12
+#: meld/resources/ui/new-diff-tab.ui:393
msgid "Select A Version-Controlled Folder"
msgstr "Välj en versionshanterad mapp"
-#: ../meld/resources/ui/new-diff-tab.ui.h:13
+#: meld/resources/ui/new-diff-tab.ui:442
msgid "_Blank comparison"
msgstr "_Tom jämförelse"
-#: ../meld/resources/ui/new-diff-tab.ui.h:14
+#: meld/resources/ui/new-diff-tab.ui:459
msgid "C_ompare"
msgstr "_Jämför"
-#: ../meld/resources/ui/notebook-label.ui.h:1
+#: meld/resources/ui/notebook-label.ui:24
msgid "Close Tab"
msgstr "Stäng flik"
-#: ../meld/resources/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/patch-dialog.ui:9
msgid "Format as Patch"
msgstr "Formatera som programfix"
-#: ../meld/resources/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
msgid "Copy to Clipboard"
msgstr "Kopiera till Urklipp"
-#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
msgid "Save Patch"
msgstr "Spara programfix"
-#: ../meld/resources/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
msgid "Use differences between:"
msgstr "Använd skillnader mellan:"
-#: ../meld/resources/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
msgid "Left and middle panes"
msgstr "Vänster- och mittenpaneler"
-#: ../meld/resources/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
msgid "Middle and right panes"
msgstr "Mitten- och högerpaneler"
-#: ../meld/resources/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
msgid "_Reverse patch direction"
msgstr "_Omvänd programfixriktning"
-#: ../meld/resources/ui/preferences.ui.h:1
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
msgid "Preferences"
msgstr "Inställningar"
-#: ../meld/resources/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
msgid "Font"
msgstr "Typsnitt"
-#: ../meld/resources/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
msgid "_Use the system fixed width font"
msgstr "_Använd systemets typsnitt med fast bredd"
-#: ../meld/resources/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
msgid "_Editor font:"
msgstr "_Typsnitt för redigerare:"
#. TRANSLATORS: This is the status bar label for a group of settings,
#. such as text wrapping, show line numbers, whitespace, etc.
-#: ../meld/resources/ui/preferences.ui.h:5 ../meld/ui/statusbar.py:282
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
msgid "Display"
msgstr "Visa"
-#: ../meld/resources/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
msgid "_Tab width:"
msgstr "_Tabulatorbredd:"
-#: ../meld/resources/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
msgid "_Insert spaces instead of tabs"
msgstr "_Infoga blanksteg istället för tabbar"
-#: ../meld/resources/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
msgid "Enable text _wrapping"
msgstr "Aktivera text_radbrytning"
-#: ../meld/resources/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
msgid "Do not _split words over two lines"
msgstr "Dela inte _ord över två rader"
-#: ../meld/resources/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
msgid "Highlight _current line"
msgstr "Markera _aktuell rad"
-#: ../meld/resources/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
msgid "Show _line numbers"
msgstr "Visa _radnummer"
-#: ../meld/resources/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
msgid "Show w_hitespace"
msgstr "Visa tom_rum"
-#: ../meld/resources/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
msgid "Use s_yntax highlighting"
msgstr "Använd _syntaxmarkering"
-#: ../meld/resources/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
msgid "Syntax highlighting color scheme:"
msgstr "Färgschema för syntaxmarkering:"
-#: ../meld/resources/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
+msgid "Code Overview"
+msgstr "Kodöversikt"
+
+#: meld/resources/ui/preferences.ui:506
+msgid "Show overview map"
+msgstr "Visa översiktskarta"
+
+#: meld/resources/ui/preferences.ui:529
+msgid "Overview map style:"
+msgstr "Stil för översiktskarta:"
+
+#: meld/resources/ui/preferences.ui:596
msgid "External Editor"
msgstr "Extern redigerare"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:632
msgid "Use _default system editor"
msgstr "Använd systemets standardred_igerare"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:655
msgid "Edito_r command:"
msgstr "Kommando för re_digerare:"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:711
msgid "Editor"
msgstr "Redigerare"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:732
msgid "Shallow Comparison"
msgstr "Ytlig jämförelse"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:768
msgid "C_ompare files based only on size and timestamp"
msgstr "J_ämför filer enbart baserat på storlek och tidsstämpel"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:791
msgid "_Timestamp resolution:"
msgstr "_Tidsstämpelupplösning:"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:855
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"
-#: ../meld/resources/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:904
msgid "Symbolic Links"
msgstr "Symboliska länkar"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:972
msgid "Visible Columns"
msgstr "Synliga kolumner"
-#: ../meld/resources/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:1039
msgid "Folder Comparisons"
msgstr "Mappjämförelser"
-#: ../meld/resources/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:1061
msgid "Version Comparisons"
msgstr "Versionsjämförelser"
-#: ../meld/resources/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:1104
msgid "_Order when comparing file revisions:"
msgstr "_Sortering vid jämförelse av filrevisioner:"
-#: ../meld/resources/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1151
msgid "Order when _merging files:"
msgstr "Sortering när filer _sammanfogas:"
-#: ../meld/resources/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1219
msgid "Commit Messages"
msgstr "Incheckningsmeddelanden"
-#: ../meld/resources/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1260
msgid "Show _right margin at:"
msgstr "Visa _högermarginal vid:"
-#: ../meld/resources/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1301
msgid "Automatically _break lines at right margin on commit"
msgstr "_Radbryt automatiskt vid högermarginal under incheckning"
-#: ../meld/resources/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1351
msgid "Version Control"
msgstr "Versionshantering"
-#: ../meld/resources/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1373
msgid "Filename filters"
msgstr "Filnamnsfilter"
-#: ../meld/resources/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1411
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -1431,23 +1384,19 @@ msgstr ""
"deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda "
"med blanksteg."
-#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
-msgid "File Filters"
-msgstr "Filfilter"
-
-#: ../meld/resources/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1478
msgid "Change trimming"
msgstr "Ändra borttagning av blanksteg"
-#: ../meld/resources/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1514
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"
-#: ../meld/resources/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1558
msgid "Text filters"
msgstr "Textfilter"
-#: ../meld/resources/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1596
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1461,301 +1410,304 @@ msgstr ""
"grupper kommer endast grupperna att ersättas. Se användarhandboken för mer "
"information."
-#: ../meld/resources/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Textfilter"
-
-#: ../meld/resources/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1687
msgid "Left is remote, right is local"
msgstr "Vänster är fjärr, höger är lokal"
-#: ../meld/resources/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1691
msgid "Left is local, right is remote"
msgstr "Vänster är lokal, höger är fjärr"
-#: ../meld/resources/ui/preferences.ui.h:45
+#: meld/resources/ui/preferences.ui:1705
+msgid "Simple change map"
+msgstr "Enkel ändringskarta"
+
+#: meld/resources/ui/preferences.ui:1709
+msgid "Compact source map"
+msgstr "Kompakt källkodskarta"
+
+#: meld/resources/ui/preferences.ui:1713
+msgid "Full source map"
+msgstr "Fullständig källkodskarta"
+
+#: meld/resources/ui/preferences.ui:1727
msgid "Remote, merge, local"
msgstr "Fjärr, sammanfoga, lokal"
-#: ../meld/resources/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1731
msgid "Local, merge, remote"
msgstr "Lokal, sammanfoga, fjärr"
-#: ../meld/resources/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1753
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../meld/resources/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1757
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../meld/resources/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1761
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../meld/resources/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1765
msgid "2s (VFAT)"
msgstr "2s (VFAT)"
-#: ../meld/resources/ui/push-dialog.ui.h:1
+#: meld/resources/ui/push-dialog.ui:9
msgid "Push local commits to remote?"
-msgstr "Tryck lokala incheckningar till fjärr?"
+msgstr "Sänd lokala incheckningar till fjärr?"
-#: ../meld/resources/ui/push-dialog.ui.h:2
+#: meld/resources/ui/push-dialog.ui:10
msgid "The commits to be pushed are determined by your version control system."
-msgstr "Incheckningar att trycka bestäms av ditt versionshanteringssystem."
+msgstr "Incheckningar att sända bestäms av ditt versionshanteringssystem."
-#: ../meld/resources/ui/push-dialog.ui.h:3
+#: meld/resources/ui/push-dialog.ui:38
msgid "_Push commits"
-msgstr "_Tryck incheckningar"
+msgstr "_Sänd incheckningar"
-#: ../meld/resources/ui/revert-dialog.ui.h:1
+#: meld/resources/ui/recent-selector.ui:16
+msgid "Search recent comparisons…"
+msgstr "Sök senaste jämförelser…"
+
+#: meld/resources/ui/revert-dialog.ui:9
msgid "Discard unsaved changes to documents?"
msgstr "Förkasta osparade ändringar i dokumenten?"
-#: ../meld/resources/ui/revert-dialog.ui.h:2
+#: meld/resources/ui/revert-dialog.ui:10
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/revert-dialog.ui.h:3
+#: meld/resources/ui/revert-dialog.ui:39
msgid "_Discard"
msgstr "_Förkasta"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+#: meld/resources/ui/save-confirm-dialog.ui:9
msgid "Save changes to documents before closing?"
msgstr "Spara ändringar till dokument innan stängning?"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+#: meld/resources/ui/save-confirm-dialog.ui:10
msgid "If you don’t save, changes will be permanently lost."
msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+#: meld/resources/ui/save-confirm-dialog.ui:24
msgid "Close _without Saving"
msgstr "Stäng _utan att spara"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1039
+#: meld/iohelpers.py:56 meld/iohelpers.py:114
msgid "_Cancel"
msgstr "_Avbryt"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+#: meld/resources/ui/save-confirm-dialog.ui:52
msgid "_Save"
msgstr "_Spara"
-#: ../meld/resources/ui/statusbar-menu.ui.h:2
+#: meld/resources/ui/statusbar-menu.ui:9
msgid "Show whitespace"
msgstr "Visa tomrum"
-#: ../meld/resources/ui/statusbar-menu.ui.h:4
+#: meld/resources/ui/statusbar-menu.ui:17
msgid "Text wrapping"
msgstr "Textradbrytning"
-#: ../meld/resources/ui/vcview.ui.h:3
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Jämför"
+
+#: meld/resources/ui/vcview-menus.ui:11
msgid "Co_mmit…"
msgstr "Che_cka in…"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview-menus.ui:15
+msgid "_Update"
+msgstr "_Uppdatera"
+
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Re_vert"
+msgstr "Åter_ställ"
+
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+msgid "Delete"
+msgstr "Ta bort"
+
+#: meld/resources/ui/vcview-menus.ui:41
+msgid "Mar_k as Resolved"
+msgstr "Markera som _löst"
+
+#: meld/resources/ui/vcview.ui:73
+msgid "Commit…"
+msgstr "Checka in…"
+
+#: meld/resources/ui/vcview.ui:74
msgid "Commit changes to version control"
msgstr "Checka in ändringar till versionshanteraren"
-#: ../meld/resources/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "_Uppdatera"
+#: meld/resources/ui/vcview.ui:86
+msgid "Update"
+msgstr "Uppdatera"
-#: ../meld/resources/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:87
msgid "Update working copy from version control"
msgstr "Uppdatera arbetskopian från versionshanteraren"
-#: ../meld/resources/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "_Tryck"
+#: meld/resources/ui/vcview.ui:99
+msgid "Push"
+msgstr "_Sänd"
-#: ../meld/resources/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:100
msgid "Push local changes to remote"
-msgstr "Tryck lokala ändringar till fjärr"
+msgstr "Sänd lokala ändringar till fjärr"
+
+#: meld/resources/ui/vcview.ui:112
+msgid "Add"
+msgstr "Lägg till"
-#: ../meld/resources/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:113
msgid "Add to version control"
msgstr "Lägg till för versionshantering"
-#: ../meld/resources/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:125
+msgid "Remove"
+msgstr "Ta bort"
+
+#: meld/resources/ui/vcview.ui:126
msgid "Remove from version control"
msgstr "Ta bort från versionshantering"
-#: ../meld/resources/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "Markera som _löst"
+#: meld/resources/ui/vcview.ui:138
+msgid "Mark as Resolved"
+msgstr "Markera som löst"
-#: ../meld/resources/ui/vcview.ui.h:14
+#: meld/resources/ui/vcview.ui:139
msgid "Mark as resolved in version control"
msgstr "Markera som löst i versionshanteraren"
-#: ../meld/resources/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "Åter_ställ"
+#: meld/resources/ui/vcview.ui:151
+msgid "Revert"
+msgstr "Återställ"
-#: ../meld/resources/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:152
msgid "Revert working copy to original state"
msgstr "Återställ arbetskopian till ursprungligt tillstånd"
-#: ../meld/resources/ui/vcview.ui.h:17
+#: meld/resources/ui/vcview.ui:165
msgid "Delete from working copy"
msgstr "Ta bort från arbetskopia"
-#: ../meld/resources/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Konsol"
-
-#: ../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"
-
-#: ../meld/resources/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "_Platta till"
-
-#: ../meld/resources/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "Platta till kataloger"
-
-#: ../meld/resources/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Ändrade"
-
-#: ../meld/resources/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Visa ändrade filer"
-
-#: ../meld/resources/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Normala"
-
-#: ../meld/resources/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Visa normala filer"
-
-#: ../meld/resources/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "O_versionerade"
-
-#: ../meld/resources/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Visa filer som inte versionshanteras"
-
-#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
-msgid "Ignored"
-msgstr "Ignorerade"
-
-#: ../meld/resources/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Visa ignorerade filer"
-
-#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
+#: meld/resources/ui/vcview.ui:220 meld/vcview.py:410
msgid "Location"
msgstr "Plats"
-#: ../meld/resources/ui/vcview.ui.h:32
+#: meld/resources/ui/vcview.ui:229
msgid "Status"
msgstr "Status"
-#: ../meld/resources/ui/vcview.ui.h:33
+#: meld/resources/ui/vcview.ui:238
msgid "Extra"
msgstr "Extra"
-#: ../meld/resources/ui/vcview.ui.h:34
+#: meld/resources/ui/vcview.ui:270
msgid "Console output"
msgstr "Konsolutskrift"
-#: ../meld/const.py:12
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "Kopiera _upp"
+
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "Kopiera _ned"
+
+#: meld/const.py:30
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:13
+#: meld/const.py:31
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:14
+#: meld/const.py:32
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:476 ../meld/preferences.py:138
+#: meld/dirdiff.py:528 meld/preferences.py:132
msgid "Size"
msgstr "Storlek"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:484 ../meld/preferences.py:139
+#: meld/dirdiff.py:536 meld/preferences.py:133
msgid "Modification time"
msgstr "Ändringstid"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:492 ../meld/preferences.py:140
+#: meld/dirdiff.py:544 meld/preferences.py:134
msgid "Permissions"
msgstr "Rättigheter"
-#: ../meld/dirdiff.py:626
-#, python-format
-msgid "Hide %s"
-msgstr "Dölj %s"
-
-#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791
+#: meld/dirdiff.py:767 meld/dirdiff.py:790
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Söker igenom %s"
-#: ../meld/dirdiff.py:926
+#: meld/dirdiff.py:926
#, python-format
msgid "[%s] Done"
msgstr "[%s] Klar"
-#: ../meld/dirdiff.py:934
+#: meld/dirdiff.py:933
msgid "Folders have no differences"
msgstr "Mapparna skiljer sig inte åt"
-#: ../meld/dirdiff.py:936
+#: 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:938
+#: 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:941
+#: 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:943
+#: 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:961 ../meld/filediff.py:1603 ../meld/filediff.py:1633
-#: ../meld/filediff.py:1635 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: meld/dirdiff.py:958 meld/filediff.py:1824
+msgid "Hide"
+msgstr "Dölj"
+
+#: meld/dirdiff.py:960 meld/filediff.py:1826 meld/filediff.py:1856
+#: meld/filediff.py:1858 meld/ui/msgarea.py:106 meld/ui/msgarea.py:119
msgid "Hi_de"
msgstr "_Dölj"
-#: ../meld/dirdiff.py:970
+#: 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:971
+#: 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:973
+#: 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:975
+#: 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:977
+#: 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:"
@@ -1763,17 +1715,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:988
+#: meld/dirdiff.py:987
#, python-format
msgid "“%s” hidden by “%s”"
msgstr "”%s” dolda av ”%s”"
-#: ../meld/dirdiff.py:1044
+#: meld/dirdiff.py:1043
#, python-format
msgid "Replace folder “%s”?"
msgstr "Ersätt mappen ”%s”?"
-#: ../meld/dirdiff.py:1046
+#: meld/dirdiff.py:1045
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1782,11 +1734,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:1059
+#: meld/dirdiff.py:1058
msgid "Error copying file"
msgstr "Fel vid filkopiering"
-#: ../meld/dirdiff.py:1060
+#: meld/dirdiff.py:1059
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1799,19 +1751,19 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720
+#: meld/dirdiff.py:1084 meld/vcview.py:758
msgid "Error deleting {}"
msgstr "Fel vid borttagning av {}"
-#: ../meld/dirdiff.py:1597
+#: meld/dirdiff.py:1563
msgid "No folder"
msgstr "Ingen mapp"
-#: ../meld/filediff.py:920
+#: meld/filediff.py:1116
msgid "Comparison results will be inaccurate"
msgstr "Jämförelseresultat kommer att bli osäkra"
-#: ../meld/filediff.py:922
+#: meld/filediff.py:1118
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1819,64 +1771,69 @@ msgstr ""
"Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
"kommer att vara osäker."
-#: ../meld/filediff.py:994
+#: meld/filediff.py:1190
msgid "Mark conflict as resolved?"
msgstr "Markera konflikten som löst?"
-#: ../meld/filediff.py:996
+#: meld/filediff.py:1192
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:998
+#: meld/filediff.py:1194
msgid "Cancel"
msgstr "Avbryt"
-#: ../meld/filediff.py:999
+#: meld/filediff.py:1195
msgid "Mark _Resolved"
msgstr "Markera som _löst"
-#: ../meld/filediff.py:1318
+#: meld/filediff.py:1520
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
-#: ../meld/filediff.py:1326
+#: meld/filediff.py:1528
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Filen %s verkar vara en binärfil."
-#: ../meld/filediff.py:1328
+#: meld/filediff.py:1530
msgid "Do you want to open the file using the default application?"
msgstr "Vill du öppna filen med standardprogrammet?"
-#: ../meld/filediff.py:1330
+#: meld/filediff.py:1532
msgid "Open"
msgstr "Öppna"
-#: ../meld/filediff.py:1346
+#: meld/filediff.py:1546
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Sammanfogar filer"
+
+#: meld/filediff.py:1560
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Beräknar skillnader"
-#: ../meld/filediff.py:1407
+#: meld/filediff.py:1619
#, python-format
msgid "File %s has changed on disk"
msgstr "Filen %s har ändrats på disk"
-#: ../meld/filediff.py:1408
+#: meld/filediff.py:1620
msgid "Do you want to reload the file?"
msgstr "Vill du läsa om filen?"
-#: ../meld/filediff.py:1410
+#: meld/filediff.py:1622
msgid "_Reload"
msgstr "_Läs om"
-#: ../meld/filediff.py:1566
+#: meld/filediff.py:1789
msgid "Files are identical"
msgstr "Filerna är identiska"
-#: ../meld/filediff.py:1579
+#: meld/filediff.py:1802
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1884,11 +1841,11 @@ msgstr ""
"Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
"ofiltrerade filerna?"
-#: ../meld/filediff.py:1584
+#: meld/filediff.py:1807
msgid "Files differ in line endings only"
msgstr "Filer skiljer sig endast vad gäller radslut"
-#: ../meld/filediff.py:1586
+#: meld/filediff.py:1809
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1897,15 +1854,15 @@ msgstr ""
"Filerna är identiska förutom radavsluten:\n"
"%s"
-#: ../meld/filediff.py:1606
+#: meld/filediff.py:1829
msgid "Show without filters"
msgstr "Visa utan filer"
-#: ../meld/filediff.py:1628
+#: meld/filediff.py:1851
msgid "Change highlighting incomplete"
msgstr "Ändra markering av ofärdiga"
-#: ../meld/filediff.py:1629
+#: meld/filediff.py:1852
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."
@@ -1914,19 +1871,19 @@ msgstr ""
"Meld till att längre tid på sig att markera större ändringar, men det kan "
"bli långsamt."
-#: ../meld/filediff.py:1637
+#: meld/filediff.py:1860
msgid "Keep highlighting"
msgstr "Använd markering"
-#: ../meld/filediff.py:1639
+#: meld/filediff.py:1862
msgid "_Keep highlighting"
msgstr "_Använd markering"
-#: ../meld/filediff.py:1652
+#: meld/filediff.py:1875
msgid "Saving failed"
msgstr "Misslyckades med att spara"
-#: ../meld/filediff.py:1653
+#: meld/filediff.py:1876
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1934,36 +1891,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:1662
+#: meld/filediff.py:1885
msgid "Save Left Pane As"
msgstr "Spara vänsterpanel som"
-#: ../meld/filediff.py:1664
+#: meld/filediff.py:1887
msgid "Save Middle Pane As"
msgstr "Spara mittenpanel som"
-#: ../meld/filediff.py:1666
+#: meld/filediff.py:1889
msgid "Save Right Pane As"
msgstr "Spara högerpanel som"
-#: ../meld/filediff.py:1679
+#: meld/filediff.py:1900
#, 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:1681
+#: meld/filediff.py:1902
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:1684
+#: meld/filediff.py:1905
msgid "Save Anyway"
msgstr "Spara ändå"
-#: ../meld/filediff.py:1685
+#: meld/filediff.py:1906
msgid "Don’t Save"
msgstr "Spara inte"
-#: ../meld/filediff.py:1727
+#: meld/filediff.py:1948
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
@@ -1971,7 +1928,7 @@ msgstr ""
"Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
"”{}”."
-#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144
+#: meld/filediff.py:1952 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1980,16 +1937,20 @@ msgstr ""
"Kunde in spara fil beroende på:\n"
"%s"
-#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143
+#: meld/filediff.py:1956 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Kunde inte spara filen %s."
-#: ../meld/filediff.py:2128
+#: meld/filediff.py:2017
+msgid "Open File"
+msgstr "Öppna fil"
+
+#: meld/filediff.py:2371
msgid "Live comparison updating disabled"
msgstr "Inaktivera realtidsuppdateringar av jämförelser"
-#: ../meld/filediff.py:2129
+#: meld/filediff.py:2372
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -2000,46 +1961,33 @@ msgstr ""
"manuellt, och uppdateringar i realtid kommer att fortsätta när "
"synkroniseringspunkterna är rensade."
-#: ../meld/filemerge.py:37
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Sammanfogar filer"
-
-#: ../meld/gutterrendererchunk.py:220
-msgid "Copy _up"
-msgstr "Kopiera _upp"
-
-#: ../meld/gutterrendererchunk.py:221
-msgid "Copy _down"
-msgstr "Kopiera _ned"
-
-#: ../meld/iohelpers.py:43
+#: meld/iohelpers.py:41
msgid "Deleting remote folders is not supported"
msgstr "Att ta bort fjärrmappar stöds ej"
-#: ../meld/iohelpers.py:45
+#: meld/iohelpers.py:43
msgid "Not a file or directory"
msgstr "Inte en fil eller katalog"
-#: ../meld/iohelpers.py:49
+#: meld/iohelpers.py:47
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:54
+#: meld/iohelpers.py:52
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:59
+#: meld/iohelpers.py:57
msgid "_Delete Permanently"
msgstr "_Ta bort permanent"
-#: ../meld/iohelpers.py:106
+#: meld/iohelpers.py:108
#, python-format
msgid "Replace file “%s”?"
msgstr "Ersätt filen ”%s”?"
-#: ../meld/iohelpers.py:108
+#: meld/iohelpers.py:110
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2048,276 +1996,124 @@ 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:169
+#: meld/meldapp.py:179
msgid "wrong number of arguments supplied to --diff"
msgstr "felaktigt antal argument angavs för --diff"
-#: ../meld/meldapp.py:174
+#: meld/meldapp.py:184
msgid "Start with an empty window"
msgstr "Starta med ett tomt fönster"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: meld/meldapp.py:185 meld/meldapp.py:187
msgid "file"
msgstr "fil"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: meld/meldapp.py:185 meld/meldapp.py:189
msgid "folder"
msgstr "mapp"
-#: ../meld/meldapp.py:176
+#: meld/meldapp.py:186
msgid "Start a version control comparison"
msgstr "Starta en versionshanterad jämförelse"
-#: ../meld/meldapp.py:178
+#: meld/meldapp.py:188
msgid "Start a 2- or 3-way file comparison"
msgstr "Starta med en två- eller trevägs filjämförelse"
-#: ../meld/meldapp.py:180
+#: meld/meldapp.py:190
msgid "Start a 2- or 3-way folder comparison"
msgstr "Starta med en två- eller trevägs mappjämförelse"
-#: ../meld/meldapp.py:223
+#: meld/meldapp.py:233
#, python-format
msgid "Error: %s\n"
msgstr "Fel: %s\n"
-#: ../meld/meldapp.py:230
+#: meld/meldapp.py:240
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:234
+#: meld/meldapp.py:244
msgid "Set label to use instead of file name"
msgstr "Sätt etikett att använda istället för filnamn"
-#: ../meld/meldapp.py:237
+#: meld/meldapp.py:247
msgid "Open a new tab in an already running instance"
msgstr "Öppna en ny flik i en redan körande instans"
-#: ../meld/meldapp.py:240
+#: meld/meldapp.py:250
msgid "Automatically compare all differing files on startup"
msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart"
-#: ../meld/meldapp.py:243
+#: meld/meldapp.py:253
msgid "Ignored for compatibility"
msgstr "Ignorerad för kompatibilitet"
-#: ../meld/meldapp.py:247
+#: meld/meldapp.py:257
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:250
+#: meld/meldapp.py:260
msgid "Automatically merge files"
msgstr "Sammanfoga automatiskt filer"
-#: ../meld/meldapp.py:254
+#: meld/meldapp.py:264
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:258
+#: meld/meldapp.py:268
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:278
+#: meld/meldapp.py:288
#, 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:281
+#: meld/meldapp.py:291
msgid "can’t auto-merge less than 3 files"
msgstr "kan inte automatiskt sammanfoga mindre är tre filer"
-#: ../meld/meldapp.py:283
+#: meld/meldapp.py:293
msgid "can’t auto-merge directories"
msgstr "kan inte automatiskt sammanfoga kataloger"
-#: ../meld/meldapp.py:297
+#: meld/meldapp.py:308
msgid "Error reading saved comparison file"
msgstr "Fel vid läsning av den sparade konfigurationsfilen"
-#: ../meld/meldapp.py:314
+#: meld/meldapp.py:325
#, python-format
msgid "invalid path or URI “%s”"
msgstr "ogiltig sökväg eller URI ”%s”"
-#: ../meld/meldapp.py:320
+#: meld/meldapp.py:331
msgid "remote folder “{}” not supported"
msgstr "fjärrmapp ”{}” stöds ej"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:123
+#: meld/meldbuffer.py:114
msgid "<unnamed>"
msgstr "<namnlös>"
-#: ../meld/melddoc.py:63
+#: meld/melddoc.py:60
msgid "untitled"
msgstr "namnlös"
-#: ../meld/meldwindow.py:56
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../meld/meldwindow.py:57
-msgid "_New Comparison…"
-msgstr "_Ny jämförelse…"
-
-#: ../meld/meldwindow.py:58
-msgid "Start a new comparison"
-msgstr "Starta en ny jämförelse"
-
-#: ../meld/meldwindow.py:61
-msgid "Save the current file"
-msgstr "Spara den aktuella filen"
-
-#: ../meld/meldwindow.py:63
-msgid "Save As…"
-msgstr "Spara som…"
-
-#: ../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:67
-msgid "Close the current file"
-msgstr "Stäng den aktuella filen"
-
-#: ../meld/meldwindow.py:70
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: ../meld/meldwindow.py:72
-msgid "Undo the last action"
-msgstr "Ångra den senaste åtgärden"
-
-#: ../meld/meldwindow.py:75
-msgid "Redo the last undone action"
-msgstr "Gör om den senaste ångrade åtgärden"
-
-#: ../meld/meldwindow.py:77
-msgid "Cut the selection"
-msgstr "Klipp ut markering"
-
-#: ../meld/meldwindow.py:79
-msgid "Copy the selection"
-msgstr "Kopiera markering"
-
-#: ../meld/meldwindow.py:81
-msgid "Paste the clipboard"
-msgstr "Klistra in Urklipp"
-
-#: ../meld/meldwindow.py:83
-msgid "Find…"
-msgstr "Sök…"
-
-#: ../meld/meldwindow.py:83
-msgid "Search for text"
-msgstr "Sök efter text"
-
-#: ../meld/meldwindow.py:85
-msgid "Find Ne_xt"
-msgstr "Sök _nästa"
-
-#: ../meld/meldwindow.py:86
-msgid "Search forwards for the same text"
-msgstr "Sök framåt efter samma text"
-
-#: ../meld/meldwindow.py:88
-msgid "Find _Previous"
-msgstr "Sök _Föregående"
-
-#: ../meld/meldwindow.py:89
-msgid "Search backwards for the same text"
-msgstr "Sök bakåt efter samma text"
-
-#: ../meld/meldwindow.py:92
-msgid "_Replace…"
-msgstr "_Ersätt…"
-
-#: ../meld/meldwindow.py:93
-msgid "Find and replace text"
-msgstr "Sök och ersätt text"
-
-#: ../meld/meldwindow.py:95
-msgid "Go to _Line"
-msgstr "Gå till _rad"
-
-#: ../meld/meldwindow.py:96
-msgid "Go to a specific line"
-msgstr "Gå till en specifik rad"
-
-#: ../meld/meldwindow.py:99
-msgid "_Changes"
-msgstr "Än_dringar"
-
-#: ../meld/meldwindow.py:100
-msgid "Next Change"
-msgstr "Nästa ändring"
-
-#: ../meld/meldwindow.py:101
-msgid "Go to the next change"
-msgstr "Gå till nästa ändring"
-
-#: ../meld/meldwindow.py:103
-msgid "Previous Change"
-msgstr "Föregående ändring"
-
-#: ../meld/meldwindow.py:104
-msgid "Go to the previous change"
-msgstr "Gå till föregående ändring"
-
-#: ../meld/meldwindow.py:106
-msgid "Open Externally"
-msgstr "Öppna externt"
-
-#: ../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:111
-msgid "_View"
-msgstr "_Visa"
-
-#: ../meld/meldwindow.py:112
-msgid "File Status"
-msgstr "Filstatus"
-
-#: ../meld/meldwindow.py:113
-msgid "Version Status"
-msgstr "Versionsstatus"
-
-#: ../meld/meldwindow.py:116
-msgid "Stop the current action"
-msgstr "Stoppa den aktuella åtgärden"
-
-#: ../meld/meldwindow.py:119
-msgid "Refresh the view"
-msgstr "Uppdatera vyn"
-
-#: ../meld/meldwindow.py:123
-msgid "Fullscreen"
-msgstr "Helskärm"
-
-#: ../meld/meldwindow.py:124
-msgid "View the comparison in fullscreen"
-msgstr "Visa jämförelsen i helskärmsläge"
-
-#: ../meld/meldwindow.py:133
-msgid "Open Recent"
-msgstr "Öppna senaste"
-
-#: ../meld/meldwindow.py:134
-msgid "Open recent files"
-msgstr "Öppna senaste filer"
+#: meld/meldwindow.py:151
+msgid "Filename"
+msgstr "Filnamn"
-#: ../meld/meldwindow.py:567
+#: meld/meldwindow.py:380
#, 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:588
+#: meld/meldwindow.py:402
msgid "Cannot compare a mixture of files and directories"
msgstr "Kan inte jämföra en blandning av filer och kataloger"
-#: ../meld/misc.py:155
+#: meld/misc.py:150
msgid ""
"{}\n"
"\n"
@@ -2329,234 +2125,241 @@ msgstr ""
"Meld stötte på ett kritiskt fel under körning:\n"
"<tt>{}</tt>"
-#: ../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:311
+#: meld/misc.py:201
msgid "[None]"
msgstr "[Ingen]"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "label"
msgstr "etikett"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "pattern"
msgstr "mönster"
-#: ../meld/recent.py:106
+#: meld/recent.py:104
msgid "Version control:"
msgstr "Versionshantering:"
-#: ../meld/ui/bufferselectors.py:114
+#: meld/style.py:90
+#, 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/ui/bufferselectors.py:110
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
msgid "Plain Text"
msgstr "Vanlig text"
+#: meld/ui/filechooser.py:68
+msgid "Autodetect Encoding"
+msgstr "Upptäck automatiskt kodning"
+
+#: meld/ui/filechooser.py:71
+msgid "Current Locale ({})"
+msgstr "Aktuell lokal ({})"
+
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
+#: meld/ui/statusbar.py:123
#, python-format
msgid "Ln %i, Col %i"
msgstr "Rad %i, kolumn %i"
-#: ../meld/ui/statusbar.py:182
+#: meld/ui/statusbar.py:183
msgid "Line you want to move the cursor to"
msgstr "Rad du vill flytta markören till"
-#: ../meld/ui/vcdialogs.py:55
+#: meld/ui/vcdialogs.py:50
msgid "No files will be committed"
msgstr "Inga filer kommer att checkas in"
#. Translators: First %s is replaced by translated "%d unpushed
#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
+#: meld/vc/git.py:91
#, python-format
msgid "%s in %s"
msgstr "%s i %s"
#. Translators: These messages cover the case where there is
#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:92 meld/vc/git.py:99
#, python-format
msgid "%d unpushed commit"
msgid_plural "%d unpushed commits"
-msgstr[0] "%d ej tryckt incheckning"
-msgstr[1] "%d ej tryckta incheckningar"
+msgstr[0] "%d ej sänd incheckning"
+msgstr[1] "%d ej sända incheckningar"
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:94
#, python-format
msgid "%d branch"
msgid_plural "%d branches"
msgstr[0] "%d gren"
msgstr[1] "%d grenar"
-#: ../meld/vc/git.py:334
+#: meld/vc/git.py:333
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Läge ändrat från %s till %s"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
msgid "Partially staged"
msgstr "Delvis köad"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
msgid "Staged"
msgstr "Köad"
#. Translators: This is the displayed name of a version control system
#. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:37
msgid "None"
msgstr "Ingen"
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:203
#, python-format
msgid "Rev %s"
msgstr "Rev %s"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Merged"
msgstr "Sammanfogade"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Base"
msgstr "Bas"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Local"
msgstr "Lokal"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Remote"
msgstr "Fjärr"
-#: ../meld/vc/_vc.py:71
-msgid "Unversioned"
-msgstr "Oversionerad"
-
-#: ../meld/vc/_vc.py:74
+#: meld/vc/_vc.py:73
msgid "Error"
msgstr "Fel"
-#: ../meld/vc/_vc.py:76
+#: meld/vc/_vc.py:75
msgid "Newly added"
msgstr "Nyligen tillagt"
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:77
msgid "Renamed"
msgstr "Bytt namn"
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:78
msgid "Conflict"
msgstr "Konflikt"
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:79
msgid "Removed"
msgstr "Borttagen"
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:80
msgid "Missing"
msgstr "Saknas"
-#: ../meld/vc/_vc.py:82
+#: meld/vc/_vc.py:81
msgid "Not present"
msgstr "Inte närvarande"
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:332
+#, python-format
+msgid "%(name)s (not found)"
+msgstr "%(name)s (hittades inte)"
+
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:282
+#: meld/vcview.py:336
#, 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:286
+#: meld/vcview.py:340
#, python-format
-msgid "%(name)s (Invalid repository)"
-msgstr "%(name)s (Ogiltigt förråd)"
+msgid "%(name)s (invalid repository)"
+msgstr "%(name)s (ogiltigt förråd)"
-#: ../meld/vcview.py:307
+#: meld/vcview.py:354
msgid "No valid version control system found in this folder"
msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp"
-#: ../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:311
+#: meld/vcview.py:356
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:366
+#: meld/vcview.py:410
#, 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:373
+#: meld/vcview.py:417
msgid "Scanning repository"
msgstr "Söker igenom förråd"
-#: ../meld/vcview.py:402
+#: meld/vcview.py:446
#, python-format
msgid "Scanning %s"
msgstr "Söker igenom %s"
-#: ../meld/vcview.py:441
+#: meld/vcview.py:485
msgid "(Empty)"
msgstr "(Tom)"
-#: ../meld/vcview.py:487
+#: meld/vcview.py:532
#, python-format
msgid "%s — local"
msgstr "%s — lokal"
-#: ../meld/vcview.py:488
+#: meld/vcview.py:533
#, python-format
msgid "%s — remote"
msgstr "%s — fjärr"
-#: ../meld/vcview.py:496
+#: meld/vcview.py:541
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (lokal, sammanfoga, fjärr)"
-#: ../meld/vcview.py:501
+#: meld/vcview.py:546
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (fjärr, sammanfoga, lokal)"
-#: ../meld/vcview.py:512
+#: meld/vcview.py:557
#, python-format
msgid "%s — repository"
msgstr "%s — förråd"
-#: ../meld/vcview.py:518
+#: meld/vcview.py:563
#, python-format
msgid "%s (working, repository)"
msgstr "%s (arbetskopia, förråd)"
-#: ../meld/vcview.py:522
+#: meld/vcview.py:567
#, python-format
msgid "%s (repository, working)"
msgstr "%s (förråd, arbetskopia)"
-#: ../meld/vcview.py:688
+#: meld/vcview.py:729
msgid "Remove folder and all its files?"
msgstr "Ta bort mapp och dess filer?"
-#: ../meld/vcview.py:690
+#: meld/vcview.py:731
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2564,10 +2367,297 @@ 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:804
+#: meld/vcview.py:844
msgid "Clear"
msgstr "Töm"
+#~ msgid "Cannot import: "
+#~ msgstr "Kan inte importera: "
+
+#~ msgid "Meld requires %s or higher."
+#~ msgstr "Meld kräver %s eller högre."
+
+#~ msgid "About Meld"
+#~ msgstr "Om Meld"
+
+#~ msgid "Website"
+#~ msgstr "Webbplats"
+
+#~ msgid ""
+#~ "Couldn’t load Meld-specific CSS (%s)\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte läsa in Meld-specifik CSS (%s)\n"
+#~ "%s"
+
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Meld diffvisare"
+
+#~ 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
+#~ msgid ""
+#~ "Selector for individual whitespace character types to be shown. Possible "
+#~ "values are 'space', 'tab', 'newline' and 'nbsp'."
+#~ msgstr ""
+#~ "Väljare för individuella tomrumsteckentyper att visa. Möjliga värden är "
+#~ "\"space\", \"tab\", \"newline\" och \"nbsp\"."
+
+#~ msgid "Meld base scheme"
+#~ msgstr "Meld basschema"
+
+#~ msgid "_About"
+#~ msgstr "_Om"
+
+#~ msgid "_Quit"
+#~ msgstr "_Avsluta"
+
+#~ msgid "Collapse selected folder and all subfolders"
+#~ msgstr "Fäll ihop markerad mapp och alla undermappar"
+
+#~ msgid "Expand selected folder and all subfolders"
+#~ msgstr "Expandera markerad mapp och alla undermappar"
+
+#~ msgid "Copy to _Left"
+#~ msgstr "Kopiera till _vänster"
+
+#~ msgid "Copy to _Right"
+#~ msgstr "Kopiera till _höger"
+
+#~ msgid "Hide selected"
+#~ msgstr "Dölj markerade"
+
+#~ 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"
+
+#~ msgid "Show identical"
+#~ msgstr "Visa identiska"
+
+#~ msgid "Show new"
+#~ msgstr "Visa nya"
+
+#~ msgid "Show modified"
+#~ msgstr "Visa ändrade"
+
+#~ msgid "Filters"
+#~ msgstr "Filter"
+
+#~ msgid "Set active filters"
+#~ msgstr "Ställ in aktiva filter"
+
+#~ msgid "Create a patch using differences between files"
+#~ msgstr "Skapa en programfix med skillnaderna mellan filer"
+
+#~ msgid "Save all files in the current comparison"
+#~ msgstr "Spara alla filer i den aktuella jämförelsen"
+
+#~ msgid "Revert files to their saved versions"
+#~ msgstr "Återställ filer till deras sparade versioner"
+
+#~ msgid "Add a synchronization point for changes between files"
+#~ msgstr "Lägg till en synkroniseringspunkt för ändringar mellan filer"
+
+#~ msgid "Clear sychronization points for changes between files"
+#~ msgstr "Rensa synkroniseringspunkter för ändringar mellan filer"
+
+#~ msgid "Previous Conflict"
+#~ msgstr "Föregående konflikt"
+
+#~ msgid "Next Conflict"
+#~ msgstr "Nästa konflikt"
+
+#~ msgid "Push to Left"
+#~ msgstr "Tryck över åt vänster"
+
+#~ msgid "Push to Right"
+#~ msgstr "Tryck över åt höger"
+
+#~ msgid "Pull from Left"
+#~ msgstr "Dra från vänster"
+
+#~ msgid "Pull change from the left"
+#~ msgstr "Dra ändring från vänster"
+
+#~ msgid "Pull from Right"
+#~ msgstr "Dra från höger"
+
+#~ msgid "Pull change from the right"
+#~ msgstr "Dra ändring från höger"
+
+#~ msgid "Copy Above Left"
+#~ msgstr "Kopiera ovan vänster"
+
+#~ msgid "Copy Below Left"
+#~ msgstr "Kopiera under vänster"
+
+#~ msgid "Copy Above Right"
+#~ msgstr "Kopiera ovan höger"
+
+#~ msgid "Copy Below Right"
+#~ msgstr "Kopiera under höger"
+
+#~ msgid "Merge all non-conflicting changes from the left"
+#~ msgstr "Sammanfoga alla ändringar utan konflikter från vänster"
+
+#~ msgid "Merge all non-conflicting changes from the right"
+#~ msgstr "Sammanfoga alla ändringar utan konflikter från höger"
+
+#~ 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"
+
+#~ msgid "Previous Pane"
+#~ msgstr "Föregående panel"
+
+#~ msgid "Move keyboard focus to the previous document in this comparison"
+#~ msgstr ""
+#~ "Flytta tangentbordsfokus till föregående dokument i denna jämförelse"
+
+#~ msgid "Next Pane"
+#~ msgstr "Nästa panel"
+
+#~ msgid "Move keyboard focus to the next document in this comparison"
+#~ msgstr "Flytta tangentbordsfokus till nästa dokument i denna jämförelse"
+
+#~ msgid "Lock scrolling of all panes"
+#~ msgstr "Lås rullning för alla paneler"
+
+#~ msgid "_Previous"
+#~ msgstr "_Föregående"
+
+#~ msgid "_Next"
+#~ msgstr "_Nästa"
+
+#~ msgid "Find:"
+#~ msgstr "Sök:"
+
+#~ msgid "Replace _with:"
+#~ msgstr "Ersätt _med:"
+
+#~ msgid "File comparison"
+#~ msgstr "Filjämförelse"
+
+#~ msgid "Directory comparison"
+#~ msgstr "Katalogjämförelse"
+
+#~ msgid "Version control view"
+#~ msgstr "Versionshanteringsvy"
+
+#~ msgid "Console"
+#~ msgstr "Konsol"
+
+#~ msgid "Show or hide the version control console output pane"
+#~ msgstr "Visa eller dölj konsolutmatningspanelen för versionshanteringen"
+
+#~ msgid "_Flatten"
+#~ msgstr "_Platta till"
+
+#~ msgid "_Modified"
+#~ msgstr "_Ändrade"
+
+#~ msgid "Show modified files"
+#~ msgstr "Visa ändrade filer"
+
+#~ msgid "Show normal files"
+#~ msgstr "Visa normala filer"
+
+#~ msgid "Un_versioned"
+#~ msgstr "O_versionerade"
+
+#~ msgid "Show unversioned files"
+#~ msgstr "Visa filer som inte versionshanteras"
+
+#~ msgid "Show ignored files"
+#~ msgstr "Visa ignorerade filer"
+
+#~ msgid "Hide %s"
+#~ msgstr "Dölj %s"
+
+#~ msgid "_New Comparison…"
+#~ msgstr "_Ny jämförelse…"
+
+#~ msgid "Save the current file"
+#~ msgstr "Spara den aktuella filen"
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Spara den aktuella filen med ett annat namn"
+
+#~ msgid "Close the current file"
+#~ msgstr "Stäng den aktuella filen"
+
+#~ msgid "_Edit"
+#~ msgstr "_Redigera"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Ångra den senaste åtgärden"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "Gör om den senaste ångrade åtgärden"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Klipp ut markering"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopiera markering"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Klistra in Urklipp"
+
+#~ msgid "Search for text"
+#~ msgstr "Sök efter text"
+
+#~ msgid "Find Ne_xt"
+#~ msgstr "Sök _nästa"
+
+#~ msgid "Search forwards for the same text"
+#~ msgstr "Sök framåt efter samma text"
+
+#~ msgid "Find _Previous"
+#~ msgstr "Sök _Föregående"
+
+#~ msgid "Search backwards for the same text"
+#~ msgstr "Sök bakåt efter samma text"
+
+#~ msgid "Find and replace text"
+#~ msgstr "Sök och ersätt text"
+
+#~ msgid "Go to _Line"
+#~ msgstr "Gå till _rad"
+
+#~ msgid "Go to a specific line"
+#~ msgstr "Gå till en specifik rad"
+
+#~ msgid "_Changes"
+#~ msgstr "Än_dringar"
+
+#~ msgid "Next Change"
+#~ msgstr "Nästa ändring"
+
+#~ msgid "Previous Change"
+#~ msgstr "Föregående ändring"
+
+#~ msgid "Open selected file or directory in the default external application"
+#~ msgstr "Öppna markerad fil eller katalog i det externa standardprogrammet"
+
+#~ msgid "Stop the current action"
+#~ msgstr "Stoppa den aktuella åtgärden"
+
+#~ msgid "View the comparison in fullscreen"
+#~ msgstr "Visa jämförelsen i helskärmsläge"
+
+#~ msgid "Open Recent"
+#~ msgstr "Öppna senaste"
+
+#~ msgid "Only one version control system found in this folder"
+#~ msgstr "Endast ett versionshanteringssystem hittades i denna mapp"
+
#~ msgid "Show toolbar"
#~ msgstr "Visa verktygsfältet"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
