[meld] Update Swedish translation



commit 091537abf442e52b146131dd7689f4090fe1aca1
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date:   Tue Mar 27 21:54:06 2018 +0000

    Update Swedish translation

 po/sv.po |  222 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 120 insertions(+), 102 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index cdcf7af..8c0c527 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: 2018-03-11 09:08+0000\n"
-"PO-Revision-Date: 2018-03-12 01:11+0100\n"
+"POT-Creation-Date: 2018-03-24 22:20+0000\n"
+"PO-Revision-Date: 2018-03-27 23:51+0200\n"
 "Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "Language: sv\n"
@@ -574,7 +574,7 @@ msgstr "Kopiera till höger"
 msgid "Delete selected"
 msgstr "Ta bort markerade"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:872 ../meld/filediff.py:1445
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:873 ../meld/filediff.py:1436
 msgid "Hide"
 msgstr "Dölj"
 
@@ -642,7 +642,7 @@ msgid "_Add"
 msgstr "_Lägg till"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:681
+#: ../meld/vcview.py:682
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -664,7 +664,7 @@ msgstr "Flytta _nedåt"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:372
+#: ../meld/dirdiff.py:373
 msgid "Name"
 msgstr "Namn"
 
@@ -869,8 +869,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:953 ../meld/filediff.py:1516
-#: ../meld/filediff.py:1588
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:954 ../meld/filediff.py:1507
+#: ../meld/filediff.py:1579 ../meld/iohelpers.py:49
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -911,7 +911,7 @@ msgstr ""
 msgid "_Discard"
 msgstr "_Förkasta"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:954 ../meld/filediff.py:1517
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:955 ../meld/filediff.py:1508
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1615,7 +1615,7 @@ msgstr "Föregående loggar:"
 msgid "Co_mmit"
 msgstr "Che_cka in"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:333
 msgid "Location"
 msgstr "Plats"
 
@@ -1656,82 +1656,82 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:393 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:394 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:401 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:402 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:409 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:410 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: ../meld/dirdiff.py:540
+#: ../meld/dirdiff.py:541
 #, python-format
 msgid "Hide %s"
 msgstr "Dölj %s"
 
-#: ../meld/dirdiff.py:681 ../meld/dirdiff.py:704
+#: ../meld/dirdiff.py:682 ../meld/dirdiff.py:705
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Söker igenom %s"
 
-#: ../meld/dirdiff.py:839
+#: ../meld/dirdiff.py:840
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Klar"
 
-#: ../meld/dirdiff.py:847
+#: ../meld/dirdiff.py:848
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: ../meld/dirdiff.py:849
+#: ../meld/dirdiff.py:850
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:852
 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:854
+#: ../meld/dirdiff.py:855
 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:856
+#: ../meld/dirdiff.py:857
 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:874 ../meld/filediff.py:1447 ../meld/filediff.py:1477
-#: ../meld/filediff.py:1479 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: ../meld/dirdiff.py:875 ../meld/filediff.py:1438 ../meld/filediff.py:1468
+#: ../meld/filediff.py:1470 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: ../meld/dirdiff.py:883
+#: ../meld/dirdiff.py:884
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: ../meld/dirdiff.py:884
+#: ../meld/dirdiff.py:885
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:886
+#: ../meld/dirdiff.py:887
 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:888
+#: ../meld/dirdiff.py:889
 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:890
+#: ../meld/dirdiff.py:891
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1739,17 +1739,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:901
+#: ../meld/dirdiff.py:902
 #, python-format
 msgid "“%s” hidden by “%s”"
 msgstr "”%s” dolda av ”%s”"
 
-#: ../meld/dirdiff.py:957
+#: ../meld/dirdiff.py:958
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:960
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1758,11 +1758,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:972
+#: ../meld/dirdiff.py:973
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: ../meld/dirdiff.py:973
+#: ../meld/dirdiff.py:974
 #, python-format
 msgid ""
 "Couldn’t copy %s\n"
