[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: Sun, 14 Aug 2022 17:00:29 +0000 (UTC)
commit 68f5dd8eaf49a8eb59a5c43dc622cf94ab3fb82d
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date: Sun Aug 14 17:00:28 2022 +0000
Update Swedish translation
po/sv.po | 312 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 160 insertions(+), 152 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index c4d52835..4aa4a0f9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-07-10 01:05+0000\n"
-"PO-Revision-Date: 2022-07-10 10:20+0200\n"
+"POT-Creation-Date: 2022-08-12 00:04+0000\n"
+"PO-Revision-Date: 2022-08-12 07:03+0200\n"
"Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"Language: sv\n"
@@ -20,7 +20,7 @@ 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 3.1\n"
+"X-Generator: Poedit 3.1.1\n"
"X-Project-Style: gnome\n"
#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
@@ -523,360 +523,365 @@ msgstr "Uppdatera jämförelse"
#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
+msgid "Open externally"
+msgstr "Öppna externt"
+
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Helskärm"
-#: meld/resources/gtk/help-overlay.ui:61
+#: meld/resources/gtk/help-overlay.ui:68
msgctxt "shortcut window"
msgid "Swap left and right panes"
msgstr "Byt plats på vänster- och högerpanelen"
-#: meld/resources/gtk/help-overlay.ui:70
+#: meld/resources/gtk/help-overlay.ui:77
msgctxt "shortcut window"
msgid "Panes"
msgstr "Paneler"
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
msgctxt "shortcut window"
msgid "Previous comparison pane"
msgstr "Föregående jämförelsepanel"
-#: meld/resources/gtk/help-overlay.ui:82
+#: meld/resources/gtk/help-overlay.ui:89
msgctxt "shortcut window"
msgid "Next comparison pane"
msgstr "Nästa jämförelsepanel"
-#: meld/resources/gtk/help-overlay.ui:91
+#: meld/resources/gtk/help-overlay.ui:98
msgctxt "shortcut window"
msgid "Changes"
msgstr "Ändringar"
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
msgctxt "shortcut window"
msgid "Go to previous change"
msgstr "Gå till föregående ändring"
-#: meld/resources/gtk/help-overlay.ui:103
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to next change"
msgstr "Gå till nästa ändring"
-#: meld/resources/gtk/help-overlay.ui:112
+#: meld/resources/gtk/help-overlay.ui:119
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Flikar"
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Gå till föregående flik"
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Gå till nästa flik"
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Växla till flik"
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Flytta flik åt vänster"
-#: meld/resources/gtk/help-overlay.ui:145
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Flytta flik åt höger"
-#: meld/resources/gtk/help-overlay.ui:154
+#: meld/resources/gtk/help-overlay.ui:161
msgctxt "shortcut window"
msgid "Editing"
msgstr "Redigering"
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Undo"
msgstr "Ångra"
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Redo"
msgstr "Gör om"
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Cut"
msgstr "Klipp ut"
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Copy"
msgstr "Kopiera"
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Paste"
msgstr "Klistra in"
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find"
msgstr "Sök"
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Sök nästa"
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Sök föregående"
-#: meld/resources/gtk/help-overlay.ui:215
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Replace"
msgstr "Ersätt"
-#: meld/resources/gtk/help-overlay.ui:224
+#: meld/resources/gtk/help-overlay.ui:231
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Filjämförelse"
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Spara den aktuella filen"
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
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:243
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Spara alla filer i jämförelse"
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Föregående konflikt"
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Nästa konflikt"
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Tryck över ändring till vänster"
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Tryck över ändring till höger"
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Dra ändring från vänster"
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Dra ändring från höger"
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Kopiera ändringar ovanför vänster"
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Kopiera ändringar under vänster"
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Kopiera ändringar ovanför höger"
-#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:320
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Kopiera ändringar under höger"
-#: meld/resources/gtk/help-overlay.ui:320
-#: meld/resources/gtk/help-overlay.ui:348
+#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Ta bort ändring"
-#: meld/resources/gtk/help-overlay.ui:329
+#: meld/resources/gtk/help-overlay.ui:336
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Mappjämförelse"
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Kopiera till vänster"
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:348
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Kopiera till höger"
-#: meld/resources/gtk/help-overlay.ui:357
+#: meld/resources/gtk/help-overlay.ui:364
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Versionshanterad jämförelse"
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Checka in i versionshanteraren"
-#: meld/resources/gtk/help-overlay.ui:369
+#: meld/resources/gtk/help-overlay.ui:376
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Visa/dölj konsolutskrift"
#: 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
+#: meld/resources/gtk/menus.ui:11
msgid "Save A_ll"
msgstr "Spara _alla"
-#: meld/resources/gtk/menus.ui:34
+#: meld/resources/gtk/menus.ui:15
msgid "Revert files…"
msgstr "Återställ filer…"
-#: meld/resources/gtk/menus.ui:38
+#: meld/resources/gtk/menus.ui:19
msgid "Open Externally"
msgstr "Öppna externt"
-#: meld/resources/gtk/menus.ui:45
+#: meld/resources/gtk/menus.ui:26
+msgid "Refresh Comparison"
+msgstr "Uppdatera jämförelse"
+
+#: meld/resources/gtk/menus.ui:33
msgid "_Find…"
msgstr "_Sök…"
-#: meld/resources/gtk/menus.ui:49
+#: meld/resources/gtk/menus.ui:37
msgid "_Replace…"
msgstr "_Ersätt…"
-#: meld/resources/gtk/menus.ui:55
+#: meld/resources/gtk/menus.ui:43
msgid "View"
msgstr "Visa"
-#: meld/resources/gtk/menus.ui:59
+#: meld/resources/gtk/menus.ui:47
+msgid "Fullscreen"
+msgstr "Helskärm"
+
+#: meld/resources/gtk/menus.ui:52
msgid "Overview Map"
msgstr "Översiktskarta"
-#: meld/resources/gtk/menus.ui:63
+#: meld/resources/gtk/menus.ui:56
msgid "Version control console"
msgstr "Versionshanteringskonsol"
-#: meld/resources/gtk/menus.ui:67
+#: meld/resources/gtk/menus.ui:60
msgid "Lock scrolling"
msgstr "Lås rullning"
-#: meld/resources/gtk/menus.ui:74
+#: meld/resources/gtk/menus.ui:67
msgid "Swap left and right panes"
msgstr "Byt plats på vänster- och högerpanelen"
-#: meld/resources/gtk/menus.ui:80
+#: meld/resources/gtk/menus.ui:73
msgid "Comparison"
msgstr "Jämförelse"
-#: meld/resources/gtk/menus.ui:84
+#: meld/resources/gtk/menus.ui:75
+msgid "Stop"
+msgstr "Stoppa"
+
+#: meld/resources/gtk/menus.ui:81
msgid "Merge All from Left"
msgstr "Sammanfoga allt från vänster"
-#: meld/resources/gtk/menus.ui:88
+#: meld/resources/gtk/menus.ui:85
msgid "Merge All from Right"
msgstr "Sammanfoga allt från höger"
-#: meld/resources/gtk/menus.ui:92
+#: meld/resources/gtk/menus.ui:89
msgid "Merge All"
msgstr "Sammanfoga alla"
-#: meld/resources/gtk/menus.ui:99
+#: meld/resources/gtk/menus.ui:96
msgid "Format as Patch…"
msgstr "Formatera som programfix…"
-#: meld/resources/gtk/menus.ui:108
+#: meld/resources/gtk/menus.ui:105
msgid "_Preferences"
msgstr "Inställ_ningar"
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:109
msgid "Keyboard Shortcuts"
msgstr "Tangentbordsgenvägar"
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:113
msgid "_Help"
msgstr "_Hjälp"
-#: meld/resources/gtk/menus.ui:121
+#: meld/resources/gtk/menus.ui:118
msgid "_About Meld"
msgstr "_Om Meld"
-#: meld/resources/gtk/menus.ui:134
+#: meld/resources/gtk/menus.ui:131
msgid "File status"
msgstr "Filstatus"
-#: meld/resources/gtk/menus.ui:136
+#: meld/resources/gtk/menus.ui:133
msgid "Same"
msgstr "Samma"
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:137
msgid "New"
msgstr "Nya"
-#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
-#: meld/vc/_vc.py:76
+#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164
+#: meld/vc/_vc.py:77
msgid "Modified"
msgstr "Ändrade"
-#: meld/resources/gtk/menus.ui:154
+#: meld/resources/gtk/menus.ui:151
msgid "Ignore filename case"
msgstr "Ignorera skiftlägeskänslighet för filnamn"
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:155
msgid "Normalize Unicode paths"
msgstr "Normalisera Unicode-sökvägar"
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:168
msgid "Normal"
msgstr "Normala"
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71
msgid "Unversioned"
msgstr "Oversionerade"
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70
msgid "Ignored"
msgstr "Ignorerade"
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:183
msgid "Flatten folders"
msgstr "Platta till mappar"
@@ -1666,11 +1671,11 @@ msgstr "Extra"
msgid "Console output"
msgstr "Konsolutskrift"
-#: meld/actiongutter.py:247
+#: meld/actiongutter.py:254
msgid "Copy _up"
msgstr "Kopiera _upp"
-#: meld/actiongutter.py:248
+#: meld/actiongutter.py:255
msgid "Copy _down"
msgstr "Kopiera _ned"
@@ -1748,12 +1753,12 @@ msgstr "Filfilter används, och därför har inte alla filer genomsökts."
msgid "Text filters are in use and may be masking content differences."
msgstr "Textfilter används och kan dölja skillnader i innehåll."
-#: meld/dirdiff.py:1145 meld/filediff.py:1985
+#: meld/dirdiff.py:1145 meld/filediff.py:1989
msgid "Hide"
msgstr "Dölj"
-#: meld/dirdiff.py:1147 meld/filediff.py:1987 meld/filediff.py:2017
-#: meld/filediff.py:2019 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1991 meld/filediff.py:2021
+#: meld/filediff.py:2023 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
msgid "Hi_de"
msgstr "_Dölj"
@@ -1831,11 +1836,11 @@ msgstr "Ingen mapp"
msgid "Folder comparison:"
msgstr "Mappjämförelse:"
-#: meld/filediff.py:1158
+#: meld/filediff.py:1162
msgid "Comparison results will be inaccurate"
msgstr "Jämförelseresultat kommer att bli osäkra"
-#: meld/filediff.py:1160
+#: meld/filediff.py:1164
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1843,97 +1848,97 @@ msgstr ""
"Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
"kommer att vara osäker."
-#: meld/filediff.py:1232
+#: meld/filediff.py:1236
msgid "Mark conflict as resolved?"
msgstr "Markera konflikten som löst?"
-#: meld/filediff.py:1234
+#: meld/filediff.py:1238
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:1237
+#: meld/filediff.py:1241
msgid "Cancel"
msgstr "Avbryt"
-#: meld/filediff.py:1238
+#: meld/filediff.py:1242
msgid "Mark _Resolved"
msgstr "Markera som _löst"
-#: meld/filediff.py:1429 meld/filediff.py:1445
+#: meld/filediff.py:1433 meld/filediff.py:1449
msgid "Add Synchronization Point"
msgstr "Lägg till synkroniseringspunkt"
-#: meld/filediff.py:1433
+#: meld/filediff.py:1437
msgid "Remove Synchronization Point"
msgstr "Ta bort synkroniseringspunkt"
-#: meld/filediff.py:1437
+#: meld/filediff.py:1441
msgid "Move Synchronization Point"
msgstr "Flytta synkroniseringspunkt"
-#: meld/filediff.py:1441
+#: meld/filediff.py:1445
msgid "Match Synchronization Point"
msgstr "Matcha synkroniseringspunkt"
-#: meld/filediff.py:1465
+#: meld/filediff.py:1469
msgid "Clear Synchronization Points"
msgstr "Rensa synkroniseringspunkter"
-#: meld/filediff.py:1525
+#: meld/filediff.py:1529
msgid "File comparison:"
msgstr "Filjämförelse:"
-#: meld/filediff.py:1659
+#: meld/filediff.py:1663
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
-#: meld/filediff.py:1668
+#: meld/filediff.py:1672
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Filen %s verkar vara en binärfil."
-#: meld/filediff.py:1670
+#: meld/filediff.py:1674
msgid "Do you want to open the file using the default application?"
msgstr "Vill du öppna filen med standardprogrammet?"
-#: meld/filediff.py:1672
+#: meld/filediff.py:1676
msgid "Open"
msgstr "Öppna"
-#: meld/filediff.py:1694
+#: meld/filediff.py:1698
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Sammanfogar filer"
-#: meld/filediff.py:1708
+#: meld/filediff.py:1712
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Beräknar skillnader"
-#: meld/filediff.py:1768
+#: meld/filediff.py:1772
#, python-format
msgid "File %s has changed on disk"
msgstr "Filen %s har ändrats på disk"
-#: meld/filediff.py:1769
+#: meld/filediff.py:1773
msgid "Do you want to reload the file?"
msgstr "Vill du läsa om filen?"
-#: meld/filediff.py:1771
+#: meld/filediff.py:1775
msgid "_Reload"
msgstr "_Läs om"
-#: meld/filediff.py:1941
+#: meld/filediff.py:1945
msgid "File {} is being compared to itself"
msgstr "Filen {} jämförs med sig själv"
-#: meld/filediff.py:1950
+#: meld/filediff.py:1954
msgid "Files are identical"
msgstr "Filerna är identiska"
-#: meld/filediff.py:1963
+#: meld/filediff.py:1967
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1941,11 +1946,11 @@ msgstr ""
"Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
"ofiltrerade filerna?"
-#: meld/filediff.py:1968
+#: meld/filediff.py:1972
msgid "Files differ in line endings only"
msgstr "Filer skiljer sig endast vad gäller radslut"
-#: meld/filediff.py:1970
+#: meld/filediff.py:1974
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1954,15 +1959,15 @@ msgstr ""
"Filerna är identiska förutom radavsluten:\n"
"%s"
-#: meld/filediff.py:1990
+#: meld/filediff.py:1994
msgid "Show without filters"
msgstr "Visa utan filer"
-#: meld/filediff.py:2012
+#: meld/filediff.py:2016
msgid "Change highlighting incomplete"
msgstr "Ändra markering av ofärdiga"
-#: meld/filediff.py:2013
+#: meld/filediff.py:2017
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."
@@ -1971,19 +1976,19 @@ msgstr ""
"Meld till att längre tid på sig att markera större ändringar, men det kan "
"bli långsamt."
-#: meld/filediff.py:2021
+#: meld/filediff.py:2025
msgid "Keep highlighting"
msgstr "Använd markering"
-#: meld/filediff.py:2023
+#: meld/filediff.py:2027
msgid "_Keep highlighting"
msgstr "_Använd markering"
-#: meld/filediff.py:2036
+#: meld/filediff.py:2040
msgid "Saving failed"
msgstr "Misslyckades med att spara"
-#: meld/filediff.py:2037
+#: meld/filediff.py:2041
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1991,36 +1996,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:2046
+#: meld/filediff.py:2050
msgid "Save Left Pane As"
msgstr "Spara vänsterpanel som"
-#: meld/filediff.py:2048
+#: meld/filediff.py:2052
msgid "Save Middle Pane As"
msgstr "Spara mittenpanel som"
-#: meld/filediff.py:2050
+#: meld/filediff.py:2054
msgid "Save Right Pane As"
msgstr "Spara högerpanel som"
-#: meld/filediff.py:2061
+#: meld/filediff.py:2065
#, 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:2063
+#: meld/filediff.py:2067
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:2066
+#: meld/filediff.py:2070
msgid "Save Anyway"
msgstr "Spara ändå"
-#: meld/filediff.py:2067
+#: meld/filediff.py:2071
msgid "Don’t Save"
msgstr "Spara inte"
-#: meld/filediff.py:2109
+#: meld/filediff.py:2113
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
@@ -2028,7 +2033,7 @@ msgstr ""
"Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
"”{}”."
-#: meld/filediff.py:2113 meld/patchdialog.py:138
+#: meld/filediff.py:2117 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -2037,16 +2042,16 @@ msgstr ""
"Kunde in spara fil beroende på:\n"
"%s"
-#: meld/filediff.py:2117 meld/patchdialog.py:137
+#: meld/filediff.py:2121 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Kunde inte spara filen %s."
-#: meld/filediff.py:2527
+#: meld/filediff.py:2531
msgid "Live comparison updating disabled"
msgstr "Inaktivera realtidsuppdateringar av jämförelser"
-#: meld/filediff.py:2528
+#: meld/filediff.py:2532
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -2315,51 +2320,51 @@ msgstr "Ingen"
msgid "Rev %s"
msgstr "Rev %s"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Merged"
msgstr "Sammanfogade"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Base"
msgstr "Bas"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Local"
msgstr "Lokal"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Remote"
msgstr "Fjärr"
-#: meld/vc/_vc.py:73
+#: meld/vc/_vc.py:74
msgid "Error"
msgstr "Fel"
-#: meld/vc/_vc.py:75
+#: meld/vc/_vc.py:76
msgid "Newly added"
msgstr "Nyligen tillagt"
-#: meld/vc/_vc.py:77
+#: meld/vc/_vc.py:78
msgid "Renamed"
msgstr "Bytt namn"
-#: meld/vc/_vc.py:78
+#: meld/vc/_vc.py:79
msgid "Conflict"
msgstr "Konflikt"
-#: meld/vc/_vc.py:79
+#: meld/vc/_vc.py:80
msgid "Removed"
msgstr "Borttagen"
-#: meld/vc/_vc.py:80
+#: meld/vc/_vc.py:81
msgid "Missing"
msgstr "Saknas"
-#: meld/vc/_vc.py:81
+#: meld/vc/_vc.py:82
msgid "Not present"
msgstr "Inte närvarande"
-#: meld/vc/_vc.py:82
+#: meld/vc/_vc.py:83
msgid "Scanning…"
msgstr "Söker igenom…"
@@ -2465,6 +2470,9 @@ msgstr ""
msgid "Clear"
msgstr "Töm"
+#~ msgid "Refresh"
+#~ msgstr "Uppdatera"
+
#, python-brace-format
#~ msgid "Location: {path}"
#~ msgstr "Plats: {path}"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]