[meld/meld-3-12] Updated Swedish translation
- From: Damned-Lies <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/meld-3-12] Updated Swedish translation
- Date: Sun, 1 Mar 2015 19:58:38 +0000 (UTC)
commit c88ca21c94bc841f52717f3805153cfacff8f999
Author: Sebastian Rasmussen <sebras gmail com>
Date: Sun Mar 1 19:58:28 2015 +0000
Updated Swedish translation
po/sv.po | 223 +++++++++++++++++++++++++++++++------------------------------
1 files changed, 113 insertions(+), 110 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index 4f0d2f1..fe41152 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,24 +1,25 @@
# Swedish messages for meld.
-# Copyright © 2005-2014 Free Software Foundation, Inc.
+# Copyright © 2005-2015 Free Software Foundation, Inc.
# Christian Rose <menthos menthos com>, 2005.
# Daniel Nylander <po danielnylander se>, 2006, 2007, 2008, 2009, 2011.
# Josef Andersson <josef andersson fripost org>, 2014.
+# Sebastian Rasmussen <sebras gmail com>, 2015.
#
msgid ""
msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-30 21:29+0000\n"
-"PO-Revision-Date: 2014-09-13 17:28+0100\n"
-"Last-Translator: Josef Andersson <josef andersson fripost org>\n"
+"POT-Creation-Date: 2015-02-08 11:05+0000\n"
+"PO-Revision-Date: 2015-02-08 17:15+0100\n"
+"Last-Translator: Sebastian Rasmussen <sebras gmail com>\n"
"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#: ../bin/meld:138
msgid "Cannot import: "
@@ -84,11 +85,11 @@ msgstr "Standardtillstånd för fönster"
#: ../data/org.gnome.meld.gschema.xml.h:3
msgid "Show toolbar"
-msgstr "Visa verktygsraden"
+msgstr "Visa verktygsfältet"
#: ../data/org.gnome.meld.gschema.xml.h:4
msgid "If true, the window toolbar is visible."
-msgstr "Om true så är fönsterverktygsraden synlig."
+msgstr "Om true så är fönsterverktygsfältet synlig."
#: ../data/org.gnome.meld.gschema.xml.h:5
msgid "Show statusbar"
@@ -369,16 +370,13 @@ msgid ""
"the version control commit message editor."
msgstr ""
"Om true så visas en guide för marginalens kolumn i "
-"versionshanteringsredigeraren för incheckningsmeddelanden. "
+"versionshanteringsredigeraren för incheckningsmeddelanden."
#: ../data/org.gnome.meld.gschema.xml.h:53
msgid "Margin column in commit message editor"
msgstr "Marginalkolumn i redigeraren för incheckningsmeddelanden"
#: ../data/org.gnome.meld.gschema.xml.h:54
-#| msgid ""
-#| "The column of the margin is at in the version control commit message "
-#| "editor."
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -505,7 +503,7 @@ msgstr "Kopiera till höger"
msgid "Delete selected"
msgstr "Ta bort markerade"
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1449
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1463
msgid "Hide"
msgstr "Dölj"
@@ -522,7 +520,7 @@ 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 "
+"Behandla filnamn som lika om de skiljer i skiftläge men annars är identiska"
#: ../data/ui/dirdiff.ui.h:12
msgid "Same"
@@ -705,29 +703,29 @@ msgid "Format as Patch"
msgstr "Formatera som programfix"
#: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Kopiera till Urklipp"
+
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+msgid "Save Patch"
+msgstr "Spara programfix"
+
+#: ../data/ui/patch-dialog.ui.h:4
msgid "Use differences between:"
msgstr "Använd skillnader mellan:"
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:5
msgid "Left and middle panes"
msgstr "Vänster- och mittenpaneler"
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:6
msgid "Middle and right panes"
msgstr "Mitten- och högerpaneler"
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
msgstr "_Omvänd programfixriktning"
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Copy to Clipboard"
-msgstr "Kopiera till Urklipp"
-
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
-msgid "Save Patch"
-msgstr "Spara programfix"
-
#: ../data/ui/preferences.ui.h:1
msgid "Left is remote, right is local"
msgstr "Vänster är fjärr, höger är lokal"
@@ -1181,8 +1179,8 @@ msgstr ""
msgid "'%s' hidden by '%s'"
msgstr "”%s” dolda av ”%s”"
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1124 ../meld/filediff.py:1275
-#: ../meld/filediff.py:1451 ../meld/filediff.py:1481 ../meld/filediff.py:1483
+#: ../meld/dirdiff.py:873 ../meld/filediff.py:1138 ../meld/filediff.py:1289
+#: ../meld/filediff.py:1465 ../meld/filediff.py:1495 ../meld/filediff.py:1497
msgid "Hi_de"
msgstr "_Dölj"
@@ -1217,187 +1215,187 @@ msgstr ""
msgid "Error deleting %s"
msgstr "Fel vid borttagning av %s"
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:251
msgid "Format as Patch..."
msgstr "Formatera som programfix…"
-#: ../meld/filediff.py:244
+#: ../meld/filediff.py:252
msgid "Create a patch using differences between files"
msgstr "Skapa en programfix med skillnaderna mellan filer"
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:254
msgid "Save A_ll"
msgstr "Spara _alla"
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:255
msgid "Save all files in the current comparison"
msgstr "Spara alla filer i den aktuella jämförelsen"
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:258
msgid "Revert files to their saved versions"
msgstr "Återställ filer till deras sparade versioner"
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:260
msgid "Add Synchronization Point"
msgstr "Lägg till synkroniseringspunkt"
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:261
msgid "Add a manual point for synchronization of changes between files"
msgstr "Lägg till en manuell punkt för att synkronisera ändringar mellan filer"
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:264
msgid "Clear Synchronization Points"
msgstr "Rensa synkroniseringspunkter"
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:265
msgid "Clear manual change sychronization points"
msgstr "Rensa manuella ändringar av synkroniseringspunkter"
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:267
msgid "Previous Conflict"
msgstr "Föregående konflikt"
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:268
msgid "Go to the previous conflict"
msgstr "Gå till föregående konflikt"
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:270
msgid "Next Conflict"
msgstr "Nästa konflikt"
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:271
msgid "Go to the next conflict"
msgstr "Gå till nästa konflikt"
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:273
msgid "Push to Left"
msgstr "Tryck åt vänster"
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:274
msgid "Push current change to the left"
msgstr "Tryck aktuell ändring till vänster"
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:277
msgid "Push to Right"
msgstr "Tryck åt höger"
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:278
msgid "Push current change to the right"
msgstr "Tryck aktuell ändring till höger"
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:282
msgid "Pull from Left"
msgstr "Dra från vänster"
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:283
msgid "Pull change from the left"
msgstr "Dra ändring från vänster"
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:286
msgid "Pull from Right"
msgstr "Dra från höger"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:287
msgid "Pull change from the right"
msgstr "Dra ändring från höger"
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:289
msgid "Copy Above Left"
msgstr "Kopiera ovan vänster"
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:290
msgid "Copy change above the left chunk"
msgstr "Kopiera ändringar ovanför vänstra stycket"
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:292
msgid "Copy Below Left"
msgstr "Kopiera under vänster"
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:293
msgid "Copy change below the left chunk"
msgstr "Kopiera ändringar under vänstra stycket"
-#: ../meld/filediff.py:287
+#: ../meld/filediff.py:295
msgid "Copy Above Right"
msgstr "Kopiera ovan höger"
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:296
msgid "Copy change above the right chunk"
msgstr "Kopiera ändringar ovanför högra stycket"
-#: ../meld/filediff.py:290
+#: ../meld/filediff.py:298
msgid "Copy Below Right"
msgstr "Kopiera under höger"
-#: ../meld/filediff.py:291
+#: ../meld/filediff.py:299
msgid "Copy change below the right chunk"
msgstr "Kopiera ändringar under högra stycket"
-#: ../meld/filediff.py:293
+#: ../meld/filediff.py:301
msgid "Delete"
msgstr "Ta bort"
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:302
msgid "Delete change"
msgstr "Ta bort ändring"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:304
msgid "Merge All from Left"
msgstr "Sammanfoga allt från vänster"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:305
msgid "Merge all non-conflicting changes from the left"
msgstr "Sammanfoga alla ändringar utan konflikter från vänster"
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:307
msgid "Merge All from Right"
msgstr "Sammanfoga allt från höger"
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:308
msgid "Merge all non-conflicting changes from the right"
msgstr "Sammanfoga alla ändringar utan konflikter från höger"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:310
msgid "Merge All"
msgstr "Sammanfoga alla"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:311
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/filediff.py:307
+#: ../meld/filediff.py:315
msgid "Cycle Through Documents"
msgstr "Bläddra genom dokumenten"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:316
msgid "Move keyboard focus to the next document in this comparison"
msgstr "Flytta tangentbordsfokus till nästa dokument i denna jämförelse"
-#: ../meld/filediff.py:314
+#: ../meld/filediff.py:322
msgid "Lock Scrolling"
msgstr "Lås rullning"
-#: ../meld/filediff.py:315
+#: ../meld/filediff.py:323
msgid "Lock scrolling of all panes"
msgstr "Lås rullning för alla paneler"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:483
msgid "INS"
msgstr "INF"
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:483
msgid "OVR"
msgstr "ÖVR"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:485
#, python-format
msgid "Ln %i, Col %i"
msgstr "Rad %i, kolumn %i"
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:832
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -1406,72 +1404,72 @@ msgstr ""
"Filtret ”%s” ändrade antalet rader i filen. Jämförelsen kommer att vara "
"felaktig. Se användarhandboken för mer information."
-#: ../meld/filediff.py:890
+#: ../meld/filediff.py:904
msgid "Mark conflict as resolved?"
msgstr "Markera konflikten som löst?"
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:906
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:894
+#: ../meld/filediff.py:908
msgid "Cancel"
msgstr "Avbryt"
-#: ../meld/filediff.py:895
+#: ../meld/filediff.py:909
msgid "Mark _Resolved"
msgstr "Markera som _löst"
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1125
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Ställ in numrerade paneler"
-#: ../meld/filediff.py:1118
+#: ../meld/filediff.py:1132
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Öppnar filer"
-#: ../meld/filediff.py:1141 ../meld/filediff.py:1151 ../meld/filediff.py:1164
-#: ../meld/filediff.py:1170
+#: ../meld/filediff.py:1155 ../meld/filediff.py:1165 ../meld/filediff.py:1178
+#: ../meld/filediff.py:1184
msgid "Could not read file"
msgstr "Kunde inte läsa filen"
-#: ../meld/filediff.py:1142
+#: ../meld/filediff.py:1156
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Läser filer"
-#: ../meld/filediff.py:1152
+#: ../meld/filediff.py:1166
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s verkar vara en binärfil."
-#: ../meld/filediff.py:1165
+#: ../meld/filediff.py:1179
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s finns inte i teckenkodningar: %s"
-#: ../meld/filediff.py:1203
+#: ../meld/filediff.py:1217
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Beräknar skillnader"
-#: ../meld/filediff.py:1270
+#: ../meld/filediff.py:1284
#, python-format
msgid "File %s has changed on disk"
msgstr "Filen %s har ändrats på disk"
-#: ../meld/filediff.py:1271
+#: ../meld/filediff.py:1285
msgid "Do you want to reload the file?"
msgstr "Vill du läsa om filen?"
-#: ../meld/filediff.py:1274
+#: ../meld/filediff.py:1288
msgid "_Reload"
msgstr "_Läs om"
-#: ../meld/filediff.py:1440
+#: ../meld/filediff.py:1454
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1479,19 +1477,19 @@ msgstr ""
"Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
"ofiltrerade filerna?"
-#: ../meld/filediff.py:1446
+#: ../meld/filediff.py:1460
msgid "Files are identical"
msgstr "Filerna är identiska"
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1468
msgid "Show without filters"
msgstr "Visa utan filer"
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1490
msgid "Change highlighting incomplete"
msgstr "Ändra markering av ofärdiga"
-#: ../meld/filediff.py:1477
+#: ../meld/filediff.py:1491
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."
@@ -1500,15 +1498,15 @@ msgstr ""
"Meld till att längre tid på sig att markera större ändringar, men det kan "
"bli långsamt."
-#: ../meld/filediff.py:1485
+#: ../meld/filediff.py:1499
msgid "Keep highlighting"
msgstr "Använd markering"
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1501
msgid "_Keep highlighting"
msgstr "_Använd markering"
-#: ../meld/filediff.py:1618
+#: ../meld/filediff.py:1630
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -1517,7 +1515,7 @@ msgstr ""
"”%s” finns redan!\n"
"Skriv över?"
-#: ../meld/filediff.py:1631
+#: ../meld/filediff.py:1643
#, python-format
msgid ""
"Error writing to %s\n"
@@ -1528,36 +1526,36 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1642
+#: ../meld/filediff.py:1654
msgid "Save Left Pane As"
msgstr "Spara vänsterpanel som"
-#: ../meld/filediff.py:1644
+#: ../meld/filediff.py:1656
msgid "Save Middle Pane As"
msgstr "Spara mittenpanel som"
-#: ../meld/filediff.py:1646
+#: ../meld/filediff.py:1658
msgid "Save Right Pane As"
msgstr "Spara högerpanel som"
-#: ../meld/filediff.py:1659
+#: ../meld/filediff.py:1671
#, 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:1661
+#: ../meld/filediff.py:1673
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:1664
+#: ../meld/filediff.py:1676
msgid "Save Anyway"
msgstr "Spara ändå"
-#: ../meld/filediff.py:1665
+#: ../meld/filediff.py:1677
msgid "Don't Save"
msgstr "Spara inte"
-#: ../meld/filediff.py:1689
+#: ../meld/filediff.py:1701
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -1568,7 +1566,7 @@ msgstr ""
"\n"
"Vilket format vill du använda?"
-#: ../meld/filediff.py:1705
+#: ../meld/filediff.py:1717
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -1577,11 +1575,11 @@ msgstr ""
"”%s” innehåller tecken som inte kan kodas med ”%s”\n"
"Vill du spara som UTF-8?"
-#: ../meld/filediff.py:2068
+#: ../meld/filediff.py:2084
msgid "Live comparison updating disabled"
msgstr "Inaktivera realtidsuppdateringar av jämförelser"
-#: ../meld/filediff.py:2069
+#: ../meld/filediff.py:2085
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1878,11 +1876,11 @@ msgstr "Visa jämförelsen i helskärmsläge"
#: ../meld/meldwindow.py:131
msgid "_Toolbar"
-msgstr "Ver_ktygsrad"
+msgstr "Ver_ktygsfält"
#: ../meld/meldwindow.py:132
msgid "Show or hide the toolbar"
-msgstr "Visa eller dölj verktygsraden"
+msgstr "Visa eller dölj verktygsfältet"
#: ../meld/meldwindow.py:141
msgid "Open Recent"
@@ -1924,12 +1922,17 @@ msgstr "Om detta program"
msgid "Switch to this tab"
msgstr "Växla till denna flik"
-#: ../meld/meldwindow.py:669
+#: ../meld/meldwindow.py:657
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "Behöver tre filer för att auto-sammanfoga, fick: %r"
+
+#: ../meld/meldwindow.py:671
msgid "Cannot compare a mixture of files and directories"
msgstr "Kan inte jämföra en blandning av filer och kataloger"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:213
+#: ../meld/misc.py:218
msgid "[None]"
msgstr "[Ingen]"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]