@@ -1775,20 +1775,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:996
-#, python-format
-msgid "Error deleting %s"
-msgstr "Fel vid borttagning av %s"
+#: ../meld/dirdiff.py:999 ../meld/vcview.py:705
+msgid "Error deleting {}"
+msgstr "Fel vid borttagning av {}"
 
-#: ../meld/dirdiff.py:1470
+#: ../meld/dirdiff.py:1480
 msgid "No folder"
 msgstr "Ingen mapp"
 
-#: ../meld/filediff.py:805
+#: ../meld/filediff.py:796
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: ../meld/filediff.py:807
+#: ../meld/filediff.py:798
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1796,64 +1795,64 @@ msgstr ""
 "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: ../meld/filediff.py:864
+#: ../meld/filediff.py:855
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: ../meld/filediff.py:866
+#: ../meld/filediff.py:857
 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:868
+#: ../meld/filediff.py:859
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../meld/filediff.py:869
+#: ../meld/filediff.py:860
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: ../meld/filediff.py:1162
+#: ../meld/filediff.py:1153
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: ../meld/filediff.py:1170
+#: ../meld/filediff.py:1161
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1163
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1165
 msgid "Open"
 msgstr "Öppna"
 
-#: ../meld/filediff.py:1190
+#: ../meld/filediff.py:1181
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: ../meld/filediff.py:1251
+#: ../meld/filediff.py:1242
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: ../meld/filediff.py:1252
+#: ../meld/filediff.py:1243
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: ../meld/filediff.py:1254
+#: ../meld/filediff.py:1245
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: ../meld/filediff.py:1410
+#: ../meld/filediff.py:1401
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: ../meld/filediff.py:1423
+#: ../meld/filediff.py:1414
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1861,11 +1860,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: ../meld/filediff.py:1428
+#: ../meld/filediff.py:1419
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: ../meld/filediff.py:1430
+#: ../meld/filediff.py:1421
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1874,15 +1873,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: ../meld/filediff.py:1450
+#: ../meld/filediff.py:1441
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1463
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: ../meld/filediff.py:1473
+#: ../meld/filediff.py:1464
 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."
@@ -1891,20 +1890,20 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: ../meld/filediff.py:1481
+#: ../meld/filediff.py:1472
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: ../meld/filediff.py:1483
+#: ../meld/filediff.py:1474
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: ../meld/filediff.py:1520
+#: ../meld/filediff.py:1511
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ersätt filen ”%s”?"
 
-#: ../meld/filediff.py:1522
+#: ../meld/filediff.py:1513
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1913,45 +1912,45 @@ 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/filediff.py:1539
+#: ../meld/filediff.py:1530
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: ../meld/filediff.py:1541
+#: ../meld/filediff.py:1532
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: ../meld/filediff.py:1543
+#: ../meld/filediff.py:1534
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: ../meld/filediff.py:1557
+#: ../meld/filediff.py:1548
 #, 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:1559
+#: ../meld/filediff.py:1550
 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:1562
+#: ../meld/filediff.py:1553
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: ../meld/filediff.py:1563
+#: ../meld/filediff.py:1554
 msgid "Don’t Save"
 msgstr "Spara inte"
 
-#: ../meld/filediff.py:1589
+#: ../meld/filediff.py:1580
 msgid "_Save as UTF-8"
 msgstr "_Spara som UTF-8"
 
-#: ../meld/filediff.py:1592
+#: ../meld/filediff.py:1583
 #, python-format
 msgid "Couldn’t encode text as “%s”"
 msgstr "Kunde inte koda text som ”%s”"
 
-#: ../meld/filediff.py:1594
+#: ../meld/filediff.py:1585
 #, python-format
 msgid ""
 "File “%s” contains characters that can’t be encoded using encoding “%s”.\n"
@@ -1960,12 +1959,12 @@ msgstr ""
 "Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n"
 "Vill du spara som UTF-8?"
 
