commit meld for openSUSE:Factory
Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2016-05-03 09:37:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2016-04-28 17:01:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2016-05-03 10:17:02.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 1 14:21:14 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.16.0: + + Updated translations. + +------------------------------------------------------------------- Old: ---- meld-3.15.3.tar.xz New: ---- meld-3.16.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.4TCHNx/_old 2016-05-03 10:17:03.000000000 +0200 +++ /var/tmp/diff_new_pack.4TCHNx/_new 2016-05-03 10:17:03.000000000 +0200 @@ -17,13 +17,13 @@ Name: meld -Version: 3.15.3 +Version: 3.16.0 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ Group: Development/Tools/Other Url: http://meldmerge.org/ -Source: http://download.gnome.org/sources/meld/3.15/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/meld/3.16/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-nodocs.patch dimstar@opensuse.org -- We do not want COPYING and NEWS installed like this Patch0: meld-nodocs.patch BuildRequires: fdupes ++++++ meld-3.15.3.tar.xz -> meld-3.16.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.3/NEWS new/meld-3.16.0/NEWS --- old/meld-3.15.3/NEWS 2016-04-19 21:47:52.000000000 +0200 +++ new/meld-3.16.0/NEWS 2016-04-30 23:34:44.000000000 +0200 @@ -1,4 +1,12 @@ +2016-05-01 meld 3.16.0 +====================== + + Translations: + + * Josef Andersson (sv) + + 2016-04-20 meld 3.15.3 ====================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.3/PKG-INFO new/meld-3.16.0/PKG-INFO --- old/meld-3.15.3/PKG-INFO 2016-04-19 21:48:18.000000000 +0200 +++ new/meld-3.16.0/PKG-INFO 2016-04-30 23:34:59.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: meld -Version: 3.15.3 +Version: 3.16.0 Summary: Visual diff and merge tool Home-page: http://meldmerge.org Author: Kai Willadsen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.3/meld/conf.py new/meld-3.16.0/meld/conf.py --- old/meld-3.15.3/meld/conf.py 2016-04-15 22:43:53.000000000 +0200 +++ new/meld-3.16.0/meld/conf.py 2016-04-30 23:33:52.000000000 +0200 @@ -3,7 +3,7 @@ import sys __package__ = "meld" -__version__ = "3.15.3" +__version__ = "3.16.0" # START; these paths are clobbered on install by meld.build_helpers DATADIR = os.path.join(sys.prefix, "share", "meld") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.3/po/sv.po new/meld-3.16.0/po/sv.po --- old/meld-3.15.3/po/sv.po 2016-04-15 22:43:53.000000000 +0200 +++ new/meld-3.16.0/po/sv.po 2016-04-24 23:52:09.000000000 +0200 @@ -1,24 +1,24 @@ # Swedish messages for meld. -# Copyright © 2005-2015 Free Software Foundation, Inc. +# Copyright © 2005-2016 Free Software Foundation, Inc. # Christian Rose <menthos@menthos.com>, 2005. # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2011. # Sebastian Rasmussen <sebras@gmail.com>, 2015. -# Josef Andersson <josef.andersson@fripost.org>, 2014, 2015. +# Josef Andersson <josef.andersson@fripost.org>, 2014, 2015, 2016. 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: 2016-01-27 13:29+0000\n" -"PO-Revision-Date: 2016-01-27 22:56+0100\n" -"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" +"POT-Creation-Date: 2016-04-15 22:51+0000\n" +"PO-Revision-Date: 2016-03-17 17:04+0100\n" +"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\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.8.6\n" +"X-Generator: Poedit 1.8.4\n" "X-Project-Style: gnome\n" #: ../bin/meld:144 @@ -526,10 +526,14 @@ msgstr "_Hjälp" #: ../data/ui/application.ui.h:8 +msgid "Keyboard Shortcuts" +msgstr "Tangentbordsgenvägar" + +#: ../data/ui/application.ui.h:9 msgid "_About" msgstr "_Om" -#: ../data/ui/application.ui.h:9 +#: ../data/ui/application.ui.h:10 msgid "_Quit" msgstr "_Avsluta" @@ -561,7 +565,7 @@ msgid "Delete selected" msgstr "Ta bort markerade" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1379 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1366 msgid "Hide" msgstr "Dölj" @@ -596,7 +600,7 @@ msgid "Show new" msgstr "Visa nya" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:73 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 msgid "Modified" msgstr "Ändrade" @@ -651,7 +655,7 @@ #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:374 msgid "Name" msgstr "Namn" @@ -721,19 +725,19 @@ #: ../data/ui/filediff.ui.h:14 msgid "Push to Left" -msgstr "Tryck åt vänster" +msgstr "Tryck över åt vänster" #: ../data/ui/filediff.ui.h:15 msgid "Push current change to the left" -msgstr "Tryck aktuell ändring till vänster" +msgstr "Tryck över aktuell ändring till vänster" #: ../data/ui/filediff.ui.h:16 msgid "Push to Right" -msgstr "Tryck åt höger" +msgstr "Tryck över åt höger" #: ../data/ui/filediff.ui.h:17 msgid "Push current change to the right" -msgstr "Tryck aktuell ändring till höger" +msgstr "Tryck över aktuell ändring till höger" #: ../data/ui/filediff.ui.h:18 msgid "Pull from Left" @@ -852,8 +856,8 @@ msgid "Close _without Saving" msgstr "Stäng _utan att spara" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1445 -#: ../meld/filediff.py:1513 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1432 +#: ../meld/filediff.py:1500 msgid "_Cancel" msgstr "_Avbryt" @@ -890,7 +894,7 @@ msgstr "" "Ändringar utförda i följande dokument kommer att gå förlorade för alltid:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1446 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1433 msgid "_Replace" msgstr "_Ersätt" @@ -1128,7 +1132,7 @@ "deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda " "med blanksteg." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filfilter" @@ -1162,7 +1166,252 @@ msgid "Text Filters" msgstr "Textfilter" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:659 +#: ../data/ui/shortcuts.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Allmänt" + +#: ../data/ui/shortcuts.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Ny jämförelse" + +#: ../data/ui/shortcuts.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Stäng en jämförelse" + +#: ../data/ui/shortcuts.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Avsluta Meld" + +#: ../data/ui/shortcuts.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Stoppa den aktuella åtgärden" + +#: ../data/ui/shortcuts.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Uppdatera jämförelse" + +#: ../data/ui/shortcuts.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Helskärm" + +#: ../data/ui/shortcuts.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Flikar" + +#: ../data/ui/shortcuts.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Gå till föregående flik" + +#: ../data/ui/shortcuts.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Gå till nästa flik" + +#: ../data/ui/shortcuts.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Växla till flik" + +#: ../data/ui/shortcuts.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Flytta flik åt vänster" + +#: ../data/ui/shortcuts.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Flytta flik åt höger" + +#: ../data/ui/shortcuts.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Ändringar" + +#: ../data/ui/shortcuts.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Gå till föregående ändring" + +#: ../data/ui/shortcuts.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Gå till nästa ändring" + +#: ../data/ui/shortcuts.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Redigering" + +#: ../data/ui/shortcuts.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Ångra" + +#: ../data/ui/shortcuts.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Gör om" + +#: ../data/ui/shortcuts.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Klipp ut" + +#: ../data/ui/shortcuts.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Kopiera" + +#: ../data/ui/shortcuts.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Klistra in" + +#: ../data/ui/shortcuts.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Sök" + +#: ../data/ui/shortcuts.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Sök nästa" + +#: ../data/ui/shortcuts.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Sök föregående" + +#: ../data/ui/shortcuts.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Ersätt" + +#: ../data/ui/shortcuts.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Filjämförelse" + +#: ../data/ui/shortcuts.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Spara den aktuella filen" + +#: ../data/ui/shortcuts.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Spara den aktuella filen till ny sökväg" + +#: ../data/ui/shortcuts.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Spara alla filer i jämförelse" + +#: ../data/ui/shortcuts.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Föregående konflikt" + +#: ../data/ui/shortcuts.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Nästa konflikt" + +#: ../data/ui/shortcuts.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Tryck över ändring till vänster" + +#: ../data/ui/shortcuts.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Tryck över ändring till höger" + +#: ../data/ui/shortcuts.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Dra ändring från vänster" + +#: ../data/ui/shortcuts.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Dra ändring från höger" + +#: ../data/ui/shortcuts.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Kopiera ändringar ovanför vänster" + +#: ../data/ui/shortcuts.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Kopiera ändringar under vänster" + +#: ../data/ui/shortcuts.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Kopiera ändringar ovanför höger" + +#: ../data/ui/shortcuts.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Kopiera ändringar under höger" + +#: ../data/ui/shortcuts.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Ta bort ändring" + +#: ../data/ui/shortcuts.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Föregående jämförelsepanel" + +#: ../data/ui/shortcuts.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Nästa jämförelsepanel" + +#: ../data/ui/shortcuts.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Mappjämförelse" + +#: ../data/ui/shortcuts.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Kopiera till vänster" + +#: ../data/ui/shortcuts.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Kopiera till höger" + +#: ../data/ui/shortcuts.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Versionshanterad jämförelse" + +#: ../data/ui/shortcuts.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Checka in i versionshanteraren" + +#: ../data/ui/shortcuts.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Visa/dölj konsolutskrift" + +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 msgid "New comparison" msgstr "Ny jämförelse" @@ -1310,7 +1559,7 @@ msgid "Show unversioned files" msgstr "Visa filer som inte versionshanteras" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:66 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 msgid "Ignored" msgstr "Ignorerade" @@ -1379,82 +1628,82 @@ msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 msgid "Size" msgstr "Storlek" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 msgid "Modification time" msgstr "Ändringstid" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 msgid "Permissions" msgstr "Rättigheter" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:538 #, python-format msgid "Hide %s" msgstr "Dölj %s" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:690 +#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Söker igenom %s" -#: ../meld/dirdiff.py:823 +#: ../meld/dirdiff.py:827 #, python-format msgid "[%s] Done" msgstr "[%s] Klar" -#: ../meld/dirdiff.py:831 +#: ../meld/dirdiff.py:835 msgid "Folders have no differences" msgstr "Mapparna skiljer sig inte åt" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:837 msgid "Contents of scanned files in folders are identical." msgstr "Innehållet i mapparnas avsökta filer är identiskt." -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:839 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:838 +#: ../meld/dirdiff.py:842 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:840 +#: ../meld/dirdiff.py:844 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:858 ../meld/filediff.py:1381 ../meld/filediff.py:1411 -#: ../meld/filediff.py:1413 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:862 ../meld/filediff.py:1368 ../meld/filediff.py:1398 +#: ../meld/filediff.py:1400 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Dölj" -#: ../meld/dirdiff.py:868 +#: ../meld/dirdiff.py:872 msgid "Multiple errors occurred while scanning this folder" msgstr "Flera fel inträffade vid avsökning av denna mapp" -#: ../meld/dirdiff.py:869 +#: ../meld/dirdiff.py:873 msgid "Files with invalid encodings found" msgstr "Filer med ogiltiga teckenkodningar hittades" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:875 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:873 +#: ../meld/dirdiff.py:877 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:875 +#: ../meld/dirdiff.py:879 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1462,17 +1711,17 @@ "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. " "En del filer syns inte:" -#: ../meld/dirdiff.py:886 +#: ../meld/dirdiff.py:890 #, python-format msgid "'%s' hidden by '%s'" msgstr "”%s” dolda av ”%s”" -#: ../meld/dirdiff.py:942 +#: ../meld/dirdiff.py:946 #, python-format msgid "Replace folder “%s”?" msgstr "Ersätt mappen ”%s”?" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:948 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1481,11 +1730,11 @@ "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:957 +#: ../meld/dirdiff.py:961 msgid "Error copying file" msgstr "Fel vid filkopiering" -#: ../meld/dirdiff.py:958 +#: ../meld/dirdiff.py:962 #, python-format msgid "" "Couldn't copy %s\n" @@ -1498,101 +1747,100 @@ "\n" "%s" -#: ../meld/dirdiff.py:981 +#: ../meld/dirdiff.py:985 #, python-format msgid "Error deleting %s" msgstr "Fel vid borttagning av %s" -#: ../meld/dirdiff.py:1486 +#: ../meld/dirdiff.py:1492 msgid "No folder" msgstr "Ingen mapp" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:357 msgid "INS" msgstr "INF" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:357 msgid "OVR" msgstr "ÖVR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:359 #, python-format msgid "Ln %i, Col %i" msgstr "Rad %i, kolumn %i" -#: ../meld/filediff.py:792 +#: ../meld/filediff.py:774 msgid "Comparison results will be inaccurate" msgstr "Jämförelseresultat kommer att bli osäkra" -#: ../meld/filediff.py:794 -#, python-format +#: ../meld/filediff.py:776 msgid "" -"Filter “%s” changed the number of lines in the file, which is unsupported. " -"The comparison will not be accurate." +"A filter changed the number of lines in the file, which is unsupported. The " +"comparison will not be accurate." msgstr "" -"Filtret ”%s” ändrade antalet rader i filen vilket inte stöds. Jämförelsen " +"Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen " "kommer att vara osäker." -#: ../meld/filediff.py:852 +#: ../meld/filediff.py:834 msgid "Mark conflict as resolved?" msgstr "Markera konflikten som löst?" -#: ../meld/filediff.py:854 +#: ../meld/filediff.py:836 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:856 +#: ../meld/filediff.py:838 msgid "Cancel" msgstr "Avbryt" -#: ../meld/filediff.py:857 +#: ../meld/filediff.py:839 msgid "Mark _Resolved" msgstr "Markera som _löst" -#: ../meld/filediff.py:1097 +#: ../meld/filediff.py:1084 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1092 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s verkar vara en binärfil." -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1094 msgid "Do you want to open the file using the default application?" msgstr "Vill du öppna filen med standardprogrammet?" -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1096 msgid "Open" msgstr "Öppna" -#: ../meld/filediff.py:1125 +#: ../meld/filediff.py:1112 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beräknar skillnader" -#: ../meld/filediff.py:1190 +#: ../meld/filediff.py:1177 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s har ändrats på disk" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1178 msgid "Do you want to reload the file?" msgstr "Vill du läsa om filen?" -#: ../meld/filediff.py:1193 +#: ../meld/filediff.py:1180 msgid "_Reload" msgstr "_Läs om" -#: ../meld/filediff.py:1344 +#: ../meld/filediff.py:1331 msgid "Files are identical" msgstr "Filerna är identiska" -#: ../meld/filediff.py:1357 +#: ../meld/filediff.py:1344 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1600,11 +1848,11 @@ "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de " "ofiltrerade filerna?" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1349 msgid "Files differ in line endings only" msgstr "Filer skiljer sig endast vad gäller radslut" -#: ../meld/filediff.py:1364 +#: ../meld/filediff.py:1351 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1613,15 +1861,15 @@ "Filerna är identiska förutom radavsluten:\n" "%s" -#: ../meld/filediff.py:1384 +#: ../meld/filediff.py:1371 msgid "Show without filters" msgstr "Visa utan filer" -#: ../meld/filediff.py:1406 +#: ../meld/filediff.py:1393 msgid "Change highlighting incomplete" msgstr "Ändra markering av ofärdiga" -#: ../meld/filediff.py:1407 +#: ../meld/filediff.py:1394 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." @@ -1630,20 +1878,20 @@ "Meld till att längre tid på sig att markera större ändringar, men det kan " "bli långsamt." -#: ../meld/filediff.py:1415 +#: ../meld/filediff.py:1402 msgid "Keep highlighting" msgstr "Använd markering" -#: ../meld/filediff.py:1417 +#: ../meld/filediff.py:1404 msgid "_Keep highlighting" msgstr "_Använd markering" -#: ../meld/filediff.py:1449 +#: ../meld/filediff.py:1436 #, python-format msgid "Replace file “%s”?" msgstr "Ersätt filen ”%s”?" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1438 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1652,45 +1900,45 @@ "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:1468 +#: ../meld/filediff.py:1455 msgid "Save Left Pane As" msgstr "Spara vänsterpanel som" -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1457 msgid "Save Middle Pane As" msgstr "Spara mittenpanel som" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1459 msgid "Save Right Pane As" msgstr "Spara högerpanel som" -#: ../meld/filediff.py:1486 +#: ../meld/filediff.py:1473 #, 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:1488 +#: ../meld/filediff.py:1475 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:1491 +#: ../meld/filediff.py:1478 msgid "Save Anyway" msgstr "Spara ändå" -#: ../meld/filediff.py:1492 +#: ../meld/filediff.py:1479 msgid "Don't Save" msgstr "Spara inte" -#: ../meld/filediff.py:1514 +#: ../meld/filediff.py:1501 msgid "_Save as UTF-8" msgstr "_Spara som UTF-8" -#: ../meld/filediff.py:1517 +#: ../meld/filediff.py:1504 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Kunde inte koda text som ”%s”" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1506 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1699,12 +1947,12 @@ "Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n" "Vill du spara som UTF-8?" -#: ../meld/filediff.py:1556 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1543 ../meld/patchdialog.py:125 #, python-format msgid "Could not save file %s." msgstr "Kunde inte spara filen %s." -#: ../meld/filediff.py:1557 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1544 ../meld/patchdialog.py:126 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1713,11 +1961,11 @@ "Kunde in spara fil beroende på:\n" "%s" -#: ../meld/filediff.py:1903 +#: ../meld/filediff.py:1890 msgid "Live comparison updating disabled" msgstr "Inaktivera realtidsuppdateringar av jämförelser" -#: ../meld/filediff.py:1904 +#: ../meld/filediff.py:1891 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1733,11 +1981,11 @@ msgid "[%s] Merging files" msgstr "[%s] Sammanfogar filer" -#: ../meld/gutterrendererchunk.py:148 +#: ../meld/gutterrendererchunk.py:159 msgid "Copy _up" msgstr "Kopiera _upp" -#: ../meld/gutterrendererchunk.py:149 +#: ../meld/gutterrendererchunk.py:160 msgid "Copy _down" msgstr "Kopiera _ned" @@ -1833,7 +2081,7 @@ msgstr "ogiltig sökväg eller URI ”%s”" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:132 msgid "<unnamed>" msgstr "<namnlös>" @@ -1841,240 +2089,240 @@ msgid "untitled" msgstr "namnlös" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Arkiv" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Ny jämförelse…" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Starta en ny jämförelse" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Spara den aktuella filen" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Spara som…" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Spara den aktuella filen med ett annat namn" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Stäng den aktuella filen" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Redigera" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Ångra den senaste åtgärden" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Gör om den senaste ångrade åtgärden" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Klipp ut markering" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Kopiera markering" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Klistra in Urklipp" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Sök…" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Sök efter text" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Sök _nästa" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Sök framåt efter samma text" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Sök _Föregående" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Sök bakåt efter samma text" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "_Ersätt…" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Sök och ersätt text" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "Än_dringar" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Nästa ändring" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Gå till nästa ändring" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Föregående ändring" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Gå till föregående ändring" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Öppna externt" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "Öppna markerad fil eller katalog i det externa standardprogrammet" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Visa" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Filstatus" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Stoppa den aktuella åtgärden" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Uppdatera vyn" -#: ../meld/meldwindow.py:111 +#: ../meld/meldwindow.py:112 msgid "_Tabs" msgstr "_Flikar" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "_Previous Tab" msgstr "För_egående flik" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "Activate previous tab" msgstr "Aktivera föregående flik" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Next Tab" msgstr "_Nästa flik" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Activate next tab" msgstr "Aktivera nästa flik" -#: ../meld/meldwindow.py:119 +#: ../meld/meldwindow.py:120 msgid "Move Tab _Left" msgstr "Flytta flik åt _vänster" -#: ../meld/meldwindow.py:120 +#: ../meld/meldwindow.py:121 msgid "Move current tab to left" msgstr "Flytta aktuell flik åt vänster" -#: ../meld/meldwindow.py:123 +#: ../meld/meldwindow.py:124 msgid "Move Tab _Right" msgstr "Flytta flik åt _höger" -#: ../meld/meldwindow.py:124 +#: ../meld/meldwindow.py:125 msgid "Move current tab to right" msgstr "Flytta aktuell flik åt höger" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Helskärm" -#: ../meld/meldwindow.py:129 +#: ../meld/meldwindow.py:130 msgid "View the comparison in fullscreen" msgstr "Visa jämförelsen i helskärmsläge" -#: ../meld/meldwindow.py:131 +#: ../meld/meldwindow.py:132 msgid "_Toolbar" msgstr "Ver_ktygsfält" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:133 msgid "Show or hide the toolbar" msgstr "Visa eller dölj verktygsfältet" -#: ../meld/meldwindow.py:142 +#: ../meld/meldwindow.py:143 msgid "Open Recent" msgstr "Öppna senaste" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:144 msgid "Open recent files" msgstr "Öppna senaste filer" -#: ../meld/meldwindow.py:165 +#: ../meld/meldwindow.py:166 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:167 msgid "Quit the program" msgstr "Avsluta programmet" -#: ../meld/meldwindow.py:168 +#: ../meld/meldwindow.py:169 msgid "Prefere_nces" msgstr "Inställ_ningar" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:170 msgid "Configure the application" msgstr "Konfigurera programmet" -#: ../meld/meldwindow.py:171 +#: ../meld/meldwindow.py:172 msgid "_Contents" msgstr "_Innehåll" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:173 msgid "Open the Meld manual" msgstr "Öppna handboken för Meld" -#: ../meld/meldwindow.py:174 +#: ../meld/meldwindow.py:175 msgid "About this application" msgstr "Om detta program" -#: ../meld/meldwindow.py:578 +#: ../meld/meldwindow.py:587 msgid "Switch to this tab" msgstr "Växla till denna flik" -#: ../meld/meldwindow.py:693 +#: ../meld/meldwindow.py:702 #, 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:707 +#: ../meld/meldwindow.py:716 msgid "Cannot compare a mixture of files and directories" msgstr "Kan inte jämföra en blandning av filer och kataloger" -#: ../meld/misc.py:168 +#: ../meld/misc.py:202 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2082,7 +2330,7 @@ "installation" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:255 +#: ../meld/misc.py:287 msgid "[None]" msgstr "[Ingen]" @@ -2098,7 +2346,7 @@ msgid "Version control:" msgstr "Versionshantering:" -#: ../meld/ui/notebooklabel.py:68 +#: ../meld/ui/notebooklabel.py:63 msgid "Close tab" msgstr "Stäng flik" @@ -2129,16 +2377,16 @@ msgstr[0] "%d gren" msgstr[1] "%d grenar" -#: ../meld/vc/git.py:350 +#: ../meld/vc/git.py:352 #, python-format msgid "Mode changed from %s to %s" msgstr "Läge ändrat från %s till %s" -#: ../meld/vc/git.py:358 +#: ../meld/vc/git.py:360 msgid "Partially staged" msgstr "Delvis köad" -#: ../meld/vc/git.py:358 +#: ../meld/vc/git.py:360 msgid "Staged" msgstr "Köad" @@ -2153,51 +2401,51 @@ msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:52 msgid "Merged" msgstr "Sammanfogade" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:52 msgid "Base" msgstr "Bas" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:52 msgid "Local" msgstr "Lokal" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:52 msgid "Remote" msgstr "Fjärr" -#: ../meld/vc/_vc.py:67 +#: ../meld/vc/_vc.py:68 msgid "Unversioned" msgstr "Oversionerad" -#: ../meld/vc/_vc.py:70 +#: ../meld/vc/_vc.py:71 msgid "Error" msgstr "Fel" -#: ../meld/vc/_vc.py:72 +#: ../meld/vc/_vc.py:73 msgid "Newly added" msgstr "Nyligen tillagt" -#: ../meld/vc/_vc.py:74 +#: ../meld/vc/_vc.py:75 msgid "Renamed" msgstr "Bytt namn" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:76 msgid "Conflict" msgstr "Konflikt" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:77 msgid "Removed" msgstr "Borttagen" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:78 msgid "Missing" msgstr "Saknas" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:79 msgid "Not present" msgstr "Inte närvarande"
participants (1)
-
root＠hilbert.suse.de