[meld] Update Swedish translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Swedish translation
- Date: Mon, 11 Apr 2022 08:34:45 +0000 (UTC)
commit 05aee2814577749870526dd421367d12757ced4f
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date: Mon Apr 11 08:34:43 2022 +0000
Update Swedish translation
po/sv.po | 289 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 149 insertions(+), 140 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index 7c6f2a8e..2f51e8dc 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-03-27 00:52+0000\n"
-"PO-Revision-Date: 2022-03-27 11:44+0200\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-11 10:34+0200\n"
"Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"Language: sv\n"
@@ -526,218 +526,223 @@ msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Helskärm"
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+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
msgctxt "shortcut window"
msgid "Panes"
msgstr "Paneler"
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
msgctxt "shortcut window"
msgid "Previous comparison pane"
msgstr "Föregående jämförelsepanel"
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
msgctxt "shortcut window"
msgid "Next comparison pane"
msgstr "Nästa jämförelsepanel"
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
msgctxt "shortcut window"
msgid "Changes"
msgstr "Ändringar"
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
msgctxt "shortcut window"
msgid "Go to previous change"
msgstr "Gå till föregående ändring"
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
msgctxt "shortcut window"
msgid "Go to next change"
msgstr "Gå till nästa ändring"
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Flikar"
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Gå till föregående flik"
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Gå till nästa flik"
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Växla till flik"
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Flytta flik åt vänster"
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Flytta flik åt höger"
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
msgctxt "shortcut window"
msgid "Editing"
msgstr "Redigering"
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
msgctxt "shortcut window"
msgid "Undo"
msgstr "Ångra"
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Redo"
msgstr "Gör om"
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Cut"
msgstr "Klipp ut"
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Copy"
msgstr "Kopiera"
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Paste"
msgstr "Klistra in"
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Find"
msgstr "Sök"
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Sök nästa"
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Sök föregående"
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
msgctxt "shortcut window"
msgid "Replace"
msgstr "Ersätt"
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Filjämförelse"
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Spara den aktuella filen"
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
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:236
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Spara alla filer i jämförelse"
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Föregående konflikt"
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Nästa konflikt"
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Tryck över ändring till vänster"
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Tryck över ändring till höger"
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Dra ändring från vänster"
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Dra ändring från höger"
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Kopiera ändringar ovanför vänster"
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Kopiera ändringar under vänster"
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Kopiera ändringar ovanför höger"
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Kopiera ändringar under höger"
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Ta bort ändring"
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Mappjämförelse"
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Kopiera till vänster"
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Kopiera till höger"
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Versionshanterad jämförelse"
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Checka in i versionshanteraren"
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Visa/dölj konsolutskrift"
@@ -794,80 +799,84 @@ msgstr "Versionshanteringskonsol"
msgid "Lock scrolling"
msgstr "Lås rullning"
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Byt plats på vänster- och högerpanelen"
+
+#: meld/resources/gtk/menus.ui:80
msgid "Comparison"
msgstr "Jämförelse"
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
msgid "Merge All from Left"
msgstr "Sammanfoga allt från vänster"
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
msgid "Merge All from Right"
msgstr "Sammanfoga allt från höger"
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
msgid "Merge All"
msgstr "Sammanfoga alla"
-#: meld/resources/gtk/menus.ui:92
+#: meld/resources/gtk/menus.ui:99
msgid "Format as Patch…"
msgstr "Formatera som programfix…"
-#: meld/resources/gtk/menus.ui:101
+#: meld/resources/gtk/menus.ui:108
msgid "_Preferences"
msgstr "Inställ_ningar"
-#: meld/resources/gtk/menus.ui:105
+#: meld/resources/gtk/menus.ui:112
msgid "Keyboard Shortcuts"
msgstr "Tangentbordsgenvägar"
-#: meld/resources/gtk/menus.ui:109
+#: meld/resources/gtk/menus.ui:116
msgid "_Help"
msgstr "_Hjälp"
-#: meld/resources/gtk/menus.ui:114
+#: meld/resources/gtk/menus.ui:121
msgid "_About Meld"
msgstr "_Om Meld"
-#: meld/resources/gtk/menus.ui:127
+#: meld/resources/gtk/menus.ui:134
msgid "File status"
msgstr "Filstatus"
-#: meld/resources/gtk/menus.ui:129
+#: meld/resources/gtk/menus.ui:136
msgid "Same"
msgstr "Samma"
-#: meld/resources/gtk/menus.ui:133
+#: meld/resources/gtk/menus.ui:140
msgid "New"
msgstr "Nya"
-#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
#: meld/vc/_vc.py:76
msgid "Modified"
msgstr "Ändrade"
-#: meld/resources/gtk/menus.ui:147
+#: meld/resources/gtk/menus.ui:154
msgid "Ignore filename case"
msgstr "Ignorera skiftlägeskänslighet för filnamn"
-#: meld/resources/gtk/menus.ui:151
+#: meld/resources/gtk/menus.ui:158
msgid "Normalize Unicode paths"
msgstr "Normalisera Unicode-sökvägar"
-#: meld/resources/gtk/menus.ui:164
+#: meld/resources/gtk/menus.ui:171
msgid "Normal"
msgstr "Normala"
-#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
msgid "Unversioned"
msgstr "Oversionerade"
-#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
msgid "Ignored"
msgstr "Ignorerade"
-#: meld/resources/gtk/menus.ui:179
+#: meld/resources/gtk/menus.ui:186
msgid "Flatten folders"
msgstr "Platta till mappar"
@@ -1142,7 +1151,7 @@ msgstr "Fil ett"
#. Create icon and filename CellRenderer
#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
msgid "Name"
msgstr "Namn"
@@ -1182,7 +1191,7 @@ msgstr "Radbruten"
msgid "Replace _All"
msgstr "Ersätt _alla"
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
msgid "_Replace"
msgstr "_Ersätt"
@@ -1568,7 +1577,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:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
#: meld/iohelpers.py:56 meld/iohelpers.py:116
msgid "_Cancel"
msgstr "_Avbryt"
@@ -1678,95 +1687,95 @@ msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
msgid "Size"
msgstr "Storlek"
#. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
msgid "Modification time"
msgstr "Ändringstid"
#. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
msgid "Modification time (ISO)"
msgstr "Ändringstid (ISO)"
#. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
msgid "Permissions"
msgstr "Rättigheter"
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
#, python-brace-format
msgid "{filename} (scanning…)"
msgstr "{filename} (söker igenom…)"
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
#, python-brace-format
msgid "[{label}] Scanning {folder}"
msgstr "[{label}] Söker igenom {folder}"
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
#, python-brace-format
msgid "[{label}] Done"
msgstr "[{label}] Klar"
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
msgid "Folder {} is being compared to itself"
msgstr "Mappen {} jämförs med sig själv"
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
msgid "Folders have no differences"
msgstr "Mapparna skiljer sig inte åt"
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
msgid "Contents of scanned files in folders are identical."
msgstr "Innehållet i mapparnas avsökta filer är identiskt."
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
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:1126
+#: meld/dirdiff.py:1127
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:1128
+#: meld/dirdiff.py:1129
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:1144 meld/filediff.py:1980
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
msgid "Hide"
msgstr "Dölj"
-#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
-#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
msgid "Hi_de"
msgstr "_Dölj"
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
msgid "Multiple errors occurred while scanning this folder"
msgstr "Flera fel inträffade vid avsökning av denna mapp"
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
msgid "Files with invalid encodings found"
msgstr "Filer med ogiltiga teckenkodningar hittades"
#. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
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:1160
+#: meld/dirdiff.py:1161
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:1162
+#: meld/dirdiff.py:1163
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1774,17 +1783,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:1173
+#: meld/dirdiff.py:1174
#, python-brace-format
msgid "“{first_file}” hidden by “{second_file}”"
msgstr "”{first_file}” dold av ”{second_file}”"
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
#, python-format
msgid "Replace folder “%s”?"
msgstr "Ersätt mappen ”%s”?"
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1793,11 +1802,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:1250
+#: meld/dirdiff.py:1251
msgid "Error copying file"
msgstr "Fel vid filkopiering"
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
#, python-brace-format
msgid ""
"Couldn’t copy {source}\n"
@@ -1810,19 +1819,19 @@ msgstr ""
"\n"
"{error}"
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
msgid "Error deleting {}"
msgstr "Fel vid borttagning av {}"
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
msgid "No folder"
msgstr "Ingen mapp"
-#: meld/filediff.py:1156
+#: meld/filediff.py:1158
msgid "Comparison results will be inaccurate"
msgstr "Jämförelseresultat kommer att bli osäkra"
-#: meld/filediff.py:1158
+#: meld/filediff.py:1160
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1830,93 +1839,93 @@ msgstr ""
"Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
"kommer att vara osäker."
-#: meld/filediff.py:1230
+#: meld/filediff.py:1232
msgid "Mark conflict as resolved?"
msgstr "Markera konflikten som löst?"
-#: meld/filediff.py:1232
+#: meld/filediff.py:1234
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:1235
+#: meld/filediff.py:1237
msgid "Cancel"
msgstr "Avbryt"
-#: meld/filediff.py:1236
+#: meld/filediff.py:1238
msgid "Mark _Resolved"
msgstr "Markera som _löst"
-#: meld/filediff.py:1427 meld/filediff.py:1443
+#: meld/filediff.py:1429 meld/filediff.py:1445
msgid "Add Synchronization Point"
msgstr "Lägg till synkroniseringspunkt"
-#: meld/filediff.py:1431
+#: meld/filediff.py:1433
msgid "Remove Synchronization Point"
msgstr "Ta bort synkroniseringspunkt"
-#: meld/filediff.py:1435
+#: meld/filediff.py:1437
msgid "Move Synchronization Point"
msgstr "Flytta synkroniseringspunkt"
-#: meld/filediff.py:1439
+#: meld/filediff.py:1441
msgid "Match Synchronization Point"
msgstr "Matcha synkroniseringspunkt"
-#: meld/filediff.py:1463
+#: meld/filediff.py:1465
msgid "Clear Synchronization Points"
msgstr "Rensa synkroniseringspunkter"
-#: meld/filediff.py:1654
+#: meld/filediff.py:1656
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
-#: meld/filediff.py:1663
+#: meld/filediff.py:1665
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Filen %s verkar vara en binärfil."
-#: meld/filediff.py:1665
+#: meld/filediff.py:1667
msgid "Do you want to open the file using the default application?"
msgstr "Vill du öppna filen med standardprogrammet?"
-#: meld/filediff.py:1667
+#: meld/filediff.py:1669
msgid "Open"
msgstr "Öppna"
-#: meld/filediff.py:1689
+#: meld/filediff.py:1691
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Sammanfogar filer"
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Beräknar skillnader"
-#: meld/filediff.py:1763
+#: meld/filediff.py:1765
#, python-format
msgid "File %s has changed on disk"
msgstr "Filen %s har ändrats på disk"
-#: meld/filediff.py:1764
+#: meld/filediff.py:1766
msgid "Do you want to reload the file?"
msgstr "Vill du läsa om filen?"
-#: meld/filediff.py:1766
+#: meld/filediff.py:1768
msgid "_Reload"
msgstr "_Läs om"
-#: meld/filediff.py:1936
+#: meld/filediff.py:1938
msgid "File {} is being compared to itself"
msgstr "Filen {} jämförs med sig själv"
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
msgid "Files are identical"
msgstr "Filerna är identiska"
-#: meld/filediff.py:1958
+#: meld/filediff.py:1960
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1924,11 +1933,11 @@ msgstr ""
"Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
"ofiltrerade filerna?"
-#: meld/filediff.py:1963
+#: meld/filediff.py:1965
msgid "Files differ in line endings only"
msgstr "Filer skiljer sig endast vad gäller radslut"
-#: meld/filediff.py:1965
+#: meld/filediff.py:1967
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1937,15 +1946,15 @@ msgstr ""
"Filerna är identiska förutom radavsluten:\n"
"%s"
-#: meld/filediff.py:1985
+#: meld/filediff.py:1987
msgid "Show without filters"
msgstr "Visa utan filer"
-#: meld/filediff.py:2007
+#: meld/filediff.py:2009
msgid "Change highlighting incomplete"
msgstr "Ändra markering av ofärdiga"
-#: meld/filediff.py:2008
+#: meld/filediff.py:2010
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."
@@ -1954,19 +1963,19 @@ msgstr ""
"Meld till att längre tid på sig att markera större ändringar, men det kan "
"bli långsamt."
-#: meld/filediff.py:2016
+#: meld/filediff.py:2018
msgid "Keep highlighting"
msgstr "Använd markering"
-#: meld/filediff.py:2018
+#: meld/filediff.py:2020
msgid "_Keep highlighting"
msgstr "_Använd markering"
-#: meld/filediff.py:2031
+#: meld/filediff.py:2033
msgid "Saving failed"
msgstr "Misslyckades med att spara"
-#: meld/filediff.py:2032
+#: meld/filediff.py:2034
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1974,36 +1983,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:2041
+#: meld/filediff.py:2043
msgid "Save Left Pane As"
msgstr "Spara vänsterpanel som"
-#: meld/filediff.py:2043
+#: meld/filediff.py:2045
msgid "Save Middle Pane As"
msgstr "Spara mittenpanel som"
-#: meld/filediff.py:2045
+#: meld/filediff.py:2047
msgid "Save Right Pane As"
msgstr "Spara högerpanel som"
-#: meld/filediff.py:2056
+#: meld/filediff.py:2058
#, 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:2058
+#: meld/filediff.py:2060
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:2061
+#: meld/filediff.py:2063
msgid "Save Anyway"
msgstr "Spara ändå"
-#: meld/filediff.py:2062
+#: meld/filediff.py:2064
msgid "Don’t Save"
msgstr "Spara inte"
-#: meld/filediff.py:2104
+#: meld/filediff.py:2106
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
@@ -2011,7 +2020,7 @@ msgstr ""
"Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
"”{}”."
-#: meld/filediff.py:2108 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -2020,16 +2029,16 @@ msgstr ""
"Kunde in spara fil beroende på:\n"
"%s"
-#: meld/filediff.py:2112 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Kunde inte spara filen %s."
-#: meld/filediff.py:2522
+#: meld/filediff.py:2524
msgid "Live comparison updating disabled"
msgstr "Inaktivera realtidsuppdateringar av jämförelser"
-#: meld/filediff.py:2523
+#: meld/filediff.py:2525
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]