-#: ../meld/filediff.py:1634 ../meld/patchdialog.py:130
+#: ../meld/filediff.py:1625 ../meld/patchdialog.py:130
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: ../meld/filediff.py:1635 ../meld/patchdialog.py:131
+#: ../meld/filediff.py:1626 ../meld/patchdialog.py:131
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1974,11 +1973,11 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: ../meld/filediff.py:2011
+#: ../meld/filediff.py:2002
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: ../meld/filediff.py:2012
+#: ../meld/filediff.py:2003
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2002,6 +2001,27 @@ msgstr "Kopiera _upp"
 msgid "Copy _down"
 msgstr "Kopiera _ned"
 
+#: ../meld/iohelpers.py:34
+msgid "Deleting remote folders is not supported"
+msgstr "Att ta bort fjärrmappar stöds ej"
+
+#: ../meld/iohelpers.py:36
+msgid "Not a file or directory"
+msgstr "Inte en fil eller katalog"
+
+#: ../meld/iohelpers.py:40
+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:45
+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:50
+msgid "_Delete Permanently"
+msgstr "_Ta bort permanent"
+
 #: ../meld/meldapp.py:179
 msgid "wrong number of arguments supplied to --diff"
 msgstr "felaktigt antal argument angavs för --diff"
@@ -2307,7 +2327,7 @@ msgstr "Behöver tre filer för att sammanfoga automatiskt, fick: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan inte jämföra en blandning av filer och kataloger"
 
-#: ../meld/misc.py:207
+#: ../meld/misc.py:218
 #, python-format
 msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
@@ -2315,7 +2335,7 @@ msgstr ""
 "installation"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:268
+#: ../meld/misc.py:279
 msgid "[None]"
 msgstr "[Ingen]"
 
@@ -2455,91 +2475,91 @@ msgstr "Inte närvarande"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:249
+#: ../meld/vcview.py:250
 #, 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:253
+#: ../meld/vcview.py:254
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Ogiltigt förråd)"
 
-#: ../meld/vcview.py:274
+#: ../meld/vcview.py:275
 msgid "No valid version control system found in this folder"
 msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp"
 
-#: ../meld/vcview.py:276
+#: ../meld/vcview.py:277
 msgid "Only one version control system found in this folder"
 msgstr "Endast ett versionshanteringssystem hittades i denna mapp"
 
-#: ../meld/vcview.py:278
+#: ../meld/vcview.py:279
 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:332
+#: ../meld/vcview.py:333
 #, 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:339
+#: ../meld/vcview.py:340
 msgid "Scanning repository"
 msgstr "Söker igenom förråd"
 
-#: ../meld/vcview.py:368
+#: ../meld/vcview.py:369
 #, python-format
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
 
-#: ../meld/vcview.py:407
+#: ../meld/vcview.py:408
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../meld/vcview.py:451
+#: ../meld/vcview.py:452
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:452
+#: ../meld/vcview.py:453
 #, python-format
 msgid "%s — remote"
 msgstr "%s — fjärr"
 
-#: ../meld/vcview.py:460
+#: ../meld/vcview.py:461
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, sammanfoga, fjärr)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:466
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (fjärr, sammanfoga, lokal)"
 
-#: ../meld/vcview.py:476
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s — repository"
 msgstr "%s — förråd"
 
-#: ../meld/vcview.py:482
+#: ../meld/vcview.py:483
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (arbetskopia, förråd)"
 
-#: ../meld/vcview.py:486
+#: ../meld/vcview.py:487
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (förråd, arbetskopia)"
 
-#: ../meld/vcview.py:675
+#: ../meld/vcview.py:676
 msgid "Remove folder and all its files?"
 msgstr "Ta bort mapp och dess filer?"
 
-#: ../meld/vcview.py:677
+#: ../meld/vcview.py:678
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2547,15 +2567,13 @@ 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:702
-#, python-format
-msgid "Error removing %s"
-msgstr "Fel vid borttagning av %s"
-
-#: ../meld/vcview.py:780
+#: ../meld/vcview.py:787
 msgid "Clear"
 msgstr "Töm"
 
+#~ msgid "Error removing %s"
+#~ msgstr "Fel vid borttagning av %s"
+
 #~ msgid "INS"
 #~ msgstr "INF"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]