[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, 7 Mar 2021 20:39:41 +0000 (UTC)
commit 192f264f6484bd2e625b1d18339254a9c5b0983d
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date:   Sun Mar 7 20:39:39 2021 +0000

    Update Swedish translation

 po/sv.po | 251 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 130 insertions(+), 121 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index d49b897c..2779c92b 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: 2021-01-29 20:26+0000\n"
-"PO-Revision-Date: 2021-02-13 12:30+0100\n"
+"POT-Creation-Date: 2021-03-05 22:54+0000\n"
+"PO-Revision-Date: 2021-03-07 21:37+0100\n"
 "Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "Language: sv\n"
@@ -1101,7 +1101,7 @@ msgstr "Fil ett"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:509
+#: meld/dirdiff.py:517
 msgid "Name"
 msgstr "Namn"
 
@@ -1141,7 +1141,7 @@ msgstr "Radbruten"
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1054 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1260,7 +1260,7 @@ 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:198 meld/ui/statusbar.py:288
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
 msgid "Display"
 msgstr "Visa"
 
@@ -1511,7 +1511,7 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1053
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
 #: meld/iohelpers.py:55 meld/iohelpers.py:112
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -1612,7 +1612,7 @@ msgstr "Återställ arbetskopian till ursprungligt tillstånd"
 msgid "Delete from working copy"
 msgstr "Ta bort från arbetskopia"
 
-#: meld/resources/ui/vcview.ui:220 meld/vcview.py:411
+#: meld/resources/ui/vcview.ui:220
 msgid "Location"
 msgstr "Plats"
 
@@ -1649,86 +1649,85 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:530 meld/preferences.py:132
+#: meld/dirdiff.py:538 meld/preferences.py:132
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:133
+#: meld/dirdiff.py:546 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:134
+#: meld/dirdiff.py:554 meld/preferences.py:134
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: meld/dirdiff.py:770 meld/dirdiff.py:793
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] Söker igenom %s"
-
-#: meld/dirdiff.py:933
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Klar"
+#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr "[{label}] Söker igenom {folder}"
 
 #: meld/dirdiff.py:942
 #, python-brace-format
-msgid "Folder {duplicate_directory} is being compared to itself"
-msgstr "Mappen {duplicate_directory} jämförs med sig själv"
+msgid "[{label}] Done"
+msgstr "[{label}] Klar"
+
+#: meld/dirdiff.py:951
+msgid "Folder {} is being compared to itself"
+msgstr "Mappen {} jämförs med sig själv"
 
-#: meld/dirdiff.py:947
+#: meld/dirdiff.py:957
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: meld/dirdiff.py:949
+#: meld/dirdiff.py:959
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:961
 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:954
+#: meld/dirdiff.py:964
 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:956
+#: meld/dirdiff.py:966
 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:972 meld/filediff.py:1863
+#: meld/dirdiff.py:982 meld/filediff.py:1874
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:974 meld/filediff.py:1865 meld/filediff.py:1895
-#: meld/filediff.py:1897 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
+#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: meld/dirdiff.py:983
+#: meld/dirdiff.py:993
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:994
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:996
 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:988
+#: meld/dirdiff.py:998
 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:990
+#: meld/dirdiff.py:1000
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1736,17 +1735,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:1001
-#, python-format
-msgid "“%s” hidden by “%s”"
-msgstr "”%s” dolda av ”%s”"
+#: meld/dirdiff.py:1011
+#, python-brace-format
+msgid "“{first_file}” hidden by “{second_file}”"
+msgstr "”{first_file}” dold av ”{second_file}”"
 
-#: meld/dirdiff.py:1057
+#: meld/dirdiff.py:1070
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: meld/dirdiff.py:1059
+#: meld/dirdiff.py:1072
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1755,36 +1754,36 @@ 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:1072
+#: meld/dirdiff.py:1085
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: meld/dirdiff.py:1073
-#, python-format
+#: meld/dirdiff.py:1086
+#, python-brace-format
 msgid ""
-"Couldn’t copy %s\n"
-"to %s.\n"
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
 "\n"
-"%s"
+"{error}"
 msgstr ""
-"Fel vid kopiering av %s\n"
-"till %s.\n"
+"Fel vid kopiering av {source}\n"
+"till {dest}.\n"
 "\n"
-"%s"
+"{error}"
 
-#: meld/dirdiff.py:1098 meld/vcview.py:759
+#: meld/dirdiff.py:1111 meld/vcview.py:759
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
-#: meld/dirdiff.py:1591
+#: meld/dirdiff.py:1604
 msgid "No folder"
 msgstr "Ingen mapp"
 
-#: meld/filediff.py:1134
+#: meld/filediff.py:1144
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: meld/filediff.py:1136
+#: meld/filediff.py:1146
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1792,74 +1791,73 @@ msgstr ""
 "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: meld/filediff.py:1208
+#: meld/filediff.py:1218
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: meld/filediff.py:1210
+#: meld/filediff.py:1220
 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:1212
+#: meld/filediff.py:1222
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: meld/filediff.py:1213
+#: meld/filediff.py:1223
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: meld/filediff.py:1546
+#: meld/filediff.py:1556
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: meld/filediff.py:1554
+#: meld/filediff.py:1564
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1566
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: meld/filediff.py:1558
+#: meld/filediff.py:1568
 msgid "Open"
 msgstr "Öppna"
 
-#: meld/filediff.py:1572
+#: meld/filediff.py:1582
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
 
