Index: trunk/l10n-kf5/sv/docmessages/extragear-utils/kdiff3.po =================================================================== --- trunk/l10n-kf5/sv/docmessages/extragear-utils/kdiff3.po (revision 1559205) +++ trunk/l10n-kf5/sv/docmessages/extragear-utils/kdiff3.po (revision 1559206) @@ -1,7722 +1,7748 @@ # translation of kdiff3.po to Swedish # # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # Stefan Asserhäll , 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2019-12-30 02:51+0000\n" -"PO-Revision-Date: 2019-12-30 13:05+0100\n" +"PO-Revision-Date: 2019-12-30 15:19+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 19.04.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #. Tag: title #: index.docbook:16 #, no-c-format msgid "The &kdiff3; Handbook" msgstr "Handbok &kdiff3;" #. Tag: othercredit #: index.docbook:19 #, no-c-format #| msgid "Joachim Eibl" msgid "Michael Reeves" msgstr "Michael Reeves" #. Tag: email #: index.docbook:23 #, no-c-format msgid "reeves.87@gmail.com" msgstr "reeves.87@gmail.com" #. Tag: othercredit #: index.docbook:26 #, no-c-format msgid "Joachim Eibl" msgstr "Joachim Eibl" #. Tag: email #: index.docbook:30 #, no-c-format msgid "joachim.eibl at gmx.de" msgstr "joachim.eibl snabela gmx.de" #. Tag: trans_comment #: index.docbook:33 #, no-c-format msgid "ROLES_OF_TRANSLATORS" msgstr "" "StefanAsserhäll
stefan." "asserhall@bredband.net
Översättare" #. Tag: holder #: index.docbook:38 #, no-c-format msgid "Joachim Eibl" msgstr "Joachim Eibl" #. Tag: holder #: index.docbook:42 #, no-c-format msgid "Michael Reeves" msgstr "Michael Reeves" #. Tag: date #: index.docbook:56 #, no-c-format msgid "2019-02-22" msgstr "2019-02-22" #. Tag: releaseinfo #: index.docbook:57 #, no-c-format #| msgid "1.08.00" msgid "1.08.70" msgstr "1.08.70" #. Tag: para #: index.docbook:61 #, no-c-format msgid "&kdiff3; is a file and directory diff and merge tool which" msgstr "" "&kdiff3; är ett verktyg för jämförelser och sammanfogning av filer och " "kataloger, som" #. Tag: para #: index.docbook:64 #, no-c-format msgid "compares and merges two or three text input files or directories," msgstr "" "jämför och sammanfogar två eller tre indatafiler med text eller kataloger," #. Tag: para #: index.docbook:65 #, no-c-format msgid "shows the differences line by line and character by character(!)," msgstr "visar skillnaden rad-för-rad och tecken-för-tecken(!)," #. Tag: para #: index.docbook:66 #, no-c-format msgid "provides an automatic merge-facility," msgstr "tillhandahåller en automatisk sammanfogningsfunktion," #. Tag: para #: index.docbook:67 #, no-c-format msgid "has an editor for comfortable solving of merge-conflicts," msgstr "har en editor för bekväm upplösning av sammanfogningskonflikter," #. Tag: para #: index.docbook:68 #, no-c-format #| msgid "provides networktransparency via KIO," msgid "provides network transparency via KIO," msgstr "erbjuder nätverkstransparens via KIO," #. Tag: para #: index.docbook:69 #, no-c-format msgid "has options to highlight or hide changes in white-space or comments," msgstr "" "har alternativ för att färglägga eller dölja ändringar av blanktecken och " "kommentarer," #. Tag: para #: index.docbook:70 #, no-c-format msgid "supports Unicode, UTF-8 and other file encodings," msgstr "stöder Unicode, UTF-8 och andra filkodningar," #. Tag: para #: index.docbook:71 #, no-c-format msgid "prints differences," msgstr "skriver ut skillnader," #. Tag: para #: index.docbook:72 #, no-c-format msgid "supports version control keyword and history merging." msgstr "stöder versionshanteringsnyckelord och historiksammanfogning." #. Tag: para #: index.docbook:74 #, no-c-format msgid "This document describes &kdiff3;-version 1.8." msgstr "Det här dokumentet beskriver &kdiff3; version 1.8." #. Tag: keyword #: index.docbook:84 #, no-c-format msgid "KDE" msgstr "KDE" #. Tag: keyword #: index.docbook:85 #, no-c-format msgid "kdiff3" msgstr "kdiff3" #. Tag: keyword #: index.docbook:86 #, no-c-format msgid "diff" msgstr "diff" #. Tag: keyword #: index.docbook:87 #, no-c-format msgid "merge" msgstr "sammanfoga" #. Tag: keyword #: index.docbook:88 #, no-c-format msgid "CVS" msgstr "CVS" #. Tag: keyword #: index.docbook:89 #, no-c-format #| msgid "triplediff" msgid "triple diff" msgstr "trippeljämförelse" #. Tag: keyword #: index.docbook:90 #, no-c-format msgid "compare" msgstr "jämföra" #. Tag: keyword #: index.docbook:91 #, no-c-format msgid "files" msgstr "filer" #. Tag: keyword #: index.docbook:92 #, no-c-format msgid "directories" msgstr "kataloger" #. Tag: keyword #: index.docbook:93 #, no-c-format msgid "version control" msgstr "versionshantering" #. Tag: keyword #: index.docbook:94 #, no-c-format msgid "three-way-merge" msgstr "trevägs sammanfogning" #. Tag: keyword #: index.docbook:95 #, no-c-format msgid "in-line-differences" msgstr "skillnader på plats" #. Tag: keyword #: index.docbook:96 #, no-c-format msgid "synchronise" msgstr "synkronisera" #. Tag: keyword #: index.docbook:97 #, no-c-format msgid "kpart" msgstr "kpart" #. Tag: keyword #: index.docbook:98 #, no-c-format msgid "kio" msgstr "kio" #. Tag: keyword #: index.docbook:99 #, no-c-format #| msgid "networktransparent" msgid "network transparent" msgstr "nätverkstransparent" #. Tag: keyword #: index.docbook:100 #, no-c-format msgid "editor" msgstr "editor" #. Tag: keyword #: index.docbook:101 #, no-c-format msgid "white space" msgstr "blanktecken" #. Tag: keyword #: index.docbook:102 #, no-c-format msgid "comments" msgstr "kommentarer" #. Tag: title #: index.docbook:107 #, no-c-format msgid "Introduction" msgstr "Inledning" #. Tag: title #: index.docbook:108 #, no-c-format msgid "Yet Another Diff Frontend?" msgstr "Ännu ett jämförelsegränssnitt?" #. Tag: para #: index.docbook:109 #, no-c-format msgid "" "Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I " "wrote it." msgstr "" "Det finns flera grafiska jämförelseverktyg. Varför ska du välja &kdiff3;? " "Låt mig tala om varför jag skrev det." #. Tag: para #: index.docbook:111 #, no-c-format msgid "" "&kdiff3; started because I had to do a difficult merge. Merging is necessary " "when several people work on the same files in a project. A merge can be " "somewhat automated, when the merge-tool not only has the new modified files " "(called \"branches\"), but also the original file (called \"base\"). The " "merge tool will automatically choose any modification that was only done in " "one branch. When several contributors change the same lines, then the merge " "tool detects a conflict which must be solved manually." msgstr "" "&kdiff3; påbörjades därför att jag var tvungen att göra en svår " "sammanfogning. Att sammanfoga är nödvändigt när flera personer arbetar med " "samma fil i ett projekt. En sammanfogning kan vara delvis automatiserad, när " "sammanfogningsverktyget inte bara har tillgång till de nya ändrade filerna " "(som kallas \"grenar\"), utan också originalfilen (som kallas \"bas\"). " "Sammanfogningsverktyget väljer automatiskt en ändring som bara gjorts i en " "gren. När flera bidragsgivare ändrar samma rader, detekterar " "sammanfogningsverktyget en konflikt som måste lösas manuellt." #. Tag: para #: index.docbook:118 #, no-c-format msgid "" "The merge then was difficult because one contributor had changed many things " "and corrected the indentation in many places. Another contributor also had " "changed much text in the same file, which resulted in several merge " "conflicts." msgstr "" "Sammanfogningen var svår eftersom en bidragsgivare hade ändrat mycket och " "rättat indenteringen på många ställen. Den andra bidragsgivaren hade också " "ändrat mycket text i samma fil, vilket orsakade flera konflikter vid " "sammanfogningen." #. Tag: para #: index.docbook:122 #, no-c-format msgid "" "The tool I used then, only showed the changed lines, but not what had " "changed within these lines. And there was no information about where only " "the indentation was changed. The merge was a little nightmare." msgstr "" "Verktyget som jag då använde visade bara ändrade rader, men inte vad som " "hade ändrats inom raden. Det fanns inte heller någon information om var bara " "indenteringen hade ändrats. Sammanfogningen var en mindre mardröm." #. Tag: para #: index.docbook:126 #, no-c-format msgid "" "So this was the start. The first version could show differences within a " "line and showed white space differences. Later many other features were " "added to increase the usefulness." msgstr "" "Det var alltså början. Den första versionen kunde visa skillnader på en rad, " "och visade skillnader i blanktecken. Senare tillkom många funktioner för att " "öka användbarheten." #. Tag: para #: index.docbook:129 #, no-c-format msgid "" "For example if you want to compare some text quickly, then you can copy it " "to the clipboard and paste it into either diff window." msgstr "" "Om du till exempel snabbt vill jämföra en text, kan du kopiera den till " "klippbordet och klistra in i endera jämförelsefönstret." #. Tag: para #: index.docbook:132 #, no-c-format msgid "" "A feature that required a big effort was the directory comparison and merge " "facility, which turned the program almost into a full file browser." msgstr "" "En funktion som krävde en stor ansträngning var funktionen för " "katalogjämförelse och sammanfogning, som gjorde programmet till en nästan " "fullständig filbläddrare." #. Tag: para #: index.docbook:135 #, no-c-format msgid "I hope &kdiff3; works for you too. Have fun!" msgstr "Jag hoppas att &kdiff3; fungerar för dig, också. Ha det så kul!" #. Tag: para #: index.docbook:137 #, no-c-format msgid "Joachim Eibl (2003)" msgstr "Joachim Eibl (2003)" #. Tag: title #: index.docbook:142 #, no-c-format msgid "Screenshots and Features" msgstr "Skärmbilder och funktioner" #. Tag: para #: index.docbook:143 #, no-c-format #| msgid "This screenshot shows the difference between two text files" msgid "" "This screenshot shows the difference between two text files (using an early " "version of &kdiff3;):" msgstr "" "Den här skärmbilden visar skillnaden mellan två textfiler (med en tidig" " version av &kdiff3;)" #. Tag: para #: index.docbook:148 #, no-c-format msgid "" "3-way-merging is fully supported. This is useful if two people change code " "independently. The original file (the base) is used to help &kdiff3; to " "automatically select the correct changes. The merge-editor below the diff-" "windows allows you to solve conflicts, while showing you the output you will " "get. You can even edit the output. This screenshot shows three input files " "being merged:" msgstr "" "Trevägs sammanfogning stöds fullständigt. Den är användbar om två personer " "ändrar kod oberoende av varandra. Originalfilen (basen) används för att " "hjälpa &kdiff3; att automatiskt välja de riktiga ändringarna. " "Sammanfogningseditorn under jämförelsefönstren låter dig lösa konflikter, " "medan utdata du kommer att få visas. Skärmbilden visar tre indatafiler som " "håller på att' sammanfogas:" #. Tag: para #: index.docbook:161 #, no-c-format msgid "" "&kdiff3; also helps you to compare and merge complete directories. This " "screenshot shows &kdiff3; during a directory merge:" msgstr "" "&kdiff3; hjälper dig också att jämföra och sammanfoga hela kataloger. Den " "här skärmbilden visar &kdiff3; under en katalogsammanfogning:" #. Tag: title #: index.docbook:170 #, no-c-format msgid "More Features" msgstr "Mer funktioner" #. Tag: title #: index.docbook:171 #, no-c-format msgid "Line-By-Line And Char-By-Char Diff-Viewer" msgstr "Rad-för-rad och tecken-för-tecken jämförelsevisning" #. Tag: para #: index.docbook:172 #, no-c-format msgid "" "By using the possibilities of a graphical color display &kdiff3; shows " "exactly what the difference is. When you have to do many code-reviews, you " "will like this." msgstr "" "Genom att använda möjligheterna hos en grafisk färgskärm, visar &kdiff3; " "exakt vad skillnaderna är. När du måste göra många kodgranskningar, gillar " "du det här." #. Tag: title #: index.docbook:180 #, no-c-format msgid "See White-Space Differences At One Glance" msgstr "Se skillnader i blanktecken med en blick" #. Tag: para #: index.docbook:181 #, no-c-format msgid "" "Spaces and tabs that differ appear visibly. When lines differ only in the " "amount of white space this can be seen at one look in the summary column on " "the left side. (No more worries when people change the indentation.)" msgstr "" "Mellanslag och tabulatorer som skiljer sig åt syns. När rader bara skiljer " "sig i mängden blanktecken syns det med en blick i sammanfattningskolumnen " "till vänster. (Inga mer problem om någon ändrar indenteringen.)" #. Tag: title #: index.docbook:190 #, no-c-format msgid "Triple-Diff" msgstr "Trevägsjämförelse" #. Tag: para #: index.docbook:191 #, no-c-format msgid "Analyze three files and see where they differ." msgstr "Analysera tre filer och se var de skiljer sig åt." #. Tag: para #: index.docbook:192 #, no-c-format #| msgid "" #| "The left/middle/right windows are named A/B/C and have the blue/green/" #| "magenta color respectively." msgid "" "The left/middle/right windows are named A/B/C and have the blue/green/magenta color " "respectively." msgstr "" "Vänster/mitten/höger fönster kallas A/B<" "/guilabel>/C och har blå/grön/magenta färg." #. Tag: para #: index.docbook:194 #, no-c-format msgid "" "If one file is the same and one file is different on a line then the color " "shows which file is different. The red color means that both other files are " "different." msgstr "" "Om en fil är likadan och en annan annorlunda för en rad, så visar färgerna " "vilken fil som är annorlunda. Den röda färgen betyder att båda de andra " "filerna är olika." #. Tag: title #: index.docbook:204 #, no-c-format msgid "Comfortable Merge Of Two Or Three Input Files" msgstr "Bekväm sammanfogning av två eller tre indatafiler" #. Tag: para #: index.docbook:205 #, no-c-format #| msgid "" #| "&kdiff3; can be used to merge two or three input files and automatically " #| "merges as much as possible. The result is presented in an editable window " #| "where most conflicts can be solved with a single mouseclick: Select the " #| "buttons A/B/C from the button-bar to select the source that should be " #| "used. You can also select more than one source. Since this output window " #| "is an editor even conflicts which need further corrections can be solved " #| "here without requiring another tool." msgid "" "&kdiff3; can be used to merge two or three input files and automatically " "merges as much as possible. The result is presented in an editable window " "where most conflicts can be solved with a single mouseclick: Select the " "respective ... buttons at the A/ " "B/C windows to select the source " "that should be used. You can also select more than one source. Since this " "output window is an editor even conflicts which need further corrections can " "be solved here without requiring another tool." msgstr "" "&kdiff3; kan användas för att sammanfoga två eller tre indatafiler och" " sammanfogar automatiskt så mycket som möjligt. Resultatet visas i ett" " redigerbart fönster där de flesta konflikter kan lösas med ett enda" " musklick. Välj knapparna ... i respektive fönster <" "guilabel>A/B/C för att" " välja källan som ska användas. Du kan också välja mer än en källa. Eftersom" " utmatningsfönstret är en editor, kan till och med konflikter som behöver" " ytterligare korrigering lösas här utan att kräva ett annat verktyg." #. Tag: title #: index.docbook:216 #, no-c-format msgid "And ..." msgstr "Och ..." #. Tag: para #: index.docbook:218 #, no-c-format msgid "Fast navigation via buttons." msgstr "Snabb navigering via knappar." #. Tag: para #: index.docbook:219 #, no-c-format msgid "" "A mouse-click into a summary column sync's all windows to show the same " "position." msgstr "" "Ett musklick i sammanfattningskolumnen synkroniserar alla fönster så att " "samma position visas." #. Tag: para #: index.docbook:220 #, no-c-format msgid "Select and copy from any window and paste into the merge result window." msgstr "" "Markera och kopiera från vilket fönster som helst, och klistra in i " "resultatfönstret för sammanfogning." #. Tag: para #: index.docbook:221 #, no-c-format msgid "Overview column that shows where the changes and conflicts are." msgstr "Översiktskolumn som visar var ändringar och konflikter finns." #. Tag: para #: index.docbook:222 #, no-c-format msgid "The colors are adjustable to your specific preferences." msgstr "Färgerna kan justeras enligt dina specifika önskemål." #. Tag: para #: index.docbook:223 #, no-c-format msgid "Adjustable Tab size." msgstr "Justerbar flikstorlek." #. Tag: para #: index.docbook:224 #, no-c-format msgid "Option to insert spaces instead of tabs." msgstr "Alternativ för att infoga mellanslag istället för tabulatortecken." #. Tag: para #: index.docbook:225 #, no-c-format msgid "Open files comfortably via dialog or specify files on the command line." msgstr "" "Öppna filer bekvämt via dialogrutor, eller ange filnamn på kommandoraden." #. Tag: para #: index.docbook:226 #, no-c-format msgid "" "Search for strings in all text windows with EditFind (&Ctrl;" "F) and EditFind Next (F3) menu items." msgstr "" +"Sök efter strängar i alla textfönster med menyalternativen <" +"guimenu>RedigeraSök (<" +"keycombo>&Ctrl;F) och RedigeraSök nästa (F3)." #. Tag: para #: index.docbook:227 #, no-c-format msgid "Show the line numbers for each line." msgstr "Visa radnummer för varje rad." #. Tag: para #: index.docbook:228 #, no-c-format msgid "Paste clipboard or drag text into a diff input window." msgstr "" "Klistra in klippbordet eller dra text till ett indatafönster för jämförelse" #. Tag: para #: index.docbook:229 #, no-c-format #| msgid "Networktransparency via KIO." msgid "Network transparency via KIO." msgstr "Nätverkstransparens via KIO." #. Tag: para #: index.docbook:230 #, no-c-format #| msgid "Can be used as diff-viewer in KDevelop 3." msgid "Can be used as diff-viewer from the &kdevelop; 3." msgstr "Kan användas för jämförelsevisning i &kdevelop; 3." #. Tag: para #: index.docbook:231 #, no-c-format msgid "Word-wrap for long lines." msgstr "Radbrytning för långa rader." #. Tag: para #: index.docbook:232 #, no-c-format msgid "Support for Unicode, UTF-8 and other codecs." msgstr "Stöd för Unicode, UTF-8 och andra kodningar." #. Tag: para #: index.docbook:233 #, no-c-format msgid "Support for right to left languages." msgstr "Stöd för språk som läses från höger till vänster." #. Tag: para #: index.docbook:234 index.docbook:1153 #, no-c-format msgid "..." msgstr "..." #. Tag: title #: index.docbook:240 #, no-c-format msgid "File Comparison And Merge" msgstr "Filjämförelse och sammanfogning" #. Tag: title #: index.docbook:242 #, no-c-format msgid "Command-Line Options" msgstr "Kommandoradsväljare" #. Tag: title #: index.docbook:244 #, no-c-format msgid "Comparing 2 files:" msgstr "Jämföra två filer:" #. Tag: screen #: index.docbook:245 #, no-c-format msgid "kdiff3 file1 file2" msgstr "kdiff3 fil1 fil2" #. Tag: title #: index.docbook:248 #, no-c-format msgid "Merging 2 files:" msgstr "Sammanfoga två filer:" #. Tag: screen #: index.docbook:249 #, no-c-format msgid "" "kdiff3 file1 file2 -m\n" " kdiff3 file1 file2 -o " "outputfile" msgstr "" "kdiff3 fil1 fil2 -m\n" " kdiff3 fil1 fil2 -o " "utdatafil" #. Tag: title #: index.docbook:252 #, no-c-format msgid "Comparing 3 files:" msgstr "Jämföra tre filer:" #. Tag: screen #: index.docbook:253 #, no-c-format msgid "kdiff3 file1 file2 file3" msgstr "kdiff3 fil1 fil2 fil3" #. Tag: title #: index.docbook:256 #, no-c-format msgid "Merging 3 files:" msgstr "Sammanfoga tre filer:" #. Tag: screen #: index.docbook:257 #, no-c-format msgid "" "kdiff3 file1 file2 file3 -m\n" " kdiff3 file1 file2 file3 -o " "outputfile" msgstr "" "kdiff3 fil1 fil2 fil3 -m\n" " kdiff3 fil1 fil2 fil3 -o " "utdatafil" #. Tag: para #: index.docbook:258 #, no-c-format msgid "" "Note that file1 will be treated as base of " "file2 and file3." msgstr "" "Observera att fil1 behandlas som bas för " "fil2 och fil3." #. Tag: title #: index.docbook:265 #, no-c-format msgid "Special case: Files with the same name" msgstr "Specialfall: Filer med samma namn" #. Tag: para #: index.docbook:266 #, no-c-format #| msgid "" #| "If all files have the same name but are in different directories, you can " #| "reduce typework by specifying the filename only for the first file. E.g.:" msgid "" "If all files have the same name but are in different directories, you can " "reduce typework by specifying the filename only for the first file, ⪚:" msgstr "" "Om alla filer har samma namn men finns i olika kataloger, kan du reducera " "hur mycket du måste skriva genom att bara ange filnamnet för den första " "filen. T.ex.:" #. Tag: screen #: index.docbook:270 #, no-c-format msgid "" "kdiff3 dir1/filename dir2 dir3" msgstr "" "kdiff3 kat1/filnamn kat2 kat3" #. Tag: title #: index.docbook:273 #, no-c-format msgid "Commandline for starting a directory comparison or merge:" msgstr "Kommandorad för att starta en katalogjämförelse eller sammanfogning:" #. Tag: para #: index.docbook:274 #, no-c-format msgid "This is very similar, but now it's about directories." msgstr "Det här är mycket likt, men nu handlar det om kataloger." #. Tag: screen #: index.docbook:275 #, no-c-format msgid "" "kdiff3 dir1 dir2\n" " kdiff3 dir1 dir2 -o " "destdir\n" " kdiff3 dir1 dir2 dir3\n" " kdiff3 dir1 dir2 dir3 -o " "destdir" msgstr "" "kdiff3 kat1 kat2\n" " kdiff3 kat1 kat2 -o " "målkat\n" " kdiff3 kat1 kat2 kat3\n" " kdiff3 kat1 kat2 kat3 -o " "målkat" #. Tag: para #: index.docbook:276 #, no-c-format msgid "" "For directory comparison and merge you can continue to read here." msgstr "" "För katalogjämförelse och sammanfogning kan du fortsätta att läsa här." #. Tag: title #: index.docbook:279 #, no-c-format msgid "Other command line options" msgstr "Andra kommandoradsväljare" #. Tag: para #: index.docbook:280 #, no-c-format msgid "To see all available command line options type" msgstr "För att se alla tillgängliga kommandoradsväljare, skriv" #. Tag: screen #: index.docbook:281 #, no-c-format msgid "kdiff3 --help" msgstr "kdiff3 --help" #. Tag: para #: index.docbook:282 #, no-c-format msgid "Example output:" msgstr "Exempel på utmatning:" #. Tag: screen #: index.docbook:283 #, no-c-format msgid "" "Options:\n" " -m, --merge Merge the input.\n" " -b, --base file Explicit base file. For compatibility with " "certain tools.\n" " -o, --output file Output file. Implies -m. E.g.: -o newfile.txt\n" " --out file Output file, again. (For compatibility with " "certain tools.)\n" " --auto No GUI if all conflicts are auto-solvable. " "(Needs -o file)\n" " --qall Don't solve conflicts automatically. (For " "compatibility...)\n" " --L1 alias1 Visible name replacement for input file 1 " "(base).\n" " --L2 alias2 Visible name replacement for input file 2.\n" " --L3 alias3 Visible name replacement for input file 3.\n" " -L, --fname alias Alternative visible name replacement. Supply " "this once for every input.\n" " --cs string Override a config setting. Use once for every " "setting. E.g.: --cs \"AutoAdvance=1\"\n" " --confighelp Show list of config settings and current " "values.\n" " --config file Use a different config file." msgstr "" "Väljare:\n" " -m, --merge Sammanfoga indata.\n" " -b, --base file Explicit basfil. För att fungera tillsammans med " "vissa verktyg.\n" " -o, --output file Utdatafil. Betyder underförstått -m. T.ex.: -o " "ny_fil.txt\n" " --out file Utdatafil, igen. (för att fungera med vissa " "verktyg.)\n" " --auto Inget grafiskt gränssnitt om alla konflikter kan " "lösas automatiskt (kräver -o fil)\n" " --qall Lös inte konflikter automatiskt. (För att " "fungera med andra verktyg...)\n" " --L1 alias1 Synlig ersättning av namn för indatafil 1 " "(bas).\n" " --L2 alias2 Synlig ersättning av namn för indatafil 2.\n" " --L3 alias3 Synlig ersättning av namn för indatafil 3.\n" " -L, --fname alias Alternativ synlig ersättning av namn. Ange detta " "en gång för all indata.\n" " --cs string Överskrid en inställning. Använd en gång för " "varje inställning, t.ex. --cs \"AutoAdvance=1\"\n" " --confighelp Visa lista med inställningar och nuvarande " "värden.\n" " --config file Använd en annan inställningsfil." #. Tag: para #: index.docbook:284 #, no-c-format msgid "" "The option allows you to adjust a configuration value " "that is otherwise only adjustable via the configure dialogs. But be aware " "that when &kdiff3; then terminates the changed value will be stored along " "with the other settings. With you can find out " "the names of the available items and current values." msgstr "" "Väljaren låter dig justera ett inställningsalternativ " "som annars bara kan justeras via inställningsdialogrutorna. Men var medveten " "om att när &kdiff3; avslutas lagras det ändrade värdet tillsammans med andra " "inställningar. Med kan du ta reda på namnen på " "tillgängliga alternativ och nuvarande värden." #. Tag: para #: index.docbook:287 #, no-c-format msgid "" "Via you can specify a different config file. When " "you often use &kdiff3; with completely different setups this allows you to " "easily switch between them." msgstr "" "Via kan du ange en annan inställningsfil. Om du " "ofta använder &kdiff3; med helt olika inställningar låter det dig enkelt " "byta mellan dem." #. Tag: title #: index.docbook:290 #, no-c-format msgid "Ignorable command line options" msgstr "Kommandoradsväljare som ignoreras" #. Tag: para #: index.docbook:291 #, no-c-format #| msgid "" #| "Many people want to use &kdiff3; with some version control system. But " #| "when that version control system calls &kdiff3; using command line " #| "parameters that &kdiff3; doesn't recognise, then &kdiff3; terminates with " #| "an error. The integration settings allow to specify command line " #| "parameters that should be ignored by &kdiff3;. They will appear in the " #| "usage help like in this example:" msgid "" "Many people want to use &kdiff3; with some version control system. But when " "that version control system calls &kdiff3; using command line parameters " "that &kdiff3; doesn't recognise, then &kdiff3; terminates with an error. The " "Integration item in the settings dialog allow to " "specify command line parameters that should be ignored by &kdiff3;. They " "will appear in the usage help like in this example:" msgstr "" "Många personer vill använda &kdiff3; tillsammans med något" " versionshanteringssystem, men när versionshanteringssystemet anropar" " &kdiff3; med kommandoradsväljare som &kdiff3; inte känner igen, avslutas" " &kdiff3; med ett fel. Alternativet Integration i" " inställningsdialogrutan gör det möjligt att ange kommandoradsväljare som ska" " ignoreras av &kdiff3;. De visas i användningshjälpen som i det här exemplet:" #. Tag: screen #: index.docbook:294 #, no-c-format msgid "" "--foo Ignored. (User defined.)" msgstr "" "--väljare Ignoreras. " "(anvädardefinierad)" #. Tag: guilabel #: index.docbook:296 #, no-c-format msgid "Command line options to ignore:" msgstr "Kommandoradsväljare att ignorera:" #. Tag: para #: index.docbook:296 #, no-c-format #| msgid "" #| "A list of options, separated via semicolon ';'. When one of these options " #| "appears on the commandline, then &kdiff3; will ignore it and run without " #| "reporting an error. (Default is \"u;query;html;abort\")." msgid "" "A list of options, separated via semicolon ';'. When one of these options " "appears on the commandline, then &kdiff3; will ignore it and run without " "reporting an error. (Default is \"u;query;html;abort\")." msgstr "" "En lista med väljare, åtskilda med semikolon ';'. När en av dessa väljare " "finns på kommenderaden, ignorerar &kdiff3; den och kör utan att rapportera " "ett fel. (Förval är u;query;html;abort)." #. Tag: para #: index.docbook:301 #, no-c-format msgid "" "When this isn't enough, then it is recommended to write a shell script that " "does the option translation." msgstr "" "Om det inte är nog, rekommenderas du att skriva ett skalskript som gör " "översättningen av väljare." #. Tag: title #: index.docbook:306 #, no-c-format msgid "Open-Dialog" msgstr "Dialogrutan Öppna" #. Tag: para #: index.docbook:307 #, no-c-format msgid "" "Since many input files must be selectable, the program has a special open " "dialog:" msgstr "" "Eftersom många indatafiler måste kunna väljas, har programmet en särskild " "öppningsdialogruta:" #. Tag: para #: index.docbook:313 #, no-c-format #| msgid "" #| "The open dialog allows you to edit the filenames by hand, selecting a " #| "file via the file-browser (\"File...\") or allows you to choose recent " #| "files from the drop-down lists. If you open the dialog again, then the " #| "current names still remain there. The third input file is not required. " #| "If the entry for \"C\" remains empty, then only a two file diff analysis " #| "will be done." msgid "" "The open dialog allows you to edit the filenames by hand, selecting a file " "via the file-browser via the File... button or allows " "you to choose recent files from the drop-down lists. If you open the dialog " "again, then the current names still remain there. The third input file is " "not required. If the entry for C remains empty, then " "only a two file diff analysis will be done." msgstr "" "Öppningsdialogrutan tillåter att filnamnen redigeras för hand, att en fil" " väljes via filbläddraren med knappen Fil... eller att" " senast använda filer väljes i kombinationsrutorna. Om du öppnar dialogrutan" " igen, finns de nuvarande namnen fortfarande där. Den tredje indatafilen" " krävs inte. Om fältet för C förblir tomt, görs bara en" " tvåvägs jämförelseanalys." #. Tag: para #: index.docbook:320 #, no-c-format #| msgid "" #| "You can also select a directory via \"Dir...\". If for A a directory is " #| "specified then a directory-comparison/merge starts. If A specifies a file " #| "but B, C or the output specify a directory, then &kdiff3; uses the " #| "filename from A in the specified directories." msgid "" "You can also select a directory via the Dir... " "button. If for A a directory is specified then a " "directory-comparison /merge starts. If A specifies a " "file but B, C or the output " "specify a directory, then &kdiff3; uses the filename from A in the specified directories." msgstr "" "Du kan också välja en katalog med knappen Katalog...." " Om en katalog anges för A, startar en katalogjämförelse" " och sammanfogning. Om A anger en fil, men B<" "/guilabel>, C eller utmatningen anger en katalog," " använder &kdiff3; filnamnet från A i de angivna" " katalogerna." #. Tag: para #: index.docbook:326 #, no-c-format #| msgid "" #| "If \"Merge\" is selected, then the \"Output\"-line becomes editable. But " #| "it is not required to specify the output filename immediately. You can " #| "also postpone this until saving." msgid "" "If Merge check box is selected, then the " "Output line becomes editable. But it is not required to " "specify the output filename immediately. You can also postpone this until " "saving." msgstr "" "Om kryssrutan Sammanfoga är markerad, blir raden <" "guilabel>Utmatning redigerbar. Det krävs dock inte att" " utdatafilens namn anges omedelbart. Du kan också vänta med detta till du" " sparar." #. Tag: para #: index.docbook:330 #, no-c-format #| msgid "" #| "The \"Configure...\"-button opens the options-dialog, so that you can set " #| "the options before running the analysis." msgid "" "The Configure... button opens the settings dialog, so " "that you can set the options before running the analysis." msgstr "" "Knappen Anpassa... visar inställningsdialogrutan, så" " att du kan ställa in alternativ innan analysen utförs." #. Tag: title #: index.docbook:336 #, no-c-format msgid "Paste and Drop Input" msgstr "Klistra in eller släpp indata" #. Tag: para #: index.docbook:337 #, no-c-format #| msgid "" #| "Sometimes you want to compare parts of a text that is not an own file. " #| "&kdiff3; also allows you to paste text from the clipboard into the diff " #| "input window that has the focus. The diff analysis happens immediately " #| "then. In the open dialog you need not specify files then, but just close " #| "it via \"Cancel\"." msgid "" "Sometimes you want to compare parts of a text that is not an own file. " "&kdiff3; also allows you to paste text from the clipboard into the diff " "input window that has the focus. The diff analysis happens immediately then. " "In the open dialog you need not specify files then, but just close it via " "Cancel button." msgstr "" "Ibland vill du jämföra delar av en text som inte är en egen fil. &kdiff3; " "låter dig också klistra in text från klippbordet i det indatafönster för " "jämförelse som har fokus. Jämförelseanalysen sker då omedelbart. I " "öppningsdialogrutan behöver du då inte ange filer, utan bara stänga den via " "knappen Avbryt." #. Tag: para #: index.docbook:342 #, no-c-format msgid "" "You can also use drag and drop: Drag a file from a file manager or selected " "text from an editor and drop it onto a diff input window." msgstr "" "Du kan också använda drag och släpp: Dra en fil från en filhanterare eller " "markerad text från en editor och släpp den på ett indatafönster för " "jämförelse." #. Tag: para #: index.docbook:345 #, no-c-format msgid "" "What's the idea? Sometimes a file contains two similar functions, but " "checking how similar they really are is a big effort if you first must " "create two files and then load them. Now you can simply copy, paste and " "compare the relevant sections." msgstr "" "Vad är idén? Ibland innehåller en fil två liknande funktioner, men att " "kontrollera hur lika de verkligen är blir en stor ansträngning om du först " "måste skapa två filer och sedan ladda dem. Nu kan du helt enkelt kopiera, " "klistra in och jämföra de relevanta avsnitten." #. Tag: para #: index.docbook:349 #, no-c-format #| msgid "" #| "Note: Currently you cannot drag anything from &kdiff3;. Only dropping in " #| "the diff input is supported." msgid "" "Currently you cannot drag anything from &kdiff3;. Only dropping in the diff " "input is supported." msgstr "" "För närvarande kan du inte dra någonting från &kdiff3;. Bara att släppa " "indata i jämförelsefönstret stöds." #. Tag: para #: index.docbook:352 #, no-c-format #| msgid "" #| "Warning: Some editors still interpret the drag and drop into another " #| "program like cut (instead of copy) and paste. Your original data might be " #| "lost then." msgid "" "Some editors still interpret the drag and drop into another program like cut " "(instead of copy) and paste. Your original data might be lost then." msgstr "" "Vissa editorer tolkar fortfarande drag och släpp till ett annat program som" " klipp ut (istället för kopiera) och klistra in. Ditt ursprungliga data kan" " då gå förlorat." #. Tag: title #: index.docbook:358 #, no-c-format msgid "Comparing Files And Interpreting The Information In The Input Windows" msgstr "Jämföra filer och tolka informationen i indatafönstren" #. Tag: title #: index.docbook:362 #, no-c-format msgid "Info Line" msgstr "Informationsrad" #. Tag: para #: index.docbook:362 #, no-c-format #| msgid "" #| "At the top of each text window is its \"info line\". The info lines of " #| "the input windows contain a letter \"A\", \"B\" or \"C\", the editable " #| "filename, a button for browsing, and the line number of the first visible " #| "line in the window. (Note that window \"C\" is optional.) Each info line " #| "appears in a different color." msgid "" "At the top of each text window is its \"info line\". The info lines of the " "input windows contain a letter A, B or C, the editable filename, a button for " "browsing, and the line number of the first visible line in the window. (Note " "that window C is optional.) Each info line appears in a " "different color." msgstr "" "Längst upp i varje textfönster finns dess \"informationsrad\"." " Informationsraderna i indatafönstret innehåller bokstaven A<" "/guilabel>, B eller C, filnamnet" " och radnumret för den första synliga raden i fönstret. (Observera att" " fönstret \"C\" är valfritt.) Varje informationsrad visas i en egen färg." #. Tag: para #: index.docbook:368 #, no-c-format #| msgid "" #| "When you selected another file via browsing or finished editing the " #| "filename here by pressing enter, the new file will be loaded and compared " #| "with the already loaded file(s)." msgid "" "When you selected another file via browsing or finished editing the filename " "here by pressing &Enter;, the new file will be loaded and compared with the " "already loaded file(s)." msgstr "" "När du väljer en annan fil genom att bläddra eller avslutar redigera" " filnamnet här genom att trycka på returtangenten, laddas den nya filen och" " jämförs med filen eller filerna som redan är laddade." #. Tag: title #: index.docbook:372 #, no-c-format msgid "Coloring" msgstr "Färgläggning" #. Tag: para #: index.docbook:372 #, no-c-format #| msgid "" #| "The three input windows are assigned the letters \"A\", \"B\" and \"C\". " #| "\"A\" has color blue, \"B\" has green and \"C\" has magenta. (These are " #| "the defaults, but can be changed in the Settings-Menu.)" msgid "" "The three input windows are assigned the letters A, " "B and C. A " "has color blue, B has green and C " "has magenta. (These are the defaults, but can be changed in the " "Color item in the settings dialog.)" msgstr "" "De tre indatafönstren tilldelas bokstäverna A, B och C. A har blå" " färg, B har grön färg och C har" " magenta. (Det är förvalda färger, men kan ändras med alternativet Färg i inställningsdialogrutan.)" #. Tag: para #: index.docbook:378 #, no-c-format #| msgid "" #| "When a difference is detected then the color shows which input file " #| "differs. When both other input files differ then the color used to " #| "express this is red by default (\"Conflict color\" in the Settings). This " #| "colorscheme is especially useful in the case of three input files, which " #| "will be seen in the next section (Merging)." msgid "" "When a difference is detected then the color shows which input file differs. " "When both other input files differ then the color used to express this is " "red by default (Conflict color option in the " "Color item in the settings dialog). This colorscheme is " "especially useful in the case of three input files, which will be seen in " "the next section (Merging)." msgstr "" "När en skillnad upptäcks visar färgen vilken indatafil som skiljer sig åt." " När båda övriga indatafiler skiljer sig åt, är färgen som används för att" " uttrycka det normalt röd (Konfliktfärg med alternativet" " Färg i inställningsdialogrutan). Färgschemat är" " särskilt användbart i fallet med tre indatafiler, som framgår av nästa" " avsnitt (Sammanfogning)." #. Tag: title #: index.docbook:385 #, no-c-format msgid "Summary Column" msgstr "Sammanfattningskolumn" #. Tag: para #: index.docbook:385 #, no-c-format #| msgid "" #| "Left of each text is the \"summary column\". If differences occurred on a " #| "line then the summary column shows the respective color. For a white-" #| "space-only difference the summary is chequered. For programming languages " #| "where white space is not so important this is useful to see at one glance " #| "if anything of importance was modified. (In C/C++ white space is only " #| "interesting within strings, comments, for the preprocessor, and some only " #| "very esoteric situations.)" msgid "" "Left of each text is the \"summary\" column. If differences occurred on a " "line then the summary column shows the respective color. For a white-space-" "only difference the summary is chequered. For programming languages where " "white space is not so important this is useful to see at one glance if " "anything of importance was modified. (In C/C++ white space is only " "interesting within strings, comments, for the preprocessor, and some only " "very esoteric situations.)" msgstr "" "Till vänster om varje text är \"sammanfattningskolumnen\". Om skillnader " "uppstod på en rad, visar sammanfattningskolumnen motsvarande färg. För en " "skillnad som bara består av blanktecken är sammanfattningen kryssad. För " "programspråk, där blanktecken inte är så viktiga är det användbart för att " "se med en blick om något av vikt ändrades. (För C/C++ är blanktecken bara " "intressanta inne i strängar, i kommentarer, för preprocessorn och i några " "mycket esoteriska situationer.)" #. Tag: para #: index.docbook:392 #, no-c-format msgid "" "The vertical line separating the summary column and the text is interrupted " "if the input file had no lines there. When word-wrap is enabled then this " "vertical line appears dotted for wrapped lines." msgstr "" "Den vertikala linjen som skiljer sammanfattningskolumnen och texten är " "avbruten om indatafilen inte har några rader där. När radbrytning är " "aktiverad visas den vertikala linjen med punkter för brutna rader." #. Tag: title #: index.docbook:396 #, no-c-format msgid "Overview Column" msgstr "Översiktskolumn" #. Tag: para #: index.docbook:396 #, no-c-format #| msgid "" #| "On the right side a \"overview\"-column is visible left of the vertical " #| "scrollbar. It shows the compressed summary column of input \"A\". All the " #| "differences and conflicts are visible at one glance. When only two input " #| "windows are used, then all differences appear red here because every " #| "difference is also a conflict. A black rectangle frames the visible part " #| "of the inputs. For very long input files, when the number of input lines " #| "is bigger than the height of the overview column in pixels, then several " #| "input lines share one overview line. A conflict then has top priority " #| "over simple differences, which have priority over no change, so that no " #| "difference or conflict is lost here. By clicking into this overview " #| "column the corresponding text will be shown." msgid "" "On the right side a \"overview\" column is visible left of the vertical " "scrollbar. It shows the compressed summary column of input A. All the differences and conflicts are visible at one glance. When " "only two input windows are used, then all differences appear red here " "because every difference is also a conflict. A black rectangle frames the " "visible part of the inputs. For very long input files, when the number of " "input lines is bigger than the height of the overview column in pixels, then " "several input lines share one overview line. A conflict then has top " "priority over simple differences, which have priority over no change, so " "that no difference or conflict is lost here. By clicking into this overview " "column the corresponding text will be shown." msgstr "" "På höger sida är en \"översiktskolumn\" synlig till vänster om den vertikala" " rullningslisten. Den visar en komprimerad sammanfattning av indata A. Alla skillnader och konflikter är synliga med en blick. När" " bara två indatafönster används, syns alla skillnader i rött här, eftersom" " alla skillnader också är konflikter. En svart rektangel ramar in den synliga" " delen av indata. För mycket långa indatafiler, där antalet indatarader är" " större än höjden på översikten i bildpunkter, delar flera indatarader en" " översiktsrad. En konflikt har prioritet över enkla skillnader, som har" " prioritet över inga ändringar, så att inga skillnader eller konflikter går" " förlorade här. Genom att klicka på översiktskolumnen visas motsvarande text." #. Tag: title #: index.docbook:408 #, no-c-format msgid "Manually Aligning Lines" msgstr "Justera rader manuellt" #. Tag: para #: index.docbook:408 #, no-c-format #| msgid "" #| "Sometimes the algorithm places the wrong lines next to each other. Or you " #| "want to compare one piece of text with text at a completely different " #| "position in the other file. For these situations you can manually " #| "instruct &kdiff3; to align certain lines. Mark the text for which you " #| "want to improve the alignment with the mouse as you would for copy and " #| "paste in the first diff view and then choose \"Add Manual Diff Alignment" #| "\" in the \"Diffview\"-menu (keyboard shortcut &Ctrl;Y). An orange bar will appear in the summary column next " #| "to the chosen text. Repeat this for the second and (if available) third " #| "diff view. &kdiff3; will immediately recalculate the differences " #| "everytime you do this, and will align the chosen lines. Of course some of " #| "the previously matching lines in between might not match anymore." msgid "" "Sometimes the algorithm places the wrong lines next to each other. Or you " "want to compare one piece of text with text at a completely different " "position in the other file. For these situations you can manually instruct " "&kdiff3; to align certain lines. Mark the text for which you want to improve " "the alignment with the mouse as you would for copy and paste in the first " "diff view and then choose DiffviewAdd Manual Diff Alignment " "menu item (&Ctrl;Y). An orange bar " "will appear in the summary column next to the chosen text. Repeat this for " "the second and (if available) third diff view. &kdiff3; will immediately " "recalculate the differences everytime you do this, and will align the chosen " "lines. Of course some of the previously matching lines in between might not " "match anymore." msgstr "" "Ibland placerar algoritmen fel rader intill varandra, eller så vill du" " jämföra ett textstycke med text på en helt annan position i den andra filen." " I dessa fall kan du manuellt tala om för &kdiff3; att vissa rader ska" " arrangeras i rak linje. Markera texten som du vill arrangera med musen, som" " du skulle göra vid kopiera och klistra in i det första jämförelsefönstret" " och välj därefter JämförelsevyLägg till manuell justering av jämförelse (<" "keycombo>&Ctrl;Y). En orange rad visas i" " sammanfattningskolumnen intill den markerade texten. Upprepa det för den" " andra och (om tillgänglig) tredje jämförelsevyn. &kdiff3; beräknar" " omedelbart om jämförelsen varje gång du gör det, och radar upp de markerade" " raderna. Naturligtvis kanske några av raderna som tidigare matchade inte" " längre matchar." #. Tag: para #: index.docbook:418 #, no-c-format msgid "Currently merging doesn't support the use of manual diff help." msgstr "" "För närvarande stöder inte sammanfogning användning av manuell hjälp vid " "jämförelse." #. Tag: title #: index.docbook:420 #, no-c-format msgid "Manually Joining and Splitting Diff Sections" msgstr "Manuell ihopfogning och delning av jämförelseavsnitt" #. Tag: para #: index.docbook:420 #, no-c-format msgid "" "In some cases &kdiff3; will see too many or too few diff sections for " "merging. In such a case you can join or split existing sections." msgstr "" "I vissa fall ser &kdiff3; för många eller för få avsnitt att sammanfoga. I " "ett sådant fall kan du foga ihop eller dela befintliga avsnitt." #. Tag: para #: index.docbook:423 #, no-c-format #| msgid "" #| "Add new sections by first selecting text in the lines that belong " #| "together in either input window (as for copying to the clipboard). Then " #| "choose \"Split Diff At Selection\" in the \"Merge\" menu. Splits will be " #| "added above the first line and below the last line of the selected text. " #| "If you only want to add one section, then select text beginning at " #| "another section-split." msgid "" "Add new sections by first selecting text in the lines that belong together " "in either input window (as for copying to the clipboard). Then choose " "MergeSplit Diff At Selection menu item. Splits will be added above the first " "line and below the last line of the selected text. If you only want to add " "one section, then select text beginning at another section-split." msgstr "" "Lägg till nya avsnitt genom att först markera texten på raderna som hör ihop" " i något av indatafönstren (som vid kopiering till klippbordet). Välj" " därefter menyalternativet Sammanfoga<" "guimenuitem>Dela jämförelse vid markering." " Delningen görs ovanför den första raden och under den sista raden i den" " markerade texten. Om du bara vill lägga till ett avsnitt, markera text som" " börjar på ett annat avsnitts delning." #. Tag: para #: index.docbook:428 #, no-c-format #| msgid "" #| "For joining sections in either input window select something in the lines " #| "from the sections to join. (You can join several sections in one step " #| "too.) Then choose \"Join selected Diffs\" in the \"Merge\"-menu." msgid "" "For joining sections in either input window select something in the lines " "from the sections to join. (You can join several sections in one step too.) " "Then choose MergeJoin Selected " "Diffs menu item." msgstr "" "För att foga ihop avsnitt i något indatafönster, markera någonting på raderna" " i avsnitten som ska fogas ihop. (Du kan också foga ihop flera avsnitt i ett" " steg.) Välj därefter menyalternativet Sammanfoga<" "/guimenu>Foga ihop markerade jämförelser<" "/menuchoice>." #. Tag: title #: index.docbook:435 #, no-c-format msgid "Merging And The Merge Output Editor Window" msgstr "Sammanfogning och editorfönstret för sammanfogningsutdata" #. Tag: para #: index.docbook:439 #, no-c-format #| msgid "" #| "The merge output editor window (below the diff input windows) also has an " #| "info line at the top showing \"Output:\", the filename and \"[Modified]\" " #| "if you edited something. Usually it will contain some text through the " #| "automatic merge facilities, but often it will also contain conflicts." msgid "" "The merge output editor window (below the diff input windows) also has an " "info line at the top showing Output:, the filename and " "[Modified] tag if you edited something. Usually " "it will contain some text through the automatic merge facilities, but often " "it will also contain conflicts." msgstr "" "Editorfönstret för sammanfogningsutdata (under indatafönstren för jämförelse)" " har också en informationsrad längst upp som visar Utmatning<" "/guilabel>, filnamnet och [Ändrad] om du redigerat" " något. Oftast innehåller det någon text från de automatiska" " sammanfogningsfunktionerna, men det innehåller också ofta konflikter." #. Tag: para #: index.docbook:441 #, no-c-format #| msgid "" #| "!!! Saving is disabled until all conflicts are resolved !!! (Use the \"Go " #| "to prev/next unsolved conflicts\"-buttons to find the remaining " #| "conflicts.)" msgid "" "!!! Saving is disabled until all conflicts are resolved !!! (Use the " "Go to Previous/Next Unsolved Conflict buttons to find " "the remaining conflicts.)" msgstr "" "Spara är inaktiverat till alla konflikter är lösta! (Använd knapparna <" "guibutton>Gå till föregående/nästa olösta konflikt för att hitta" " återstående konflikter.)" #. Tag: para #: index.docbook:443 #, no-c-format msgid "" "With only two input files every difference is also a conflict that must be " "solved manually." msgstr "" "Med bara två filer är varje skillnad också en konflikt, som måste lösas " "manuellt." #. Tag: para #: index.docbook:446 #, no-c-format #| msgid "" #| "With three input files the first file is treated as base, while the " #| "second and third input files contain modifications. When at any line only " #| "either input B or input C have changed but not both then the changed " #| "source will automatically be selected. Only when B and C have changed on " #| "the same lines, then the tool detects a conflict that must be solved " #| "manually. When B and C are the same, but not the same as A, then C is " #| "selected." msgid "" "With three input files the first file is treated as base, while the second " "and third input files contain modifications. When at any line only either " "input B or input C have changed " "but not both then the changed source will automatically be selected. Only " "when B and C have changed on the " "same lines, then the tool detects a conflict that must be solved manually. " "When B and C are the same, but not " "the same as A, then C is selected." msgstr "" "Med tre indatafiler behandlas den första som bas, medan den andra och tredje" " indatafilen innehåller ändringar. Om bara indata B" " eller C har ändrats för en viss rad, men inte båda" " väljes den ändrade källan automatiskt. Bara om B och <" "guilabel>C har ändrats på samma rader, detekterar verktyget en" " konflikt som måste lösas manuellt. När B och C är likadana, men inte samma som A, väljes" " C." #. Tag: title #: index.docbook:448 #, no-c-format msgid "The Summary Column" msgstr "Sammanfattningskolumnen" #. Tag: para #: index.docbook:448 #, no-c-format msgid "" "The merge output editor window also has a summary column on the left. It " "shows the letter of the input from which a line was selected or nothing if " "all three sources where equal on a line. For conflicts it shows a " "questionmark \"?\" and the line shows \"<Merge Conflict>\", all in " "red. Because solving conflicts line by line would take very long, the lines " "are grouped into groups that have the same difference and conflict " "characteristics. But only-white-space-conflicts are separated from non-white-" "space-conflicts in order to ease the merging of files were the indentation " "changed for many lines." msgstr "" "Editorfönstret för sammanfogningsutdata har också en sammanfattningskolumn " "till vänster. Den visar bokstaven för indata som raden valdes, eller " "ingenting om alla tre källorna var likadana för raden. Vid konflikter visar " "den ett frågetecken \"?\" och raden visar \"< Konflikter vid " "sammanfogning >\", allt med rött. Eftersom det skulle ta mycket lång tid " "att lösa konflikter rad för rad, grupperas rader i grupper som har samma " "skillnader och konfliktkaraktär. Konflikter med bara blanktecken skiljs dock " "från andra konflikter för att förbättra sammanfogningen av filer där " "indenteringen ändrats på många rader." #. Tag: title #: index.docbook:458 #, no-c-format msgid "" "Setting The Current Group And Synchronising Merge And Diff View Position" msgstr "" "Ställa in aktuell grupp och synkronisera sammanfognings- och jämförelsevyns " "position" #. Tag: para #: index.docbook:458 #, no-c-format #| msgid "" #| "When clicking into the summary column with the left mouse button in " #| "either window then the beginning of the group belonging to that line will " #| "shown in all windows. This group then becomes the \"current group\". It " #| "is highlighted with the \"Current range (diff) background color\" and a " #| "black bar appears on the left side of the text." msgid "" "When clicking into the summary column with the &LMB; in either window then " "the beginning of the group belonging to that line will shown in all windows. " "This group then becomes the \"current group\". It is highlighted with the " "Current range diff background color option of " "Integration item in the settings dialog and a black bar " "appears on the left side of the text." msgstr "" "När du klickar på sammanfattningskolumnen med vänster musknapp i endera" " fönstret, så markeras gruppen som hör till den raden i alla fönster och" " gruppens början visas. (Det här kan innebära ett automatiskt byte av" " position i fönstren om gruppens början inte syns.) Gruppen blir då den" " \"aktuella gruppen\". Den markeras med alternativetBakgrundsfärgen" " för aktuellt jämförelseintervall i objektet Integrering och en svart rad visas till vänster om texten." #. Tag: title #: index.docbook:460 #, no-c-format msgid "Choosing Inputs A, B or C For Current Conflict And Editing" msgstr "Välja indata A, B eller C för aktuell konflikt och redigering" #. Tag: para #: index.docbook:460 #, no-c-format #| msgid "" #| "The button bar below the menubar contains three input selector buttons " #| "containing the letters \"A\", \"B\" and \"C\". Click the input selector " #| "button to insert (or remove if already inserted) the lines from the " #| "respective source. To choose the lines from several inputs click the " #| "respective buttons in the needed order. For example if you want that the " #| "lines from \"B\" appear before the lines from \"A\" in the output, first " #| "click \"B\", then \"A\"." msgid "" "The Button bar below the menubar contains three input selector buttons " "containing the letters A, B and " "C. Click the input selector button to insert (or remove " "if already inserted) the lines from the respective source. To choose the " "lines from several inputs click the respective buttons in the needed order. " "For example if you want that the lines from B appear " "before the lines from A in the output, first click " "B, then A." msgstr "" "Knappraden under menyraden innehåller tre knappar för indataval som" " innehåller bokstäverna A, B och <" "guilabel>C. Klicka på knappen för indataval för att infoga rader" " (eller ta bort dem om de redan infogats) från respektive källfil. För att" " välja rader från flera indatafiler klicka på respektive knappar i nödvändig" " ordning. Om du till exempel vill att rader från B ska" " hamna före rader från A i utdata, klicka först på <" "guilabel>B och därefter på A." #. Tag: para #: index.docbook:462 #, no-c-format #| msgid "" #| "If you use the auto-advance option (" #| "\"Automatically go to next unsolved conflict after source selection\"), you should disable this before choosing lines from several inputs " #| "or if you want to edit the lines after your choice. Otherwise &kdiff3; " #| "will jump to the next conflict after choosing the first input." msgid "" "If you use the Automatically Go to Next Unsolved Conflict After " "Source Selection button (see Auto-" "Advance section), you should disable this before choosing lines from " "several inputs or if you want to edit the lines after your choice. Otherwise " "&kdiff3; will jump to the next conflict after choosing the first input." msgstr "" "Om du använder knappen Gå automatiskt till nästa olösta konflikt" " efter val av källa (see Avancera" " automatiskt), måste du inaktivera det innan du väljer rader från" " flera indatafiler eller om du vill redigera raderna efter du valt dem." " Annars går &kdiff3; till nästa konflikt efter den första indatafilen valts." #. Tag: para #: index.docbook:464 #, no-c-format msgid "" "It is often helpful directly edit the merge output. The summary column will " "show \"m\" for every line that was manually modified. When for instance the " "differences are aligned in a way that simply choosing the inputs won't be " "satisfactory, then you can mark the needed text and use normal copy and paste to put it into the merge output." msgstr "" "Det är ofta användbart att direkt redigera sammanfogad utdata. " "Sammanfattningskolumnen visar \"m\" för varje rad som ändrades manuellt. När " "skillnaderna till exempel justeras på ett sätt så att ett enkelt val av " "indata inte är tillfredsställande, kan du markera texten som behövs och " "använda normal kopiera och klistra in " "för att placera den i sammanfogad utdata." #. Tag: para #: index.docbook:470 #, no-c-format msgid "" "Sometimes, when a line is removed either by automatic merge or by editing " "and no other lines remain in that group, then the text <No src line> " "will appear in that line. This is just a placeholder for the group for when " "you might change your mind and select some source again. This text won't " "appear in the saved file or in any selections you want to copy and paste." msgstr "" "Ibland, när en rad tas bort antingen på grund av automatisk sammanfogning " "eller genom redigering och inga andra rader finns kvar i gruppen, visas " "texten <Ingen källrad> på raden. Det är bara en platsmarkör för " "gruppen om du ändrar dig och väljer en källa igen. Texten syns inte i " "sparade filer eller i några markeringar som du vill kopiera och klistra in." #. Tag: para #: index.docbook:476 #, no-c-format msgid "" "The text \"<Merge Conflict>\" will appear in the clipboard if you copy " "and paste some text containing such a line. But still be careful to do so." msgstr "" "Texten \"< Konflikter vid sammanfogning >\" visas på klippbordet om du " "kopierar och klistrar in någon text som innehåller en sådan rad. Men var " "ändå försiktig med att göra det." #. Tag: title #: index.docbook:480 #, no-c-format msgid "Choosing Input A, B, or C for All Conflicts" msgstr "Välja indata A, B eller C för alla konflikter" #. Tag: para #: index.docbook:480 #, no-c-format #| msgid "" #| "The normal merge will start by solving simple conflicts automatically. " #| "But the \"Merge\"-menu provides some actions for other common needs. If " #| "you have to select the same source for most conflicts, then you can " #| "choose \"A\", \"B\" or \"C\" everywhere, or only for the remaining " #| "unsolved conflicts, or for unsolved white space conflicts. If you want to " #| "decide every single delta yourself, you can \"Set deltas to conflicts\". " #| "Or if you want to return to the automatic choices of &kdiff3; then select " #| "\"Automatically solve simple conflicts\". &kdiff3; then restarts the " #| "merge. For actions that change your previous modifications &kdiff3; will " #| "ask for your confirmation before proceeding." msgid "" "The normal merge will start by solving simple conflicts automatically. But " "the Merge menu provides some actions for other common " "needs. If you have to select the same source for most conflicts, then you " "can choose A, B or C everywhere, or only for the remaining unsolved conflicts, or for " "unsolved white space conflicts. If you want to decide every single delta " "yourself, you can Set Deltas to Conflicts. Or if " "you want to return to the automatic choices of &kdiff3; then select " "Automatically Solve Simple Conflicts. &kdiff3; " "then restarts the merge. For actions that change your previous modifications " "&kdiff3; will ask for your confirmation before proceeding." msgstr "" "Den normala sammanfogningen börjar med att automatiskt lösa enkla konflikter." " Menyn Sammanfoga tillhandahåller också några alternativ" " för andra vanliga behov. Om du måste välja samma källfil för de flesta" " konflikter, kan du välja A, B" " eller C överallt, eller bara för återstående olösta" " konflikter, eller för olösta konflikter med blanktecken. Om du vill bestämma" " själv för varje enskild skillnad, kan du Ändra skillnader till" " konflikter, eller om du vill återgå till de automatiska valen" " i &kdiff3; kan du välja Lös automatiskt enkla konflikter<" "/guimenuitem>. Då startar &kdiff3; om sammanfogningen. För åtgärder som" " påverkar dina tidigare ändringar frågar &kdiff3; om bekräftelse innan" " åtgärden utförs." #. Tag: para #: index.docbook:482 #, no-c-format #| msgid "" #| "Note: When choosing either source for unsolved white space conflicts and " #| "the options \"Ignore Numbers\" or \"Ignore C/C++ Comments\" are used then " #| "changes in numbers or comments will be treated like white space too." msgid "" "When choosing either source for unsolved white space conflicts and the " "Ignore numbers (treat as white space) or " "Ignore C/C++ comments (treat as white space) options at " "Diff item in the settings dialog are used then changes " "in numbers or comments will be treated like white space too." msgstr "" "När endera källan väljes för olösta konflikter för blanktecken och" " alternativet Ignorera siffror (behandla som blanktecken) eller Ignorera C/C++ kommentarer (behandla som blanktecken)<" "/guilabel> under alternativet Jämför används, så" " behandlas ändringar i siffror eller kommentarer också som blanktecken." #. Tag: title #: index.docbook:485 #, no-c-format msgid "Automatic Merge of Version Control Keywords and History (Log)" msgstr "" "Sammanfoga automatiskt nyckelord för versionshantering och historik (logg)" #. Tag: para #: index.docbook:485 #, no-c-format #| msgid "" #| "Many version control systems support special keywords in the file. (e.g. " #| "\"$Date$\", \"$Header$\", \"$Author$\", \"$" #| "Log$\" etc.) During the check-in the version control system (VCS) " #| "changes these lines. For instance \"$Date$\" will turn into " #| "\"$Date: 2005/03/22 18:45:01 $\". Since this line will be " #| "different in every version of the file, it would require manual " #| "interaction during the merge." msgid "" "Many version control systems support special keywords in the file. (⪚ " "\"$Date$\", \"$Header$" "\", \"$Author$\", \"$Log$\", &etc;) During the check-in the version control system (VCS) " "changes these lines. For instance \"$Date$\" will " "turn into \"$Date: 2005/03/22 18:45:01 $\". Since " "this line will be different in every version of the file, it would require " "manual interaction during the merge." msgstr "" "Många versionshanteringssystem stöder särskilda nyckelord i filen (t.ex. \"<" "literal>$Date$\", \"$Header$\"," " \"$Author$\", \"$Log$\" etc.) Vid arkivering ändrar versionshanteringssystemet (VCN) dessa rader." " Till exempel ändras \"$Date$\" till \"$Date: 2005/03/22 18:45:01 $\". Eftersom raden är olika i" " varje version av filen, skulle den kräva manuell interaktion under" " sammanfogningen." #. Tag: para #: index.docbook:487 #, no-c-format #| msgid "" #| "&kdiff3; offers automatic merge for these items. For simple lines that " #| "match the \"Auto merge regular expression\"-option in all input-files " #| "&kdiff3; will choose the line from B or - if available - from C. " #| "(Additionally it is necessary that the lines in question line up in the " #| "comparison and the previous line contains no conflict.) This auto merge " #| "can either be run immediately after a merge starts (activate the option " #| "\"Run regular expression auto merge on merge start\") or later via the " #| "merge menu \"Run Regular Expression Auto Merge\"." msgid "" "&kdiff3; offers automatic merge for these items at Merge item in the settings dialog. For simple lines that match the " "Auto merge regular expression option in all input-files " "&kdiff3; will choose the line from B or - if available " "- from C. (Additionally it is necessary that the lines " "in question line up in the comparison and the previous line contains no " "conflict.) This auto merge can either be run immediately after a merge " "starts (activate the option Run regular expression auto merge on " "merge start) or later via MergeRun Regular Expression Auto Merge menu item." msgstr "" "&kdiff3; erbjuder automatisk sammanfogning av dessa poster med alternativet <" "guilabel>Sammanfoga i inställningsdialogrutan. För enkla rader som" " matchar alternativet Reguljärt uttryck för automatisk" " sammanfogning i alla indatafiler väljer &kdiff3; raden från <" "guilabel>B, eller om tillgänglig, den från C." " (Dessutom är det nödvändigt att raderna i fråga radas upp i jämförelsen och" " att föregående rad inte innehåller en konflikt.) Den automatiska" " sammanfogningen kan antingen utföras omedelbart när sammanfogningen startas" " (aktivera alternativet Kör automatisk sammanfogning med reguljärt" " uttryck när sammanfogning startar) eller senare via" " menyalternativet SammanfogaKör" " automatisk sammanfogning med reguljärt uttryck." #. Tag: para #: index.docbook:489 #, no-c-format #| msgid "" #| "Automatic merge for version control history (also called \"log\") is also " #| "supported. The history automerge can either run immediately when the " #| "merge starts by activating the option \"Merge version control history on " #| "merge start\" or later via the merge menu \"Automatically Solve History " #| "Conflicts\"." msgid "" "Automatic merge for version control history (also called \"log\") is also " "supported. The history automerge can either run immediately when the merge " "starts by activating the option Merge version control history on " "merge start at Merge item in the settings " "dialog or later via the MergeAutomatically Solve History Conflicts menu item." msgstr "" "Automatisk sammanfogning för versionshanteringshistorik (också kallat" " \"logg\") stöds också. Automatisk sammanfogning av historik kan antingen" " utföras omedelbart när sammanfogningen startas genom att aktivera" " alternativet Sammanfogning enligt versionshanteringshistorik när" " sammanfogning startar under alternativet Sammanfoga<" "/guilabel> i inställningsdialogrutan eller senare via menyalternativet <" "menuchoice>SammanfogaLös automatiskt" " historikkonflikter." #. Tag: para #: index.docbook:491 #, no-c-format #| msgid "" #| "Usually the version control history begins with a line containing the " #| "keyword \"$Log$\". This must be matched by the \"History start " #| "regular expression\"-option. &kdiff3; detects which subsequent lines are " #| "in the history by analysing the leading characters that came before the " #| "\"$Log$\"-keyword. If the same \"leading comment\"-characters " #| "also appears in the following lines, then they are also included in the " #| "history." msgid "" "Usually the version control history begins with a line containing the " "keyword \"$Log$\".This must be matched by the " "\"History start regular expression\"-option. &kdiff3; detects which " "subsequent lines are in the history by analysing the leading characters that " "came before the \"$Log$\" keyword. If the same " "\"leading comment\" characters also appears in the following lines, then " "they are also included in the history." msgstr "" "Oftast börjar versionshanteringshistoriken med en rad som innehåller" " nyckelordet \"$Log$\". Den måste matchas av" " alternativet \"Reguljärt uttryck för historikens början\". &kdiff3;" " detekterar vilka efterföljande rader som ingår i historiken genom att" " analysera de inledande tecknen som fanns före nyckelordet \"$Log$\". Om samma \"inledande kommentar\" också finns på" " följande rader inkluderas de också i historiken." #. Tag: para #: index.docbook:493 #, no-c-format msgid "" "During each check-in the VCS writes a unique line specifying version-, date- " "and time-information followed by lines with user comments. These lines form " "one history-entry. This history section grows with every check-in and the " "most recent entries appear at the top (after the history start line)." msgstr "" "Vid varje arkivering skriver VCS en unik rad som anger version, datum- och " "tidsinformation följd av rader med användarens kommentarer. Raderna utgör en " "historikpost. Historikavsnittet växer vid varje arkivering och de senaste " "posterna visas längst upp (efter historikens startrad)." #. Tag: para #: index.docbook:498 #, no-c-format msgid "" "When for parallel development two or more developers check-in a branch of " "the file then the merge history will contain several entries that appear as " "conflicts during the merge of the branches. Since merging these can become " "very tedious, &kdiff3; offers support with two possible strategies: Just " "insert the history information from both contributors at the top or sort the " "history information by a user defined key." msgstr "" "När två utvecklare arkiverar grenar av en fil under parallell utveckling, " "kommer historiken för sammanfogning att innehålla flera poster som visas som " "konflikter under sammafogning av grenarna. Eftersom sammafogning av dem kan " "bli mycket tröttsam, erbjuder &kdiff3; stöd för den med två möjliga " "strategier: Bara infoga historikinformationen från båda bidragsgivarna " "längst upp, eller sortera historikinformationen enligt en användardefinierad " "nyckel." #. Tag: para #: index.docbook:504 #, fuzzy, no-c-format #| msgid "" #| "The just-insert-all-entries-method is easier to configure. &kdiff3; just " #| "needs a method to detect, which lines belong to one history entry. Most " #| "VCS insert an empty line after each history entry. If there are no other " #| "empty lines, this is a sufficient criterion for &kdiff3;. Just set an " #| "empty \"History entry start regular expression\". If the empty line " #| "criterion isn't sufficient, you can specify a regular expression to " #| "detect the history entry start." msgid "" "The just-insert-all-entries-method is easier to configure. &kdiff3; just " "needs a method to detect, which lines belong to one history entry. Most VCS " "insert an empty line after each history entry. If there are no other empty " "lines, this is a sufficient criterion for &kdiff3;. Just set an empty " "History entry start regular expression at " "Merge item in the settings dialog. If the empty line " "criterion isn't sufficient, you can specify a regular expression to detect " "the history entry start." msgstr "" "Metoden att bara infoga alla poster är enklast att ställa in. &kdiff3; " "behöver bara en metod att detektera vilka rader som hör till en " "historikpost. De flesta VCS infogar en tom rad efter varje historikpost. Om " "det inte finns några andra tomma rader, är det ett tillräckligt villkor för " "&kdiff3;. Ange bara en tom \"Reguljärt uttryck för historikens början\". Om " "kriteriet med en tom rad inte är tillräckligt kan du ange ett reguljärt " "uttryck för att detektera historikpostens början." #. Tag: para #: index.docbook:506 #, no-c-format msgid "" "Note that &kdiff3; will remove duplicate history entries. If a history entry " "appeared several times in the history of a input file, only one entry will " "remain in the output." msgstr "" "Observera att &kdiff3; tar bort duplicerade historikposter.Om en " "historikpost fanns flera gånger i en indatafils historik, förblir bara en " "post i utmatningen." #. Tag: para #: index.docbook:509 #, fuzzy, no-c-format #| msgid "" #| "If you want to sort the history, then you have to specify how the sort " #| "key should be built. Use parentheses in the \"History entry start regular " #| "expression\" to group parts of the regular expression that should later " #| "be used for the sort key. Then specify the \"History entry start sort key " #| "order\" specifying a comma \",\" separated list of numbers referring to " #| "the position of the group in the regular expression." msgid "" "If you want to sort the history, then you have to specify how the sort key " "should be built. Use parentheses in the History entry start " "regular expression at Merge item in the " "settings dialog to group parts of the regular expression that should later " "be used for the sort key. Then specify the History entry start " "sort key order option specifying a comma \",\" separated list of " "numbers referring to the position of the group in the regular expression." msgstr "" "Om du vill sortera historiken måste du ange hur sorteringsnyckeln ska " "byggas. Använd parenteser som i \"Reguljärt uttryck för historikpostens " "början\" för att gruppera delar av det reguljära uttrycket som senare ska " "användas i sorteringsnyckeln. Ange därefter \"Sorteringsnycklarnas ordning " "från historikpostens början\" med en lista av nummer som refererar till " "gruppens position i det reguljära uttrycket åtskilda av kommatecken \",\"." #. Tag: para #: index.docbook:511 #, fuzzy, no-c-format #| msgid "" #| "Because this is not so easy to get right immediately, you are able to " #| "test and improve the regular expressions and key-generation in a " #| "dedicated dialog by pressing the \"Test your regular expressions\"-button." msgid "" "Because this is not so easy to get right immediately, you are able to test " "and improve the regular expressions and key-generation in a dedicated dialog " "by pressing the Test your regular expressions button." msgstr "" "Eftersom det inte är så enkelt att få det rätt omedelbart, kan du prova och " "förbättra det reguljära uttrycket och nyckelgenereringen i en särskild " "dialogruta genom att klicka på knappen \"Prova dina reguljära uttryck\"." #. Tag: para #: index.docbook:513 #, fuzzy, no-c-format #| msgid "" #| "Example: Assume a history that looks like this: \n" #| "/" #| "**************************************************************************\n" #| "** HISTORY: $Log: \\toms_merge_main_view\\MyApplication\\src" #| "\\complexalgorithm.cpp $\n" #| "**\n" #| "** \\main\\integration_branch_12 2 Apr 2001 10:45:41 tom\n" #| "** Merged branch simon_branch_15.\n" #| "**\n" #| "** \\main\\henry_bugfix_branch_7\\1 30 Mar 2001 19:22:05 henry\n" #| "** Improved the speed for subroutine convertToMesh().\n" #| "** Fixed crash.\n" #| "**************************************************************************/\n" #| " The history start line matches the regular expression \".*" #| "\\$Log.*\\$.*\". Then follow the history entries." msgid "" "Example: Assume a history that looks like this: \n" "/**************************************************************************\n" "** HISTORY: $Log: \\toms_merge_main_view\\MyApplication\\src" "\\complexalgorithm.cpp $\n" "**\n" "** \\main\\integration_branch_12 2 Apr 2001 10:45:41 tom\n" "** Merged branch simon_branch_15.\n" "**\n" "** \\main\\henry_bugfix_branch_7\\1 30 Mar 2001 19:22:05 henry\n" "** Improved the speed for subroutine convertToMesh().\n" "** Fixed crash.\n" "**************************************************************************/\n" " The history start line matches the regular expression \".*" "\\$Log.*\\$.*\". Then follow the history entries." msgstr "" "Antag att historiken ser ut så här: \n" "/**************************************************************************\n" "** HISTORIK: $Log: \\toms_sammanfogning_huvudvy\\Mitt_program\\kod" "\\komplexalgoritm.cpp $\n" "**\n" "** \\head\\integreringsgren_12 2 Apr 2001 10:45:41 tom\n" "** Sammanfogade grenen simongren_15.\n" "**\n" "** \\main\\henry_felrättningsgren_7\\1 30 Mar 2001 19:22:05 henry\n" "** Förbättrade hastigheten för delrutinen omvandlaTill().\n" "** Fixade krasch.\n" "**************************************************************************/\n" " Historikens inledande rad matchar det reguljära uttrycket \".*" "\\$Log.*\\$.*\". Därefter följer historikposterna." #. Tag: para #: index.docbook:516 #, fuzzy, no-c-format #| msgid "" #| "The line with the \"$Log$\"-keyword begins with two \"*\" after " #| "which follows a space. &kdiff3; uses the first non-white-space string as " #| "\"leading comment\" and assumes that the history ends in the first line " #| "without this leading comment. In this example the last line ends with a " #| "string that also starts with two \"*\", but instead of a space character " #| "more \"*\" follow. Hence this line ends the history." msgid "" "The line with the \"$Log$\" keyword begins with " "two \"*\" after which follows a space. &kdiff3; uses the first non-white-" "space string as \"leading comment\" and assumes that the history ends in the " "first line without this leading comment. In this example the last line ends " "with a string that also starts with two \"*\", but instead of a space " "character more \"*\" follow. Hence this line ends the history." msgstr "" "Raden med nyckelordet \"$Log$\" börjar med två \"*\" och därefter " "följer ett mellanslag. &kdiff3; använder den första strängen utan " "blanktecken som \"inledande kommentar\" och antar att historiken slutar med " "den första raden utan denna inledande kommentar. I exemplet slutar den sista " "raden med en sträng som också börjar med två \"*\", men istället för ett " "mellanslag följer fler \"*\". Därför avslutar denna rad historiken." #. Tag: para #: index.docbook:518 #, fuzzy, no-c-format #| msgid "" #| "If history sorting isn't required then the history entry start line " #| "regular expression could look like this. (This line is split in two " #| "because it wouldn't fit otherwise.) \n" #| "\\s*\\\\main\\\\\\S+\\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|" #| "Nov|Dec)\n" #| " [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\\s+.*\n" #| " For details about regular expressions please see the regular expression " #| "documentation by Trolltech. Note that \"\\s\" (with lowercase \"s" #| "\") matches any white space and \"\\S\" (with uppercase \"S\") matches " #| "any non-white-space. In our example the history entry start contains " #| "first the version info with reg. exp. \"\\\\main\\\\\\S+\", the date " #| "consisting of day \"[0-9]+\", month \"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|" #| "Sep|Oct|Nov|Dec)\" and year \"[0-9][0-9][0-9][0-9]\", the time \"[0-9]" #| "[0-9]:[0-9][0-9]:[0-9][0-9]\" and finally the developers login name \".*" #| "\"." msgid "" "If history sorting isn't required then the history entry start line regular " "expression could look like this. (This line is split in two because it " "wouldn't fit otherwise.) \n" "\\s*\\\\main\\\\\\S+\\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|" "Dec)\n" " [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\\s+.*\n" " For details about regular expressions please see the regular expression " "documentation by Trolltech. Note that \"\\s" "\" (with lowercase \"s\") matches any white space and " "\"\\S\" (with uppercase \"S\") matches " "any non-white-space. In our example the history entry start contains first " "the version info with reg. exp. \"\\\\main\\\\\\S+\", the " "date consisting of day \"[0-9]+\", month \"(Jan|" "Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\" and year " "\"[0-9][0-9][0-9][0-9]\", the time \"[0-9][0-9]:" "[0-9][0-9]:[0-9][0-9]\" and finally the developers login name " "\".*\"." msgstr "" "Om sortering av historiken inte krävs kan det reguljära uttrycket för " "historikpostens början se ut så här. (Raden är delad i två eftersom den inte " "skulle få plats annars.) \n" "\\s*\\\\main\\\\\\S+\\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|" "Dec)\n" " [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\\s+.*\n" " För detaljinformation om reguljära uttryck se Trolltechs dokumentation av " "reguljära uttryck. Observera att \"\\s\" (med ett litet \"s\") " "matchar alla blanktecken och \"\\S\" (med ett stort \"S\") matchar alla " "tecken som inte är blanktecken. I vårt exempel innehåller historikpostens " "början först versionsinformation med det reguljära uttrycket \"\\\\main\\\\" "\\S+\", datumet som består av dagen \"[0-9]+\", månaden \"(Jan|Feb|Mar|Apr|" "May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\" och året \"[0-9][0-9][0-9][0-9]\", tiden " "\"[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\" och till sist utvecklarens " "inloggningsnamn \".*\"." #. Tag: para #: index.docbook:523 #, fuzzy, no-c-format #| msgid "" #| "Note that the \"leading comment\"-characters (in the example \"**\") will " #| "already be removed by &kdiff3; before trying to match, hence the regular " #| "expression begins with a match for none or more white-space characters " #| "\"\\s*\". Because comment characters can differ in each file (e.g. C/C++ " #| "uses other comment characters than a Perl script) &kdiff3; takes care of " #| "the leading comment characters and you should not specify them in the " #| "regular expression." msgid "" "Note that the \"leading comment\" characters (in the example \"**\") will already be removed by &kdiff3; before trying to match, " "hence the regular expression begins with a match for none or more white-" "space characters \"\\s*\". Because comment characters can " "differ in each file (⪚ C/C++ uses other comment characters than a Perl " "script) &kdiff3; takes care of the leading comment characters and you should " "not specify them in the regular expression." msgstr "" "Observera att de \"inledande kommentartecknen\" (i exemplet \"**\") redan " "har tagits bort av &kdiff3; innan försöket att matcha, alltså börjar det " "reguljära uttrycket med att matcha ett eller flera blanktecken \"\\s*\". " "Eftersom kommentartecken kan skilja sig åt i varje fil (C/C++ använder t.ex. " "andra kommentartecken än ett Perl-skript), tar &kdiff3; hand om de inledande " "kommentartecknen och du ska inte ange dem i det reguljära uttrycket." #. Tag: para #: index.docbook:525 #, fuzzy, no-c-format #| msgid "" #| "If you require a sorted history. Then the sortkey must be calculated. For " #| "this the relevant parts in the regular expression must be grouped by " #| "parentheses. (The extra parentheses can also stay in if history sorting " #| "is disabled.) \n" #| "\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|" #| "Oct|Nov|Dec)\n" #| " ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)\n" #| " The parentheses now contain 1. version info, 2. day, 3. month, " #| "4. year, 5. time, 6. name. But if we want to sort by date and time, we " #| "need to construct a key with the elements in a different order of " #| "appearance: First the year, followed by month, day, time, version info " #| "and name. Hence the sortkey order to specify is \"4,3,2,5,1,6\"." msgid "" "If you require a sorted history. Then the sortkey must be calculated. For " "this the relevant parts in the regular expression must be grouped by " "parentheses. (The extra parentheses can also stay in if history sorting is " "disabled.) \n" "\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|" "Nov|Dec)\n" " ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)\n" " The parentheses now contain 1. version info, " "2. day, 3. month, 4. year, 5. time, 6. name. But " "if we want to sort by date and time, we need to construct a key with the " "elements in a different order of appearance: First the year, followed by " "month, day, time, version info and name. Hence the sortkey order to specify " "is \"4,3,2,5,1,6\"." msgstr "" "Om du kräver sorterad historik måste sorteringsnyckeln beräknas. För att " "göra det måste relevanta delar i det reguljära uttrycket grupperas med " "parenteser. (De extra parenteserna kan också vara kvar även om " "historiksortering inaktiveras.) \n" "\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|" "Nov|Dec)\n" " ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)\n" " Parenteserna innehåller nu 1. versionsinformation, 2. dag, 3. " "månad, 4. år, 5. tid, 6. namn. Men om vi vill sortera enligt datum och tid " "måste vi skapa en nyckel med elementen synliga i en annan ordning: Först " "året, följt av månad, dag, tid, versionsinformation och namn. Därför ska " "sorteringsnyckelns ordning som anges vara \"4,3,2,5,1,6\"." #. Tag: para #: index.docbook:533 #, fuzzy, no-c-format #| msgid "" #| "Because month names aren't good for sorting (\"Apr\" would be first) " #| "&kdiff3; detects in which order the month names were given and uses that " #| "number instead (\"Apr\"->\"04\"). And if a pure number is found it will " #| "be transformed to a 4-digit value with leading zeros for sorting. Finally " #| "the resulting sort key for the first history entry start line will be:" msgid "" "Because month names aren't good for sorting (\"Apr\" " "would be first) &kdiff3; detects in which order the month names were given " "and uses that number instead (\"Apr\" -> " "\"04\"). And if a pure number is found it will be " "transformed to a 4-digit value with leading zeros for sorting. Finally the " "resulting sort key for the first history entry start line will be:" msgstr "" "Eftersom månadsnamn inte är bra att sortera enligt (\"Apr\" skulle vara " "först) detekterar &kdiff3; vilken ordning månadsnamnen anges och använder " "det numret istället (\"Apr\"->\"04\"). Och om ett rent nummer hittas " "omvandlas det till ett fyrasiffrors värde med inledande nollor för " "sortering. Till sist blir den resulterande sorteringsnyckeln för den första " "historikpostens inledande rad:" #. Tag: screen #: index.docbook:535 #, no-c-format msgid "2001 04 0002 10:45:41 integration_branch_12 tom" msgstr "2001 04 0002 10:45:41 integreringsgren_12 tom" #. Tag: para #: index.docbook:536 #, fuzzy, no-c-format #| msgid "" #| "For more information also see Merge " #| "Settings." msgid "" "For more information also see Merge Settings section." msgstr "" "För mer information, se också Inställningar " "av sammanfoga." #. Tag: title #: index.docbook:542 #, no-c-format msgid "Navigation And Editing" msgstr "Navigering och redigering" #. Tag: para #: index.docbook:543 #, fuzzy, no-c-format #| msgid "" #| "Much navigation will be done with the scroll bars and the mouse but you " #| "can also navigate with the keys. If you click into either window then you " #| "can use the cursor buttons left, right, up, down, page up, page down, " #| "home, end, ctrl-home, ctrl-end as you would in other programs. The " #| "overview-column next to the vertical scroll bar of the input files can " #| "also be used for navigating by clicking into it." msgid "" "Much navigation will be done with the scroll bars and the mouse but you can " "also navigate with the keys. If you click into either window then you can " "use the shorcuts &Left;, &Right;, &Up;, &Down;, &PgUp;, &PgDn;, &Home;, " "&End;, &Ctrl;&Home; and &Ctrl;&End; as you would in other programs. The overview-column next to the " "vertical scroll bar of the input files can also be used for navigating by " "clicking into it." msgstr "" "Mycket navigering görs med rullningslisterna och musen, men du kan också " "navigera med tangentbordet. Om du klickar på något fönster kan du använda " "markörtangenterna vänsterpil, högerpil, uppåtpil, neråtpil, Page Up, Page " "Down, Home, End, Ctrl+Home och Ctrl+End som du kan i andra program. " "Sammanfattningskolumnen intill indatafilernas vertikala rullningslist kan " "också användas för att navigera genom att klicka i den." #. Tag: para #: index.docbook:545 #, fuzzy, no-c-format #| msgid "You can also use the wheel mouse to scroll up and down." msgid "" "You can also use the wheel mouse to scroll up and " "down." msgstr "Du kan också använda hjulmusen för att rulla uppåt och neråt." #. Tag: para #: index.docbook:547 #, fuzzy, no-c-format #| msgid "" #| "In the merge output editor you can also use the other keys for editing. " #| "You can toggle between insert and overwrite mode with the insert key. " #| "(Default is insert-mode.)" msgid "" "In the merge output editor you can also use the other keys for editing. You " "can toggle between insert and overwrite mode with the &Ins; key. (Default is " "insert-mode.)" msgstr "" "I editorn för sammanfogningsutdata kan du också använda andra tangenter för " "redigering. Du kan byta mellan infognings- och ersättningsläge med tangenten " "Insert. (Normalläget är infoga.)" #. Tag: para #: index.docbook:551 #, fuzzy, no-c-format #| msgid "" #| "A left-mouse-button-click into any summary column will synchronise all " #| "windows to show the beginning of the same group of lines (as explained in " #| "section \"Setting The Current Group " #| "And Synchronising Merge And Diff View Position\")." msgid "" "A click with the &LMB; into any summary column will synchronise all windows " "to show the beginning of the same group of lines (as explained in section " "Setting The Current Group And " "Synchronising Merge And Diff View Position)." msgstr "" "Ett klick med vänster musknapp i någon sammanfattningskolumn synkroniserar " "alla fönster för att visa början på samma grupp av rader (som förklaras i " "avsnittet Ställa in aktuell grupp och " "synkronisera sammanfognings- och jämförelsevyns position)." #. Tag: para #: index.docbook:555 #, fuzzy, no-c-format #| msgid "" #| "The button bar also contains nine navigation buttons with which you can " #| "jump to the current/first/last difference, to the next/previous " #| "difference (ctrl-down/ctrl-up), to the next/previous conflict (ctrl-" #| "pgdown/ctrl-pgup), or to the next/previous unsolved conflict. Note that " #| "for &kdiff3; a \"conflict\" that was not automatically solved at the " #| "start of the merge stays a \"conflict\" even if it is solved. Hence the " #| "necessity to distinguish \"unsolved conflicts\"." msgid "" "The Button bar also contains nine navigation buttons with which you can jump " "to the current/first/last difference, to the previous/next difference " "(&Ctrl;&Down;/&Ctrl;&Up;), to the " "previous/next conflict (&Ctrl;&PgDn;/&Ctrl;" "&PgUp;), or to the previous/next unsolved conflict. Note that for " "&kdiff3; a \"conflict\" that was not automatically solved at the start of " "the merge stays a \"conflict\" even if it is solved. Hence the necessity to " "distinguish \"unsolved conflicts\"." msgstr "" "Verktygsraden innehåller också nio navigeringsknappar som du kan använda för " "att gå till aktuell/första/sista skillnaden, till nästa/föregående skillnad " "(Ctrl+Neråtpil eller Ctrl+Uppåtpil), till nästa/föregående konflikt (Ctrl" "+Page Down eller Ctrl+Page Up) eller till nästa/föregående olösta konflikt. " "Observera att för &kdiff3; förblir en \"konflikt\" som inte automatiskt " "löstes vid start av sammanfogningen alltid en \"konflikt\" även om den är " "löst. Därav nödvändigheten att särskilja \"olösta konflikter\"." #. Tag: title #: index.docbook:564 #, no-c-format msgid "Auto-Advance" msgstr "Automatisk fortsättning" #. Tag: para #: index.docbook:565 #, fuzzy, no-c-format #| msgid "" #| "There also is a button \"Automatically go to next unsolved conflict after " #| "source selection\" (Auto-Advance). If you enable this, then, when one " #| "source is selected, &kdiff3; will jump to and select the next unsolved " #| "conflict automatically. This can help when you always want to choose one " #| "source only. When you need both sources, or you want to edit after " #| "selecting, then you probably want to switch this off. Before proceeding " #| "to the next unsolved conflict &kdiff3; shows you the effect of your " #| "choice for a short time. This delay is adjustable in the Diff- & " #| "Merge-Settings: You can specify the \"Auto-Advance delay\" in milli " #| "seconds between 0 and 2000. Hint: Tired of many clicks? - Use a small " #| "Auto-Advance-delay and the shortcuts Ctrl-1/2/3 to select A/B/C for many " #| "conflicts." msgid "" "There also is a button Automatically Go to Next Unsolved Conflict " "After Source Selection (Auto-Advance). If you enable this, then, " "when one source is selected, &kdiff3; will jump to and select the next " "unsolved conflict automatically. This can help when you always want to " "choose one source only. When you need both sources, or you want to edit " "after selecting, then you probably want to switch this off. Before " "proceeding to the next unsolved conflict &kdiff3; shows you the effect of " "your choice for a short time. This delay is adjustable in the Diff- & " "Merge-Settings: You can specify the \"Auto-Advance delay\" in milli seconds " "between 0 and 2000. Hint: Tired of many clicks? - Use a small Auto-Advance-" "delay and the shortcuts &Ctrl;1/" "2/3 to select A/" "B/C for many conflicts." msgstr "" "Det finns också en knapp som heter \"Gå automatiskt till nästa olösta " "konflikt efter val av källa\" (automatisk fortsättning). Om du aktiverar det " "här, så går &kdiff3; automatiskt till nästa olösta konflikt när en källa " "väljes. Det kan hjälpa till när du bara vill välja en källa. När du behöver " "båda källor, eller du vill redigera efter valet, bör du troligen stänga av " "det här. Innan &kdiff3; fortsätter till nästa olösta konflikt, visas " "effekten av valet en kort tid. Den här fördröjningen kan justeras i " "inställningarna under Jämför och sammanfoga. Du kan ange \"Fördröjning vid " "automatisk fortsättning\" i millisekunder mellan 0 och 2000. Tips: Är du " "trött på många klick? Använd en kort fördröjning vid automatisk fortsättning " "och snabbtangenterna Ctrl+1/2/3 för att välja A/B/C för många konflikter." #. Tag: title #: index.docbook:582 #, no-c-format msgid "Select, Copy And Paste" msgstr "Markera, kopiera och klistra in" #. Tag: para #: index.docbook:583 #, fuzzy, no-c-format #| msgid "" #| "The input windows don't show a cursor, so selections must be made with " #| "the mouse by clicking with the left mouse button at the start, holding " #| "down the mousebutton and moving to the end, where you release the mouse " #| "button again. You can also select a word by double clicking it. In the " #| "merge output editor you can also select via the keyboard by holding the " #| "\"shift\"-button and navigation with the cursor keys." msgid "" "The input windows don't show a cursor, so selections must be made with the " "mouse by clicking with the &RMB; at the start, holding down the mousebutton " "and moving to the end, where you release the mouse button again. You can " "also select a word by double clicking it. In the merge output editor you can " "also select via the keyboard by holding the &Shift; key and navigation with " "the cursor keys." msgstr "" "Indatafönstren visar inte någon markör, så markeringar måste göras med " "musen, genom att klicka med vänster musknapp på början, hålla nere " "musknappen och gå till slutet, där musknappen släpps upp igen. Du kan också " "markera ett ord genom att dubbelklicka på det. I editorn för " "sammanfogningsutdata kan du också markera med tangentbordet, genom att hålla " "nere skifttangenten och navigera med piltangenterna." #. Tag: para #: index.docbook:590 #, no-c-format msgid "" "If the selection exceeds the visible range you can move the mouse over the " "window borders which causes &kdiff3; to scroll in that direction." msgstr "" "Om markeringen överstiger det synliga området, kan du flytta musen över " "fönsterkanterna, vilket gör att &kdiff3; rullar i den riktningen." #. Tag: para #: index.docbook:593 #, fuzzy, no-c-format #| msgid "" #| "For very large selections you can also use the navigation keys while " #| "holding down the mouse. E.g. use page up and page down to quickly go to a " #| "certain position. At the end position release the mouse button." msgid "" "For very large selections you can also use the navigation keys while holding " "down the mouse. E.g. use &PgUp; and &PgDn; to quickly go to a certain " "position. At the end position release the mouse button." msgstr "" "För mycket stora markeringar kan du också använda navigationstangenterna " "medan musknappen hålls nere. Använd t.ex. Page Up och Page Down för att " "snabbt gå till en viss position. Släpp upp musknappen på slutpositionen." #. Tag: para #: index.docbook:597 #, no-c-format msgid "" "In order to select everything in the current window use " "Edit Select All menu item (&Ctrl;A)." msgstr "" +"Använd menyalternativet Redigera Markera alla (&Ctrl;A<" +"/keycombo>) för att markera allting i aktuellt fönster." #. Tag: para #: index.docbook:600 #, fuzzy, no-c-format #| msgid "" #| "To copy to the clipboard you must press the \"Copy\"-button (Ctrl-C or " #| "Ctrl-Insert). But there exists an option \"Auto Copy Selection\". If this " #| "is enabled, then whatever you select is copied immediately and you don't " #| "need to explicitly copy. But pay attention when using this because the " #| "contents of the clipboard might then be destroyed accidentally." msgid "" "To copy to the clipboard you must press the Copy " "button (&Alt;C or &Alt;&Ins;" "). But there exists an option Auto copy selection at Editor item in the settings dialog. If " "this is enabled, then whatever you select is copied immediately and you " "don't need to explicitly copy. But pay attention when using this because the " "contents of the clipboard might then be destroyed accidentally." msgstr "" "För att kopiera till klippbordet måste du trycka på knappen \"Kopiera\" (Ctrl" "+C eller Ctrl+Insert). Men det finns ett alternativ som heter \"Kopiera " "automatiskt markering\". Om det är aktiverat, kopieras vad du än väljer " "omedelbart, och du behöver aldrig explicit kopiera. Men var försiktig när du " "använder detta, eftersom klippbordets innehåll kan förstöras av misstag." #. Tag: para #: index.docbook:602 #, fuzzy, no-c-format #| msgid "" #| "\"Cut\" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the " #| "selected text." msgid "" "Cut (&Ctrl;X or " "&Shift;∇) copies to the clipboard and deletes the " "selected text." msgstr "" "\"Klipp ut\" (Ctrl+X eller Skift+Delete) kopierar till klippbordet och tar " "bort den markerade texten." #. Tag: para #: index.docbook:604 #, fuzzy, no-c-format #| msgid "" #| "\"Paste\" (Ctrl-V or Shift-Insert) inserts the text in the clipboard at " #| "the cursorposition or over the current selection. If you paste to either " #| "diff input window the contents of the clipboard will be shown in that " #| "window and the comparison will restart immediately. This is useful if you " #| "want to quickly grab a piece of text from somewhere and compare it with " #| "something else without first creating files." msgid "" "Paste (&Ctrl;V " "or &Shift;&Ins;) inserts the text in the clipboard at " "the cursorposition or over the current selection. If you paste to either " "diff input window the contents of the clipboard will be shown in that window " "and the comparison will restart immediately. This is useful if you want to " "quickly grab a piece of text from somewhere and compare it with something " "else without first creating files." msgstr "" "\"Klistra in\" (Ctrl+V eller Skift+Insert) infogar texten på klippbordet vid " "markörens position eller istället för den nuvarande markeringen. Om du " "klistrar in i något av jämförelsefönstren visas klippbordets innehåll i " "fönstret och jämförelsen startas omedelbart om. Det är användbart om du " "snabbt vill hämta ett textstycke någonstans och jämföra det med något annat " "utan att först skapa filer." #. Tag: title #: index.docbook:614 #, no-c-format msgid "Saving" msgstr "Spara" #. Tag: para #: index.docbook:615 #, fuzzy, no-c-format #| msgid "" #| "Saving will only be allowed, when all conflicts were solved. If the file " #| "already exists and the \"Backup files\"-option is enabled then the " #| "existing file will be renamed with an \".orig\"-extension, but if such a " #| "file exists it will be deleted. When you exit or start another diff-" #| "analysis and data wasn't saved yet, then &kdiff3; will ask if you want to " #| "save, cancel or proceed without saving. (&kdiff3; does not catch any " #| "signals. So if you \"kill\" &kdiff3; then your data will be lost.)" msgid "" "Saving will only be allowed, when all conflicts were solved. If the file " "already exists and the Backup files option is enabled " "at Directory item in the settings dialog then the " "existing file will be renamed with an .orig extension, but if such a file exists it will be deleted. When you " "exit or start another diff-analysis and data wasn't saved yet, then &kdiff3; " "will ask if you want to save, cancel or proceed without saving. (&kdiff3; " "does not catch any signals. So if you \"kill\" a &kdiff3; instance then your " "data will be lost.)" msgstr "" "Att spara tillåts bara när alla konflikter är lösta. Om filen redan finns " "och alternativet \"Säkerhetskopiera filer\" är markerat, ändras " "originalversionens namn med tillägg av filändelsen .orig, och om en sådan " "fil redan finns tas den bort. När du avslutar eller startar en ny " "jämförelseanalys och data inte sparats ännu, frågar &kdiff3; om du vill " "spara, avbryta eller fortsätta utan att spara. (&kdiff3; fångar inga " "signaler, så om du \"dödar\" &kdiff3; går data förlorat.)" #. Tag: para #: index.docbook:617 #, fuzzy, no-c-format #| msgid "" #| "Line endings are saved according to the normal method on the underlying " #| "operating system. For Unices each line ends with an linefeed-character " #| "\"\\n\", while for Win32-based systems each line ends with a carriage-" #| "return + a linefeed \"\\r\\n\". &kdiff3; does not preserve the line-" #| "endings of the input files, which also means that you shouldn't use " #| "&kdiff3; with binary files." msgid "" "Line endings are saved according to the normal method on the underlying " "operating system. For Unices each line ends with an linefeed-character " "\"\\n\", while for Win32-based systems each line ends " "with a carriage-return + a linefeed \"\\r\\n\". &kdiff3; " "does not preserve the line-endings of the input files, which also means that " "you shouldn't use &kdiff3; with binary files." msgstr "" "Radslut sparas enligt den normala metoden i det underliggande " "operativsystemet. För Unix slutar varje rad med ett nyradstecken \"\\n\", " "medan för Windows-baserade system slutar varje rad med ett returtecken och " "ett nyradstecken \"\\r\\n\". &kdiff3; behåller inte radslut för " "indatafilerna, vilket också betyder att du inte ska använda &kdiff3; med " "binärfiler." #. Tag: title #: index.docbook:622 #, no-c-format msgid "Finding Strings" msgstr "Söka efter strängar" #. Tag: para #: index.docbook:623 #, fuzzy, no-c-format #| msgid "" #| "You can search for a string in any text-window of &kdiff3;. The \"Find ..." #| "\"-command (Ctrl-F) in the Edit-menu opens a dialog that lets you specify " #| "the string to search for. You can also select the windows which should be " #| "searched. Searching will always start at the top. Use the \"Find Next\"-" #| "command (F3) to proceed to the next occurrence. If you select to search " #| "several windows then the first window will be searched from top to bottom " #| "before the search starts in the next window at the top again, etc." msgid "" "You can search for a string in any text-window of &kdiff3;. The " "EditFind... menu item (&Ctrl;F) opens " "a dialog that lets you specify the string to search for. You can also select " "the windows which should be searched. Searching will always start at the " "top. Use the EditFind Next... menu item (F3) to proceed to the " "next occurrence. If you select to search several windows then the first " "window will be searched from top to bottom before the search starts in the " "next window at the top again, &etc;" msgstr "" "Du kan söka efter en sträng i vilket textfönster som helst i &kdiff3;. " "Kommandot \"Sök...\" (Ctrl+F) i menyn Redigera, visar en dialogruta som " "låter dig ange strängen att söka efter. Du kan också välja de fönster som " "ska sökas. Sökning startar alltid från början. Använd kommandot \"Sök igen" "\" (F3) för att fortsätta till nästa förekomst. Om du väljer att söka i " "flera fönster, söks det första fönstret från början till slut innan " "sökningen fortsätter från början i nästa fönster, etc." #. Tag: title #: index.docbook:628 #, no-c-format msgid "Printing" msgstr "Utskrift" #. Tag: para #: index.docbook:629 #, fuzzy, no-c-format #| msgid "" #| "&kdiff3; supports printing for textfile differences. The \"Print...\"-" #| "command (Ctrl-P) in the File-menu opens a dialog that allows you to " #| "select the printer and to adjust other options." msgid "" "&kdiff3; supports printing for textfile differences. The " "FilePrint... menu item (&Ctrl;P) opens " "a dialog that allows you to select the printer and to adjust other options." msgstr "" "&kdiff3; stöder utskrift av skillnader mellan textfiler. Kommandot \"Skriv " "ut...\" (Ctrl+P) i menyn Arkiv visar en dialogruta som låter dig välja " "skrivare och justera andra alternativ." #. Tag: para #: index.docbook:631 #, no-c-format msgid "" "There are several possibilities to adjust the range. Due to different " "printing dialogs on different operating systems, the method to achieve " "certain range selections varies." msgstr "" "Det finns flera möjligheter att justera intervallet. Beroende på olika " "utskriftsdialogrutor på olika operativsystem, varierar metoden för att " "åstadkomma val av ett visst intervall." #. Tag: term #: index.docbook:636 #, no-c-format msgid "All:" msgstr "Alla:" #. Tag: para #: index.docbook:636 #, no-c-format msgid "Print everything." msgstr "Skriv ut allt." #. Tag: term #: index.docbook:637 #, no-c-format msgid "Current:" msgstr "Aktuell:" #. Tag: para #: index.docbook:637 #, no-c-format msgid "" "Print a page starting at the first visible line in the window. (On systems " "without this option this can be achieved by specifying page number 10000 for " "printing.)" msgstr "" "Skriv ut en sida som börjar på den första synliga raden i fönstret. (På " "system utan alternativet kan det åstadkommas genom att ange sidnumret 10000 " "för utskrift.)" #. Tag: term #: index.docbook:639 #, no-c-format msgid "Selection:" msgstr "Markering:" #. Tag: para #: index.docbook:639 #, no-c-format msgid "" "Before choosing to print select text with the mouse (like for copy and " "paste) in one of the diff input windows to define the start and end line. If " "no text in one of the diff input windows was selected, then this won't be an " "available choice. (On systems without this option this can be achived by " "specifying page number 9999 for printing.)" msgstr "" "Innan du väljer att skriva ut, markera text med musen (som för kopiera och " "klistra in) i ett av jämförelsefönstren för att definiera start- och " "slutrad. Om ingen text var markerad i något av jämförelsefönstren, är inte " "alternativet tillgängligt. (På system utan alternativet kan det åstadkommas " "genom att ange sidnumret 9999 för utskrift.)" #. Tag: term #: index.docbook:645 #, no-c-format msgid "Range:" msgstr "Intervall:" #. Tag: para #: index.docbook:645 #, no-c-format msgid "Specify the first and last page." msgstr "Ange första och sista sidan." #. Tag: para #: index.docbook:648 #, no-c-format msgid "" "Other important options for printing will be taken from the normal options:" msgstr "" "Andra viktiga inställningar för utskrift tas från de normala inställningarna:" #. Tag: para #: index.docbook:651 #, no-c-format msgid "Font, font size" msgstr "Teckensnitt, teckenstorlek" #. Tag: para #: index.docbook:652 #, no-c-format msgid "Show line numbers" msgstr "Visa radnummer" #. Tag: para #: index.docbook:653 #, no-c-format msgid "Word wrap" msgstr "Radbryt" #. Tag: para #: index.docbook:654 #, no-c-format msgid "Colors" msgstr "Färger" #. Tag: para #: index.docbook:655 #, no-c-format msgid "&etc;" msgstr "etc." #. Tag: para #: index.docbook:657 #, no-c-format msgid "Landscape formatting is also recommended for printing." msgstr "Liggande formatering rekommenderas också för utskrift." #. Tag: title #: index.docbook:662 #, no-c-format msgid "Options" msgstr "Alternativ" #. Tag: para #: index.docbook:663 #, fuzzy, no-c-format #| msgid "" #| "Options and the recent-file-list will be saved when you exit the program, " #| "and reloaded when you start it. (Menu Settings->Configure &kdiff3; ...)" msgid "" "Options and the recent-file-list will be saved when you exit the program, " "and reloaded when you start it. (Settings " "Configure &kdiff3;... menu item)." msgstr "" "Alternativ och listan med senaste filer sparas när du avslutar programmet, " "och laddas igen när du startar det. (Menyn Inställningar -> Anpassa " "&kdiff3;...)" #. Tag: title #: index.docbook:668 #, no-c-format msgid "Font" msgstr "Teckensnitt" #. Tag: para #: index.docbook:669 #, no-c-format msgid "" "Select a fixed width font. (On some systems this dialog will also present " "variable width fonts, but you should not use them.)" msgstr "" "Välj ett teckensnitt med fast breddsteg. (På vissa system visar dialogrutan " "också teckensnitt med variabel bredd, men du bör inte använda dem.)" #. Tag: guilabel #: index.docbook:675 #, fuzzy, no-c-format #| msgid "Italic Font for Deltas:" msgid "Italic font for deltas:" msgstr "Kursiv stil för skillnader:" #. Tag: para #: index.docbook:675 #, no-c-format msgid "" "If you select this, then text differences will be drawn with the italic " "version of the selected font. If the font doesn't support italic, then this " "does nothing." msgstr "" "Om du markerar detta, visas textskillnader med kursiv version av det valda " "teckensnittet. Om teckensnittet inte stöder kursiv stil, gör det ingenting." #. Tag: title #: index.docbook:682 #, no-c-format msgid "Colors" msgstr "Färger" #. Tag: guilabel #: index.docbook:684 #, no-c-format msgid "Editor and Diff Views:" msgstr "Editor- och skillnadsvyer:" #. Tag: guilabel #: index.docbook:686 #, no-c-format msgid "Foreground color:" msgstr "Förgrundsfärg:" #. Tag: para #: index.docbook:686 index.docbook:702 #, no-c-format msgid "Usually black." msgstr "Oftast svart." #. Tag: guilabel #: index.docbook:687 #, no-c-format msgid "Background color:" msgstr "Bakgrundsfärg:" #. Tag: para #: index.docbook:687 #, no-c-format msgid "Usually white." msgstr "Oftast vit." #. Tag: guilabel #: index.docbook:688 #, fuzzy, no-c-format #| msgid "Diff Background color:" msgid "Diff background color:" msgstr "Bakgrundsfärg för jämförelse:" #. Tag: para #: index.docbook:688 #, no-c-format msgid "Usually light gray." msgstr "Oftast ljusgrå." #. Tag: guilabel #: index.docbook:689 #, no-c-format msgid "Color A:" msgstr "Färg A:" #. Tag: para #: index.docbook:689 #, no-c-format msgid "Usually dark blue." msgstr "Oftast mörkblå." #. Tag: guilabel #: index.docbook:690 #, no-c-format msgid "Color B:" msgstr "Färg B:" #. Tag: para #: index.docbook:690 #, no-c-format msgid "Usually dark green." msgstr "Oftast mörkgrön." #. Tag: guilabel #: index.docbook:691 #, no-c-format msgid "Color C:" msgstr "Färg C:" #. Tag: para #: index.docbook:691 #, no-c-format msgid "Usually dark magenta." msgstr "Oftast mörk magenta." #. Tag: guilabel #: index.docbook:692 #, fuzzy, no-c-format #| msgid "Conflict Color:" msgid "Conflict color:" msgstr "Konfliktfärg:" #. Tag: para #: index.docbook:692 index.docbook:700 #, no-c-format msgid "Usually red." msgstr "Oftast röd." #. Tag: guilabel #: index.docbook:693 #, no-c-format msgid "Current range background color:" msgstr "Bakgrundsfärg för aktuellt intervall:" #. Tag: para #: index.docbook:693 #, no-c-format msgid "Usually light yellow." msgstr "Oftast ljusgul." #. Tag: guilabel #: index.docbook:694 #, no-c-format msgid "Current range diff background color:" msgstr "Bakgrundsfärg för aktuellt jämförelseintervall:" #. Tag: para #: index.docbook:694 #, no-c-format msgid "Usually dark yellow." msgstr "Oftast mörkgul." #. Tag: guilabel #: index.docbook:695 #, fuzzy, no-c-format #| msgid "Color for manually selected diff ranges:" msgid "Color for manually aligned difference ranges:" msgstr "Färg för manuellt justerade jämförelseintervall:" #. Tag: para #: index.docbook:695 #, no-c-format msgid "Usually orange." msgstr "Oftast orange." #. Tag: guilabel #: index.docbook:697 #, fuzzy, no-c-format #| msgid "Starting Directory Comparison Or Merge" msgid "Directory Comparison View:" msgstr "Starta katalogjämförelse eller sammanfogning" #. Tag: guilabel #: index.docbook:699 #, fuzzy, no-c-format #| msgid "Newest file color in directory comparison:" msgid "Newest file color:" msgstr "Färg för nyaste fil i katalogjämförelse:" #. Tag: para #: index.docbook:699 #, no-c-format msgid "Usually green." msgstr "Oftast grön." #. Tag: guilabel #: index.docbook:700 #, fuzzy, no-c-format #| msgid "Oldest file color in directory comparison:" msgid "Oldest file color:" msgstr "Färg för äldsta fil i en katalogjämförelse:" #. Tag: guilabel #: index.docbook:701 #, fuzzy, no-c-format #| msgid "Middle age file color in directory comparison:" msgid "Middle age file color:" msgstr "Färg för medelgamla filer i en katalogjämförelse:" #. Tag: para #: index.docbook:701 #, fuzzy, no-c-format #| msgid "Usually dark yellow." msgid "Usually strong yellow." msgstr "Oftast mörkgul." #. Tag: guilabel #: index.docbook:702 #, fuzzy, no-c-format #| msgid "Color for missing files in directory comparison:" msgid "Color for missing files:" msgstr "Färg för saknade filer i en katalogjämförelse:" #. Tag: para #: index.docbook:705 #, no-c-format msgid "" "Changing the colors for directory comparison will be effective only when " "starting the next directory comparison." msgstr "" "Att ändra färgerna för katalogjämförelser får inte någon effekt förrän nästa " "katalogjämförelse startas." #. Tag: para #: index.docbook:708 #, fuzzy, no-c-format #| msgid "" #| "On systems with only 16 or 256 colors some colors are not available in " #| "pure form. On such systems the \"Defaults\"-button will choose a pure " #| "color." msgid "" "On systems with only 16 or 256 colors some colors are not available in pure " "form. On such systems the Defaults button will choose " "a pure color." msgstr "" "För system med bara 16 eller 256 färger är vissa rena färger inte " "tillgängliga. För sådana system väljer knappen \"Förval\" en ren färg." #. Tag: title #: index.docbook:714 #, no-c-format msgid "Editor Settings" msgstr "Inställningar för editor" #. Tag: guilabel #: index.docbook:716 #, fuzzy, no-c-format #| msgid "Tab inserts spaces:" msgid "Tab inserts spaces" msgstr "Tabulator infogar mellanslag:" #. Tag: para #: index.docbook:716 #, fuzzy, no-c-format #| msgid "" #| "If this is disabled and you press the tabulator key, a tab-character is " #| "inserted, otherwise the appropriate amount of characters is inserted." msgid "" "If this is disabled and you press the key, a tab-character is " "inserted, otherwise the appropriate amount of characters is inserted." msgstr "" "Om det här inte är markerat, och du trycker på tabulatortangenten, infogas " "en tabulator, annars infogas lämpligt antal mellanslag." #. Tag: guilabel #: index.docbook:719 #, no-c-format msgid "Tab size:" msgstr "Tabulatorbredd:" #. Tag: para #: index.docbook:719 #, fuzzy, no-c-format #| msgid "Can be adjusted for your specific needs. Default is 8." msgid "" "Can be adjusted for your specific needs. Default is 8." msgstr "Kan justeras för dina speciella behov. Normalvärdet är 8." #. Tag: guilabel #: index.docbook:721 #, fuzzy, no-c-format #| msgid "Auto indentation:" msgid "Auto indentation" msgstr "Automatisk indentering:" #. Tag: para #: index.docbook:721 #, fuzzy, no-c-format #| msgid "" #| "When pressing Enter or Return the indentation of the previous line is " #| "used for the new line." msgid "" "When pressing &Enter; or Return the indentation of the " "previous line is used for the new line." msgstr "" "När du trycker på Enter eller returtangenten, används föregående rads " "indentering för den nya raden." #. Tag: guilabel #: index.docbook:724 #, fuzzy, no-c-format #| msgid "Auto copy selection:" msgid "Auto copy selection" msgstr "Kopiera automatiskt markering:" #. Tag: para #: index.docbook:724 #, no-c-format msgid "" "Every selection is immediately copied to the clipboard when active and you " "needn't explicitly copy it." msgstr "" "Varje markering kopieras omedelbart till klippbordet när den aktiveras, och " "du behöver inte kopiera den explicit." #. Tag: guilabel #: index.docbook:727 #, no-c-format msgid "Line end style:" msgstr "Radslutstil:" #. Tag: para #: index.docbook:727 #, no-c-format msgid "" "When saving you can select what line end style you prefer. The default " "setting is the common choice for the used operating system." msgstr "" "När du sparar kan du välja vilken radslutsstil du föredrar. Förvald " "inställning är det vanliga valet för operativsystemet som används." #. Tag: title #: index.docbook:733 #, no-c-format msgid "Diff Settings" msgstr "Inställningar av jämför" #. Tag: para #: index.docbook:734 #, no-c-format msgid "" "When comparing files, &kdiff3; first it tries to match lines that are equal " "in all input files. Only during this step it might ignore white space. The " "second step compares each line. In this step white space will not be " "ignored. Also during the merge white space will not be ignored." msgstr "" "När filer jämförs försöker &kdiff3; först att matcha rader som är lika i " "alla indatafiler. Det är bara under detta steg som blanktecken kan " "ignoreras. Det andra steget jämför varje rad. Under detta steg ignoreras " "inte blanktecken. Under sammanfogning ignoreras inte heller blanktecken." #. Tag: guilabel #: index.docbook:742 #, fuzzy, no-c-format #| msgid "Ignore white space" msgid "Ignore numbers (treat as white space)" msgstr "Ignorera blanktecken" #. Tag: para #: index.docbook:742 #, no-c-format msgid "" "Default is off. Number characters ('0'-'9', '.', '-') will be ignored in the " "first part of the analysis in which the line matching is done. In the result " "the differences will be shown nevertheless, but they are treated as white " "space." msgstr "" "Normalvärdet är av. Siffertecken ('0'-'9', '.', '-') ignoreras under första " "delen av analysen när radmatchningen görs. Skillnaderna för resultatet visas " "ändå, men de behandlas som blanktecken." #. Tag: guilabel #: index.docbook:747 #, fuzzy, no-c-format #| msgid "Ignore white space" msgid "Ignore case (treat as white space)" msgstr "Ignorera blanktecken" #. Tag: para #: index.docbook:747 #, no-c-format msgid "" "Default is off. Changes in comments will be treated like changes in white " "space." msgstr "" "Normalvärdet är av. Ändringar i kommentarer behandlas som ändringar i " "blanktecken." #. Tag: guilabel #: index.docbook:750 #, no-c-format msgid "Ignora les majúscules/minúscules (tracta'ls com a espais en blanc)" -msgstr "" +msgstr "Ignorera skiftläge (behandla som blanktecken)" #. Tag: para #: index.docbook:750 #, no-c-format msgid "" "Default is off. Case-differences of characters (like 'A' vs. 'a') will be " "treated like changes in white space." msgstr "" "Normalvärdet är av. Ändringar i skiftläge för tecken (som 'A' eller 'a') " "hanteras som ändringar i blanktecken." #. Tag: guilabel #: index.docbook:753 index.docbook:928 #, fuzzy, no-c-format #| msgid "Preprocessor-Command:" msgid "Preprocessor command:" msgstr "Preprocessorkommando:" #. Tag: para #: index.docbook:753 index.docbook:756 #, no-c-format msgid "See next section." msgstr "Se nästa avsnitt." #. Tag: guilabel #: index.docbook:756 index.docbook:935 #, fuzzy, no-c-format #| msgid "Line-Matching Preprocessor-Command:" msgid "Line-matching preprocessor command:" msgstr "Radmatchande preprocessorkommando:" #. Tag: guilabel #: index.docbook:759 #, no-c-format msgid "Try hard (slower)" msgstr "Var noggrann (långsammare)" #. Tag: para #: index.docbook:759 #, no-c-format msgid "" "Try hard to find an even smaller delta. (Default is on.) This will probably " "be effective for complicated and big files. And slow for very big files." msgstr "" "Gör en ansträngning att hitta en ännu mindre skillnad (Normalvärdet är på). " "Det här är troligen effektivt för komplicerade och stora filer, och långsamt " "för mycket stora filer." #. Tag: guilabel #: index.docbook:763 #, no-c-format msgid "Align B and C for 3 input files" msgstr "Justera B och C vid tre indatafiler" #. Tag: para #: index.docbook:763 #, no-c-format msgid "" "Try to align B and C when " "comparing or merging three input files. Not recommended for merging because " "merge might get more complicated. (Default is off.)" msgstr "" +"Försök justera B och C vid" +" jämförelse eller sammanfogning av tre indatafiler. Rekommenderas inte vid" +" sammanfogning eftersom den kan bli mer komplicerad (normalvärdet är av)." #. Tag: title #: index.docbook:771 #, no-c-format msgid "Merge Settings" msgstr "Inställningar av sammanfoga" #. Tag: guilabel #: index.docbook:773 #, fuzzy, no-c-format #| msgid "Auto Advance Delay (ms):" msgid "Auto advance delay (ms):" msgstr "Fördröjning vid automatisk fortsättning (ms):" #. Tag: para #: index.docbook:773 #, no-c-format msgid "" "When in auto-advance-mode this setting specifies how long to show the result " "of the selection before jumping to the next unsolved conflict." msgstr "" "I automatiskt fortsättningsläge anger den här inställningen hur länge " "resultatet för gruppen ska visas innan hopp till nästa olösta konflikt." #. Tag: guilabel #: index.docbook:777 #, no-c-format msgid "Show info dialogs" msgstr "Visa informationsdialogrutor" #. Tag: para #: index.docbook:777 #, no-c-format msgid "Show a dialog with information about the number of conflicts." msgstr "Visa en dialogruta med information om antal konflikter." #. Tag: guilabel #: index.docbook:780 #, no-c-format msgid "White space 2/3-file merge default:" msgstr "Standardvärde för sammanfogning av blanktecken med två/tre filer:" #. Tag: para #: index.docbook:780 #, fuzzy, no-c-format #| msgid "" #| "Automatically solve all white-space conflict by choosing the specified " #| "file. (Default is manual choice.) Useful if white space really isn't " #| "important in many files. If you need this only occasionally better use " #| "\"Choose A/B/C For All Unsolved Whitespace Conflicts\" in the merge menu. " #| "Note that if you enable either \"Ignore numbers\" or \"Ignore C/C++ " #| "comments\" then this auto-choice also applies for conflicts in numbers or " #| "comments." msgid "" "Automatically solve all white-space conflict by choosing the specified file. " "(Default is manual choice.) Useful if white space really isn't important in " "many files. If you need this only occasionally better use Choose A/" "B/C for All Unsolved Whitespace Conflicts in the Merge menu. Note that if you enable either Ignore numbers " "(treat as white space) or Ignore C/C++ comments (treat " "as white space) then this auto-choice also applies for conflicts " "in numbers or comments." msgstr "" "Lös automatiskt alla konflikter för blanktecken genom att välja angiven fil. " "(Normalvärdet är manuellt val.) Användbart om blanktecken verkligen är " "oviktiga i många filer. Om du bara behöver det ibland, är det bättre att " "använda \"Välj A/B/C för olösta konflikter med blanktecken\" i menyn " "Sammanfoga. Observera att om du antingen aktiverar \"Ignorera siffror\" " "eller \"Ignorera C/C++ kommentarer\" gäller det automatiska valet också vid " "konflikter för siffror eller kommentarer." #. Tag: guilabel #: index.docbook:789 #, no-c-format msgid "Auto merge regular expression:" msgstr "Reguljärt uttryck för automatisk sammanfogning:" #. Tag: para #: index.docbook:789 #, fuzzy, no-c-format #| msgid "" #| "Regular expression for lines where &kdiff3; should automatically choose " #| "one source. See also Automatic " #| "Merge ..." msgid "" "Regular expression for lines where &kdiff3; should automatically choose one " "source. See also Automatic Merge..." "." msgstr "" "Reguljärt uttryck för rader där &kdiff3; automatisk ska välja en källa. Se " "också Automatisk sammanfogning ..." "" #. Tag: guilabel #: index.docbook:792 #, fuzzy, no-c-format #| msgid "Run regular expression auto merge on merge start:" msgid "Run regular expression auto merge on merge start" msgstr "" "Kör automatisk sammanfogning med reguljärt uttryck när sammanfogning startar:" #. Tag: para #: index.docbook:792 #, fuzzy, no-c-format #| msgid "" #| "If activated &kdiff3; runs the automatic merge using the \"Auto merge " #| "regular expression\" when a merge is started." msgid "" "If activated &kdiff3; runs the automatic merge using the Auto " "merge regular expression: option when a merge is started." msgstr "" "Om aktiverad utför &kdiff3; den automatiska sammanfogningen med \"Reguljärt " "uttryck för automatisk sammanfogning\" när en sammanfogning startas." #. Tag: guilabel #: index.docbook:795 #, no-c-format msgid "History start regular expression:" msgstr "Reguljärt uttryck för historikens början:" #. Tag: para #: index.docbook:795 #, fuzzy, no-c-format #| msgid "" #| "Regular expression for the start of the merge history entry. Usually this " #| "line contains the \"$Log$\"-keyword. Default value: \".*\\$" #| "Log.*\\$.*\"" msgid "" "Regular expression for the start of the merge history entry. Usually this " "line contains the \"$Log$\" keyword. Default " "value: \".*\\$Log.*\\$.*\"" msgstr "" "Reguljärt uttryck för början av historikposten för sammanfogning. Oftast " "innehåller raden nyckelordet \"$Log$\". Förvalt värde: \".*\\$" "Log.*\\$.*\"" #. Tag: guilabel #: index.docbook:800 #, no-c-format msgid "History entry start regular expression:" msgstr "Reguljärt uttryck för historikpostens början:" #. Tag: para #: index.docbook:800 #, fuzzy, no-c-format #| msgid "" #| "A merge history entry consists of several lines. Specify the regular " #| "expression to detect the first line (without the leading comment). Use " #| "parentheses to group the keys you want to use for sorting. If left empty, " #| "then &kdiff3; assumes that empty lines separate history entries. See also " #| "Automatic Merge ..." msgid "" "A merge history entry consists of several lines. Specify the regular " "expression to detect the first line (without the leading comment). Use " "parentheses to group the keys you want to use for sorting. If left empty, " "then &kdiff3; assumes that empty lines separate history entries. See also " "Automatic Merge...." msgstr "" "En historikpost för sammanfogning består av flera rader. Ange det reguljära " "uttrycket för att detektera den första raden (utan inledande kommentar). " "Använd parenteser för att gruppera nycklarna du vill använda för sortering. " "Om det lämnas tomt, antar &kdiff3; att tomma rader skiljer historikposterna " "åt. Se också Automatisk " "sammanfogning ..." #. Tag: guilabel #: index.docbook:807 #, fuzzy, no-c-format #| msgid "History merge sorting:" msgid "History merge sorting" msgstr "Sortering av historiksammanfogning:" #. Tag: para #: index.docbook:807 #, no-c-format msgid "Enable version control history sorting." msgstr "Aktivera sortering av versionshanteringshistorik." #. Tag: guilabel #: index.docbook:810 #, no-c-format msgid "History entry start sort key order:" msgstr "Sorteringsnycklarnas ordning från historikpostens början:" #. Tag: para #: index.docbook:810 #, fuzzy, no-c-format #| msgid "" #| "Each parentheses used in the regular expression for the history start " #| "entry groups a key that can be used for sorting. Specify the list of keys " #| "(that are numbered in order of occurrence starting with 1) using ',' as " #| "separator (e.g. \"4,5,6,1,2,3,7\"). If left empty, then no sorting will " #| "be done. See also Automatic " #| "Merge ..." msgid "" "Each pair of parentheses used in the regular expression for the history " "start entry groups a key that can be used for sorting. Specify the list of " "keys (that are numbered in order of occurrence starting with 1) using ',' as separator (⪚ \"4,5,6,1,2,3,7" "\"). If left empty, then no sorting will be done. See also Automatic Merge...." msgstr "" "Varje parentes som används i det reguljära uttrycket för historikens " "startpost grupperar en nyckel som kan användas för sortering. Ange listan " "med nycklar (som numreras i ordning de uppträder med början på 1) med ',' " "som skiljetecken (t.ex. \"4,5,6,1,2,3,7\"). Om det lämnas tomt utförs ingen " "sortering. Se också Automatisk " "sammanfogning ..." #. Tag: guilabel #: index.docbook:818 #, fuzzy, no-c-format #| msgid "Merge version control history on merge start:" msgid "Merge version control history on merge start" msgstr "" "Sammanfogning enligt versionshanteringshistorik när sammanfogningen startar:" #. Tag: para #: index.docbook:818 #, no-c-format msgid "" "If activated &kdiff3; runs the automatic history merging using " "aforementioned options when a merge is started." msgstr "" "Om aktiverad utför &kdiff3; den automatiska sammafogningen av historik med " "tidigarenämnda alternativ när en sammanfogning startas." #. Tag: guilabel #: index.docbook:821 #, no-c-format msgid "Max number of history entries:" msgstr "Maximalt antal historikposter:" #. Tag: para #: index.docbook:821 #, fuzzy, no-c-format #| msgid "" #| "&kdiff3; truncates the history list after the specified number of " #| "entries. Use -1 to avoid truncation. (Default is -1)." msgid "" "&kdiff3; truncates the history list after the specified number of entries. " "Use -1 to avoid truncation. (Default is -1)." msgstr "" "&kdiff3; kortar av historiklistan till angivet antal poster. Använd -1 för " "att undvika avkortning. (Standardvärde är -1)." #. Tag: guilabel #: index.docbook:824 #, no-c-format msgid "Test your regular expressions" msgstr "Prova dina reguljära uttryck" #. Tag: para #: index.docbook:824 #, fuzzy, no-c-format #| msgid "" #| "This button shows a dialog that allows you to improve and test the " #| "regular expressions above. Just copy the respective data from your files " #| "into the example lines. The \"Match results\" will immediately show " #| "whether the match succeeds or not. The \"Sort key result\" will display " #| "the key used for history merge sorting." msgid "" "This button shows a dialog that allows you to improve and test the regular " "expressions above. Just copy the respective data from your files into the " "example lines. The Match result: option will " "immediately show whether the match succeeds or not. The Sort key " "result: will display the key used for history merge sorting." msgstr "" "Knappen visar en dialogruta som låter dig förbättra och prova det reguljära " "uttrycket ovan. Kopiera bara respektive data från dina filer till " "exempelraderna. \"Matchningsresultat\" visar omedelbart om matchningen " "lyckas eller inte. \"Sorteringsnyckelresultat\" visar nyckeln som används " "för sortering vid sammanfogning av historik." #. Tag: guilabel #: index.docbook:829 #, no-c-format msgid "Irrelevant merge command:" msgstr "Ej relevant sammanfogningskommando:" #. Tag: para #: index.docbook:829 #, fuzzy, no-c-format #| msgid "" #| "Specify a command of your own that should be called when &kdiff3; detects " #| "that for a three file merge the file from B doesn't contribute any " #| "relevant data that isn't already contained in the file from C. The " #| "command is called with the three filenames as parameters. Data matched by " #| "the \"Auto merge regular expression\" or in the history isn't considered " #| "relevant." msgid "" "Specify a command of your own that should be called when &kdiff3; detects " "that for a three file merge the file from B doesn't " "contribute any relevant data that isn't already contained in the file from " "C. The command is called with the three filenames as " "parameters. Data matched by the Auto merge regular expression or in the history isn't considered relevant." msgstr "" "Ange ett eget kommando som ska anropas när &kdiff3; detekterar att filen " "från B inte bidrar med något relevant data som inte reda finns i filen från " "C. Kommandot anropas med de tre filnamnen som parametrar. Data som matchas " "av \"Reguljärt uttryck för automatisk sammanfogning\" eller i historiken " "anses inte vara relevant." #. Tag: guilabel #: index.docbook:837 #, no-c-format msgid "Auto save and quit on merge without conflicts" msgstr "Spara automatiskt och avsluta vid sammanfogning utan konflikter" #. Tag: para #: index.docbook:837 #, no-c-format msgid "" "If &kdiff3; was started for a file-merge from the command line and all " "conflicts are solvable without user interaction then automatically save and " "quit. (Similar to command line option .)" msgstr "" +"När &kdiff3; startas från kommandoraden för en filsammanfogning och alla" +" konflikter kan lösas utan användarinteraktion, spara då automatiskt och" +" avsluta. (Liknar kommandoradsväljaren .)" #. Tag: title #: index.docbook:846 #, no-c-format msgid "Directory Merge" msgstr "Katalogsammanfogning" #. Tag: para #: index.docbook:847 #, no-c-format msgid "" "These options are concerned with scanning the directory and handling the " "merge: See the Directory Comparison/Merge " "Docs for details." msgstr "" "De här alternativen har att göra med avsökning av katalogen och hantering av " "sammanfogningen: Se Katalogjämförelse och " "sammanfogning för detaljinformation." #. Tag: para #: index.docbook:851 #, no-c-format msgid "" "Yet there is one option here that is also relevant for saving single files:" msgstr "" "Ändå finns det ett alternativ här som också är relevant för att spara " "enstaka filer:" #. Tag: guilabel #: index.docbook:855 index.docbook:1571 #, fuzzy, no-c-format #| msgid "Backup files:" msgid "Backup files (.orig)" msgstr "Säkerhetskopiera filer:" #. Tag: para #: index.docbook:855 #, fuzzy, no-c-format #| msgid "" #| "When a file is saved and an older version already exists, then the " #| "original version will be renamed with an \".orig\" extension. If an old " #| "backup file with \".orig\" extension already exists then this will be " #| "deleted without backup." msgid "" "When a file is saved and an older version already exists, then the original " "version will be renamed with an .orig " "extension. If an old backup file with .orig extension already exists then this will be deleted without backup." msgstr "" "När en fil sparas och en äldre version redan finns, ändras " "originalversionens namn med tillägg av filändelsen \".orig\". Om en gammal " "säkerhetskopia med filändelsen \".orig\" redan finns tas den bort utan " "säkerhetskopiering." #. Tag: title #: index.docbook:860 #, no-c-format msgid "Regional and Language Options" msgstr "Inställningar för region och språk" #. Tag: guilabel #: index.docbook:862 #, fuzzy, no-c-format #| msgid "Use the same encoding for everything:" msgid "Use the same encoding for everything" msgstr "Använd samma kodning för allt:" #. Tag: para #: index.docbook:862 #, no-c-format msgid "" "The following encoding options can be adjusted separately for each item or " "if this option is true, all values will take the first value." msgstr "" "Följande kodningsalternativ kan justeras separat för varje objekt, eller om " "alternativet är sant, ställs alla värden in till det första värdet." #. Tag: guilabel #: index.docbook:864 #, fuzzy, no-c-format #| msgid "Local Encoding:" msgid "Note: Local Encoding is \"...\"" msgstr "Lokal kodning:" #. Tag: para #: index.docbook:864 #, fuzzy, no-c-format #| msgid "" #| "Above the codec-selectors appears a note that tells you what the local " #| "encoding is. (This is not adjustable but for your information just in " #| "case you don't know your local encoding, but need to select it.)" msgid "" "Above the codec-selectors appears this note that tells you what the local " "encoding is. (This is not adjustable but for your information just in case " "you don't know your local encoding, but need to select it.)" msgstr "" "Ovanför kodningsväljarna visas en anmärkning som talar om för dig vad den " "lokala kodningen är (Den kan inte justeras, utan bara som information om du " "inte vet vad den lokala kodningen är, men behöver kunna välja den.)" #. Tag: guilabel #: index.docbook:866 #, no-c-format msgid "File Encoding for A/B/C:" msgstr "Filkodning för A/B/C:" #. Tag: para #: index.docbook:866 #, no-c-format msgid "" "Adjust the file encoding for input files. This has an effect on how the " "special characters are interpreted. Since you can adjust each codec " "separately you can even compare and merge files that were saved using " "different codecs." msgstr "" "Justera filkodningen för indatafiler. Det ger effekt på hur specialtecken " "tolkas. Eftersom du kan justera varje kodning separat, kan du till och med " "jämföra och sammanfoga filer som sparades med olika kodningar." #. Tag: guilabel #: index.docbook:868 #, no-c-format msgid "File Encoding for Merge Output and Saving:" msgstr "Filkodning för sammanfogad utdata och vid spara:" #. Tag: para #: index.docbook:868 #, no-c-format msgid "" "When you have edited a file, then you can adjust which encoding will be used " "when saving to disk." msgstr "" "När du har redigerat en fil, kan du justera vilken kodning som används när " "den sparas till disk." #. Tag: guilabel #: index.docbook:870 #, no-c-format msgid "File Encoding for Preprocessor Files:" msgstr "Filkodning för preprocessorfiler:" #. Tag: para #: index.docbook:870 #, fuzzy, no-c-format #| msgid "" #| "When you define preprocessors then they might not be able to operate on " #| "your codec. (e.g.: Your files are 16-bit-unicode and your preprocessor " #| "can only take 8-bit-ascii.) With this option you can define the encoding " #| "of preprocessor output." msgid "" "When you define preprocessors then they might not be able to operate on your " "codec. (⪚: Your files are 16 bit unicode and your preprocessor can only " "take 8 bit &ASCII;.) With this option you can define the encoding of " "preprocessor output." msgstr "" "När du definierar preprocessorer kanske de inte kan hantera din kodning " "(exempelvis om dina filer använder 16-bitars Unicode och preprocessorn bara " "kan hantera 8-bitars ASCII). Med det här alternativet kan du definiera " "kodningen för preprocessorns utdata." #. Tag: guilabel #: index.docbook:872 #, no-c-format msgid "Right To Left Language:" msgstr "Språk som läses från höger till vänster" #. Tag: para #: index.docbook:872 #, fuzzy, no-c-format #| msgid "" #| "Some languages are written right to left. When this option is enabled, " #| "&kdiff3; draws the text from right to left in the diff input windows and " #| "in the merge output window. Note that if you start &kdiff3; with the " #| "command line option \"--reverse\" then all layouting will be done right " #| "to left too. (This is a feature provided by Qt.) This documentation was " #| "written assuming that \"Right To Left Language\" or reverse layout are " #| "disabled. So some references to \"left\" or \"right\" must be replaced by " #| "their respective counterpart if you use these options." msgid "" "Some languages are written right to left. When this option is enabled, " "&kdiff3; draws the text from right to left in the diff input windows and in " "the merge output window. Note that if you start &kdiff3; with the command " "line option then all layouting will be done right " "to left too. (This is a feature provided by &Qt;.)" msgstr "" "Vissa språk skrivs från höger till vänster. När alternativet är aktiverat, " "ritar &kdiff3; text från höger till vänster i jämförelsefönstren och i " "sammanfogningsfönstret. Observera att om du startar &kdiff3; med " "kommandoradsväljaren \"--reverse\" så visas all layout också från höger till " "vänster. (Det är en funktion som Qt tillhandahåller.) Denna dokumentation är " "skriven med antagandet att \"Språk som läses från höger till vänster\" eller " "omvänd layout inte är aktiverade. Vissa referenser till \"vänster\" eller " "\"höger\" måste ersättas av motsatsen om du använder alternativen." #. Tag: para #: index.docbook:873 #, no-c-format msgid "" "This documentation was written assuming that this option or reverse layout " "are disabled. So some references to \"left\" or \"right\" must be replaced " "by their respective counterpart if you use these options." msgstr "" +"Dokumentationen är skriven med antagandet att det här alternativet eller" +" omvänd layout är inaktiverad. Så vissa referenser till \"vänster\" eller" +" \"höger\" måste ersätta av respektive motpart om du använder de här" +" alternativen." #. Tag: title #: index.docbook:880 #, no-c-format msgid "Miscellaneous" msgstr "Diverse" #. Tag: para #: index.docbook:881 #, no-c-format msgid "(These options and actions are available in menus or the buttonbar.)" msgstr "" "(Dessa alternativ och åtgärder är tillgängliga i menyerna eller " "verktygsraden.)" #. Tag: emphasis #: index.docbook:883 #, no-c-format msgid "Overview options:" msgstr "Översiktsalternativ:" #. Tag: para #: index.docbook:883 #, no-c-format msgid "" "These choices are only available when you compare three files. In normal " "mode all differences are shown in one color-coded overview-column. But " "sometimes you are especially interested in the differences between only two " "of these three files. Selecting \"A vs. B\", \"A vs. C\" or \"B vs. C\"-" "overview will show a second overview column with the required information " "next to the normal overview." msgstr "" "Dessa alternativ är bara tillgängliga när du jämför tre filer. I normalläge " "visas alla skillnader i en färgkodad översiktskolumn, men ibland är du " "särskilt intresserad av skillnaderna mellan två av de tre filerna. Genom att " "välja översikten \"A mot B\", \"A mot C\" eller \"B mot C\", visas en andra " "översiktskolumn med begärd information intill den vanliga översikten." #. Tag: guimenuitem #: index.docbook:890 #, fuzzy, no-c-format #| msgid "Word wrap diff windows:" msgid "Word Wrap Diff Windows" msgstr "Radbryt skillnadsfönster:" #. Tag: para #: index.docbook:890 #, no-c-format msgid "Wrap lines when their length would exceed the width of a window." msgstr "Radbryt rader när deras längd skulle överskrida ett fönsters bredd." #. Tag: guibutton #: index.docbook:893 #, no-c-format msgid "Show Window A/B/C:" msgstr "Visa fönster A/B/C:" #. Tag: para #: index.docbook:893 #, no-c-format msgid "" "Sometimes you want to use the space on the screen better for long lines. " "Hide the windows that are not important. (In the Windows-menu.)" msgstr "" "Ibland vill du använda skärmutrymmet bättre för långa rader. Dölj fönster " "som inte är viktiga. (I menyn Fönster.)" #. Tag: guibutton #: index.docbook:896 #, fuzzy, no-c-format #| msgid "Toggle Split Orientation:" msgid "Toggle Split Orientation" msgstr "Byt delningsorientering:" #. Tag: para #: index.docbook:896 #, fuzzy, no-c-format #| msgid "" #| "Switch between diff windows shown next to each other (A left of B left of " #| "C) or above each other (A above B above C). This should also help for " #| "long lines. (In the Windows-menu.)" msgid "" "Switch between diff windows shown next to each other (A " "left of B left of C) or above each " "other (A above B above " "C). This should also help for long lines. (In the " "Window menu.)" msgstr "" "Byt mellan jämförelsefönster som visas intill varandra (A till vänster om B " "till vänster om C) eller ovanför varandra (A ovanför B ovanför C). Det bör " "också hjälpa för långa rader. (I menyn Fönster.)" #. Tag: guibutton #: index.docbook:899 #, no-c-format msgid "Merge Current File" msgstr "Sammanfoga aktuell fil" #. Tag: para #: index.docbook:899 #, fuzzy, no-c-format #| msgid "" #| "Sometimes you are viewing the deltas and decide to merge. " #| " \"Merge current file\" " #| "in the Directory-menu also works if you only compare two files. A single " #| "click starts the merge and uses the filename of the last input-file as " #| "the default output filename. (When this is used to restart a merge, then " #| "the output filename will be preserved.)" msgid "" "Works if you only compare two files. A single click starts the merge and " "uses the filename of the last input-file as the default output filename. " "(When this is used to restart a merge, then the output filename will be " "preserved.)" msgstr "" "Ibland tittar du på skillnader, och bestämmer dig för att sammanfoga. " " \"Sammanfoga aktuell fil" "\" i menyn Katalog fungerar också om du bara jämför två filer. Ett " "enkelklick startar sammanfogningen och använder filnamnet på den sista " "indatafilen som förvalt utmatningsfilnamn. (När detta används för att starta " "om en sammanfogning, behålls utmatningsfilnamnet.)" #. Tag: guibutton #: index.docbook:903 #, fuzzy, no-c-format #| msgid "Show white space:" msgid "Show White Space" msgstr "Visa blanktecken:" #. Tag: para #: index.docbook:903 #, fuzzy, no-c-format #| msgid "" #| "Turn this off to suppress any highlighting of white-space-only changes in " #| "the text or overview-columns. (Note that this also applies to changes in " #| "numbers or comments if the options \"Ignore numbers\" or \"Ignore C/C++ " #| "comments\" are active.)" msgid "" "Turn this off to suppress any highlighting of white-space-only changes in " "the text or overview-columns. (Note that this also applies to changes in " "numbers or comments if the options Ignore numbers (treat as white " "space) or Ignore C/C++ comments (treat as white space) are active.)" msgstr "" "Stäng av det här för att inte visa ändringar av bara blanktecken i texten " "eller översiktskolumnerna. (Observera att detta också gäller ändringar av " "siffror eller kommentarer om alternativen \"Ignorera siffror\" eller " "\"Ignorera C/C++ kommentarer\" är aktiva.)" #. Tag: guibutton #: index.docbook:908 #, fuzzy, no-c-format #| msgid "Show space and tabulator characters for differences:" msgid "Show Space && Tabulator Characters" msgstr "Visa mellanslag och tabulatortecken i jämförelse:" #. Tag: para #: index.docbook:908 #, no-c-format msgid "" "Sometimes the visible spaces and tabs are disturbing. You can turn this off." msgstr "" "Ibland är synliga mellanslag och tabulatortecken störande. Du kan stänga av " "detta." #. Tag: guibutton #: index.docbook:910 #, fuzzy, no-c-format #| msgid "Show line numbers" msgid "Show Line Numbers" msgstr "Visa radnummer" #. Tag: para #: index.docbook:910 #, no-c-format msgid "You can select if line numbers should be shown for the input files." msgstr "Du kan välja om radnummer ska visas för indatafilerna." #. Tag: title #: index.docbook:915 #, no-c-format msgid "Configuring Keyboard-Shortcuts" msgstr "Anpassa snabbtangenter" #. Tag: para #: index.docbook:916 #, fuzzy, no-c-format #| msgid "" #| "Currently only the Frameworks-version supports user-configurable keyboard-" #| "shortcuts. (Menu Settings->Configure Shortcuts...)" msgid "" "Currently only the &frameworks; version supports user-configurable keyboard-" "shortcuts. (Menu SettingsConfigure Shortcuts...)" msgstr "" "För närvarande stöder bara ramverksversionen anpassningsbara snabbtangenter " "(Menyn Inställningar -> Anpassa genvägar...)" #. Tag: title #: index.docbook:923 #, no-c-format msgid "Preprocessor Commands" msgstr "Preprocessorkommandon" #. Tag: para #: index.docbook:924 #, no-c-format msgid "&kdiff3; supports two preprocessor options." msgstr "&kdiff3; stöder två preprocessoralternativ." #. Tag: para #: index.docbook:928 #, fuzzy, no-c-format #| msgid "" #| "When any file is read, it will be piped through this external command. " #| "The output of this command will be visible instead of the original file. " #| "You can write your own preprocessor that fulfills your specific needs. " #| "Use this to cut away disturbing parts of the file, or to automatically " #| "correct the indentation etc." msgid "" "When any file is read, it will be piped through this external command. The " "output of this command will be visible instead of the original file. You can " "write your own preprocessor that fulfills your specific needs. Use this to " "cut away disturbing parts of the file, or to automatically correct the " "indentation &etc;" msgstr "" "När en fil läses, skickas den via det här externa kommandot. Utmatningen " "från kommandot visas istället för den ursprungliga filen. Du kan skriva din " "egen preprocessor som uppfyller dina speciella behov. Använd det här för att " "ta bort störande delar av filen, eller för att automatiskt korrigera " "indenteringen, etc." #. Tag: para #: index.docbook:935 #, no-c-format msgid "" "When any file is read, it will be piped through this external command. If a " "preprocessor-command (see above) is also specified, then the output of the " "preprocessor is the input of the line-matching preprocessor. The output will " "only be used during the line matching phase of the analysis. You can write " "your own preprocessor that fulfills your specific needs. Each input line " "must have a corresponding output line." msgstr "" "När en fil läses, skickas den via det här externa kommandot. Om ett " "preprocessorkommando (se ovan) också anges är utmatningen från preprocessorn " "inmatning till den radmatchande preprocessorn. Utmatningen används bara " "under radmatchningsfasen av analysen. Du kan skriva din egen preprocessor " "som uppfyller dina speciella behov. Varje indatarad måste ha en motsvarande " "utdatarad." #. Tag: para #: index.docbook:945 #, no-c-format msgid "" "The idea is to allow the user greater flexibility while configuring the diff-" "result. But this requires an external program, and many users don't want to " "write one themselves. The good news is that very often sed or perl will do the job." msgstr "" "Idén är att ge användaren större flexibilitet när jämförelseresultatet " "ställs in, men det kräver ett externt program, och många användare vill inte " "skriva ett själva. De goda nyheterna är att ofta klarar sed eller perl av jobbet." #. Tag: para #: index.docbook:951 #, no-c-format msgid "" "Example: Simple testcase: Consider file a.txt (6 lines): \n" " aa\n" " ba\n" " ca\n" " da\n" " ea\n" " fa\n" " And file b.txt (3 lines): \n" " cg\n" " dg\n" " eg\n" " Without a preprocessor the following lines would be placed next to " "each other: \n" " aa - cg\n" " ba - dg\n" " ca - eg\n" " da\n" " ea\n" " fa\n" " This is probably not wanted since the first letter contains the " "actually interesting information. To help the matching algorithm to ignore " "the second letter we can use a line matching preprocessor command, that " "replaces 'g' with 'a': \n" " sed 's/g/a/'\n" " With this command the result of the comparison would be: \n" " aa\n" " ba\n" " ca - cg\n" " da - dg\n" " ea - eg\n" " fa\n" " Internally the matching algorithm sees the files after running the " "line matching preprocessor, but on the screen the file is unchanged. (The " "normal preprocessor would change the data also on the screen.)" msgstr "" "Till exempel ett enkelt fall att prova: Betrakta filen a.txt (6 rader): " "\n" " aa\n" " ba\n" " ca\n" " da\n" " ea\n" " fa\n" " Och filen b.txt (3 rader): \n" " cg\n" " dg\n" " eg\n" " Utan en preprocessor skulle följande rader placeras intill " "varandra: \n" " aa - cg\n" " ba - dg\n" " ca - eg\n" " da\n" " ea\n" " fa\n" " Det är troligen inte vad som önskas eftersom den första bokstaven " "innehåller den intressanta informationen. För att hjälpa " "matchningsalgoritmen att ignorera den andra bokstaven kan man använda ett " "radmatchande preprocessorkommando som ersätter 'g' med 'a': \n" " sed 's/g/a/'\n" " Med det kommandot blir resultatet av matchningen: \n" " aa\n" " ba\n" " ca - cg\n" " da - dg\n" " ea - eg\n" " fa\n" " Internt ser matchningsalgoritmen filerna efter den radmatchande " "preprocessorn har körts, men på skärmen är filen oförändrad. (Den normala " "preprocessorn skulle också ändra data på skärmen.)" #. Tag: title #: index.docbook:968 #, no-c-format msgid "sed Basics" msgstr "Grundläggande information om sed" #. Tag: para #: index.docbook:969 #, fuzzy, no-c-format #| msgid "" #| "This section only introduces some very basic features of sed. For more information see info:/sed or http://www.gnu.org/software/sed/manual/html_mono/sed.html. A precompiled version for Windows can be found at http://unxutils.sourceforge.net. Note that the following examples assume that the sed-command is in some directory in the PATH-environment variable. " #| "If this is not the case, you have to specify the full absolute path for " #| "the command." msgid "" "This section only introduces some very basic features of sed. For more information see info:/sed or https://www.gnu.org/software/sed/manual/html_mono/sed.html. " "A precompiled version for &Windows; can be found at http://unxutils.sourceforge.net. Note " "that the following examples assume that the sed command " "is in some folder in the PATH environment variable. If this " "is not the case, you have to specify the full absolute path for the command." msgstr "" "Det här avsnittet introducerar bara några mycket grundläggande funktioner i " "sed. För mer information se info:/sed eller http://www.gnu.org/software/sed/manual/html_mono/" "sed.html. En förkompilerad version för Windows finns på http://unxutils.sourceforge.net. " "Observera att följande exempel antar att sed finns i " "någon katalog i miljövariabeln PATH. Om det inte är fallet, måste du ange " "fullständig absolut sökväg till kommandot." #. Tag: para #: index.docbook:980 #, fuzzy, no-c-format #| msgid "" #| "In this context only the sed-substitute-command is " #| "used: \n" #| " sed 's/REGEXP/" #| "REPLACEMENT/FLAGS'\n" #| " Before you use a new command within &kdiff3;, you should first " #| "test it in a console. Here the echo-command is useful. " #| "Example: \n" #| " echo abrakadabra | sed 's/a/o/'\n" #| " -> obrakadabra\n" #| " This example shows a very simple sed-command that replaces the " #| "first occurance of \"a\" with \"o\". If you want to replace all " #| "occurances then you need the \"g\"-flag: \n" #| " echo abrakadabra | sed 's/a/o/" #| "g'\n" #| " -> obrokodobro\n" #| " The \"|\"-symbol is the pipe-command that transfers the output " #| "of the previous command to the input of the following command. If you " #| "want to test with a longer file then you can use cat " #| "on Unix-like systems or type on Windows-like systems. " #| "sed will do the substitution for each line." msgid "" "In this context only the sed substitute command is used: " "\n" " sed 's/REGEXP/" "REPLACEMENT/FLAGS'\n" " Before you use a new command within &kdiff3;, you should first " "test it in a console. Here the echo command is useful. " "Example: \n" " echo abrakadabra | sed 's/a/o/'\n" " -> obrakadabra\n" " This example shows a very simple sed-command that replaces the " "first occurance of \"a\" with \"o\". If you want to replace all occurances " "then you need the \"g\" flag: \n" " echo abrakadabra | sed 's/a/o/g'\n" " -> obrokodobro\n" " The \"|\"-symbol is the pipe-command that transfers the output of " "the previous command to the input of the following command. If you want to " "test with a longer file then you can use cat on &UNIX; " "like systems or type on &Windows; like systems. " "sed will do the substitution for each line." msgstr "" "I det här sammanhanget används bara ersättningskommandot i sed: \n" " sed 's/REGUTTRYCK/" "ERSÄTTNING/FLAGGOR'\n" " Innan du använder ett nytt kommando inne i &kdiff3;, bör du först " "prova det i en terminal. Då är kommandot echo användbart. " "Till exempel: \n" " echo abrakadabra | sed 's/a/o/'\n" " -> obrakadabra\n" " Exemplet visar ett mycket enkelt sed-kommando som ersätter den " "första förekomsten av \"a\" med \"o\". Om du vill ersätta alla förekomster " "behöver du flaggan \"g\": \n" " echo abrakadabra | sed 's/a/o/g'\n" " -> obrokodobro\n" " Symbolen \"|\" är rörledningskommandot som överför utdata från " "föregående kommando till indata i efterföljande kommando. Om du vill prova " "med en längre fil kan du använda cat på Unix-liknande " "system eller type på Windows-liknande system. " "sed utför ersättningen för varje rad." #. Tag: screen #: index.docbook:993 #, no-c-format msgid "" "cat filename | sed options" msgstr "" "cat filnamn |sed väljare" #. Tag: title #: index.docbook:996 #, fuzzy, no-c-format #| msgid "Examples For sed-Use In &kdiff3;" msgid "Examples For sed Use In &kdiff3;" msgstr "Exempel på användning av sed i &kdiff3;" #. Tag: title #: index.docbook:997 #, no-c-format msgid "Ignoring Other Types Of Comments" msgstr "Ignorera andra typer av kommentarer" #. Tag: para #: index.docbook:998 #, fuzzy, no-c-format #| msgid "" #| "Currently &kdiff3; understands only C/C++ comments. Using the Line-" #| "Matching-Preprocessor-Command you can also ignore other types of " #| "comments, by converting them into C/C++-comments. Example: To ignore " #| "comments starting with \"#\", you would like to convert them to \"//\". " #| "Note that you also must enable the \"Ignore C/C++-Comments\" option to " #| "get an effect. An appropriate Line-Matching-Preprocessor-Command would " #| "be: \n" #| " sed 's/#/\\/\\//'\n" #| " Since for sed the \"/\"-character has a " #| "special meaning, it is necessary to place the \"\\\"-character before " #| "each \"/\" in the replacement-string. Sometimes the \"\\\" is required to " #| "add or remove a special meaning of certain characters. The single " #| "quotation marks (') are only important when testing on the command shell " #| "as it will otherwise attempt to process some characters. KDiff3 does not " #| "do this except for the escape sequences '\\\"' and '\\\\'." msgid "" "Currently &kdiff3; understands only C/C++ comments. Using the Line-" "matching preprocessor command: option you can also ignore other " "types of comments, by converting them into C/C++-comments. Example: To " "ignore comments starting with \"#\", you would like to " "convert them to \"//\". Note that you also must enable " "the Ignore C/C++ comments (treat as white space) option " "to get an effect. An appropriate Line-matching preprocessor " "command: would be: \n" " sed 's/#/\\/\\//'\n" " Since for sed the \"/\" " "character has a special meaning, it is necessary to place the \"\\\" character before each \"/\" in the replacement-" "string. Sometimes the \"\\\" is required to add or remove " "a special meaning of certain characters. The single quotation marks (') are " "only important when testing on the command shell as it will otherwise " "attempt to process some characters. &kdiff3; does not do this except for the " "escape sequences '\\\"' and '\\\\'." msgstr "" "För närvarande förstår &kdiff3; bara C/C++ kommentarer. Genom att använda " "ett radmatchande preprocessorkommando kan du också ignorera andra typer av " "kommentarer genom att konvertera dem till C/C++ kommentarer. Exempel: För " "att ignorera kommentarer som börjar med \"#\", skulle du vilja konvertera " "dem till \"//\". Observera att du också måste aktivera alternativet " "\"Ignorera C/C++ kommentarer\" för att få någon effekt. Ett lämpligt " "radmatchande preprocessorkommando skulle vara: \n" " sed 's/#/\\/\\//'\n" " Eftersom tecknet \"/\" har en särskild betydelse i sed, är det nödvändigt att lägga till tecknet \"\\\" innan varje \"/\" " "i ersättningssträngen. Ibland behövs \"\\\" för att lägga till eller ta bort " "en särskild betydelse för vissa tecken. De enkla citationstecknen (') är " "bara viktiga vid utprovning i kommandoskalet eftersom det annars skulle " "försöka tolka vissa tecken. Kdiff3 gör inte det utom för teckenföljderna '\\" "\"' och '\\\\'." #. Tag: title #: index.docbook:1010 #, no-c-format msgid "Caseinsensitive Diff" msgstr "Jämförelse som inte är skiftlägeskänslig" #. Tag: para #: index.docbook:1011 #, fuzzy, no-c-format #| msgid "" #| "Use the following Line-Matching-Preprocessor-Command to convert all input " #| "to uppercase: \n" #| " sed 's/\\(.*\\)/\\U\\1/'\n" #| " Here the \".*\" is a regular expression that matches any string " #| "and in this context matches all characters in the line. The \"\\1\" in " #| "the replacement string refers to the matched text within the first pair " #| "of \"\\(\" and \"\\)\". The \"\\U\" converts the inserted text to " #| "uppercase." msgid "" "Use the following Line-matching preprocessor command: " "to convert all input to uppercase: \n" " sed 's/\\(.*\\)/\\U\\1/'\n" " Here the \".*\" is a regular expression that " "matches any string and in this context matches all characters in the line. " "The \"\\1\" in the replacement string refers to the " "matched text within the first pair of \"\\(\" and " "\"\\)\". The \"\\U\" converts the " "inserted text to uppercase." msgstr "" "Använd följande radmatchande preprocessorkommando för att omvandla all " "indata till stora bokstäver: \n" " sed 's/\\(.*\\)/\\U\\1/'\n" " Här är \".*\" ett reguljärt uttryck som matchar alla strängar, och " "i det här sammanhanget matchar alla tecken på raden. Tecknet \"\\1\" i " "ersättningssträngen motsvarar den matchade texten mellan det första paret " "\"\\(\" och \"\\)\". \"\\U\" konverterar den infogade texten till stora " "bokstäver." #. Tag: title #: index.docbook:1020 #, no-c-format msgid "Ignoring Version Control Keywords" msgstr "Ignorera nyckelord för versionshantering" #. Tag: para #: index.docbook:1021 #, fuzzy, no-c-format #| msgid "" #| "CVS and other version control systems use several keywords to insert " #| "automatically generated strings (info:/cvs/Keyword substitution). All of them " #| "follow the pattern \"$KEYWORD generated text$\". We now need a Line-" #| "Matching-Preprocessor-Command that removes only the generated text: " #| "\n" #| " sed 's/\\$\\(Revision\\|Author\\|Log\\|Header\\|Date" #| "\\).*\\$/\\$\\1\\$/'\n" #| " The \"\\|\" separates the possible keywords. You might want to " #| "modify this list according to your needs. The \"\\\" before the \"$\" is " #| "necessary because otherwise the \"$\" matches the end of the line." msgid "" "CVS and other version control systems use several keywords to insert " "automatically generated strings (info:/cvs/Keyword substitution). All of them follow the pattern " "\"$KEYWORD generated text$\". We now need a line-" "matching preprocessor command that removes only the generated text: " "\n" " sed 's/\\$\\(Revision\\|Author\\|Log\\|Header\\|Date" "\\).*\\$/\\$\\1\\$/'\n" " The \"\\|\" separates the possible keywords. " "You might want to modify this list according to your needs. The \"" "\\\" before the \"$\" is necessary because " "otherwise the \"$\" matches the end of the line." msgstr "" "CVS och andra versionshanteringssystem använder flera nyckelord för att " "infoga automatiskt skapade strängar (info:/cvs/Keyword substitution). Alla följer mönstret " "\"$NYCKELORD skapad text$\". Nu behöver vi ett radmatchande " "preprocessorkommando som bara tar bort den skapade texten: \n" " sed 's/\\$\\(Revision\\|Author\\|Log\\|Header\\|Date" "\\).*\\$/\\$\\1\\$/'\n" " Strängen \"\\|\" skiljer de möjliga nyckelorden åt. Du kanske vill " "ändra listan enligt dina behov. Tecknet \"\\\" framför \"$\" behövs eftersom " "annars matchar \"$\" radens slut." #. Tag: para #: index.docbook:1031 #, no-c-format msgid "" "While experimenting with sed you might come to understand " "and even like these regular expressions. They are useful because there are " "many other programs that also support similar things." msgstr "" "Medan du experimenterar med sed kan du komma att förstå " "och till och med tycka om de reguljära uttrycken. De är användbara eftersom " "det finns många andra program som också stöder liknande funktioner." #. Tag: title #: index.docbook:1038 #, no-c-format msgid "Ignoring Numbers" msgstr "Ignorera siffror" #. Tag: para #: index.docbook:1039 #, fuzzy, no-c-format #| msgid "" #| "Ignoring numbers actually is a built-in option. But as another example, " #| "this is how it would look as a Line-Matching-Preprocessor-command. " #| "\n" #| " sed 's/[0123456789.-]//g'\n" #| " Any character within '[' and ']' is a match and will be " #| "replaced with nothing." msgid "" "Ignoring numbers actually is a built-in option. But as another example, this " "is how it would look as a line-matching preprocessor command. \n" " sed 's/[0123456789.-]//g'\n" " Any character within '[' and ']' is a match and will be replaced with nothing." msgstr "" "Att ignorera siffror är i själva verket ett inbyggt alternativ, men som ett " "annat exempel, visas hur det skulle se ut som ett radmatchande " "preprocessorkommando. \n" " sed 's/[0123456789.-]//g'\n" " Alla tecken inom '[' och ']' matchar och kommer att ersättas av " "ingenting." #. Tag: title #: index.docbook:1047 #, no-c-format msgid "Ignoring Certain Columns" msgstr "Ignorera vissa kolumner" #. Tag: para #: index.docbook:1048 #, fuzzy, no-c-format #| msgid "" #| "Sometimes a text is very strictly formatted, and contains columns that " #| "you always want to ignore, while there are other columns you want to " #| "preserve for analysis. In the following example the first five columns " #| "(characters) are ignored, the next ten columns are preserved, then again " #| "five columns are ignored and the rest of the line is preserved. \n" #| " sed 's/.....\\(..........\\).....\\(.*\\)/\\1\\2/'\n" #| " Each dot '.' matches any single character. The \"\\1\" and " #| "\"\\2\" in the replacement string refer to the matched text within the " #| "first and second pair of \"\\(\" and \"\\)\" denoting the text to be " #| "preserved." msgid "" "Sometimes a text is very strictly formatted, and contains columns that you " "always want to ignore, while there are other columns you want to preserve " "for analysis. In the following example the first five columns (characters) " "are ignored, the next ten columns are preserved, then again five columns are " "ignored and the rest of the line is preserved. \n" " sed 's/.....\\(..........\\).....\\(.*\\)/\\1\\2/'\n" " Each dot '.' matches any single character. The " "\"\\1\" and \"\\2\" in the replacement " "string refer to the matched text within the first and second pair of " "\"\\(\" and \"\\)\" denoting the text " "to be preserved." msgstr "" "Ibland är texten mycket strikt formaterad, och innehåller kolumner som du " "alltid vill ignorera, medan det finns andra kolumner du vill bevara för " "analys. I följande exempel ignoreras de fem första kolumnerna (tecknen), de " "följande tio kolumnerna bevaras, därefter ignoreras återigen fem kolumner " "och resten av raden bevaras. \n" " sed 's/.....\\(..........\\).....\\(.*\\)/\\1\\2/'\n" " Varje punkt '.' motsvarar vilket enstaka tecken som helst. " "Strängarna \"\\1\" och \"\\2\" i ersättningssträngen refererar till den " "matchande texten inom det första och andra paret av \"\\(\" och \"\\)\" som " "anger texten att bevara." #. Tag: title #: index.docbook:1058 #, no-c-format msgid "Combining Several Substitutions" msgstr "Kombinera flera ersättningar" #. Tag: para #: index.docbook:1059 #, fuzzy, no-c-format #| msgid "" #| "Sometimes you want to apply several substitutions at once. You can then " #| "use the semicolon ';' to separate these from each other. Example:" msgid "" "Sometimes you want to apply several substitutions at once. You can then use " "the semicolon ';' to separate these from each other. " "Example:" msgstr "" "Ibland vill du tillämpa flera ersättningar samtidigt. Då kan du använda " "semikolon ';' för att skilja dem från varandra. Till exempel:" #. Tag: screen #: index.docbook:1062 #, no-c-format msgid "" "echo abrakadabra | sed 's/a/o/g;s/\\(.*" "\\)/\\U\\1/'\n" " -> OBROKODOBRO" msgstr "" "echo abrakadabra | sed 's/a/o/g;s/\\(.*" "\\)/\\U\\1/'\n" " -> OBROKODOBRO" #. Tag: title #: index.docbook:1066 #, no-c-format msgid "Using perl instead of sed" msgstr "Använda perl istället för sed" #. Tag: para #: index.docbook:1067 #, fuzzy, no-c-format #| msgid "" #| "Instead of sed you might want to use something else " #| "like perl. \n" #| " perl -p -e 's/REGEXP/" #| "REPLACEMENT/FLAGS'\n" #| " But some details are different in perl. Note " #| "that where sed needed \"\\(\" and \"\\)\" " #| "perl requires the simpler \"(\" and \")\" without " #| "preceding '\\'. Example:" msgid "" "Instead of sed you might want to use something else like " "perl. \n" " perl -p -e 's/REGEXP/" "REPLACEMENT/FLAGS'\n" " But some details are different in perl. Note " "that where sed needed \"\\(\" and " "\"\\)\" perl requires the simpler " "\"(\" and \")\" without preceding " "'\\'. Example:" msgstr "" "Istället för sed kanske du vill använda något annat som " "perl. \n" " perl -p -e 's/REGUTTRYCK/" "ERSÄTTNING/FLAGGOR'\n" " Men vissa detaljer är annorlunda i perl. " "Observera att där sed behöver \"\\(\" och \"\\)\" kräver " "perl det enklare \"(\" och \")\" utan inledande '\\'. " "Till exempel:" #. Tag: screen #: index.docbook:1074 #, no-c-format msgid "" "sed 's/\\(.*\\)/\\U\\1/'\n" " perl -p -e 's/(.*)/\\U\\1/'" msgstr "" "sed 's/\\(.*\\)/\\U\\1/'\n" " perl -p -e 's/(.*)/\\U\\1/'" #. Tag: title #: index.docbook:1079 #, no-c-format msgid "Order Of Preprocessor Execution" msgstr "Ordning vid körning av preprocessor" #. Tag: para #: index.docbook:1080 #, no-c-format msgid "" "The data is piped through all internal and external preprocessors in the " "following order:" msgstr "" "Data skickas igenom all intern och extern förbehandling i följande ordning:" #. Tag: para #: index.docbook:1085 #, no-c-format msgid "Normal preprocessor," msgstr "Normal preprocessor," #. Tag: para #: index.docbook:1086 #, fuzzy, no-c-format #| msgid "Line-Matching-Preprocessor," msgid "Line-matching preprocessor," msgstr "Preprocessor för radmatchning," #. Tag: para #: index.docbook:1087 #, fuzzy, no-c-format #| msgid "Ignore case (conversion to uppercase)," msgid "Ignore case (treat as white space) (conversion to uppercase)," msgstr "Ignorera skiftläge (konvertering till stora bokstäver)," #. Tag: para #: index.docbook:1088 #, no-c-format msgid "Detection of C/C++ comments," msgstr "Detektering av C/C++ kommentarer," #. Tag: para #: index.docbook:1089 #, fuzzy, no-c-format #| msgid "Ignore white space" msgid "Ignore numbers (treat as white space)," msgstr "Ignorera blanktecken" #. Tag: para #: index.docbook:1090 #, no-c-format msgid "Ignore white space" msgstr "Ignorera blanktecken" #. Tag: para #: index.docbook:1092 #, no-c-format msgid "" "The data after the normal preprocessor will be preserved for display and " "merging. The other operations only modify the data that the line-matching-" "diff-algorithm sees." msgstr "" "Data efter den normala förbehandlingen bevaras för att visas och " "sammanfogas. De andra åtgärderna ändrar bara data som algoritmen för " "radmatchande jämförelse ser." #. Tag: para #: index.docbook:1095 #, no-c-format msgid "" "In the rare cases where you use a normal preprocessor note that the line-" "matching-preprocessor sees the output of the normal preprocessor as input." msgstr "" "I de sällsynta fall då du använder normal förbehandling, observera att den " "radmatchande förbehandlingen ser utdata från den normala förbehandlingen som " "indata." #. Tag: title #: index.docbook:1101 #, no-c-format msgid "Warning" msgstr "Varning" #. Tag: para #: index.docbook:1102 #, no-c-format msgid "" "The preprocessor-commands are often very useful, but as with any option that " "modifies your texts or hides away certain differences automatically, you " "might accidentally overlook certain differences and in the worst case " "destroy important data." msgstr "" "Förbehandlingskommandon är ofta mycket användbara, men som med alla " "alternativ som ändrar texten eller döljer vissa skillnader automatiskt, kan " "du av misstag hoppa över vissa skillnader och i värsta fall förstöra viktig " "data." #. Tag: para #: index.docbook:1106 #, fuzzy, no-c-format #| msgid "" #| "For this reason during a merge if a normal preprocessor-command is being " #| "used &kdiff3; will tell you so and ask you if it should be disabled or " #| "not. But it won't warn you if a Line-Matching-Preprocessor-command is " #| "active. The merge will not complete until all conflicts are solved. If " #| "you disabled \"Show White Space\" then the differences that were removed " #| "with the Line-Matching-Preprocessor-command will also be invisible. If " #| "the Save-button remains disabled during a merge (because of remaining " #| "conflicts), make sure to enable \"Show White Space\". If you don't want " #| "to merge these less important differences manually you can select " #| "\"Choose [A|B|C] For All Unsolved White space Conflicts\" in the Merge-" #| "menu." msgid "" "For this reason during a merge if a normal preprocessor-command is being " "used &kdiff3; will tell you so and ask you if it should be disabled or not. " "But it won't warn you if a Line-matching preprocessor command: option is active. The merge will not complete until all conflicts " "are solved. If you disabled DiffviewShow White Space menu item " "then the differences that were removed with the Line-matching " "preprocessor command: option will also be invisible. If the " "Save button remains disabled during a merge (because " "of remaining conflicts), make sure to enable DiffviewShow White Space menu item. " "If you don't want to merge these less important differences manually you can " "select MergeChoose [A|B|C] for " "All Unsolved Whitespace Conflicts menu item." msgstr "" "Av denna orsak, om ett normalt preprocessorkommando används under en " "sammanfogning, talar &kdiff3; om det för dig och frågar om det ska " "inaktiveras eller inte. Men du får ingen varning om ett radmatchande " "preprocessorkommando är aktivt. Sammanfogningen sker inte förrän alla " "konflikter är lösta. Om du inaktiverade \"Visa blanktecken\" blir också " "skillnaderna som togs bort med det radmatchande preprocessorkommandot " "osynliga. Om knappen Spara förblir inaktiv under en sammanfogning (på grund " "av kvarvarande konflikter), försäkra dig om att aktivera \"Visa blanktecken" "\". Om du inte vill sammanfoga dessa mindre viktiga skillnader för hand kan " "du välja \"Välj [A|B|C] för olösta konflikter med blanktecken\" i menyn " "\"Sammanfoga\"." #. Tag: title #: index.docbook:1115 #, no-c-format msgid "Directory Comparison and Merge with &kdiff3;" msgstr "Katalogjämförelse och sammanfogning med &kdiff3;" #. Tag: title #: index.docbook:1116 #, no-c-format msgid "Introduction into Directory Comparison and Merge" msgstr "Introduktion till katalogjämförelse och sammanfogning" #. Tag: para #: index.docbook:1117 #, no-c-format msgid "" "Often programmers must modify many files in a directory to achieve their " "purpose. For this &kdiff3; also lets you compare and merge complete " "directories recursively!" msgstr "" "Ofta måste programmerare ändra många filer i en katalog för att uppnå sina " "syften. För att åstadkomma detta låter &kdiff3; dig också jämföra och " "sammanfoga hela kataloger rekursivt!" #. Tag: para #: index.docbook:1121 #, fuzzy, no-c-format #| msgid "" #| "Even though comparing and merging directories seems to be quite obvious, " #| "there are several details that you should know about. Most important is " #| "of course the fact that now many files might be affected by each " #| "operation. If you don't have backups of your original data, then it can " #| "be very hard or even impossible to return to the original state. So " #| "before starting a merge, make sure that your data is safe, and going back " #| "is possible. If you make an archive or use some version control system is " #| "your decision, but even experienced programmers and integrators need the " #| "old sources now and then. And note that even though I (the author of " #| "&kdiff3;) try to do my best, I can't guarantee that there are no bugs. " #| "According to the GNU-GPL there is NO WARRANTY whatsoever for this " #| "program. So be humble and always keep in mind:" msgid "" "Even though comparing and merging directories seems to be quite obvious, " "there are several details that you should know about. Most important is of " "course the fact that now many files might be affected by each operation. If " "you don't have backups of your original data, then it can be very hard or " "even impossible to return to the original state. So before starting a merge, " "make sure that your data is safe, and going back is possible. If you make an " "archive or use some version control system is your decision, but even " "experienced programmers and integrators need the old sources now and then. " "And note that even though I (the author of &kdiff3;) try to do my best, I " "can't guarantee that there are no bugs. According to the &GNU; GPL there is " "NO WARRANTY whatsoever for this program. So be humble and always keep in " "mind:" msgstr "" "Även om jämförelse och sammanfogning av kataloger verkar vara ganska " "självklart, finns det flera detaljer som du bör känna till. Det viktigaste " "är förstås faktum att många filer nu kan påverkas av varje åtgärd. Om du " "inte har säkerhetskopior av originaldata, kan det vara mycket svårt eller " "till och med omöjligt att återgå till originalläget. Så innan du påbörjar en " "sammanfogning, försäkra dig om att data är säkert, och att det är möjligt " "att återställa. Om du skapar ett arkiv, eller använder ett " "versionshanteringssystem är ditt eget beslut, men till och med erfarna " "programmerare och integratörer behöver ibland gammal källkod. Observera " "också att även om jag (upphovsmannen till &kdiff3;) försöker att göra mitt " "bästa, kan jag inte garantera att det inte finns fel. Enligt GNU GPL finns " "det INGEN GARANTI av något slag för det här programmet. Så var ödmjuk, och " "kom alltid ihåg:" #. Tag: emphasis #: index.docbook:1135 #, no-c-format msgid "To err is human, but to really mess things up you need a computer." msgstr "" "Att fela är mänskligt, men för att verkligen ställa till det behövs en dator." #. Tag: para #: index.docbook:1137 #, no-c-format msgid "So this is what this program can do for you: &kdiff3; ..." msgstr "Så det här är vad programmet kan göra åt dig: &kdiff3; ..." #. Tag: para #: index.docbook:1141 #, no-c-format msgid "... reads and compares two or three directories recursively," msgstr "... läser och jämför två eller tre kataloger rekursivt," #. Tag: para #: index.docbook:1142 #, no-c-format msgid "... takes special care of symbolic links," msgstr "... hanterar symboliska länkar särskilt," #. Tag: para #: index.docbook:1143 #, no-c-format msgid "... lets you browse files on mouse double click," msgstr "... låter dig bläddra mellan filer med ett dubbelklick på musen," #. Tag: para #: index.docbook:1144 #, no-c-format msgid "" "... for each item proposes a merge operation, which you can change before " "starting the directory merge," msgstr "" "... föreslår ett sammanfogningsalternativ för varje objekt, som du kan ändra " "innan katalogsammanfogningen startas," #. Tag: para #: index.docbook:1146 #, no-c-format msgid "" "... lets you simulate the merge and lists the actions that would take place, " "without actually doing them," msgstr "" "... låter dig simulera sammanfogningen och listar åtgärderna som skulle ske, " "utan att verkligen göra dem," #. Tag: para #: index.docbook:1148 #, no-c-format msgid "" "... lets you really do the merge, and lets you interact whenever manual " "interaction is needed," msgstr "" "... låter dig utföra sammanfogningen, och låter dig bestämma så fort manuell " "interaktion behövs," #. Tag: para #: index.docbook:1150 #, fuzzy, no-c-format #| msgid "" #| "... lets you run the selected operation for all items (key F7) or the " #| "selected item (key F6)," msgid "" "... lets you run the selected operation for all items (F7 " "key) or the selected item (F6 key)," msgstr "" "... låter dig utföra vald åtgärd för alla objekt (tangenten F7 ) eller " "markerat objekt (tangenten F6)," #. Tag: para #: index.docbook:1151 #, fuzzy, no-c-format #| msgid "" #| "... lets you continue the merge after manual interaction with key F7," msgid "" "... lets you continue the merge after manual interaction with F7 key," msgstr "" "... låter dig fortsätta sammanfogningen efter manuell interaktion med " "tangenten F7," #. Tag: para #: index.docbook:1152 #, fuzzy, no-c-format #| msgid "... optionally creates backups, with the \".orig\" extension," msgid "" "... optionally creates backups, with the .orig extension," msgstr "... skapar valfria säkerhetskopior, med filändelsen \".orig\"," #. Tag: title #: index.docbook:1157 #, no-c-format msgid "Starting Directory Comparison Or Merge" msgstr "Starta katalogjämförelse eller sammanfogning" #. Tag: para #: index.docbook:1158 #, no-c-format msgid "" "This is very similar to the single file merge and comparison. You just have " "to specify directories on the command line or in the file-open dialog." msgstr "" "Det här liknar mycket sammanfogning och jämförelse av en enstaka fil. Du " "måste bara ange kataloger på kommandoraden eller i dialogrutan för " "filöppning." #. Tag: title #: index.docbook:1163 #, no-c-format msgid "Compare/Merge two directories:" msgstr "Jämföra eller sammanfoga två kataloger:" #. Tag: screen #: index.docbook:1164 #, no-c-format msgid "" "kdiff3 dir1 dir2\n" " kdiff3 dir1 dir2 -o " "destdir" msgstr "" "kdiff3 kat1 kat2\n" " kdiff3 kat1 kat2 målkat" #. Tag: para #: index.docbook:1165 #, no-c-format msgid "" "If no destination directory is specified, then &kdiff3; will use " "dir2." msgstr "" "Om ingen målkatalog anges, använder &kdiff3; kat2." #. Tag: title #: index.docbook:1170 #, no-c-format msgid "Compare/Merge three directories:" msgstr "Jämföra eller sammanfoga tre kataloger:" #. Tag: screen #: index.docbook:1171 #, no-c-format msgid "" "kdiff3 dir1 dir2 dir3\n" " kdiff3 dir1 dir2 dir3 -o " "destdir" msgstr "" "kdiff3 kat1 kat2 kat3\n" " kdiff3 kat1 kat2 kat3 " " målkat" #. Tag: para #: index.docbook:1172 #, no-c-format msgid "" "When three directories are merged then dir1 is " "used as the base for the merge. If no destination directory is specified, " "then &kdiff3; will use dir3 as the destination " "directory for the merge." msgstr "" "När tre kataloger sammanfogas, används kat1 som " "basen för sammanfogningen. Om ingen målkatalog anges, använder &kdiff3; " "kat3 som målkatalog för sammanfogningen." #. Tag: para #: index.docbook:1179 #, fuzzy, no-c-format #| msgid "" #| "Note that only the comparison starts automatically, not the merge. For " #| "this you first must select a menu entry or the key F7. (More details " #| "later.)" msgid "" "Note that only the comparison starts automatically, not the merge. For this " "you first must select a menu entry or the F7 key. (More " "details later.)" msgstr "" "Observera att bara jämförelsen startas automatiskt, inte sammanfogningen. " "För det måste du först välja ett menyalternativ eller tangenten F7. (Mer " "information kommer senare.)" #. Tag: title #: index.docbook:1186 #, no-c-format msgid "Directory Merge Visible Information" msgstr "Katalogsammanfogning av synlig information" #. Tag: para #: index.docbook:1187 #, no-c-format msgid "" "While reading the directories a message-box appears that informs you of the " "progress. If you abort the directory scan, then only files that have been " "compared until then will be listed." msgstr "" "Medan katalogerna läses visas en meddelanderuta som informerar dig om " "förloppet. Om du avbryter katalogavsökningen, visas bara filer som hittills " "har jämförts." #. Tag: para #: index.docbook:1191 #, no-c-format msgid "" "When the directory scan is complete then &kdiff3; will show a listbox with " "the results left, ..." msgstr "" "När katalogavsökningen är färdig, visar &kdiff3; en listruta med återstående " "resultat, ..." #. Tag: para #: index.docbook:1198 #, no-c-format msgid "... and details about the currently selected item on the right:" msgstr "... och detaljinformation om det markerade objektet till höger:" #. Tag: title #: index.docbook:1206 #, no-c-format msgid "The Name Column" msgstr "Namnkolumnen" #. Tag: para #: index.docbook:1207 #, no-c-format msgid "" "Each file and directory that was found during the scan is shown here in a " "tree. You can select an item by clicking it with the mouse once." msgstr "" "Varje fil och katalog som hittades under avsökningen visas här i ett träd. " "Du kan välja ett objekt genom att klicka en gång på det med musen." #. Tag: para #: index.docbook:1210 #, fuzzy, no-c-format #| msgid "" #| "The directories are collapsed by default. You can expand and collapse " #| "them by clicking on the \"+\"/\"-\" or by double-clicking the item or by " #| "using the left/right-arrow-keys. The \"Directory\"-menu also contains two " #| "actions \"Fold all subdirs\" and \"Unfold all subdirs\" with which you " #| "can collapse or expand all directories at once." msgid "" "The directories are collapsed by default. You can expand and collapse them " "by clicking on the \"+\"/\"-\" or by double-clicking the item or by using " "the &Left;/&Right; cursor keys. The Directory menu also " "contains two actions Fold All Subdirs and " "Unfold All Subdirs with which you can collapse or " "expand all directories at once." msgstr "" "Katalogerna är normalt ihopdragna. Du kan expandera och dra ihop dem genom " "att klicka på \"+\"/\"-\", genom att dubbelklicka på objektet eller genom " "att använda tangenterna vänsterpil och högerpil. Menyn \"Katalog\" " "innehåller också två alternativ \"Dra ihop alla underkataloger\" och " "\"Expandera alla underkataloger\" som du kan använda för att dra ihop eller " "expandera alla kataloger på en gång." #. Tag: para #: index.docbook:1216 #, no-c-format msgid "" "If you double-click a file item then the file comparison starts and the file-" "diff-window will appear." msgstr "" "Om du dubbelklickar på ett filobjekt, utförs filjämförelsen och " "jämförelsefönstret för filer visas." #. Tag: para #: index.docbook:1220 #, fuzzy, no-c-format #| msgid "" #| "The image in the name column reflects the file type in the first " #| "directory (\"A\"). It can be one of these:" msgid "" "The image in the name column reflects the file type in the first directory " "(A). It can be one of these:" msgstr "" "Ikonen i namnkolumnen motsvarar filtypen i den första katalogen (\"A\"). Den " "kan vara någon av dessa:" #. Tag: para #: index.docbook:1225 #, no-c-format msgid "Normal file" msgstr "Normal fil" #. Tag: para #: index.docbook:1226 #, no-c-format msgid "Normal directory (directory-image)" msgstr "Normal katalog (katalogikon)" #. Tag: para #: index.docbook:1227 #, no-c-format msgid "Link to a file (file-image with a link arrow)" msgstr "Länk till en fil (filikon med en länkpil)" #. Tag: para #: index.docbook:1228 #, no-c-format msgid "Link to a directory (directory-image with a link arrow)" msgstr "Länk till en katalog (katalogikon med en länkpil)" #. Tag: para #: index.docbook:1230 #, fuzzy, no-c-format #| msgid "" #| "If the file type is different in the other directories, then this is " #| "visible in the columns A/B/C and in the window that shows the details " #| "about the selected item. Note that for such a case no merge operation can " #| "be selected automatically. When starting the merge, then the user will be " #| "informed of problems of that kind." msgid "" "If the file type is different in the other directories, then this is visible " "in the columns A/B/C and in the window that shows the details about the selected item. " "Note that for such a case no merge operation can be selected automatically. " "When starting the merge, then the user will be informed of problems of that " "kind." msgstr "" "Om filtypen är annorlunda i övriga kataloger, syns det i kolumnerna A/B/C " "och i fönstret som visar detaljinformation om det markerade objektet. " "Observera att i dessa fall kan inte någon sammanfogningsåtgärd väljas " "automatiskt. När sammanfogningen startas, informeras användaren om den här " "sortens problem." #. Tag: title #: index.docbook:1239 #, no-c-format msgid "The Columns A/B/C and the Coloring Scheme" msgstr "Kolumnerna A/B/C och färgläggningsschemat" #. Tag: para #: index.docbook:1240 #, fuzzy, no-c-format #| msgid "" #| "As can be seen in the image above the colors red, green, yellow and black " #| "are used in the columns A/B/C." msgid "" "As can be seen in the image above the colors red, green, yellow and black " "are used in the columns A/B/" "C." msgstr "" "Som syns i bilden ovan, används färgerna röd, grön, gul och svart i " "kolumnerna A/B/C." #. Tag: para #: index.docbook:1245 #, no-c-format msgid "Black: This item doesn't exist in this directory." msgstr "Svart: Det här objektet finns inte i den här katalogen." #. Tag: para #: index.docbook:1246 #, no-c-format msgid "Green: Newest item." msgstr "Grön: Nyaste objektet." #. Tag: para #: index.docbook:1247 #, no-c-format msgid "Yellow: Older than green, newer than red." msgstr "Gul: Äldre än grön, nyare än röd." #. Tag: para #: index.docbook:1248 #, no-c-format msgid "Red: Oldest item." msgstr "Röd: Äldsta objektet." #. Tag: para #: index.docbook:1250 #, no-c-format msgid "" "But for items that were identical in the comparison their color also is " "identical even if the age is not." msgstr "" "Utom för objekt som var identiska i jämförelsen, där är färgen också " "identisk även om åldern inte är det." #. Tag: para #: index.docbook:1253 #, no-c-format msgid "" "Directories are considered equal if all items they contain are identical. " "Then they also will have the same color. But the age of a directory is not " "considered for its color." msgstr "" "Kataloger anses vara likadana om alla objekt de innehåller är likadana. Då " "har de också samma färg. Åldern på en katalog spelar dock ingen roll för " "dess färg." #. Tag: para #: index.docbook:1257 #, fuzzy, no-c-format #| msgid "" #| "The idea for this coloring scheme I came upon in dirdiff. The colors resemble " #| "the colors of a leaf that is green when new, turns yellow later and red " #| "when old." msgid "" "The idea for this coloring scheme I came upon in dirdiff command. The " "colors resemble the colors of a leaf that is green when new, turns yellow " "later and red when old." msgstr "" "Idén för färgläggningsschemat hittade jag i dirdiff. Färgerna motsvarar färgerna hos " "ett löv som är grönt från början, sedan blir gult och till sist rött när det " "är gammalt." #. Tag: title #: index.docbook:1264 #, no-c-format msgid "The Operation Column" msgstr "Åtgärdskolumnen" #. Tag: para #: index.docbook:1265 #, fuzzy, no-c-format #| msgid "" #| "After comparing the directories &kdiff3; also evaluates a proposal for a " #| "merge operation. This is shown in the \"Operation\" column. You can " #| "modify the operation by clicking on the operation you want to change. A " #| "small menu will popup and allows you to select an operation for that " #| "item. (You can also select the most needed operations via keyboard. Ctrl" #| "+1/2/3/4/Del will select A/B/C/Merge/Delete respectively if available.) " #| "This operation will be executed during the merge. It depends on the item " #| "and on the merge-mode you are in, what operations are available. The " #| "merge-mode is one of" msgid "" "After comparing the directories &kdiff3; also evaluates a proposal for a " "merge operation. This is shown in the Operation column. " "You can modify the operation by clicking on the operation you want to " "change. A small menu will popup and allows you to select an operation for " "that item. (You can also select the most needed operations via keyboard. " "&Ctrl;1/2/3/4/∇ will select A/" "B/C/Merge/ " "Delete respectively if available.) This operation will " "be executed during the merge. It depends on the item and on the merge-mode " "you are in, what operations are available. The merge-mode is one of" msgstr "" "Efter att ha jämfört katalogerna utvärderar &kdiff3; också ett förslag på " "sammanfogningsåtgärd. Det visas i kolumnen \"Åtgärd\". Du kan ändra den " "genom att klicka på åtgärden du vill ändra. En liten meny dyker upp och " "låter dig välja en åtgärd för objektet. (Du kan också välja den oftast " "använda åtgärden via tangentbordet. Ctrl+1/2/3/4/Delete väljer A/B/C/" "Sammanfoga/Ta bort om de är tillgängliga.) Åtgärden utförs under " "sammanfogningen. Vilka åtgärder som är tillgängliga beror på objektet och " "sammanfogningsläget som används. Sammanfogningsläget är ett av" #. Tag: para #: index.docbook:1277 #, fuzzy, no-c-format #| msgid "Three directory-merge (\"A\" is treated as older base of both)." msgid "" "Three directory-merge (A is treated as older base of " "both)." msgstr "" "Sammanfogning av tre kataloger (\"A\" behandlas som äldsta bas för båda)." #. Tag: para #: index.docbook:1278 #, no-c-format msgid "Two directory-merge." msgstr "Sammanfogning av två kataloger." #. Tag: para #: index.docbook:1279 #, fuzzy, no-c-format #| msgid "" #| "Two directory-sync-mode (activate via option \"Synchronize Directories\")." msgid "" "Two directory-sync-mode (activate via Synchronize directories option)." msgstr "" "Tvåkatalogs synkroniseringsläge (aktiveras med alternativet \"Synkronisera " "kataloger\")." #. Tag: para #: index.docbook:1281 #, no-c-format msgid "" "In three directory merge the operation proposal will be: If for an item ..." msgstr "" "Vid trekatalogers sammanfogning är den förslagna åtgärden: Om för ett " "objekt..." #. Tag: para #: index.docbook:1285 #, fuzzy, no-c-format #| msgid "... all three directories are equal: Copy from C" msgid "... all three directories are equal: Copy from C" msgstr "... alla tre katalogerna är likadana: Kopiera från C" #. Tag: para #: index.docbook:1288 #, fuzzy, no-c-format #| msgid "" #| "... A and C are equal but B is not: Copy from B (or if B does not exist, " #| "delete the destination if exists)" msgid "" "... A and C are equal but " "B is not: Copy from B (or if " "B does not exist, delete the destination if exists)" msgstr "" "... A och C är likadana med B är det inte: Kopiera från B (eller om B inte " "finns, ta bort målet om det finns)" #. Tag: para #: index.docbook:1291 #, fuzzy, no-c-format #| msgid "" #| "... A and B are equal but C is not: Copy from C (or if C does not exist, " #| "delete the destination if exists)" msgid "" "... A and B are equal but " "C is not: Copy from C (or if " "C does not exist, delete the destination if exists)" msgstr "" "... A och B är likadana med C är det inte: Kopiera från C (eller om C inte " "finns, ta bort målet om det finns)" #. Tag: para #: index.docbook:1294 #, fuzzy, no-c-format #| msgid "" #| "... B and C are equal but A is not: Copy from C (or if C does not exist, " #| "delete the destination if exists)" msgid "" "... B and C are equal but " "A is not: Copy from C (or if " "C does not exist, delete the destination if exists)" msgstr "" "... B och C är likadana med A är det inte: Kopiera från C (eller om C inte " "finns, ta bort målet om det finns)" #. Tag: para #: index.docbook:1297 #, fuzzy, no-c-format #| msgid "... only A exists: Delete the destination (if exists)" msgid "" "... only A exists: Delete the destination (if exists)" msgstr "... bara A finns: Ta bort målet (om det finns)" #. Tag: para #: index.docbook:1300 #, no-c-format msgid "" "... only B exists: Copy from B" msgstr "" "... bara B finns: Kopiera från B" #. Tag: para #: index.docbook:1303 #, no-c-format msgid "" "... only C exists: Copy from C" msgstr "" +"... bara C finns: Kopiera från C" #. Tag: para #: index.docbook:1306 #, no-c-format msgid "" "... A, B and C are not equal: Merge" msgstr "" +"... A, B och C" +" är inte likadana: Sammanfoga" #. Tag: para #: index.docbook:1309 #, fuzzy, no-c-format #| msgid "" #| "... A, B and C don't have the same file type (e.g. A is a directory, B is " #| "a file): \"Error: Conflicting File Types\". While such items exist the " #| "directory merge cannot start." msgid "" "... A, B and C don't have the same file type (⪚ A is a " "directory, B is a file): \"Error: Conflicting File Types" "\". While such items exist the directory merge cannot start." msgstr "" "... A, B och C har inte samma filtyp (t.ex. A är en katalog, B är en fil): " "\"Fel: Konflikt i filtyper\". Medan sådana objekt finns, kan inte " "katalogsammanfogningen startas." #. Tag: para #: index.docbook:1313 #, no-c-format msgid "" "In two directory merge the operation proposal will be: If for an item ..." msgstr "" "Vid tvåkatalogers sammanfogning är den förslagna åtgärden: Om för ett " "objekt..." #. Tag: para #: index.docbook:1317 #, fuzzy, no-c-format #| msgid "... both directories are equal: Copy from B" msgid "... both directories are equal: Copy from B" msgstr "... båda katalogerna är likadana: Kopiera från B" #. Tag: para #: index.docbook:1320 #, no-c-format msgid "" "... A exists, but not B: Copy from " "A" msgstr "" "... A finns men inte B: Kopiera från" " A" #. Tag: para #: index.docbook:1323 #, no-c-format msgid "" "... B exists, but not A: Copy from " "B" msgstr "" "... B finns men inte A: Kopiera från" " B" #. Tag: para #: index.docbook:1326 #, fuzzy, no-c-format #| msgid "... A and B exist but are not equal: Merge" msgid "" "... A and B exist but are not " "equal: Merge" msgstr "... A och B finns men är inte likadana: Sammanfoga" #. Tag: para #: index.docbook:1329 index.docbook:1352 #, fuzzy, no-c-format #| msgid "" #| "... A and B don't have the same file type (e.g. A is a directory, B is a " #| "file): \"Error: Conflicting File Types\". While such items exist the " #| "directory merge cannot start." msgid "" "... A and B don't have the same " "file type (⪚ A is a directory, B is a file): \"Error: Conflicting File Types\". While such items " "exist the directory merge cannot start." msgstr "" "... A och B har inte samma filtyp (t.ex. A är en katalog, B är en fil): " "\"Fel: Konflikt i filtyper\". Medan sådana objekt finns, kan inte " "katalogsammanfogningen startas." #. Tag: para #: index.docbook:1333 #, fuzzy, no-c-format #| msgid "" #| "Sync-mode is active if only two directories and no explicit destination " #| "were specified and if the option \"Synchronize directories\" is active. " #| "&kdiff3; then selects a default operation so that both directories are " #| "the same afterwards. If for an item ..." msgid "" "Sync-mode is active if only two directories and no explicit destination were " "specified and if the Synchronize directories option is " "active. &kdiff3; then selects a default operation so that both directories " "are the same afterwards. If for an item ..." msgstr "" "Synkroniseringsläge är bara aktivt om två kataloger och ingen explicit " "målkatalog anges, och om alternativet \"Synkronisera kataloger\" är aktivt. " "&kdiff3; väljer då en standardåtgärd så att båda katalogerna är likadana " "efteråt. Om för ett objekt ..." #. Tag: para #: index.docbook:1340 #, no-c-format msgid "... both directories are equal: Nothing will be done." msgstr "... båda katalogerna är lika: Ingenting görs." #. Tag: para #: index.docbook:1343 #, no-c-format msgid "" "... A exists, but not B: Copy " "A to B" msgstr "" "... A finns, men inte B: Kopiera <" "guilabel>A till B" #. Tag: para #: index.docbook:1346 #, no-c-format msgid "" "... B exists, but not A: Copy " "B to A" msgstr "" +"... B finns, men inte A: Kopiera <" +"guilabel>B till A" #. Tag: para #: index.docbook:1349 #, fuzzy, no-c-format #| msgid "" #| "... A and B exist, but are not equal: Merge and store the result in both " #| "directories. (For the user the visible save-filename is B, but then " #| "&kdiff3; copies B also to A.)" msgid "" "... A and B exist, but are not " "equal: Merge and store the result in both directories. (For the user the " "visible save-filename is B, but then &kdiff3; copies " "B also to A.)" msgstr "" "... A och B finns, men är inte likadana: Sammanfoga och lagra resultatet i " "båda kataloger. (För användaren är det synliga filnamnet för att spara B, " "men därefter kopierar &kdiff3; också B till A.)" #. Tag: para #: index.docbook:1356 #, fuzzy, no-c-format #| msgid "" #| "When two directories are merged and the option \"Copy newer instead of " #| "merging\" is selected, then &kdiff3; looks at the dates and proposes to " #| "choose the newer file. If the files are not equal but have equal dates, " #| "then the operation will contain \"Error: Dates are equal but files are " #| "not.\" While such items exist the directory merge cannot start." msgid "" "When two directories are merged and the Copy newer instead of " "merging (unsafe) option is selected, then &kdiff3; looks at the " "dates and proposes to choose the newer file. If the files are not equal but " "have equal dates, then the operation will contain \"Error: Dates are equal " "but files are not.\" While such items exist the directory merge cannot start." msgstr "" "När två kataloger sammanfogas och alternativet \"Kopiera nyare istället för " "att sammanfoga\" är markerat, tittar &kdiff3; på datum och föreslår att " "välja den nyare filen. Om filerna inte är lika men har samma datum, " "innehåller åtgärden \"Fel: Datum är lika men filerna är det inte.\" Medan " "sådana objekt finns, kan inte katalogsammanfogningen startas." #. Tag: title #: index.docbook:1361 #, no-c-format msgid "The Status Column" msgstr "Statuskolumnen" #. Tag: para #: index.docbook:1362 #, fuzzy, no-c-format #| msgid "" #| "During the merge one file after the other will be processed. The status " #| "column will show \"Done\" for items where the merge operation has " #| "succeeded, and other texts if something unexpected happened. When a merge " #| "is complete, then you should make a last check to see if the status for " #| "all items is agreeable." msgid "" "During the merge one file after the other will be processed. The status " "column will show Done for items where the merge " "operation has succeeded, and other texts if something unexpected happened. " "When a merge is complete, then you should make a last check to see if the " "status for all items is agreeable." msgstr "" "Under sammanfogningen behandlas en fil i taget. Statuskolumnen visar \"Klar" "\" för objekt där sammanfogningsåtgärden har lyckats, och någon annan text " "om något oväntat inträffade. När en sammanfogning är färdig, bör du göra en " "sista kontroll för att se att status för alla objekt är acceptabel." #. Tag: title #: index.docbook:1371 #, no-c-format msgid "Statistics Columns" msgstr "Statistikkolumner" #. Tag: para #: index.docbook:1372 #, fuzzy, no-c-format #| msgid "" #| "When the file comparison mode \"Full Analysis\" is enabled in the " #| "options, then &kdiff3; will show extra columns containing the numbers of " #| "unsolved, solved, nonwhite and whitespace conflicts. (The solved-column " #| "will only show when comparing or merging three directories.)" msgid "" "When the file comparison mode Full Analysis is enabled " "in the options, then &kdiff3; will show extra columns containing the numbers " "of Unsolved, Solved, Nonwhite and Whitespace conflicts. (The " "Solved column will only show when comparing or merging " "three directories.)" msgstr "" "När filjämförelseläget \"Fullständig analys\" är aktiverat i alternativen, " "visar &kdiff3; extra kolumner som innehåller antal oupplösta, upplösta, inte " "blanka och blanka konflikter. (Kolumnen lösta visas bara när kataloger " "jämförs eller sammanfogas.)" #. Tag: title #: index.docbook:1379 #, no-c-format msgid "Selecting Listed Files" msgstr "Välja listade filer" #. Tag: para #: index.docbook:1380 #, fuzzy, no-c-format #| msgid "" #| "Several options influence which files are listed here. Some are " #| "accessible in the settings dialog. The Directory-menu contains the entries:" msgid "" "Several options influence which files are listed here. Some are accessible " "in the settings dialog. The " "Directory menu contains the entries:" msgstr "" "Flera alternativ påverkar vilka filer som listas här. Vissa är tillgängliga " "i inställningsdialogrutan. Menyn " "Katalog innehåller alternativen:" #. Tag: para #: index.docbook:1384 #, fuzzy, no-c-format #| msgid "" #| "\"Show Identical Files\": Files that have been detected equal in all " #| "input directories." msgid "" "Show Identical Files: Files that have been detected " "equal in all input directories." msgstr "" "\"Visa identiska filer\": Filer som har detekterats som lika i alla " "indatakataloger." #. Tag: para #: index.docbook:1387 #, fuzzy, no-c-format #| msgid "" #| "\"Show Different Files\": Files that exist in two or more directories but " #| "are not equal." msgid "" "Show Different Files: Files that exist in two or more " "directories but are not equal." msgstr "" "\"Visa olika filer\": Filer som finns i två eller flera kataloger men inte " "är lika." #. Tag: para #: index.docbook:1390 #, fuzzy, no-c-format #| msgid "" #| "\"Show Files only in A\": Files that exist only in A, but not in B or C." msgid "" "Show Files only in A: Files that exist only in " "A, but not in B or C." msgstr "" "\"Visa bara filer i A\": Filer som bara finns i A, men inte i B eller C." #. Tag: para #: index.docbook:1393 #, fuzzy, no-c-format #| msgid "" #| "\"Show Files only in B\": Files that exist only in B, but not in A or C." msgid "" "Show Files only in B: Files that exist only in " "B, but not in A or C." msgstr "" "\"Visa bara filer i B\": Filer som bara finns i B, men inte i A eller C." #. Tag: para #: index.docbook:1396 #, fuzzy, no-c-format #| msgid "" #| "\"Show Files only in C\": Files that exist only in C, but not in A or B." msgid "" "Show Files only in C: Files that exist only in " "C, but not in A or B." msgstr "" "\"Visa bara filer i C\": Filer som bara finns i C, men inte i A eller B." #. Tag: para #: index.docbook:1400 #, fuzzy, no-c-format #| msgid "" #| "Activate only the \"Show\"-options for the items you want listed. If for " #| "example you only want to list all items that exist either in A or in B " #| "but not in both, you'll have to activate \"Show Files only in A\" and " #| "\"Show Files only in B\" and deactivate all others (\"Show Identical Files" #| "\", \"Show Different Files\", \"Show Files only in C\"). The list will be " #| "updated immediately to reflect the change." msgid "" "Activate only the Show options for the items you want " "listed. If for example you only want to list all items that exist either in " "A or in B but not in both, you'll " "have to activate Show Files only in A and " "Show Files only in B and deactivate all others " "(Show Identical Files, Show Different Files, Show Files only in C). The list will be " "updated immediately to reflect the change." msgstr "" "Aktivera bara alternativen \"Visa\" för objekten du vill lista. Om du till " "exempel bara vill lista alla objekt som antingen finns i A eller i B men " "inte i båda, måste du aktivera \"Visa bara filer i A\" och \"Visa bara filer " "i B\" och inaktivera alla andra (\"Visa identiska filer\", \"Visa olika filer" "\", \"Visa bara filer i C\"). Listan uppdateras omedelbart för att motsvara " "ändringen." #. Tag: para #: index.docbook:1402 #, fuzzy, no-c-format #| msgid "" #| "These options also apply for directories with one exception: Disabling " #| "\"Show Different Files\" will not hide any complete directories. This " #| "will work only for files within." msgid "" "These options also apply for directories with one exception: Disabling " " Show Different Files will not hide any complete " "directories. This will work only for files within." msgstr "" "Alternativen gäller också för kataloger med ett undantag: Att inaktivera " "\"Visa olika filer\" döljer inte hela kataloger. Det fungerar bara för filer " "inne i dem." #. Tag: para #: index.docbook:1406 #, fuzzy, no-c-format #| msgid "" #| "Note that of these only the \"Show Identical Files\"-option is " #| "persistant. The others are enabled when starting &kdiff3;." msgid "" "Note that of these only the Show Identical Files option " "is persistant. The others are enabled when starting &kdiff3;." msgstr "" "Observera att av dessa är bara alternativet \"Visa identiska filer\" som är " "bestående Övriga aktiveras när &kdiff3; startas." #. Tag: title #: index.docbook:1414 #, no-c-format msgid "Doing A Directory Merge" msgstr "Utföra en katalogsammanfogning" #. Tag: para #: index.docbook:1415 #, no-c-format msgid "" "You can either merge the currently selected item (file or directory), or all " "items. When you have made all your operation choices (in all subdirectories " "too) then you can start the merge." msgstr "" "Du kan antingen sammanfoga markerat objekt (fil eller katalog), eller alla " "objekt. När du har gjort alla val av åtgärder (också i alla underkataloger), " "kan du utföra sammanfogningen." #. Tag: para #: index.docbook:1419 #, fuzzy, no-c-format #| msgid "" #| "Be aware that if you didn't specify a destination directory explicitly, " #| "then the destination will be \"C\" in three directory mode, \"B\" in two " #| "directory merge mode, and in sync-mode it will be \"A\" or/and \"B\"." msgid "" "Be aware that if you didn't specify a destination directory explicitly, then " "the destination will be C in three directory mode, " "B in two directory merge mode, and in sync-mode it will " "be A or/and B." msgstr "" "Var medveten om att om du inte explicit angav en målkatalog, blir målet \"C" "\" i trekatalogsläge, \"B\" i tvåkatalogsläge, och i synkroniseringsläge är " "det \"A\" och/eller \"B\"." #. Tag: para #: index.docbook:1421 #, no-c-format msgid "" "If you have specified a destination directory also check that all items that " "should be in the output, are in the tree. There are some options that cause " "certain items to be omitted from the directory comparison and merge. Check " "these options to avoid unpleasant surprises:" msgstr "" "Om du också har angivit en målkatalog, kontrollera att alla objekt som ska " "finnas i utmatningen finns i trädet. Det finns några alternativ som får " "vissa objekt att utelämnas från katalogjämförelsen och sammanfogningen. " "Kontrollera dessa alternativ för att undvika obehagliga överraskningar:" #. Tag: para #: index.docbook:1428 #, fuzzy, no-c-format #| msgid "" #| "\"Recursive Directories\": If this is off, then items in subdirectories " #| "will not be found." msgid "" "Recursive Directories: If this is off, then items in " "subdirectories will not be found." msgstr "" "\"Rekursiva kataloger\": Om det är av, hittas inte objekt i underkataloger." #. Tag: para #: index.docbook:1429 #, fuzzy, no-c-format #| msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match" msgid "" "Pattern/Anti-Pattern: Include/" "exclude items that match" msgstr "" "\"Mönster\" eller \"Undantagsmönster\": Inkludera eller undanta objekt som " "matchar" #. Tag: guilabel #: index.docbook:1430 #, fuzzy, no-c-format #| msgid "\"Exclude Hidden Files\"" msgid "Exclude Hidden Files" msgstr "\"Undanta gömda filer\"" #. Tag: para #: index.docbook:1431 #, fuzzy, no-c-format #| msgid "" #| "\"Show\"-options (Show " #| "Identical/Different Files, Files only in A/B/C)" msgid "" "Show options (Show " "Identical/Different Files, Files only in A/B/C)" msgstr "" "\"Visa\"-alternativ (Visa " "identiska/olika filer, bara filer i A/B/C)" #. Tag: para #: index.docbook:1433 #, fuzzy, no-c-format #| msgid "" #| "If you change the settings in order to list more files, you must do a " #| "rescan via menu \"Directory\"->\"Rescan\" yourself. (The reason for this " #| "is that for faster comparison-speed &kdiff3; omits the comparison for " #| "files suppressed by these criteria.) If you changed your file and dir " #| "patterns to exclude files, then the file-list will immediately be updated " #| "on closing the options-dialog." msgid "" "If you change the settings in order to list more files, you must do a rescan " "via menu DirectoryRescan yourself. (The reason for this is that for faster " "comparison-speed &kdiff3; omits the comparison for files suppressed by these " "criteria.) If you changed your file and dir patterns to exclude files, then " "the file-list will immediately be updated on closing the options-dialog." msgstr "" "Om du ändrar inställningarna för att visa fler filer, måste du göra en " "omsökning via menyn \"Katalog\" -> \"Avsök igen\". (Orsaken till det är att " "&kdiff3; utelämnar jämförelsen för filer enligt kriterierna för att få " "snabbare jämförelsehastighet.) Om du ändrade fil- och katalogmönster för att " "undanta filer, uppdateras fillistan omedelbart när inställningsdialogrutan " "stängs." #. Tag: para #: index.docbook:1440 #, fuzzy, no-c-format #| msgid "" #| "Note that when you write to a completely new directory then you usually " #| "also want to copy the identical files. In that case enable the \"Show " #| "Identical Files\"-option. If your destination-directory is one of the " #| "inputs, then this isn't necessary because the file is already there." msgid "" "Note that when you write to a completely new directory then you usually also " "want to copy the identical files. In that case enable the Show " "Identical Files option. If your destination-directory is one of " "the inputs, then this isn't necessary because the file is already there." msgstr "" "Observera att när du skriver till en helt ny katalog vill du oftast också " "kopiera de identiska filerna. Aktivera \"Visa identiska filer\" i detta " "fall. Om din målkatalog är en av indatakatalogerna, är det inte nödvändigt " "eftersom filerna redan finns där." #. Tag: para #: index.docbook:1444 #, no-c-format msgid "If you are satisfied so far, the rest is easy." msgstr "Om du är nöjd hittills, är resten enkelt." #. Tag: para #: index.docbook:1446 #, fuzzy, no-c-format #| msgid "" #| "To merge all items: Select \"Start/Continue directory merge\" in the " #| "\"Directory\"-menu or press F7 (which is the default shortcut). To merge " #| "only the current item: Select \"Run Operation For Current Item\" or press " #| "F6." msgid "" "To merge all items: Select Start/Continue Directory Merge in the Directory menu or press F7 (which is the default shortcut). To merge only the current item: " "Select Run Operation for Current Item or press " "F6." msgstr "" "För att sammanfoga alla objekt: Välj \"Starta eller fortsätt " "katalogsammanfogning\" i menyn \"Katalog\" eller tryck på F7 (som är " "snabbtangenten). För att bara sammanfoga aktuellt objekt: Välj \"Utför " "åtgärd för aktuellt objekt\" eller tryck på F6." #. Tag: para #: index.docbook:1451 #, no-c-format msgid "" "If due to conflicting filetypes still some items with invalid operations " "exist, then a messagebox will appear and these items will be pointed out, so " "you can select a valid operation for the item." msgstr "" "Om vissa objekt med ogiltiga filtyper fortfarande finns, på grund av " "filtyper med konflikter, visas en meddelanderuta och objekten pekas ut, så " "att du kan välja en giltig åtgärd för objektet." #. Tag: para #: index.docbook:1455 #, fuzzy, no-c-format #| msgid "" #| "If you merge all items a dialog will appear giving you the options \"Do it" #| "\", \"Simulate it\" and \"Cancel\"." msgid "" "If you merge all items a dialog will appear giving you the options " "Do it, Simulate it and " "Cancel." msgstr "" "Om du sammanfogar alla objekt visas en dialogruta som ger dig alternativen " "\"Gör det\", \"Simulera det\" och \"Avbryt\"." #. Tag: para #: index.docbook:1461 #, fuzzy, no-c-format #| msgid "" #| "Select \"Simulate it\" if you want to see what would be done without " #| "actually doing it. A verbose list of all operations will be shown." msgid "" "Select Simulate it if you want to see what would be " "done without actually doing it. A verbose list of all operations will be " "shown." msgstr "" "Välj \"Simulera det\" om du vill se vad som skulle göras utan att verkligen " "göra det. En utförlig lista med alla åtgärder visas." #. Tag: para #: index.docbook:1463 #, fuzzy, no-c-format #| msgid "Otherwise select \"Do it\" to really start merging." msgid "Otherwise select Do it to really start merging." msgstr "Välj annars \"Gör det\" för att verkligen utföra sammanfogningen." #. Tag: para #: index.docbook:1465 #, no-c-format msgid "" "Then &kdiff3; will run the specified operation for all items. If manual " "interaction is required (single file merge), then a merge window will open " "(see the big screenshot)." msgstr "" "Därefter utför &kdiff3; den angivna åtgärden för alla objekt. Om manuell " "interaktion krävs (sammanfogning av enstaka fil), visas ett " "sammanfogningsfönster (se den stora " "skärmbilden)." #. Tag: para #: index.docbook:1469 #, fuzzy, no-c-format #| msgid "" #| "When you have finished with manually merging a file, again select \"Start/" #| "Continue directory merge\" or the key F7. If you haven't saved it yet, a " #| "dialog will ask you to do so. Then &kdiff3; will continue with the next " #| "item." msgid "" "When you have finished with manually merging a file, again select " "Start/ Continue Directory Merge or the " "F7 key. If you haven't saved it yet, a dialog will ask you " "to do so. Then &kdiff3; will continue with the next item." msgstr "" "När du är klar med manuell sammanfogning av en fil, välj återigen \"Starta " "eller fortsätt katalogsammanfogning\" eller tryck på F7. Om du inte har " "sparat ännu, ber en dialogruta dig att göra det. Därefter fortsätter " "&kdiff3; till nästa objekt." #. Tag: para #: index.docbook:1474 #, fuzzy, no-c-format #| msgid "" #| "When &kdiff3; encounters an error, it will tell you so and will show the " #| "verbose-status-information. At the bottom of this list, there will be " #| "some error messages which should help you to understand the cause of the " #| "problem. When you continue merging (F7 key) &kdiff3; will give you the " #| "choice to retry or skip the item that caused the problem. This means that " #| "before continuing you can choose another operation or solve the problem " #| "by other means." msgid "" "When &kdiff3; encounters an error, it will tell you so and will show the " "verbose-status-information. At the bottom of this list, there will be some " "error messages which should help you to understand the cause of the problem. " "When you continue merging (F7 key) &kdiff3; will give you " "the choice to retry or skip the item that caused the problem. This means " "that before continuing you can choose another operation or solve the problem " "by other means." msgstr "" "När &kdiff3; stöter på ett fel, meddelas det och utförlig statusinformation " "visas. Längst ner i listan finns det några felmeddelanden som bör hjälpa dig " "att förstå problemets orsak. När du fortsätter sammanslagningen (tangenten " "F7), ger &kdiff3; dig valet att försöka igen eller hoppa över objektet som " "orsakade problemet. Det betyder att du kan välja en annan åtgärd, eller lösa " "problemet på annat sätt, innan du fortsätter." #. Tag: para #: index.docbook:1481 #, no-c-format msgid "" "When the merge is complete, then &kdiff3; will inform you via a message box." msgstr "" "När sammanfogningen är färdig, informerar &kdiff3; dig med en meddelanderuta." #. Tag: para #: index.docbook:1484 #, fuzzy, no-c-format #| msgid "" #| "If some items were merged individually before running the directorymerge " #| "then &kdiff3; remembers this (while this merge-session goes on), and " #| "doesn't merge them again when later the merge for all items is run. Even " #| "when the merge was skipped or nothing was saved these items count as " #| "completed. Only when you change the merge operation the \"Done\"-status " #| "of the item will be removed and it can be merged again." msgid "" "If some items were merged individually before running the directorymerge " "then &kdiff3; remembers this (while this merge-session goes on), and doesn't " "merge them again when later the merge for all items is run. Even when the " "merge was skipped or nothing was saved these items count as completed. Only " "when you change the merge operation the Done status of " "the item will be removed and it can be merged again." msgstr "" "Om vissa objekt sammanfogades individuellt innan katalogsammanfogningen, " "kommer &kdiff3; ihåg det (medan sammanfogningssessionen pågår), och " "sammanfogar dem inte igen när sammanfogningen för alla objekt utförs. Även " "när sammanfogningen hoppas över eller ingenting sparas räknas dessa objekt " "som färdiga. Bara när sammanfogningsåtgärden ändras, tas objektets \"klar\"-" "status bort och det kan sammanfogas igen." #. Tag: title #: index.docbook:1494 #, no-c-format msgid "Options for Comparing and Merging Directories" msgstr "Alternativ för att jämföra och sammanfoga kataloger" #. Tag: para #: index.docbook:1495 #, fuzzy, no-c-format #| msgid "" #| "The &kdiff3;-preferences (menu \"Settings\"->\"Configure &kdiff3;\") " #| "has a section called \"Directory Merge\" with these options:" msgid "" "The &kdiff3; preferences (menu Settings " "Configure &kdiff3;...) has a section " "called \"Directory Merge\" with these options:" msgstr "" "Inställning av &kdiff3; (menyn \"Inställningar\" -> \"Anpassa &kdiff3;\") " "har en sida som heter \"Katalogsammanfogning\" med följande alternativ:" #. Tag: guilabel #: index.docbook:1502 #, fuzzy, no-c-format #| msgid "Recursive Directories:" msgid "Recursive directories" msgstr "Rekursiva kataloger:" #. Tag: para #: index.docbook:1502 #, no-c-format msgid "Select whether to search directories recursively." msgstr "Välj om kataloger ska sökas igenom rekursivt." #. Tag: guilabel #: index.docbook:1504 #, fuzzy, no-c-format #| msgid "File Pattern(s):" msgid "File pattern(s):" msgstr "Mönster för filer:" #. Tag: para #: index.docbook:1504 #, fuzzy, no-c-format #| msgid "" #| "Only files that match any pattern here will be put in the tree. More than " #| "one pattern may be specified here by using the semicolon \";\" as " #| "separator. Valid wildcards: '*' and '?'. (e.g. \"*.cpp;*.h\"). Default is " #| "\"*\". This pattern is not used on directories." msgid "" "Only files that match any pattern here will be put in the tree. More than " "one pattern may be specified here by using the semicolon \";\" as separator. " "Valid wildcards: '*' and '?'. (⪚ \"*.cpp;*.h\"). " "Default is \"*\". This pattern is not used on directories." msgstr "" "Bara filer som matchar något mönster här läggs till i trädet. Mer än ett " "mönster kan anges genom att använda semikolon \";\" som skiljetecken. " "Giltiga jokertecken: '*' och '?'. (t.ex. \"*.cpp;*.h\"). Normalvärdet är \"*" "\". Mönstret används inte för kataloger." #. Tag: guilabel #: index.docbook:1508 #, fuzzy, no-c-format #| msgid "File Anti-Pattern(s):" msgid "File-anti-pattern(s):" msgstr "Undantagsmönster för filer:" #. Tag: para #: index.docbook:1508 #, fuzzy, no-c-format #| msgid "" #| "Files that match this pattern will be excluded from the tree. More than " #| "one pattern may be specified here via using the semicolon \";\" as " #| "separator. Valid wildcards: '*' and '?'. Default is \"*.orig;*.o;*.obj\"." msgid "" "Files that match this pattern will be excluded from the tree. More than one " "pattern may be specified here via using the semicolon \";\" as separator. " "Valid wildcards: '*' and '?'. Default is \"*.orig;*.o;*.obj\"." msgstr "" "Filer som matchar något mönster undantas från trädet. Mer än ett mönster kan " "anges här genom att använda semikolon \";\" som skiljetecken. Giltiga " "jokertecken: '*' och '?'. Normalvärdet är \"*.orig;*.o;*.obj\"." #. Tag: guilabel #: index.docbook:1512 #, fuzzy, no-c-format #| msgid "Directory Anti-Pattern(s):" msgid "Dir-anti-pattern(s):" msgstr "Undantagsmönster för kataloger:" #. Tag: para #: index.docbook:1512 #, fuzzy, no-c-format #| msgid "" #| "Directories that match this pattern will be excluded from the tree. More " #| "than one pattern may be specified here via using the semicolon \";\" as " #| "separator. Valid wildcards: '*' and '?'. Default is \"CVS;deps;.svn\"." msgid "" "Directories that match this pattern will be excluded from the tree. More " "than one pattern may be specified here via using the semicolon \";\" as " "separator. Valid wildcards: '*' and '?'. Default is \"CVS;deps;." "svn\"." msgstr "" "Kataloger som matchar något mönster undantas från trädet. Mer än ett mönster " "kan anges genom att använda semikolon \";\" som skiljetecken. Giltiga " "jokertecken: '*' och '?'. Normalvärdet är \"CVS;deps;.svn\"." #. Tag: guilabel #: index.docbook:1516 #, fuzzy, no-c-format #| msgid "Use CVS-Ignore:" msgid "Use .cvsignore" msgstr "Använd .cvsignore:" #. Tag: para #: index.docbook:1516 #, fuzzy, no-c-format #| msgid "" #| "Ignore files and directories that would also be ignored by CVS. Many " #| "automatically generated files are ignored by CVS. The big advantage is " #| "that this can be directory specific via a local \".cvsignore\"-file. (See " #| "info:/cvs/cvsignore.)" msgid "" "Ignore files and directories that would also be ignored by CVS. Many " "automatically generated files are ignored by CVS. The big advantage is that " "this can be directory specific via a local .cvsignore " "file. (See info:/cvs/cvsignore.)" msgstr "" "Ignorera filer och kataloger som också skulle ignoreras av CVS. Många " "automatiskt genererade filer ignoreras av CVS. Den stora fördelen är att " "detta kan vara katalogspecifikt via en lokal \".cvsignore\" fil. (Se info:/cvs/cvsignore.)" #. Tag: guilabel #: index.docbook:1521 #, fuzzy, no-c-format #| msgid "\"Find hidden files and directories\"" msgid "Find hidden files and directories" msgstr "\"Sök efter gömda filer och kataloger\"" #. Tag: para #: index.docbook:1521 #, no-c-format msgid "" "On some file systems files have an \"Hidden\"-attribute. On other systems a " "filename starting with a dot \".\" causes it to be hidden. This option " "allows you to decide whether to include these files in the tree or not. " "Default is on." msgstr "" "För vissa filsystem har filer egenskapen \"Dold\". För andra system döljs " "ett filnamn som börjar med en punkt (\".\"). Alternativet låter dig bestämma " "om dessa filer ska ingå i trädet eller inte. Normalvärdet är på." #. Tag: guilabel #: index.docbook:1525 #, fuzzy, no-c-format #| msgid "Follow File Links:" msgid "Follow file links" msgstr "Följ fillänkar:" #. Tag: para #: index.docbook:1525 #, no-c-format msgid "" "For links to files: When disabled, then the symbolic links are compared. " "When enabled, then the files behind the links are compared. Default is off." msgstr "" "För länkar till filer: Om inaktiverad, jämförs de symboliska länkarna. Om " "aktiverad, jämförs filerna bakom länkarna. Normalvärdet är av." #. Tag: guilabel #: index.docbook:1528 #, fuzzy, no-c-format #| msgid "Follow Directory Links:" msgid "Follow directory links" msgstr "Följ kataloglänkar:" #. Tag: para #: index.docbook:1528 #, no-c-format msgid "" "For links to directories: When disabled, then the symbolic links will be " "compared. When enabled then the link will be treated like a directory and it " "will be scanned recursively. (Note that the program doesn't check if the " "link is \"recursive\". So for example a directory that contains a link to " "the directory would cause an infinite loop, and after some time when the " "stack overflows or all memory is used up, crash the program.) Default is off." msgstr "" "För länkar till kataloger: Om inaktiverad, jämförs symboliska länkar. Om " "aktiverad behandlas länken som en katalog och avsöks rekursivt. (Observera " "att programmet inte kontrollerar om länken är \"rekursiv\". En katalog som " "innehåller en länk till samma katalog skulle orsaka en oändlig snurra, och " "efter en viss tid när stacken blir full eller minnet tar slut, kraschar " "programmet.) Normalvärdet är av." #. Tag: guilabel #: index.docbook:1535 #, fuzzy, no-c-format #| msgid "Case Sensitive Filename Comparison:" msgid "Case sensitive filename comparison" msgstr "Skiftlägeskänslig filnamnsjämförelse:" #. Tag: para #: index.docbook:1535 #, fuzzy, no-c-format #| msgid "Default is false on Windows, true for other operating systems." msgid "Default is false on &Windows;, true for other operating systems." msgstr "Förvalt värde är falskt på Windows, och sant för andra operativsystem." #. Tag: guilabel #: index.docbook:1537 #, no-c-format msgid "File Comparison Mode:" msgstr "Filjämförelseläge:" #. Tag: guilabel #: index.docbook:1539 #, fuzzy, no-c-format #| msgid "Binary Comparison:" msgid "Binary comparison" msgstr "Binär jämförelse:" #. Tag: para #: index.docbook:1539 #, no-c-format msgid "This is the default file comparison mode." msgstr "Det här är förvalt filjämförelseläge." #. Tag: guilabel #: index.docbook:1542 #, fuzzy, no-c-format #| msgid "Full Analysis:" msgid "Full analysis" msgstr "Fullständig analys:" #. Tag: para #: index.docbook:1542 #, fuzzy, no-c-format #| msgid "" #| "Do a full analysis of each file and show the statistics information " #| "columns. (Number of solved, unsolved, nonwhite and white conflicts.) The " #| "full analysis is slower than a simple binary analysis, and much slower " #| "when used on files that don't contain text. (Specify the appropriate file-" #| "antipatterns.)" msgid "" "Do a full analysis of each file and show the statistics information columns. " "(Number of Solved, Unsolved, " "Nonwhite and White conflicts.) The " "full analysis is slower than a simple binary analysis, and much slower when " "used on files that don't contain text. (Specify the appropriate file-" "antipatterns.)" msgstr "" "Gör en fullständig analys av varje fil och visa kolumner med statistisk " "information. (Antal upplösta, oupplösta, inte blanka och blanka konflikter.) " "Den fullständiga analysen är långsammare än en enkel binäranalys, och är " "mycket långsammare för filer som inte innehåller text. (Ange lämpliga " "filmönster för att undvika dem.)" #. Tag: guilabel #: index.docbook:1550 #, fuzzy, no-c-format #| msgid "Trust the modification date:" msgid "Trust the size and modification date (unsafe)" msgstr "Lita på ändringsdatum:" #. Tag: para #: index.docbook:1550 #, no-c-format msgid "" "If you compare big directories over a slow network, it might be faster to " "compare the modification dates and file length alone. But this speed " "improvement comes with the price of a little uncertainty. Use this option " "with care. Default is off." msgstr "" "Om du jämför stora kataloger via ett långsamt nätverk, kan det gå snabbare " "att bara jämföra ändringsdatum och fillängd. Men hastighetsförbättringen " "sker till priset av en liten osäkerhet. Använd alternativet med " "försiktighet. Normalvärdet är av." #. Tag: guilabel #: index.docbook:1555 #, fuzzy, no-c-format #| msgid "Trust the size:" msgid "Trust the size (unsafe)" msgstr "Lita på storleken:" #. Tag: para #: index.docbook:1555 #, no-c-format msgid "" "Similar to trusting the modification date. No real comparison happens. Two " "files are considered equal if their file-sizes are equal. This is useful " "when the file-copy operation didn't preserve the modification date. Use this " "option with care. Default is off." msgstr "" "Liknar att lita på ändringsdatum. Ingen verklig jämförelse sker. Två filer " "anses vara lika om deras filstorlekar är lika. Detta är användbart när " "filkopieringsåtgärden inte bevarade ändringsdatum. Använd alternativet med " "försiktighet. Normalvärdet är av." #. Tag: guilabel #: index.docbook:1562 #, fuzzy, no-c-format #| msgid "Synchronize Directories:" msgid "Synchronize directories" msgstr "Synkronisera kataloger:" #. Tag: para #: index.docbook:1562 #, fuzzy, no-c-format #| msgid "" #| "Activates \"Sync-Mode\" when two directories are compared and no explicit " #| "destination directory was specified. In this mode the proposed operations " #| "will be chosen so that both source directories are equal afterwards. Also " #| "the merge result will be written to both directories. Default is off." msgid "" "Activates sync-mode when two directories are compared and no explicit " "destination directory was specified. In this mode the proposed operations " "will be chosen so that both source directories are equal afterwards. Also " "the merge result will be written to both directories. Default is off." msgstr "" "Aktiverar \"synkroniseringsläge\" när två kataloger jämförs och ingen " "explicit målkatalog anges. I det här läget väljes föreslagna åtgärder så att " "båda källkatalogerna är likadana efteråt. Sammanfogningsresultatet skrivs " "också till båda kataloger. Normalvärdet är av." #. Tag: guilabel #: index.docbook:1567 #, fuzzy, no-c-format #| msgid "Copy newer instead of merging:" msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiera nyare istället för att sammanfoga:" #. Tag: para #: index.docbook:1567 #, no-c-format msgid "" "Instead of merging the proposed operation will copy the newer source if " "changes happened. (Considered unsafe, because it implies that you know, that " "the other file hasn't been edited too. Check to make sure in every case.) " "Default is off." msgstr "" "Istället för att sammanfoga kopierar den föreslagna åtgärden den nyare " "källan om ändringar har skett. (Anses vara osäkert, eftersom det förutsätter " "att du vet att den andra filen inte också har redigerats. Kontrollera för " "att vara säker i varje enskilt fall.) Normalvärdet är av." #. Tag: para #: index.docbook:1571 #, fuzzy, no-c-format #| msgid "" #| "If a file or complete directory is replaced by another or is deleted then " #| "the original version will be renamed with an \".orig\" extension. If an " #| "old backup file with \".orig\" extension already exists then this will be " #| "deleted without backup. This also affects the normal merging of single " #| "files, not only in directory-merge mode. Default is on." msgid "" "If a file or complete directory is replaced by another or is deleted then " "the original version will be renamed with an ." "orig extension. If an old backup file with .orig extension already exists then this will be " "deleted without backup. This also affects the normal merging of single " "files, not only in directory-merge mode. Default is on." msgstr "" "Om en fil eller hel katalog ersätts med en annan eller tas bort, då ändras " "originalversionens namn med tillägg av filändelsen \".orig\". Om en gammal " "säkerhetskopia med filändelsen \".orig\" redan finns tas den bort utan " "säkerhetskopiering. Det här gäller också normal sammanfogning av enstaka " "filer, inte bara sammanfogningsläge för kataloger. Normalvärdet är på." #. Tag: title #: index.docbook:1581 #, no-c-format msgid "Other Functions in Directory Merge Window" msgstr "Andra funktioner i katalogsammanfogningsfönstret" #. Tag: title #: index.docbook:1582 #, no-c-format msgid "Split/Full Screen Mode" msgstr "Delat eller fullskärmsläge" #. Tag: para #: index.docbook:1583 #, fuzzy, no-c-format #| msgid "" #| "Usually the directory merge list view remains visible while a single file " #| "is compared or merged. With the mouse you can move the splitter bar that " #| "separates the file list from the text-diff windows. If you don't want " #| "this, you can disable \"Split Screen View\" in the \"Directory\"-menu. " #| "Then you can use \"Toggle View\" in the \"Directory\"-menu to switch " #| "between the file list and the text-diff view that then occupy the full " #| "screen." msgid "" "Usually the directory merge list view remains visible while a single file is " "compared or merged. With the mouse you can move the splitter bar that " "separates the file list from the text-diff windows. If you don't want this, " "you can disable DirectoryDir " "&& Text Split Screen View menu item. Then " "you can use DirectoryToggle " "View menu item to switch between the file list " "and the text-diff view that then occupy the full screen." msgstr "" "Oftast förblir listfönstret för katalogsammanfogning synligt medan en " "enstaka fil jämförs eller sammanfogas. Du kan flytta raden som delar " "fillistan från fönstren för textjämförelse med musen. Om du inte vill göra " "det, kan du inaktivera \"Delad skärmvy\" i menyn \"Katalog\". Därefter kan " "du använda \"Byt vy\" i menyn \"Katalog\" för att byta mellan fillistan och " "fönstren för textjämförelse, som då upptar hela fönstret." #. Tag: title #: index.docbook:1587 #, no-c-format msgid "Comparing or Merging a Single File" msgstr "Jämföra och sammanfoga en ensam fil" #. Tag: para #: index.docbook:1588 #, fuzzy, no-c-format #| msgid "" #| "Probably you will prefer a simple double mouse click on a file in order " #| "to compare it. Nevertheless there also exists an entry in the \"Directory" #| "\"-menu. You can also directly merge a single file by selecting it and " #| "choosing \"Merge current file\" in the \"Merge\"-Menu. On saving the " #| "result, the status will be set to done, and the file will not be merged " #| "again if a directory merge is started." msgid "" "Probably you will prefer a simple double mouse click on a file in order to " "compare it. Nevertheless there also exists an entry in the " "Directory menu. You can also directly merge a single file " "by selecting it and choosing MergeMerge Current File menu " "item. On saving the result, the status will be set to done, and the file " "will not be merged again if a directory merge is started." msgstr "" "Du föredrar troligen ett vanligt dubbelklick på musen för att jämföra en " "fil. Hur som helst finns det också ett alternativ i menyn \"Katalog\". Du " "kan också direkt sammanfoga en enstaka fil, utan att starta " "katalogsammanfogning via \"Sammanfoga markerade filer\" i menyn \"Sammanfoga" "\". När resultatet sparas, sätts status till klar, och filen sammanfogas " "inte igen om en katalogsammanfogning startas." #. Tag: para #: index.docbook:1595 #, fuzzy, no-c-format #| msgid "" #| "But note that this status information will be lost when you rerun a " #| "directory scan: \"Directory\"-menu: \"Rescan\"" msgid "" "But note that this status information will be lost when you rerun a " "directory scan: DirectoryRescan" msgstr "" "Men observera att statusinformationen går förlorad när du kör om en " "katalogavsökning: menyn \"Katalog\", \"Avsök igen\"" #. Tag: title #: index.docbook:1600 #, no-c-format msgid "Comparing or Merging Files with Different Names" msgstr "Jämföra eller sammanfoga filer med olika namn" #. Tag: para #: index.docbook:1601 #, fuzzy, no-c-format #| msgid "" #| "Sometimes you need to compare or merge files with different names (e.g. " #| "the current file and the backup in the same folder)." msgid "" "Sometimes you need to compare or merge files with different names (⪚ the " "current file and the backup in the same folder)." msgstr "" "Ibland behöver du jämföra eller sammanfoga filer med olika namn (t.ex. " "nuvarande fil och säkerhetskopian i samma katalog)." #. Tag: para #: index.docbook:1604 #, fuzzy, no-c-format #| msgid "" #| "Select the exact file by clicking onto the icon in the column A, B or C. " #| "The first file selected thus will be marked with an \"A\", the second and " #| "third with \"B\" and \"C\" regardless on what column they are in. Only up " #| "to three files can be chosen like this." msgid "" "Select the exact file by clicking onto the icon in the column A, B or C. The first file " "selected thus will be marked with an A, the second and " "third with B and C regardless on " "what column they are in. Only up to three files can be chosen like this." msgstr "" "Markera den exakta filen genom att klicka på ikonen i kolumnen A, B eller C. " "Filen som först markeras på det sättet markeras med \"A\", den andra och " "tredje med \"B\" och \"C\" oberoende av vilken kolumn de finns i. Bara upp " "till tre filer kan markeras på detta sätt." #. Tag: para #: index.docbook:1606 #, fuzzy, no-c-format #| msgid "" #| "Proceed by choosing \"Compare Explicitly Selected Files\" or \"Merge " #| "Explicitly Selected Files\" from the \"Directory\"-menu. For your " #| "convenience these menu entries also appear as context menu when you right-" #| "click the last selected file." msgid "" "Proceed by choosing DirectoryCompare Explicitly Selected Files or DirectoryMerge " "Explicitly Selected Files menu item. For your " "convenience these menu entries also appear as context menu when you right-" "click the last selected file." msgstr "" "Fortsätt genom att välja \"Jämför explicit markerade filer\" eller " "\"Sammanfoga explicit markerade filer\" från menyn \"Katalog\". Av " "bekvämlighetsskäl finns också menyalternativen som en sammanhangsberoende " "meny som visas när du klickar på den senast markerade filen." #. Tag: para #: index.docbook:1608 #, no-c-format msgid "" "The comparison or merge of a file will happen in the same window. If this " "method is used for directories a new window will be opened." msgstr "" "Jämförelsen eller sammanfogningen av en fil sker i samma fönster. Om metoden " "används för kataloger öppnas ett nytt fönster." #. Tag: title #: index.docbook:1616 #, no-c-format msgid "Miscellaneous Topics" msgstr "Diverse ämnen" #. Tag: title #: index.docbook:1618 #, fuzzy, no-c-format #| msgid "Networktransparency via KIO" msgid "Network transparency via KIO" msgstr "Nätverkstransparens via KIO" #. Tag: title #: index.docbook:1619 #, no-c-format msgid "KIO-Slaves" msgstr "I/O-slavar" #. Tag: para #: index.docbook:1620 #, fuzzy, no-c-format #| msgid "" #| "The KIO library from Frameworks supports networktransparency via KIO-" #| "slaves. &kdiff3; uses this for reading input files and for scanning " #| "directories. This means that you can specify files and directories on " #| "local and remote resources via URLs." msgid "" "The KIO library from &frameworks; supports network transparency via KIO-" "slaves. &kdiff3; uses this for reading input files and for scanning " "directories. This means that you can specify files and directories on local " "and remote resources via &URL;s." msgstr "" "KIO-biblioteket i Ramverk stöder nätverkstransparens via I/O-slavar. " "&kdiff3; använder dem för att läsa indatafiler och avsöka kataloger. Det " "betyder att du kan ange filer och kataloger på lokal- och fjärr-resurser via " "webbadresser." #. Tag: para #: index.docbook:1625 #, no-c-format msgid "Example:" msgstr "Exempel:" #. Tag: screen #: index.docbook:1628 #, no-c-format msgid "" "kdiff3 test.cpp ftp://ftp.faraway.org/test.cpp\n" " kdiff3 tar:/home/hacker/archive.tar.gz/dir ./dir" msgstr "" "kdiff3 test.cpp ftp://ftp.langtbortistan.org/test.cpp\n" " kdiff3 tar:/home/hackare/arkiv.tar.gz/kat ./kat" #. Tag: para #: index.docbook:1630 #, fuzzy, no-c-format #| msgid "" #| "The first line compares a local file with a file on an FTP-server. The " #| "second line compares a directory within an compressed archive with a " #| "local directory." msgid "" "The first line compares a local file with a file on an &FTP; server. The " "second line compares a directory within an compressed archive with a local " "directory." msgstr "" "Den första raden jämför en lokal fil med en fil på en FTP-server. Den andra " "raden jämför en katalog i ett komprimerat arkiv med en lokal katalog." #. Tag: para #: index.docbook:1632 #, no-c-format msgid "Other KIO-slaves that are interesting are:" msgstr "Andra I/O-slavar som är intressanta är:" #. Tag: para #: index.docbook:1636 #, no-c-format msgid "Files from the WWW (http:)," msgstr "Filer från WWW (http:)," #. Tag: para #: index.docbook:1637 #, fuzzy, no-c-format #| msgid "Files from the FTP (ftp:)," msgid "Files from the &FTP; (ftp:)," msgstr "Filer från FTP (ftp:)," #. Tag: para #: index.docbook:1638 #, no-c-format msgid "Encrypted file transfer (fish:, sftp:)," msgstr "Krypterad filöverföring (fish:, sftp:)," #. Tag: para #: index.docbook:1639 #, fuzzy, no-c-format #| msgid "Windows-resources (smb:)," msgid "&Windows; resources (smb:)," msgstr "Windows-resurser (smb:)," #. Tag: para #: index.docbook:1640 #, no-c-format msgid "Local files (file:)," msgstr "Lokala filer (file:)," #. Tag: para #: index.docbook:1642 #, no-c-format msgid "Other things that are possible, but probably less useful are:" msgstr "Andra saker som är möjliga, men troligen mindre användbara, är:" #. Tag: para #: index.docbook:1646 #, no-c-format msgid "Man-pages (man:)," msgstr "Manualsidor (man:)," #. Tag: para #: index.docbook:1647 #, no-c-format msgid "Info-pages (info:)," msgstr "Infosidor (info:)," #. Tag: title #: index.docbook:1651 #, fuzzy, no-c-format #| msgid "How To Write URLs" msgid "How To Write &URL;s" msgstr "Hur man skriver webbadresser" #. Tag: para #: index.docbook:1652 #, fuzzy, no-c-format #| msgid "" #| "An URL has a different syntax compared with paths for local files and " #| "directories. Some things should be considered:" msgid "" "An &URL; has a different syntax compared with paths for local files and " "directories. Some things should be considered:" msgstr "" "En webbadress har en annorlunda syntax jämfört med sökvägar till lokala " "filer och kataloger. Vissa saker måste tas hänsyn till:" #. Tag: para #: index.docbook:1657 #, fuzzy, no-c-format #| msgid "" #| "A path can be relative and can contain \".\" or \"..\". This is not " #| "possible for URLs which are always absolute." msgid "" "A path can be relative and can contain \".\" or \"..\". This is not possible " "for &URL;s which are always absolute." msgstr "" "En sökväg kan vara relativ, och kan innehålla \".\" eller \"..\". Det är " "inte möjligt för webbadresser, som alltid är absoluta." #. Tag: para #: index.docbook:1660 #, fuzzy, no-c-format #| msgid "" #| "Special characters must be written with \"escaping\". (\"#\"->\"%23\", " #| "space->\"%20\", etc.) E.g. A file with the name \"/#foo#\" would have the " #| "URL \"file:/%23foo%23\"." msgid "" "Special characters must be written with \"escaping\". (\"#" "\" -> \"%23\", space ->\"%20\", " "&etc;) E.g. a file with the name \"#foo#\" would have the &URL; \"file:/%23foo" "%23\"." msgstr "" "Specialtecken måste skrivas med särskilda \"teckenföljder\". (\"#\" blir " "\"%23\", mellanslag blir \"%20\", etc.) Till exempel skulle en fil med " "namnet \"/#foo#\" ha webbadressen \"file:/%23foo%23\"." #. Tag: para #: index.docbook:1663 #, fuzzy, no-c-format #| msgid "" #| "When URLs don't work as expected, try to open them in Konqueror first." msgid "" "When &URL;s don't work as expected, try to open them in &konqueror; first." msgstr "" "När webbadresser inte fungerar som väntat, försök att öppna dem i Konqueror " "först." #. Tag: title #: index.docbook:1670 #, no-c-format msgid "Capabilities of KIO-Slaves" msgstr "Möjligheter med I/O-slavar" #. Tag: para #: index.docbook:1671 #, fuzzy, no-c-format #| msgid "" #| "Networktransparency has one drawback: Not all resources have the same " #| "capabilities." msgid "" "Network transparency has one drawback: Not all resources have the same " "capabilities." msgstr "" "Nätverkstransparens har en nackdel: Alla resurser har inte samma möjligheter." #. Tag: para #: index.docbook:1673 #, no-c-format msgid "" "Sometimes this is due to the file system of the server, sometimes due to the " "protocol. Here is a short list of restrictions:" msgstr "" "Ibland beror det på serverns filsystem, ibland på protokollet. Här är en " "kort lista med begränsningar:" #. Tag: para #: index.docbook:1678 #, no-c-format msgid "Sometimes there is no support for links." msgstr "Ibland finns det inget stöd för länkar." #. Tag: para #: index.docbook:1680 #, no-c-format msgid "" "Or there is no way to distinguish if a link points to a file or a directory; " "always assuming a file. (ftp:, sftp:)." msgstr "" "Eller finns det inget sätt att särskilja om en länk pekar på en fil eller " "katalog, då antas alltid en fil (ftp:, sftp:)." #. Tag: para #: index.docbook:1683 #, no-c-format msgid "Can't always determine the filesize." msgstr "Kan inte alltid avgöra filstorleken." #. Tag: para #: index.docbook:1685 #, no-c-format msgid "Limited support for permissions." msgstr "Begränsat stöd för rättigheter." #. Tag: para #: index.docbook:1687 #, fuzzy, no-c-format #| msgid "" #| "No possibility to modify permissions or modification time, so permissions " #| "or time of a copy will differ from the original. (See the option \"Trust " #| "the size\".) (To modify permissions or modification time is only possible " #| "for local files.)" msgid "" "No possibility to modify permissions or modification time, so permissions or " "time of a copy will differ from the original. (See the Trust the " "size (unsafe) option.) (To modify permissions or modification " "time is only possible for local files.)" msgstr "" "Ingen möjlighet att ändra rättigheter eller ändringstid, så rättigheter " "eller tiden för en kopia skiljer sig från originalet. (Se alternativet " "\"Lita på storlek\". Ändring av rättigheter eller ändringstid är bara " "möjligt för lokala filer.)" #. Tag: title #: index.docbook:1697 #, no-c-format msgid "Using &kdiff3; as a KPart" msgstr "Använda &kdiff3; som en Kpart" #. Tag: para #: index.docbook:1698 #, fuzzy, no-c-format #| msgid "" #| "&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-" #| "interface." msgid "" "&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart " "interface." msgstr "" "Kdiff3 är en Kpart. För närvarande implementeras gränssnittet KParts::" "ReadOnlyPart." #. Tag: para #: index.docbook:1700 #, fuzzy, no-c-format #| msgid "" #| "It's main use is as difference-viewer in KDevelop. KDevelop always starts " #| "the internal difference viewer first. To invoke &kdiff3; press the right " #| "mouse button on the difference viewer window and select \"Show in " #| "KDiff3Part\" from the context menu." msgid "" "It's main use is as difference-viewer in &kdevelop;. &kdevelop; always " "starts the internal difference viewer first. To invoke &kdiff3; press the " "&RMB; on the difference viewer window and select Show in " "KDiff3Part from the context menu." msgstr "" "Den huvudsakliga användningen är för skillnadsvisning i KDevelop. KDevelop " "startar alltid den interna skillnadsvisningen först. För att använda " "&kdiff3;, klicka med höger musknapp i skillnadsvisningens fönster och välj " "\"Visa i KDiff3-del\" i den sammanhangsberoende menyn." #. Tag: para #: index.docbook:1704 #, no-c-format msgid "" "&kdiff3; normally requires two complete files as input. When used as part " "&kdiff3; will assume that the input file is a patch-file in the unified " "format. &kdiff3; then retrieves the original filenames from the patch-file. " "At least one of the two files must be available. &kdiff3; will then invoke " "patch to recreate the second file." msgstr "" "&kdiff3; kräver normalt två fullständiga filer som indata. När det används " "som en del, antar &kdiff3; att indatafilen är en programfixfil med unifierat " "format. &kdiff3; hämtar därefter originalfilernas namn i programfixfilen. " "Åtminstone en av de två filerna måste vara tillgänglig. &kdiff3; startar då " "kommandot patch för att återskapa den andra filen." #. Tag: para #: index.docbook:1710 #, fuzzy, no-c-format #| msgid "" #| "In &dolphin; you can select a patch-file and select \"Preview in\"-" #| "\"KDiff3Part\" from the context menu. Be aware that this won't work if " #| "none of the original files are available, and it is not reliable if the " #| "original file(s) have changed since the patch-file was generated." msgid "" "In &dolphin; you can select a patch-file and select " "Preview inKDiff3Part item from the context menu. Be aware that this " "won't work if none of the original files are available, and it is not " "reliable if the original file(s) have changed since the patch-file was " "generated." msgstr "" "Du kan välja en programfixfil i &dolphin; och välja \"Förhandsgranska i\"-" "\"Kdiff3-del\" i den sammanhangsberoende menyn. Var medveten om att det inte " "fungerar om ingen av originalfilerna finns tillgänglig, och är inte " "tillförlitligt om originalfilen eller filerna har ändrats sedan " "programfixfilen skapades." #. Tag: para #: index.docbook:1715 #, no-c-format msgid "" "When run as a part &kdiff3; only provides the a two-file-diff, a very small " "toolbar and menu. Merging or directory-comparison are not supported then." msgstr "" "När det kör som ett delprogram tillhandahåller &kdiff3; bara jämförelse " "mellan två filer, en mycket liten verktygsrad och meny. Sammanfogning eller " "katalogjämförelse stöds då inte." #. Tag: title #: index.docbook:1722 #, fuzzy, no-c-format #| msgid "Using &kdiff3; as a Git Diff and Merging Tool" msgid "Using &kdiff3; as a &git; Diff and Merging Tool" msgstr "" "Använda &kdiff3; som ett verktyg för jämförelse och sammanfogning med Git" #. Tag: para #: index.docbook:1723 #, fuzzy, no-c-format #| msgid "" #| "&kdiff3; can be used as a Git " #| "diff and merge tool." msgid "" "&kdiff3; can be used as a &git; " "diff and merge tool." msgstr "" "&kdiff3; kan användas som ett verktyg för jämförelse och sammanfogning med " "Git." #. Tag: para #: index.docbook:1726 #, no-c-format msgid "" "Just add the following lines into your gitconfig file." msgstr "Lägg bara till följande rader i filen gitconfig." #. Tag: programlisting #: index.docbook:1729 #, no-c-format msgid "" "[diff]\n" " tool = kdiff3\n" "[difftool \"kdiff3\"]\n" " path = <path to kdiff3 binary in your system>\n" "[difftool]\n" " prompt = false\n" " keepBackup = false\n" " trustExitCode = false\n" "[merge]\n" " tool = kdiff3\n" "[mergetool]\n" " prompt = false\n" " keepBackup = false\n" " keepTemporaries = false\n" "[mergetool \"kdiff3\"]\n" " path = <path to kdiff3 binary in your system>" msgstr "" "[diff]\n" " tool = kdiff3\n" "[difftool \"kdiff3\"]\n" " path = <sökväg till binärfilen kdiff3 på systemet>\n" "[difftool]\n" " prompt = false\n" " keepBackup = false\n" " trustExitCode = false\n" "[merge]\n" " tool = kdiff3\n" "[mergetool]\n" " prompt = false\n" " keepBackup = false\n" " keepTemporaries = false\n" "[mergetool \"kdiff3\"]\n" " path = <sökväg till binärfilen kdiff3 på systemet>" #. Tag: para #: index.docbook:1730 #, no-c-format msgid "" "Then to see the difference between two commits use git difftool " "first_hash second_hash " "--tool=kdiff3 --cc some_file_in_the_git_tree" msgstr "" "För att därefter se skillnaden mellan två incheckningar använd " "git difftool första kondensat " "andra kondensat --tool=kdiff3 --cc " "någon fil i git-trädet" #. Tag: para #: index.docbook:1733 #, no-c-format msgid "" "To merge a branch with &kdiff3; use git merge " "branch_name && git mergetool --" "tool=kdiff3" msgstr "" "Använd git merge grennamn && " "git mergetool --tool=kdiff3 för att sammanfoga en gren med " "&kdiff3;." #. Tag: para #: index.docbook:1736 #, no-c-format msgid "" "After resolving merging conflicts in the usual way it is enough to commit the changes to do the job." msgstr "" "Efter att sammanfogningskonflikter har lösts på vanligt sätt är det tillräckligt att checka in " "ändringarna för att göra färdigt." #. Tag: title #: index.docbook:1743 #, no-c-format msgid "Questions and Answers" msgstr "Vanliga frågor" #. Tag: chapter #: index.docbook:1743 #, no-c-format msgid "&reporting.bugs; &updating.documentation;" msgstr "&reporting.bugs; &updating.documentation;" #. Tag: para #: index.docbook:1750 #, no-c-format msgid "Why is it called \"&kdiff3;\"?" msgstr "Varför kallas det \"&kdiff3;\"?" #. Tag: para #: index.docbook:1752 #, fuzzy, no-c-format #| msgid "" #| "Tools named \"KDiff\" and \"KDiff2\" (now called \"Kompare\") already " #| "exist. Also \"KDiff3\" should suggest that it can merge like the " #| "\"diff3\"-tool in the Diff-Tool collection." msgid "" "Tools named KDiff and KDiff2 (now called &kompare;) already exist. Also &kdiff3; should " "suggest that it can merge like the diff3 tool in the Diff-" "Tool collection." msgstr "" "Verktyg som heter \"KDiff\" och \"KDiff2\" (som nu kallas \"Kompare\") fanns " "redan. Dessutom ska \"Kdiff3\" antyda att programmet kan sammanfoga som " "verktyget \"diff3\" från samlingen med diff-verktyg." #. Tag: para #: index.docbook:1756 #, no-c-format msgid "Why did I release it under GPL?" msgstr "Varför licensieras det under GPL?" #. Tag: para #: index.docbook:1758 #, no-c-format msgid "" "I'm using GPL programs for a very long time now and learned very much by " "having a look at many of the sources. Hence this is my \"Thank You\" to all " "programmers that also did so or will do the same." msgstr "" "Jag har använt GPL-program under mycket lång tid nu, och lärt mig mycket " "genom att titta på en hel del av källkoden. Alltså är det här mitt \"tack\" " "till alla programmerare som också gjorde eller kommer att göra samma sak." #. Tag: para #: index.docbook:1764 #, no-c-format msgid "Some buttons and functions are missing. What's wrong?" msgstr "Vissa knappar och funktioner saknas. Vad är fel?" #. Tag: para #: index.docbook:1766 #, fuzzy, no-c-format #| msgid "" #| "You compiled from source but you probably didn't specify the correct " #| "prefix for the installation. By default cmake wants to install in /usr/" #| "local but then the user-interface resource file (i.e. kdiff3ui.rc) can't " #| "be found. The README-file contains more information about the correct " #| "prefix." msgid "" "You compiled from source but you probably didn't specify the correct prefix " "for the installation. By default cmake wants to install " "in /usr/local but then the user-" "interface resource file (&ie; kdiff3ui.rc) can't be " "found. The README file contains more information about " "the correct prefix." msgstr "" "Du kompilerade från källkod, men angav troligen inte rätt prefix för " "installationen. Normalt vill cmake installera i /usr/local, men då kan inte " "resursfilen för användargränssnittet (dvs. kdiff3ui.rc) hittas. Filen README " "innehåller mer information om det riktiga prefixet." #. Tag: para #: index.docbook:1774 #, no-c-format msgid "" "Often lines that are similar but not identical appear next to each other but " "sometimes not. Why?" msgstr "" "Ofta visas rader som är liknande men inte identiska intill varandra, men " "inte alltid. Varför?" #. Tag: para #: index.docbook:1777 #, no-c-format msgid "" "Lines where only the amount of white space characters is different are " "treated as \"equal\" at first, while just one different non-white character " "causes the lines to be \"different\". If similar lines appear next to each " "other, this actually is coincidence but this fortunately is often the case. " "See also Manual Diff Help." msgstr "" "Rader där bara antal blanktecken är olika behandlas som \"lika\", medan bara " "ett annorlunda blanktecken gör att raderna är \"olika\". Om liknande rader " "finns intill varandra, är detta i själva verket en slump men det är som tur " "är oftast fallet. Se också hjälpen på " "manualsidan för diff." #. Tag: para #: index.docbook:1785 #, no-c-format msgid "Why must all conflicts be solved before the merge result can be saved?" msgstr "" "Varför måste alla konflikter vara lösta innan sammanfogningsresultatet kan " "sparas?" #. Tag: para #: index.docbook:1787 #, fuzzy, no-c-format #| msgid "" #| "For each equal or different section the editor in the merge result window " #| "remembers where it begins or ends. This is needed so that conflicts can " #| "be solved manually by simply selecting the source button (A, B or C). " #| "This information is lost while saving as text and it is too much effort " #| "to create a special file format that supports saving and restoring all " #| "necessary information." msgid "" "For each equal or different section the editor in the merge result window " "remembers where it begins or ends. This is needed so that conflicts can be " "solved manually by simply selecting the source button (A, B or C). This " "information is lost while saving as text and it is too much effort to create " "a special file format that supports saving and restoring all necessary " "information." msgstr "" "För varje likadant eller annorlunda avsnitt kommer editorn i fönstret med " "sammanfogningsresultatet ihåg var det börjar och slutar. Det behövs eftersom " "konflikter kan lösas upp manuellt genom att helt enkelt välja källknappen " "(A, B eller C). Informationen går förlorad när filen sparas som text, och " "det är för mycket ansträngning att skapa ett speciellt filformat som stöder " "att spara och återställa all nödvändig information." #. Tag: para #: index.docbook:1791 #, no-c-format msgid "" "How can I synchronise the diff and merge views, so that all views show the " "same text position?" msgstr "" "Hur kan jag synkronisera jämförelsevyn och sammanfogningsvyn så att alla " "vyer visar samma textposition?" #. Tag: para #: index.docbook:1793 #, no-c-format msgid "" "Click into the summary column left of the text. (See also here.)" msgstr "" "Klicka på sammanfattningskolumnen till vänster om texten. (Se också här.)" #. Tag: para #: index.docbook:1797 #, no-c-format msgid "" "Why does the editor in the merge result window not have an \"undo\"-function?" msgstr "" "Varför har inte editorn i resultatfönstret för sammanfogning en \"ångra\"-" "funktion?" #. Tag: para #: index.docbook:1799 #, fuzzy, no-c-format #| msgid "" #| "This was too much effort until now. You can always restore a version from " #| "one source (A, B or C) by clicking the respective button. For big editing " #| "the use of another editor is recommended anyway." msgid "" "This was too much effort until now. You can always restore a version from " "one source (A, B or C) by clicking the respective button. For big editing the use of " "another editor is recommended anyway." msgstr "" "Hittills har det varit för stor ansträngning. Du kan alltid återställa en " "version från en källa (A, B eller C) genom att klicka på motsvarande knapp. " "För större redigering, rekommenderas användning av en annan editor ändå." #. Tag: para #: index.docbook:1803 #, no-c-format msgid "" "When I removed some text, then suddenly \"<No src line>\" appeared and " "cannot be deleted. What does that mean and how can one remove this?" msgstr "" "När jag tog bort en del text, visades plötsligt \"<Ingen källrad>\" " "och det kan inte tas bort. Vad betyder det och hur kan man ta bort det?" #. Tag: para #: index.docbook:1806 #, fuzzy, no-c-format #| msgid "" #| "For each equal or different section the editor in the merge result window " #| "remembers where it begins or ends. \"<No src line>\" means that " #| "there is nothing left in a section, not even a new line character. This " #| "can happen either while merging automatically or by editing. This is no " #| "problem, since this hint won't appear in the saved file. If you want the " #| "orignal source back just select the section (click on the left summary " #| "column) and then click the source button with the needed contents (A/B or " #| "C)." msgid "" "For each equal or different section the editor in the merge result window " "remembers where it begins or ends. \"<No src line>\" means that there " "is nothing left in a section, not even a new line character. This can happen " "either while merging automatically or by editing. This is no problem, since " "this hint won't appear in the saved file. If you want the orignal source " "back just select the section (click on the left summary column) and then " "click the source button with the needed contents (A/" "B or C)." msgstr "" "För varje likadant eller annorlunda avsnitt kommer editorn i fönstret med " "sammanfogningsresultatet ihåg var det börjar och slutar. \"<Ingen " "källrad>\" betyder att det inte finns någonting kvar i ett avsnitt, inte " "ens ett nyradstecken. Detta kan inträffa antingen vid automatisk " "sammanfogning eller efter redigering. Det är inget problem, eftersom " "informationen inte finns med i den sparade filen. Om du vill ha tillbaka " "originalkällan, markera bara källan (klicka på sammanfattningskolumnen till " "vänster) och klicka därefter på källknappen med innehållet som önskas (A, B " "eller C)." #. Tag: para #: index.docbook:1817 #, no-c-format msgid "Why doesn't &kdiff3; support syntax-highlighting?" msgstr "Varför stöder inte &kdiff3; syntaxfärgläggning?" #. Tag: para #: index.docbook:1819 #, no-c-format msgid "" "&kdiff3; already uses many colors for difference highlighting. More " "highlighting would be confusing. Use another editor for this." msgstr "" "&kdiff3; använder redan många färger för färgläggning av jämförelser. " "Ytterligare färgläggning skulle vara förvirrande. Använd en annan editor för " "detta." #. Tag: para #: index.docbook:1824 #, no-c-format msgid "" "Can I use &kdiff3; to compare OpenOffice." "org, &Microsoft; Word, " "&Microsoft; Excel, &PDF;, &etc; files?" msgstr "" +"Kan man använda &kdiff3; för att jämföra " +" OpenOffice.org, &Microsoft; Word, <" +"application>&Microsoft; Excel, &PDF;-filer, etc.?" #. Tag: para #: index.docbook:1828 #, no-c-format msgid "" "Although &kdiff3; will analyse any kind of file the result will probably not " "be very satisfactory for you." msgstr "" "Även om &kdiff3; kan analysera alla sorters filer, är resultatet troligen " "inte särskilt tillfredsställande för dig." #. Tag: para #: index.docbook:1831 #, fuzzy, no-c-format #| msgid "" #| "&kdiff3; was made to compare pure text files. OpenOffice, Word, Excel " #| "etc. store much more information in the files (about fonts, pictures, " #| "pages, colors etc.) which &kdiff3; doesn't know about. So &kdiff3; will " #| "show you the contents of the file interpreted as pure text, but this " #| "might be unreadable or at least it will look very odd." msgid "" "&kdiff3; was made to compare pure text files. OpenOffice.org, &Microsoft; Word, " "&Microsoft; Excel, &etc; store much more " "information in the files (about fonts, pictures, pages, colors, &etc;) which " "&kdiff3; doesn't know about. So &kdiff3; will show you the contents of the " "file interpreted as pure text, but this might be unreadable or at least it " "will look very odd." msgstr "" "&kdiff3; skapades för att jämföra rena textfiler. OpenOffice, Word, Excel, " "och så vidare, lagrar mycket mer information i filerna (om teckensnitt, " "bilder, sidor, färger, etc.), som &kdiff3; inte känner till. Alltså visar " "&kdiff3; dig innehållet i filen tolkat som ren text, men det kan vara " "oläsbart eller åtminstone se mycket konstigt ut." #. Tag: para #: index.docbook:1838 #, fuzzy, no-c-format #| msgid "" #| "Since most programs nowadays store their contents in XML-format, you " #| "might be able to read it as pure text. So if the change was only small, " #| "&kdiff3; still might help you." msgid "" "Since most programs nowadays store their contents in &XML; format, you might " "be able to read it as pure text. So if the change was only small, &kdiff3; " "still might help you." msgstr "" "Eftersom de flesta program nuförtiden lagrar sitt innehåll med XML-format, " "kanske du kan läsa det som ren text. Om ändringen bara var liten, kanske " "&kdiff3; fortfarande kan hjälpa dig." #. Tag: para #: index.docbook:1842 #, fuzzy, no-c-format #| msgid "" #| "The best solution if you only want to compare the text (without embedded " #| "objects like pictures) is to use \"Select All\" and \"Copy\" in your " #| "program to copy the interesting text to the clipboard and then in " #| "&kdiff3; paste the text into either diff input window. (See also Select, Copy And Paste.)" msgid "" "The best solution if you only want to compare the text (without embedded " "objects like pictures) is to use EditSelect All and " "EditCopy menu items in your program to copy the interesting text to the " "clipboard and then in &kdiff3; paste the text into either diff input window. " "(See also Select, Copy And Paste.)" msgstr "" "Den bästa lösningen om du bara vill jämföra texten (utan inbäddade objekt " "som bilder) är att använda \"Markera alla\" och \"Kopiera\" i programmet för " "att kopiera den intressanta texten till klippbordet och därefter klistra in " "texten i något av jämförelsefönstren i &kdiff3;. (Se också Markera, kopiera och klistra in.)" #. Tag: para #: index.docbook:1846 #, fuzzy, no-c-format #| msgid "Where has the directory option \"List only deltas\" gone?" msgid "" "Where has the directory option List only deltas " "gone?" msgstr "Vart har katalogalternativet \"Lista bara skillnader\" tagit vägen?" #. Tag: para #: index.docbook:1848 #, fuzzy, no-c-format #| msgid "" #| "There are now several \"Show\"-" #| "options in the directory menu. Disabling \"Show identical files\" " #| "will achieve what enabling \"List only deltas\" used to do." msgid "" "There are now several \"Show\" " "options in the Directory menu. Disabling " "Show Identical Files will achieve what enabling " "List only deltas used to do." msgstr "" "Det finns nu flera olika \"Visa\"-" "alternativ i katalogmenyn. Att inaktivera \"Visa identiska filer\" " "åstadkommer vad aktivering av \"Lista bara skillnader\" brukade göra." #. Tag: para #: index.docbook:1854 #, no-c-format msgid "" "How can I make a big selection in the diff input window because scrolling " "takes so long?" msgstr "" "Hur kan man göra en stor markering i jämförelsefönstret fastän det tar så " "lång tid att rulla texten?" #. Tag: para #: index.docbook:1857 #, fuzzy, no-c-format #| msgid "" #| "Start the selection as usual (click and hold the left mouse button). Then " #| "use the navigation keys (e.g. page up, page down) while holding the left " #| "mouse button down. (See also Select, Copy " #| "And Paste.)" msgid "" "Start the selection as usual (click and hold the &LMB;). Then use the " "navigation keys (⪚ &PgUp;, &PgDn;) while holding the &LMB; down. (See " "also Select, Copy And Paste.)" msgstr "" "Påbörja markeringen som vanligt (klicka och håll nere vänster musknapp). " "Använd därefter navigationstangenterna (t.ex. Page Up, Page Down) medan " "vänster musknapp hålls nere. (Se också Markera, " "kopiera och klistra in.)" #. Tag: para #: index.docbook:1861 #, no-c-format msgid "" "There is so much information here, but your question is still not answered?" msgstr "" "Det finns en stor mängd information här, men din fråga har ändå inte " "besvarats?" #. Tag: para #: index.docbook:1863 #, no-c-format msgid "Please send me your question. I appreciate every comment." msgstr "Skicka gärna din fråga till mig. Jag uppskattar alla kommentarer." #. Tag: title #: index.docbook:1872 #, no-c-format msgid "Credits and License" msgstr "Tack till och licens" #. Tag: para #: index.docbook:1874 #, no-c-format msgid "&kdiff3; - File and Directory Comparison and Merge Tool" msgstr "" "&kdiff3;: Verktyg för jämförelser och sammanfogning av filer och kataloger" #. Tag: para #: index.docbook:1877 #, no-c-format msgid "" "Program copyright 2002-2007 Joachim Eibl joachim.eibl at gmx.de" msgstr "" "Program copyright 2002-2007 Joachim Eibl joachim.eibl snabela gmx.de" #. Tag: para #: index.docbook:1880 #, no-c-format msgid "" "Several cool ideas and bugreports came from colleagues and many people out " "in the Wild Wild Web. Thank you!" msgstr "" "Flera häftiga idéer och felrapporter kom från kolleger och många personer " "ute i den Vida Vilda Världen. Tack!" #. Tag: para #: index.docbook:1884 #, no-c-format msgid "" "Documentation Copyright © 2002-2007 Joachim Eibl joachim.eibl at " "gmx.de" msgstr "" "Dokumentation Copyright © 2002-2007 Joachim Eibl joachim. eibl " "snabela gmx.de" #. Tag: para #: index.docbook:1888 #, fuzzy, no-c-format #| msgid "" #| "Documentation Copyright © 2002-2007 Joachim Eibl joachim.eibl " #| "at gmx.de" msgid "" "Documentation Copyright © 2017-2019 Michael Reeves reeves.87 at " "gmail.com" msgstr "" "Dokumentation Copyright © 2002-2007 Joachim Eibl joachim. eibl " "snabela gmx.de" #. Tag: trans_comment #: index.docbook:1892 #, no-c-format msgid "CREDIT_FOR_TRANSLATORS" msgstr "" "Översättning Stefan Asserhällstefan.asserhall@bredband.net" #. Tag: chapter #: index.docbook:1892 #, no-c-format msgid "&underFDL; &underGPL;" msgstr "&underFDL; &underGPL;" #~ msgid "" #~ "Michael Reeves " #~ "
reeves.87@gmail.com
Joachim Eibl" #~ msgstr "" #~ "Michael Reeves " #~ "
reeves.87@gmail.com
Joachim Eibl" #~ msgid "1.09.70" #~ msgstr "1.09.70" #~ msgid "(Using an early version of &kdiff3;):" #~ msgstr "(Med en tidig version av &kdiff3;):" #~ msgid "" #~ "Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)" #~ msgstr "" #~ "Sök efter strängar i alla textfönster. Sök (Ctrl+F) och Sök igen (F3)" #~ msgid "" #~ "In order to select everything in the current window use menu \"Edit\"->" #~ "\"Select All\" (Ctrl-A)." #~ msgstr "" #~ "För att markera allt i det nuvarande fönstret, använd menyn \"Redigera\" -" #~ "> \"Markera allt\" (Ctrl+A)." #~ msgid "etc." #~ msgstr "etc." #~ msgid "Ignore numbers:" #~ msgstr "Ignorera siffror:" #~ msgid "Ignore C/C++ comments:" #~ msgstr "Ignorera C/C++ kommentarer:" #~ msgid "Ignore case:" #~ msgstr "Ignorera skiftläge:" #~ msgid "Try Hard:" #~ msgstr "Var noggrann:" #~ msgid "Language:" #~ msgstr "Språk:" #~ msgid "" #~ "Adjust the language of the user interface. Changing this option doesn't " #~ "affect the running program. You have to exit and restart &kdiff3; so that " #~ "the language is changed. (This option is not available in the Frameworks " #~ "version of &kdiff3;.)" #~ msgstr "" #~ "Justera användargränssnittets språk. Att ändra alternativet påverkar inte " #~ "programmet som kör. Du måste avsluta och starta om &kdiff3; för att ändra " #~ "språk. (Alternativet är inte tillgängligt i ramverksversionen av " #~ "&kdiff3;.)" #~ msgid "Show line numbers:" #~ msgstr "Visa radnummer:" #~ msgid "Start a merge quickly:" #~ msgstr "Starta sammanfogning snabbt:" #~ msgid "Ignore numbers," #~ msgstr "Ignorera siffror," #~ msgid "... only B exists: Copy from B" #~ msgstr "... bara B finns: Kopiera från B" #~ msgid "... only C exists: Copy from C" #~ msgstr "... bara C finns: Kopiera från C" #~ msgid "... A, B and C are not equal: Merge" #~ msgstr "... A, B och C är inte likadana: Sammanfoga" #~ msgid "... A exists, but not B: Copy from A" #~ msgstr "... A finns men inte B: Kopiera från A" #~ msgid "... B exists, but not A: Copy from B" #~ msgstr "... B finns men inte A: Kopiera från B" #~ msgid "... A exists, but not B: Copy A to B" #~ msgstr "... A finns, men inte B: Kopiera A till B" #~ msgid "... B exists, but not A: Copy B to A" #~ msgstr "... B finns, men inte A: Kopiera B till A" #~ msgid "Find Hidden Files and Directories:" #~ msgstr "Sök efter gömda filer och kataloger:" #~ msgid "" #~ "Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; " #~ "files?" #~ msgstr "" #~ "Kan jag använda &kdiff3; för att jämföra filer från OpenOffice.Org, Word, " #~ "Excel, PDF, och så vidare?" #~ msgid "2018-04-30" #~ msgstr "2018-04-30" #~ msgid "1.07.00" #~ msgstr "1.07.00" #~ msgid "" #~ "Also note that the following examples use the single quotation mark (') " #~ "which won't work for Windows. On Windows you should use the double " #~ "quotation marks (\") instead." #~ msgstr "" #~ "Observera också att följande exempel använder enkla citationstecken ('), " #~ "vilket inte fungerar i Windows. I Windows ska du istället använda dubbla " #~ "citationstecken (\")." #~ msgid "2007-31-03" #~ msgstr "2007-31-03" #~ msgid "0.9.92" #~ msgstr "0.9.92" #~ msgid "kdeextragear" #~ msgstr "kdeextragear" #~ msgid "Preserve Carriage Return:" #~ msgstr "Behåll returtecken:" #~ msgid "" #~ "Some editors (on some systems) save carriage return '\\r' and linefeed " #~ "'\\n'-characters at the end of line, while others will only save the " #~ "linefeed '\\n'. Usually &kdiff3; ignores the carriage return, but then " #~ "files that don't have equal sizes, look equal in side by side comparison. " #~ "When this option is on, then the carriage return characters are made " #~ "visible but are treated as white space. This option must be off during a " #~ "merge. Default is off." #~ msgstr "" #~ "Vissa editorer (på vissa system) sparar returtecken '\\r' och " #~ "nyradstecken '\\n' i slutet på raden, medan andra bara sparar " #~ "nyradstecknet '\\n'. Oftast ignorerar &kdiff3; returtecknet, men då ser " #~ "filer som inte har samma storlek likadana ut vid jämförelse sida vid " #~ "sida. När det här alternativet är markerat, görs returtecken synliga, men " #~ "behandlas som blanktecken. Det här alternativet måste vara av under en " #~ "sammanfogning. Normalvärdet är av." #~ msgid "Installation" #~ msgstr "Installation" #~ msgid "How to obtain &kdiff3;" #~ msgstr "Hur man skaffar &kdiff3;" #~ msgid "" #~ "You can download the latest version of &kdiff3; from its homepage http://kdiff3.sourceforge.net." #~ msgstr "" #~ "Du kan ladda ner senaste version av &kdiff3; från hemsidan http://kdiff3.sourceforge.net." #~ msgid "" #~ "&kdiff3; is also available for other platforms. See the homepage for " #~ "details." #~ msgstr "" #~ "&kdiff3; är också tillgänglig för andra plattformar. Se hemsidan för " #~ "detaljinformation." #~ msgid "Requirements" #~ msgstr "Krav" #~| msgid "" #~| "In order to successfully use all features of &kdiff3;, you need &kde; > " #~| "4.4." #~ msgid "" #~ "In order to successfully use all features of &kdiff3;, you need &kde; " #~ ">4.4." #~ msgstr "" #~ "För att använda alla funktioner i &kdiff3; med lyckat resultat behöver du " #~ "&kde; > 4.4." #~ msgid "" #~ "For information about how to run &kdiff3; on other platforms without KDE " #~ "please see the homepage." #~ msgstr "" #~ "För information om hur &kdiff3; kan köras på andra plattformar utan KDE, " #~ "se hemsidan." #~ msgid "" #~ "You can find a list of changes at http://kdiff3.sourceforge.net/ChangeLog or in the " #~ "\"ChangeLog\"-file of the source package." #~ msgstr "" #~ "Du hittar en lista med ändringar på http://kdiff3.sourceforge.net/ChangeLog eller i filen \"ChangeLog\" i källkodspaketet." #~ msgid "Compilation and Installation" #~ msgstr "Kompilering och installation" #~| msgid "" #~| "Information how to compile and install &kdiff3; on a system with &kde; " #~| "you find in the README file in the base directory of the &kdiff3; " #~| "distribution" #~ msgid "" #~ "In order to compile and install &kdiff3; on a system with KDE, type the " #~ "following in the base directory of the &kdiff3; distribution:" #~ msgstr "" #~ "För att kompilera och installera &kdiff3; på ett system med &kde;, skriv " #~ "följande i baskatalogen för distributionen av &kdiff3;:" #~ msgid "" #~ "% ./configure --" #~ "prefix=kde-dir\n" #~ "% make\n" #~ "% make install" #~ msgstr "" #~ "% ./configure --" #~ "prefix=kde-katalog\n" #~ "% make\n" #~ "% make install" #~ msgid "" #~ "kde-dir specifies the directory containing KDE " #~ "on your system. If you are not sure, read the README-file for details." #~ msgstr "" #~ "kde-katalog anger katalogen som innehåller KDE " #~ "på ditt system. Om du inte är säker, läs filen README för " #~ "detaljinformation." #~| msgid "" #~| "If you don't use KDE follow the instructions for Qt-only systems in the " #~| "README file." #~ msgid "" #~ "If you don't use KDE don't use configure but follow " #~ "the instructions for Qt-only systems in the README file." #~ msgstr "" #~ "Om du inte använder KDE, använd inte configure men " #~ "följ instruktionerna för system som bara använder Qt i filen README." #~| msgid "" #~| "Since &kdiff3; uses cmake you should have no trouble " #~| "compiling it. Should you run into problems please report them to the " #~| "&kde; mailing lists." #~ msgid "" #~ "Since &kdiff3; uses autoconf and automake you should have no trouble compiling it. Should you run into " #~ "problems please report them to the &kde; mailing lists." #~ msgstr "" #~ "Eftersom &kdiff3; använder autoconf och " #~ "automake bör du inte ha några problem med att " #~ "kompilera det. Skulle du stöta på problem, rapportera dem gärna till " #~ "&kde;:s e-postlistor."