-#: meld/filediff.py:1586
+#: meld/filediff.py:1596
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: meld/filediff.py:1647
+#: meld/filediff.py:1657
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: meld/filediff.py:1648
+#: meld/filediff.py:1658
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: meld/filediff.py:1650
+#: meld/filediff.py:1660
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: meld/filediff.py:1820
-#, python-brace-format
-msgid "File {duplicate_files[0]} is being compared to itself"
-msgstr "Filen {duplicate_files[0]} jämförs med sig själv"
+#: meld/filediff.py:1830
+msgid "File {} is being compared to itself"
+msgstr "Filen {} jämförs med sig själv"
 
-#: meld/filediff.py:1828
+#: meld/filediff.py:1839
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: meld/filediff.py:1841
+#: meld/filediff.py:1852
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1867,11 +1865,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: meld/filediff.py:1846
+#: meld/filediff.py:1857
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: meld/filediff.py:1848
+#: meld/filediff.py:1859
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1880,15 +1878,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: meld/filediff.py:1868
+#: meld/filediff.py:1879
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1901
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: meld/filediff.py:1891
+#: meld/filediff.py:1902
 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."
@@ -1897,19 +1895,19 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: meld/filediff.py:1899
+#: meld/filediff.py:1910
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1912
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: meld/filediff.py:1914
+#: meld/filediff.py:1925
 msgid "Saving failed"
 msgstr "Misslyckades med att spara"
 
-#: meld/filediff.py:1915
+#: meld/filediff.py:1926
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1917,36 +1915,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:1924
+#: meld/filediff.py:1935
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1937
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: meld/filediff.py:1928
+#: meld/filediff.py:1939
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1950
 #, 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:1941
+#: meld/filediff.py:1952
 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:1944
+#: meld/filediff.py:1955
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1956
 msgid "Don’t Save"
 msgstr "Spara inte"
 
-#: meld/filediff.py:1987
+#: meld/filediff.py:1998
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1954,7 +1952,7 @@ msgstr ""
 "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
 "”{}”."
 
-#: meld/filediff.py:1991 meld/patchdialog.py:138
+#: meld/filediff.py:2002 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1963,20 +1961,20 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: meld/filediff.py:1995 meld/patchdialog.py:137
+#: meld/filediff.py:2006 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: meld/filediff.py:2056
+#: meld/filediff.py:2067
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: meld/filediff.py:2409
+#: meld/filediff.py:2420
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: meld/filediff.py:2410
+#: meld/filediff.py:2421
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2167,12 +2165,10 @@ msgstr "mönster"
 msgid "Version control:"
 msgstr "Versionshantering:"
 
-#: meld/style.py:90
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+#: meld/style.py:91
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
-"Kunde inte hitta färgschemadetaljer för %s-%s; detta är en felaktig "
-"installation"
+"Kunde inte hitta färgschemadetaljer för {}; detta är en felaktig installation"
 
 #: meld/ui/bufferselectors.py:110
 #, python-brace-format
@@ -2184,12 +2180,12 @@ msgid "Plain Text"
 msgstr "Vanlig text"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: meld/ui/statusbar.py:123
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "Rad %i, kolumn %i"
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr "Rad {line}, kol {column}"
 
-#: meld/ui/statusbar.py:183
+#: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
 msgstr "Rad du vill flytta markören till"
 
@@ -2197,39 +2193,40 @@ msgstr "Rad du vill flytta markören till"
 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:91
-#, python-format
-msgid "%s in %s"
-msgstr "%s i %s"
+#. Translators: First element is replaced by translated "%d
+#. unpushed commits", second element is replaced by translated
+#. "%d branches"
+#: meld/vc/git.py:92
+#, python-brace-format
+msgid "{unpushed_commits} in {unpushed_branches}"
+msgstr "{unpushed_commits} i {unpushed_branches}"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: meld/vc/git.py:92 meld/vc/git.py:99
+#: meld/vc/git.py:94 meld/vc/git.py:103
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d ej sänd incheckning"
 msgstr[1] "%d ej sända incheckningar"
 
-#: meld/vc/git.py:94
+#: meld/vc/git.py:97
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d gren"
 msgstr[1] "%d grenar"
 
-#: meld/vc/git.py:339
-#, python-format
-msgid "Mode changed from %s to %s"
-msgstr "Läge ändrat från %s till %s"
+#: meld/vc/git.py:344
+#, python-brace-format
+msgid "Mode changed from {old_mode} to {new_mode}"
+msgstr "Läge ändrat från {old_mode} till {new_mode}"
 
-#: meld/vc/git.py:347
+#: meld/vc/git.py:352
 msgid "Partially staged"
 msgstr "Delvis köad"
 
-#: meld/vc/git.py:347
+#: meld/vc/git.py:352
 msgid "Staged"
 msgstr "Köad"
 
@@ -2319,9 +2316,9 @@ msgstr "Välj vilket versionshanteringssystem som ska användas"
 
 #. TRANSLATORS: This is the location of the directory being viewed
 #: meld/vcview.py:411
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#, python-brace-format
+msgid "Location: {path}"
+msgstr "Plats: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
@@ -2389,6 +2386,18 @@ msgstr ""
 msgid "Clear"
 msgstr "Töm"
 
+#~ msgid "[%s] Scanning %s"
+#~ msgstr "[%s] Söker igenom %s"
+
+#~ msgid "Ln %i, Col %i"
+#~ msgstr "Rad %i, kolumn %i"
+
+#~ msgid "%s in %s"
+#~ msgstr "%s i %s"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
 #~ msgid "Autodetect Encoding"
 #~ msgstr "Upptäck automatiskt kodning"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]