[Winmerge-svn] SF.net SVN: winmerge:[5836] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-08-21 13:27:21
|
Revision: 5836 http://winmerge.svn.sourceforge.net/winmerge/?rev=5836&view=rev Author: kimmov Date: 2008-08-21 13:27:19 +0000 (Thu, 21 Aug 2008) Log Message: ----------- PATCH: [ 2062107 ] A Swedish Swedish.po translation update Submitted by Hans Eriksson Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Languages/Swedish.po Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-21 07:06:13 UTC (rev 5835) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-21 13:27:19 UTC (rev 5836) @@ -19,6 +19,7 @@ - German (#2045666) - Chinese Traditional (#2039929) - Japanese (r5805) + - Swedish (#2062107) WinMerge 2.11.1.3 - 2008-08-04 (r5733) Rename color scheme menu item "None" and add separator (#2027300) Modified: trunk/Src/Languages/Swedish.po =================================================================== --- trunk/Src/Languages/Swedish.po 2008-08-21 07:06:13 UTC (rev 5835) +++ trunk/Src/Languages/Swedish.po 2008-08-21 13:27:19 UTC (rev 5836) @@ -13,7 +13,7 @@ "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-03-04 16:04+0100\n" +"PO-Revision-Date: 2008-08-20 13:00+0100\n" "Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n" "Language-Team: Swedish <win...@li...>\n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "&Copy" msgstr "K&opiera" @@ -84,7 +84,7 @@ msgstr "K&listra in" #: Merge.rc:84 -#: Merge.rc:589 +#: Merge.rc:590 #, c-format msgid "&Goto..." msgstr "&G\xE5 till..." @@ -95,22 +95,22 @@ msgstr "\xD6p&pna" #: Merge.rc:88 -#: Merge.rc:531 -#: Merge.rc:537 +#: Merge.rc:532 +#: Merge.rc:538 #, c-format msgid "with &Registered Application" msgstr "med &Registrerat program" #: Merge.rc:89 -#: Merge.rc:532 -#: Merge.rc:538 +#: Merge.rc:533 +#: Merge.rc:539 #, c-format msgid "with &External Editor" msgstr "med &Extern editor" #: Merge.rc:90 -#: Merge.rc:533 -#: Merge.rc:539 +#: Merge.rc:534 +#: Merge.rc:540 #, c-format msgid "&with..." msgstr "&med..." @@ -286,7 +286,7 @@ #: Merge.rc:454 #, c-format msgid "&List..." -msgstr "" +msgstr "&Lista..." #: Merge.rc:152 #: Merge.rc:273 @@ -389,7 +389,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1920 +#: Merge.rc:1921 #, c-format msgid "&Help" msgstr "&Hj\xE4lp" @@ -504,17 +504,17 @@ #: Merge.rc:224 #, c-format msgid "Tree &Mode" -msgstr "" +msgstr "Tr\xE4d&mod" #: Merge.rc:225 #, c-format msgid "E&xpand All Subfolders" -msgstr "" +msgstr "E&xpandera alla underkataloger" #: Merge.rc:226 #, c-format msgid "&Collapse All Subfolders" -msgstr "" +msgstr "&Minimera alla underkataloger" #: Merge.rc:239 #, c-format @@ -591,7 +591,7 @@ msgstr "&Ta bort\tDelete" #: Merge.rc:264 -#: Merge.rc:562 +#: Merge.rc:563 #, c-format msgid "&Customize Columns..." msgstr "&Anpassa kolumner..." @@ -720,7 +720,7 @@ msgstr "&Script" #: Merge.rc:370 -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "< Empty >" msgstr "< Inga >" @@ -876,1166 +876,1171 @@ msgid "&XML" msgstr "&XML" -#: Merge.rc:510 +#: Merge.rc:506 #, c-format +msgid "&HEX" +msgstr "" + +#: Merge.rc:511 +#, c-format msgid "&Left to Right" msgstr "&V\xE4nster till h\xF6ger" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "L&eft to..." msgstr "V&\xE4nster till..." -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "&Right to Left" msgstr "&H\xF6ger till v\xE4nster" -#: Merge.rc:513 +#: Merge.rc:514 #, c-format msgid "R&ight to..." msgstr "H&\xF6ger till..." -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "&Move" msgstr "&Flytta" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "&Left to..." msgstr "&V\xE4nster till..." -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "&Right to..." msgstr "&H\xF6ger till..." -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "&Delete" msgstr "&Ta bort" -#: Merge.rc:522 -#: Merge.rc:1140 -#: Merge.rc:1522 +#: Merge.rc:523 +#: Merge.rc:1141 +#: Merge.rc:1523 #, c-format msgid "&Left" msgstr "&V\xE4nster" -#: Merge.rc:523 -#: Merge.rc:1142 -#: Merge.rc:1525 +#: Merge.rc:524 +#: Merge.rc:1143 +#: Merge.rc:1526 #, c-format msgid "&Right" msgstr "&H\xF6ger" -#: Merge.rc:524 +#: Merge.rc:525 #, c-format msgid "&Both" msgstr "&B\xE5da" -#: Merge.rc:526 +#: Merge.rc:527 #, c-format msgid "Re&name" msgstr "Byt &namn" -#: Merge.rc:527 +#: Merge.rc:528 #, c-format msgid "&Hide Items" msgstr "&D\xF6lj filnamn" -#: Merge.rc:529 +#: Merge.rc:530 #, c-format msgid "&Open Left" msgstr "&\xD6ppna v\xE4nster" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "O&pen Right" msgstr "\xD6&ppna h\xF6ger" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Cop&y Pathnames" msgstr "Kop&iera S\xF6kv\xE4gar" -#: Merge.rc:544 +#: Merge.rc:545 #, c-format msgid "&Left (%1 of %2)" msgstr "&V\xE4nster (%1 av %2)" -#: Merge.rc:545 +#: Merge.rc:546 #, c-format msgid "&Right (%1 of %2)" msgstr "&H\xF6ger (%1 av %2)" -#: Merge.rc:546 +#: Merge.rc:547 #, c-format msgid "&Both (%1 of %2)" msgstr "&B\xE5da (%1 av %2)" -#: Merge.rc:548 +#: Merge.rc:549 #, c-format msgid "Copy &Filenames" msgstr "Kopiera &Filnamn" -#: Merge.rc:550 +#: Merge.rc:551 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:552 +#: Merge.rc:553 #, c-format msgid "&Left... (%1 of %2)" msgstr "&V\xE4nster... (%1 av %2)" -#: Merge.rc:553 +#: Merge.rc:554 #, c-format msgid "&Right... (%1 of %2)" msgstr "&H\xF6ger... (%1 av %2)" -#: Merge.rc:554 +#: Merge.rc:555 #, c-format msgid "&Both... (%1 of %2)" msgstr "&B\xE5da... (%1 av %2)" -#: Merge.rc:555 +#: Merge.rc:556 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Skillnader... (%1 av %2)" -#: Merge.rc:558 +#: Merge.rc:559 #, c-format msgid "&Refresh" msgstr "&Uppdatera" -#: Merge.rc:570 +#: Merge.rc:571 #, c-format msgid "&Copy Full Path" msgstr "Kopiera hela s\xF6kv\xE4gen" -#: Merge.rc:571 +#: Merge.rc:572 #, c-format msgid "Copy &Filename" msgstr "Kopiera Filnamn" -#: Merge.rc:577 +#: Merge.rc:578 #, c-format msgid "Prediffer Settings" msgstr "Prediffer-inst\xE4llningar" -#: Merge.rc:579 +#: Merge.rc:580 #, c-format msgid "&No prediffer" msgstr "&Ingen Prediffer" -#: Merge.rc:580 +#: Merge.rc:581 #, c-format msgid "Auto prediffer" msgstr "Automatisk Prediffer" -#: Merge.rc:588 +#: Merge.rc:589 #, c-format msgid "G&oto Diff" msgstr "G&\xE5 till skillnad" -#: Merge.rc:591 +#: Merge.rc:592 #, c-format msgid "&No Moved Blocks" msgstr "&Inga Flyttade Block" -#: Merge.rc:592 +#: Merge.rc:593 #, c-format msgid "&All Moved Blocks" msgstr "&Alla Flyttade Block" -#: Merge.rc:593 +#: Merge.rc:594 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttat Block f\xF6r &Aktuell Skillnad" -#: Merge.rc:662 +#: Merge.rc:663 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:668 +#: Merge.rc:669 #, c-format msgid "(Private Build)" msgstr "(Privat kompilering)" -#: Merge.rc:669 +#: Merge.rc:670 #, c-format msgid "All rights reserved." msgstr "Med ensamr\xE4tt" -#: Merge.rc:670 +#: Merge.rc:671 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Bes\xF6k WinMerges hemsida !" -#: Merge.rc:673 -#: Merge.rc:705 -#: Merge.rc:795 -#: Merge.rc:981 -#: Merge.rc:1059 -#: Merge.rc:1088 -#: Merge.rc:1098 -#: Merge.rc:1264 -#: Merge.rc:1328 -#: Merge.rc:1341 -#: Merge.rc:1433 -#: Merge.rc:1448 -#: Merge.rc:1670 +#: Merge.rc:674 +#: Merge.rc:706 +#: Merge.rc:796 +#: Merge.rc:982 +#: Merge.rc:1060 +#: Merge.rc:1089 +#: Merge.rc:1099 +#: Merge.rc:1265 +#: Merge.rc:1329 +#: Merge.rc:1342 +#: Merge.rc:1434 +#: Merge.rc:1449 +#: Merge.rc:1671 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:674 +#: Merge.rc:675 #, c-format msgid "Contributors" msgstr "Medarbetare" -#: Merge.rc:681 +#: Merge.rc:682 #, c-format msgid "Select Files or Folders" msgstr "V\xE4lj filer eller kataloger..." -#: Merge.rc:684 -#: Merge.rc:1599 +#: Merge.rc:685 +#: Merge.rc:1600 #, c-format msgid "&Left:" msgstr "&V\xE4nster:" -#: Merge.rc:688 -#: Merge.rc:749 -#: Merge.rc:1002 -#: Merge.rc:1024 +#: Merge.rc:689 +#: Merge.rc:750 +#: Merge.rc:1003 +#: Merge.rc:1025 #, c-format msgid "&Browse..." msgstr "&Bl\xE4ddra..." -#: Merge.rc:689 -#: Merge.rc:1603 +#: Merge.rc:690 +#: Merge.rc:1604 #, c-format msgid "&Right:" msgstr "&H\xF6ger:" -#: Merge.rc:693 -#: Merge.rc:1035 +#: Merge.rc:694 +#: Merge.rc:1036 #, c-format msgid "Bro&wse..." msgstr "B&l\xE4ddra..." -#: Merge.rc:694 -#: Merge.rc:1607 +#: Merge.rc:695 +#: Merge.rc:1608 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:697 -#: Merge.rc:1609 +#: Merge.rc:698 +#: Merge.rc:1610 #, c-format msgid "Select..." msgstr "V\xE4lj..." -#: Merge.rc:698 +#: Merge.rc:699 #, c-format msgid "&Unpacker:" msgstr "&Uppackare:" -#: Merge.rc:701 +#: Merge.rc:702 #, c-format msgid "&Select..." msgstr "V\xE4lj..." -#: Merge.rc:702 -#: Merge.rc:1610 +#: Merge.rc:703 +#: Merge.rc:1611 #, c-format msgid "&Include Subfolders" msgstr "&Inkludera Underkataloger" -#: Merge.rc:704 +#: Merge.rc:705 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:706 -#: Merge.rc:736 -#: Merge.rc:796 -#: Merge.rc:826 -#: Merge.rc:858 -#: Merge.rc:868 -#: Merge.rc:1060 -#: Merge.rc:1089 -#: Merge.rc:1099 -#: Merge.rc:1150 -#: Merge.rc:1265 -#: Merge.rc:1342 -#: Merge.rc:1434 -#: Merge.rc:1449 -#: Merge.rc:1671 +#: Merge.rc:707 +#: Merge.rc:737 +#: Merge.rc:797 +#: Merge.rc:827 +#: Merge.rc:859 +#: Merge.rc:869 +#: Merge.rc:1061 +#: Merge.rc:1090 +#: Merge.rc:1100 +#: Merge.rc:1151 +#: Merge.rc:1266 +#: Merge.rc:1343 +#: Merge.rc:1435 +#: Merge.rc:1450 +#: Merge.rc:1672 #, c-format msgid "Cancel" msgstr "Avbryt" -#: Merge.rc:707 -#: Merge.rc:1343 +#: Merge.rc:708 +#: Merge.rc:1344 #, c-format msgid "Help" msgstr "Hj\xE4lp" -#: Merge.rc:708 +#: Merge.rc:709 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller kataloger som skall j\xE4mf\xF6ras" -#: Merge.rc:715 +#: Merge.rc:716 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:720 +#: Merge.rc:721 #, c-format msgid "Database:" msgstr "Databas:" -#: Merge.rc:723 +#: Merge.rc:724 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:726 +#: Merge.rc:727 #, c-format msgid "User:" msgstr "Anv\xE4ndare:" -#: Merge.rc:728 +#: Merge.rc:729 #, c-format msgid "Password:" msgstr "L\xF6senord:" -#: Merge.rc:730 +#: Merge.rc:731 #, c-format msgid "Link to Destination VSS project" msgstr "L\xE4nka till valt VSS-projekt" -#: Merge.rc:732 -#: Merge.rc:873 +#: Merge.rc:733 +#: Merge.rc:874 #, c-format msgid "Apply to all items" msgstr "Till\xE4mpa p\xE5 alla objekt" -#: Merge.rc:734 +#: Merge.rc:735 #, c-format msgid "Check Out" msgstr "Checka ut" -#: Merge.rc:735 -#: Merge.rc:869 +#: Merge.rc:736 +#: Merge.rc:870 #, c-format msgid "Save As..." msgstr "Spara som..." -#: Merge.rc:741 +#: Merge.rc:742 #, c-format msgid "Versioning System" msgstr "Versionsstyrningssystem" -#: Merge.rc:744 +#: Merge.rc:745 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyrningssystem:" -#: Merge.rc:747 +#: Merge.rc:748 #, c-format msgid "&Path to cleartool.exe:" msgstr "&S\xF6kv\xE4g till Cleartool.exe:" -#: Merge.rc:754 -#: Merge.rc:1928 +#: Merge.rc:755 +#: Merge.rc:1929 #, c-format msgid "General" msgstr "Generellt" -#: Merge.rc:757 +#: Merge.rc:758 #, c-format msgid "Automatically &scroll to first difference" msgstr "G\xE5 automati&skt till f\xF6rsta skillnaden" -#: Merge.rc:760 +#: Merge.rc:761 #, c-format msgid "&Disable Splash Screen" msgstr "&Visa inte Startsk\xE4rm" -#: Merge.rc:762 +#: Merge.rc:763 #, c-format msgid "Cl&ose windows with ESC" msgstr "St&\xE4ng f\xF6nster med ESC" -#: Merge.rc:764 +#: Merge.rc:765 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifiera s\xF6kv\xE4gar i \xD6ppna-dialogen" -#: Merge.rc:767 +#: Merge.rc:768 #, c-format msgid "All&ow only one instance to run" msgstr "&Till\xE5t bara en upplaga att k\xF6ra" -#: Merge.rc:769 +#: Merge.rc:770 #, c-format msgid "As&k when closing multiple windows" msgstr "Fr\xE5&ga n\xE4r flera f\xF6nster st\xE4ngs" -#: Merge.rc:771 +#: Merge.rc:772 #, c-format msgid "&Preserve file time in file compare" msgstr "&Bevara Filtidsuppgifter i Filj\xE4mf\xF6relse" -#: Merge.rc:774 +#: Merge.rc:775 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "\xD6&ppna-dialog Auto-Komplettera:" -#: Merge.rc:777 +#: Merge.rc:778 #, c-format msgid "Enable multiple compare windows for" msgstr "Starta flera j\xE4mf\xF6rf\xF6nster f\xF6r" -#: Merge.rc:779 -#: Merge.rc:1622 +#: Merge.rc:780 +#: Merge.rc:1623 #, c-format msgid "&Folder compare" msgstr "&J\xE4mf\xF6r kataloger" -#: Merge.rc:781 -#: Merge.rc:1624 +#: Merge.rc:782 +#: Merge.rc:1625 #, c-format msgid "Fil&e compare" msgstr "J\xE4m&f\xF6r filer" -#: Merge.rc:783 +#: Merge.rc:784 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge till\xE5ter att vissa meddelanderutor d\xF6ljs. Klicka p\xE5 \xC5terst\xE4ll-knappen f\xF6r att g\xF6ra alla meddelanderutor synliga igen." -#: Merge.rc:785 +#: Merge.rc:786 #, c-format msgid "Reset" msgstr "\xC5terst\xE4ll" -#: Merge.rc:792 +#: Merge.rc:793 #, c-format msgid "Language" msgstr "Spr\xE5k" -#: Merge.rc:799 +#: Merge.rc:800 #, c-format msgid "Available languages:" msgstr "Tillg\xE4ngliga spr\xE5k:" -#: Merge.rc:805 +#: Merge.rc:806 #, c-format msgid "Find" msgstr "S\xF6k" -#: Merge.rc:808 -#: Merge.rc:835 +#: Merge.rc:809 +#: Merge.rc:836 #, c-format msgid "Fi&nd what:" msgstr "S&\xF6k efter:" -#: Merge.rc:811 -#: Merge.rc:841 +#: Merge.rc:812 +#: Merge.rc:842 #, c-format msgid "Match &whole word only" msgstr "Matcha &hela ord" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:814 +#: Merge.rc:844 #, c-format msgid "Match &case" msgstr "Mat&cha VERSALER och gemener" -#: Merge.rc:815 -#: Merge.rc:845 +#: Merge.rc:816 +#: Merge.rc:846 #, c-format msgid "Regular &expression" msgstr "&Regulj\xE4rt uttryck" -#: Merge.rc:817 +#: Merge.rc:818 #, c-format msgid "D&on't wrap end of file" msgstr "V&\xE4nd inte vid slutet av filen" -#: Merge.rc:820 +#: Merge.rc:821 #, c-format msgid "Direction" msgstr "Riktning" -#: Merge.rc:821 +#: Merge.rc:822 #, c-format msgid "&Up" msgstr "&Upp" -#: Merge.rc:823 +#: Merge.rc:824 #, c-format msgid "&Down" msgstr "&Ner" -#: Merge.rc:825 -#: Merge.rc:855 +#: Merge.rc:826 +#: Merge.rc:856 #, c-format msgid "&Find Next" msgstr "&S\xF6k n\xE4sta" -#: Merge.rc:832 +#: Merge.rc:833 #, c-format msgid "Replace" msgstr "Ers\xE4tt" -#: Merge.rc:838 +#: Merge.rc:839 #, c-format msgid "Re&place with:" msgstr "Ers\xE4&tt med:" -#: Merge.rc:847 +#: Merge.rc:848 #, c-format msgid "&Don't wrap end of file" msgstr "V\xE4nd inte vid slutet av filen" -#: Merge.rc:850 +#: Merge.rc:851 #, c-format msgid "Replace in" msgstr "Ers\xE4tt i" -#: Merge.rc:851 +#: Merge.rc:852 #, c-format msgid "&Selection" msgstr "&Markering" -#: Merge.rc:853 +#: Merge.rc:854 #, c-format msgid "Wh&ole file" msgstr "He&la filen" -#: Merge.rc:856 +#: Merge.rc:857 #, c-format msgid "&Replace" msgstr "&Ers\xE4tt" -#: Merge.rc:857 +#: Merge.rc:858 #, c-format msgid "Replace &All" msgstr "Ers\xE4tt &alla" -#: Merge.rc:864 -#: Merge.rc:2169 +#: Merge.rc:865 +#: Merge.rc:2172 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:867 +#: Merge.rc:868 #, c-format msgid "CheckOut" msgstr "Checka ut" -#: Merge.rc:872 -#: Merge.rc:1184 +#: Merge.rc:873 +#: Merge.rc:1185 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:875 +#: Merge.rc:876 #, c-format msgid "CheckIn after checkout" msgstr "Checka in efter Checka ut" -#: Merge.rc:881 +#: Merge.rc:882 #, c-format msgid "Linefilters" msgstr "Radfilter" -#: Merge.rc:884 +#: Merge.rc:885 #, c-format msgid "Enable Line Filters" msgstr "Anv\xE4nd Radfilter" -#: Merge.rc:887 +#: Merge.rc:888 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulj\xE4ra uttryck (ett per rad):" -#: Merge.rc:894 +#: Merge.rc:895 #, c-format msgid "Save" msgstr "Spara" -#: Merge.rc:895 +#: Merge.rc:896 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:896 +#: Merge.rc:897 #, c-format msgid "Edit" msgstr "\xC4ndra" -#: Merge.rc:897 +#: Merge.rc:898 #, c-format msgid "Remove" msgstr "Ta bort" -#: Merge.rc:902 -#: Merge.rc:1931 +#: Merge.rc:903 +#: Merge.rc:1932 #, c-format msgid "Colors" msgstr "Kul\xF6rer" -#: Merge.rc:905 +#: Merge.rc:906 #, c-format msgid "Difference:" msgstr "Skillnader:" -#: Merge.rc:909 +#: Merge.rc:910 #, c-format msgid "Selected Difference:" msgstr "Markerade skillnader:" -#: Merge.rc:913 -#: Merge.rc:1574 +#: Merge.rc:914 +#: Merge.rc:1575 #, c-format msgid "Background" msgstr "Bakgrund" -#: Merge.rc:914 +#: Merge.rc:915 #, c-format msgid "Deleted" msgstr "Borttaget" -#: Merge.rc:927 -#: Merge.rc:1369 -#: Merge.rc:1575 +#: Merge.rc:928 +#: Merge.rc:1370 +#: Merge.rc:1576 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:931 +#: Merge.rc:932 #, c-format msgid "Ignored Difference:" msgstr "Ignorerad Skillnad:" -#: Merge.rc:941 +#: Merge.rc:942 #, c-format msgid "Moved:" msgstr "Flyttad:" -#: Merge.rc:951 +#: Merge.rc:952 #, c-format msgid "Selected Moved:" msgstr "Markerad flyttad:" -#: Merge.rc:958 +#: Merge.rc:959 #, c-format msgid "Word Difference:" msgstr "Ordskillnad:" -#: Merge.rc:965 +#: Merge.rc:966 #, c-format msgid "Selected Word Diff:" msgstr "Vald ordskillnad:" -#: Merge.rc:972 -#: Merge.rc:1058 -#: Merge.rc:1087 -#: Merge.rc:1187 -#: Merge.rc:1415 +#: Merge.rc:973 +#: Merge.rc:1059 +#: Merge.rc:1088 +#: Merge.rc:1188 +#: Merge.rc:1416 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:978 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:979 +#: Merge.rc:1358 +#: Merge.rc:1564 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:988 -#: Merge.rc:1934 +#: Merge.rc:989 +#: Merge.rc:1935 #, c-format msgid "System" msgstr "System" -#: Merge.rc:991 +#: Merge.rc:992 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Skicka borttagna filer till Papperskorgen" -#: Merge.rc:993 +#: Merge.rc:994 #, c-format msgid "Integration" msgstr "Integration" -#: Merge.rc:994 +#: Merge.rc:995 #, c-format msgid "&Add to explorer context menu" msgstr "L\xE4gg till i Utforskarens popup-meny" -#: Merge.rc:996 +#: Merge.rc:997 #, c-format msgid "E&nable advanced menu" msgstr "A&nv\xE4nd avancerad meny" -#: Merge.rc:998 +#: Merge.rc:999 #, c-format msgid "In&clude subfolders by default" msgstr "In&kludera underkataloger som standard" -#: Merge.rc:1000 +#: Merge.rc:1001 #, c-format msgid "&External editor:" msgstr "Extern Editor:" -#: Merge.rc:1003 +#: Merge.rc:1004 #, c-format msgid "&Filter folder:" msgstr "&Filterkatalog:" -#: Merge.rc:1005 +#: Merge.rc:1006 #, c-format msgid "B&rowse..." msgstr "Bl\xE4ddra..." -#: Merge.rc:1006 +#: Merge.rc:1007 #, c-format msgid "Temporary files folder" msgstr "Katalog f\xF6r Tempor\xE4ra filer" -#: Merge.rc:1007 +#: Merge.rc:1008 #, c-format msgid "S&ystem's temp folder" msgstr "S&ystemets tempor\xE4ra katalog" -#: Merge.rc:1009 +#: Merge.rc:1010 #, c-format msgid "C&ustom folder:" msgstr "A&npassad katalog:" -#: Merge.rc:1012 -#: Merge.rc:1028 +#: Merge.rc:1013 +#: Merge.rc:1029 #, c-format msgid "Br&owse..." msgstr "Bl\xE4ddra..." -#: Merge.rc:1018 +#: Merge.rc:1019 #, c-format msgid "Patch Generator" msgstr "Patchgenerator" -#: Merge.rc:1021 +#: Merge.rc:1022 #, c-format msgid "File&1:" msgstr "Fil &1:" -#: Merge.rc:1025 +#: Merge.rc:1026 #, c-format msgid "File&2:" msgstr "Fil &2:" -#: Merge.rc:1029 +#: Merge.rc:1030 #, c-format msgid "&Swap" msgstr "Byt" -#: Merge.rc:1030 +#: Merge.rc:1031 #, c-format msgid "&Append to existing file" msgstr "L\xE4gg till i befintlig fil" -#: Merge.rc:1032 +#: Merge.rc:1033 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1036 +#: Merge.rc:1037 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1037 +#: Merge.rc:1038 #, c-format msgid "St&yle:" msgstr "T&yp:" -#: Merge.rc:1040 +#: Merge.rc:1041 #, c-format msgid "&Context:" msgstr "Samman&hang:" -#: Merge.rc:1043 +#: Merge.rc:1044 #, c-format msgid "W&hitespaces" msgstr "&Mellanslag" -#: Merge.rc:1044 +#: Merge.rc:1045 #, c-format msgid "Com&pare" msgstr "&J\xE4mf\xF6r" -#: Merge.rc:1046 +#: Merge.rc:1047 #, c-format msgid "I&gnore changes" msgstr "Ignorera skillnader" -#: Merge.rc:1048 +#: Merge.rc:1049 #, c-format msgid "Ig&nore all" msgstr "Ignorera alla" -#: Merge.rc:1050 +#: Merge.rc:1051 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorera blanka rader" -#: Merge.rc:1052 +#: Merge.rc:1053 #, c-format msgid "Case sensi&tive" msgstr "VERSAL/gemen-k\xE4nslig" -#: Merge.rc:1054 +#: Merge.rc:1055 #, c-format msgid "Inclu&de command line" msgstr "Inklu&dera kommandorad" -#: Merge.rc:1056 +#: Merge.rc:1057 #, c-format msgid "Open to e&xternal editor" msgstr "\xD6ppna i Extern editor" -#: Merge.rc:1078 +#: Merge.rc:1079 #, c-format msgid "Display Columns" msgstr "Visa kolumner" -#: Merge.rc:1084 +#: Merge.rc:1085 #, c-format msgid "Move &Up" msgstr "Flytta &Upp" -#: Merge.rc:1085 +#: Merge.rc:1086 #, c-format msgid "Move &Down" msgstr "Flytta &Ned" -#: Merge.rc:1095 +#: Merge.rc:1096 #, c-format msgid "Select Unpacker" msgstr "V\xE4lj Uppackare" -#: Merge.rc:1100 +#: Merge.rc:1101 #, c-format msgid "File unpacker:" msgstr "Fil-uppackare:" -#: Merge.rc:1103 +#: Merge.rc:1104 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visa alla uppackare, kontrollera inte filsuffixet" -#: Merge.rc:1106 +#: Merge.rc:1107 #, c-format msgid "Extensions list:" msgstr "Filsuffixlista:" -#: Merge.rc:1107 +#: Merge.rc:1108 #, c-format msgid "Description:" msgstr "Beskrivning:" -#: Merge.rc:1118 +#: Merge.rc:1119 #, c-format msgid " Folder Compare Progress" msgstr "Katalogj\xE4mf\xF6relsens fortskridande" -#: Merge.rc:1121 -#: Merge.rc:1881 +#: Merge.rc:1122 +#: Merge.rc:1882 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1126 +#: Merge.rc:1127 #, c-format msgid "Comparing items..." msgstr "J\xE4mf\xF6r objekt..." -#: Merge.rc:1127 +#: Merge.rc:1128 #, c-format msgid "Items compared:" msgstr "J\xE4mf\xF6rda objekt:" -#: Merge.rc:1128 +#: Merge.rc:1129 #, c-format msgid "Items total:" msgstr "Objekt totalt:" -#: Merge.rc:1134 +#: Merge.rc:1135 #, c-format msgid "Go To" msgstr "G\xE5 till" -#: Merge.rc:1137 +#: Merge.rc:1138 #, c-format msgid "G&oto:" msgstr "G&\xE5 till:" -#: Merge.rc:1139 +#: Merge.rc:1140 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1144 +#: Merge.rc:1145 #, c-format msgid "Goto what" msgstr "G\xE5 till vad" -#: Merge.rc:1145 +#: Merge.rc:1146 #, c-format msgid "Li&ne" msgstr "Ra&d" -#: Merge.rc:1147 +#: Merge.rc:1148 #, c-format msgid "&Difference" msgstr "&Skillnad" -#: Merge.rc:1149 +#: Merge.rc:1150 #, c-format msgid "&Go To" msgstr "&G\xE5 till" -#: Merge.rc:1155 -#: Merge.rc:1929 +#: Merge.rc:1156 +#: Merge.rc:1930 #, c-format msgid "Compare" msgstr "J\xE4mf\xF6r" -#: Merge.rc:1158 +#: Merge.rc:1159 #, c-format msgid "Whitespace" msgstr "Mellanslag" -#: Merge.rc:1159 +#: Merge.rc:1160 #, c-format msgid "&Compare" msgstr "J\xE4mf\xF6r &mellanslag" -#: Merge.rc:1161 +#: Merge.rc:1162 #, c-format msgid "&Ignore change" msgstr "&Ignorera mellanslagsskillnader " -#: Merge.rc:1163 +#: Merge.rc:1164 #, c-format msgid "I&gnore all" msgstr "Ignorera &alla mellanslag" -#: Merge.rc:1165 +#: Merge.rc:1166 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorera blan&ka rader" -#: Merge.rc:1167 +#: Merge.rc:1168 #, c-format msgid "Ignore &case" msgstr "&Ignorera VERSAL/gemen-skillnader" -#: Merge.rc:1169 +#: Merge.rc:1170 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rera skillnader i radslut (Windows/Unix/Mac)" -#: Merge.rc:1172 +#: Merge.rc:1173 #, c-format msgid "E&nable moved block detection" msgstr "M&\xF6jligg\xF6r detektion av flyttade textblock" -#: Merge.rc:1174 +#: Merge.rc:1175 #, c-format msgid "&Match similar lines" msgstr "&Matcha liknande rader" -#: Merge.rc:1176 +#: Merge.rc:1177 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orera tidsskillnad mindre \xE4n 3 sekunder" -#: Merge.rc:1179 +#: Merge.rc:1180 #, c-format msgid "&File Compare method:" msgstr "&Filj\xE4mf\xF6relsemetod:" -#: Merge.rc:1182 +#: Merge.rc:1183 #, c-format msgid "S&top after first difference" msgstr "S&toppa efter f\xF6rsta skillnaden" -#: Merge.rc:1185 +#: Merge.rc:1186 #, c-format msgid "Filter Comments" msgstr "Filterkommentarer" -#: Merge.rc:1192 -#: Merge.rc:1930 +#: Merge.rc:1193 +#: Merge.rc:1931 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1195 +#: Merge.rc:1196 #, c-format msgid "&Highlight syntax" msgstr "&Markera syntaxen" -#: Merge.rc:1197 +#: Merge.rc:1198 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &uppdatering" -#: Merge.rc:1199 +#: Merge.rc:1200 #, c-format msgid "&Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1201 +#: Merge.rc:1202 #, c-format msgid "Tabs" msgstr "Tabbar" -#: Merge.rc:1202 +#: Merge.rc:1203 #, c-format msgid "&Tab size:" msgstr "&Tabbsteg:" -#: Merge.rc:1205 +#: Merge.rc:1206 #, c-format msgid "&Insert Tabs" msgstr "Infoga tabbar" -#: Merge.rc:1207 +#: Merge.rc:1208 #, c-format msgid "Insert &Spaces" msgstr "Infoga mellanslag" -#: Merge.rc:1209 +#: Merge.rc:1210 #, c-format msgid "Line Difference Coloring" msgstr "Radskillnadskul\xF6rer" -#: Merge.rc:1211 +#: Merge.rc:1212 #, c-format msgid "View line differences" msgstr "Visa radskillnader" -#: Merge.rc:1213 +#: Merge.rc:1214 #, c-format msgid "&Character level" msgstr "&Teckenniv\xE5" -#: Merge.rc:1215 +#: Merge.rc:1216 #, c-format msgid "&Word-level:" msgstr "&Ordniv\xE5:" -#: Merge.rc:1230 +#: Merge.rc:1231 #, c-format msgid "Filefilters" msgstr "Filfilter" -#: Merge.rc:1236 +#: Merge.rc:1237 #, c-format msgid "Test" msgstr "Testa" -#: Merge.rc:1237 +#: Merge.rc:1238 #, c-format msgid "Install..." msgstr "Installera..." -#: Merge.rc:1238 +#: Merge.rc:1239 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1239 +#: Merge.rc:1240 #, c-format msgid "Edit..." msgstr "Redigera..." -#: Merge.rc:1240 +#: Merge.rc:1241 #, c-format msgid "Delete..." msgstr "Ta bort..." -#: Merge.rc:1246 +#: Merge.rc:1247 #, c-format msgid "Save modified files?" msgstr "Spara \xE4ndrade filer?" -#: Merge.rc:1249 +#: Merge.rc:1250 #, c-format msgid "Left side file" msgstr "V\xE4nster fil" -#: Merge.rc:1252 +#: Merge.rc:1253 #, c-format msgid "&Save changes" msgstr "&Spara \xE4ndringar" -#: Merge.rc:1254 +#: Merge.rc:1255 #, c-format msgid "&Discard changes" msgstr "&Ignorera \xE4ndringar" -#: Merge.rc:1256 +#: Merge.rc:1257 #, c-format msgid "Right side file" msgstr "H\xF6ger fil" -#: Merge.rc:1259 +#: Merge.rc:1260 #, c-format msgid "S&ave changes" msgstr "S¶ \xE4ndringar" -#: Merge.rc:1261 +#: Merge.rc:1262 #, c-format msgid "Dis&card changes" msgstr "Ign&orera \xE4ndringar" -#: Merge.rc:1263 +#: Merge.rc:1264 #, c-format msgid "Discard All" msgstr "Ignorera alla \xE4ndringar" -#: Merge.rc:1270 -#: Merge.rc:1518 -#: Merge.rc:1936 +#: Merge.rc:1271 +#: Merge.rc:1519 +#: Merge.rc:1937 #, c-format msgid "Codepage" msgstr "Codepage" -#: Merge.rc:1273 +#: Merge.rc:1274 #, c-format msgid "Default Codepage" msgstr "Standard Codepage" -#: Merge.rc:1274 +#: Merge.rc:1275 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "V\xE4lj den Codepage som anv\xE4nds som standard n\xE4r icke-Unicodefiler \xF6ppnas:" -#: Merge.rc:1276 +#: Merge.rc:1277 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2044,32 +2049,32 @@ "Detektera Codepageinformation f\xF6r dessa filer : .html, .rc, .xml \n" "Detta kr\xE4ver en omstart av WinMerge" -#: Merge.rc:1279 +#: Merge.rc:1280 #, c-format msgid "System codepage" msgstr "System Codepage" -#: Merge.rc:1281 +#: Merge.rc:1282 #, c-format msgid "According to WinMerge User Interface" msgstr "Enligt WinMerges anv\xE4ndargr\xE4nssnitt" -#: Merge.rc:1283 +#: Merge.rc:1284 #, c-format msgid "Custom codepage :" msgstr "Anpassad Codepage :" -#: Merge.rc:1291 +#: Merge.rc:1292 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Arkivst\xF6d \xE4r avst\xE4ngt" -#: Merge.rc:1294 +#: Merge.rc:1295 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Kan inte detektera 7-Zip-version (\xE4r 7-Zip inte installerat?)" -#: Merge.rc:1297 +#: Merge.rc:1298 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2078,12 +2083,12 @@ "Arkivst\xF6d kr\xE4ver antingen att version 3.11 eller h\xF6gre av 7-Zip \xE4r installerat p\xE5 din dator, eller att dess\n" "n\xF6dv\xE4ndiga komponenter kopieras till WinMerges programkatalog f\xF6r frist\xE5ende anv\xE4ndning." -#: Merge.rc:1299 +#: Merge.rc:1300 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Det m\xE5ste ocks\xE5 finnas ett l\xE4mpligt gr\xE4nssnittsplugin (Merge7z*.dll) i s\xF6kv\xE4gen." -#: Merge.rc:1301 +#: Merge.rc:1302 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2092,12 +2097,12 @@ "Var god och anv\xE4nd den version av 7-Zip som rekommenderas nedanf\xF6r tills gr\xE4nssnittsplugins f\xF6r senare\n" "versioner blir tillg\xE4ngliga." -#: Merge.rc:1303 +#: Merge.rc:1304 #, c-format msgid "Version" msgstr "Version" -#: Merge.rc:1305 +#: Merge.rc:1306 #, c-format msgid "" "Plugin required\n" @@ -2106,551 +2111,551 @@ "Plugin kr\xE4vd\n" "(dllbuild %04u)" -#: Merge.rc:1307 +#: Merge.rc:1308 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Rekommenderad version av 7-Zip:" -#: Merge.rc:1310 -#: Merge.rc:1313 +#: Merge.rc:1311 +#: Merge.rc:1314 #, c-format msgid "present" msgstr "finns" -#: Merge.rc:1311 +#: Merge.rc:1312 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1314 +#: Merge.rc:1315 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip program installerat p\xE5 din dator:" -#: Merge.rc:1316 -#: Merge.rc:1321 +#: Merge.rc:1317 +#: Merge.rc:1322 #, c-format msgid "none" msgstr "inget" -#: Merge.rc:1318 +#: Merge.rc:1319 #, c-format msgid "missing" msgstr "saknas" -#: Merge.rc:1319 +#: Merge.rc:1320 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip komponenter f\xF6r frist\xE5ende anv\xE4ndning:" -#: Merge.rc:1323 +#: Merge.rc:1324 #, c-format msgid "outdated" msgstr "utdaterad" -#: Merge.rc:1324 +#: Merge.rc:1325 #, c-format msgid "Plugins on path:" msgstr "Plugins i s\xF6kv\xE4g:" -#: Merge.rc:1325 +#: Merge.rc:1326 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "Visa inte detta &meddelande igen.\n(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)" -#: Merge.rc:1329 +#: Merge.rc:1330 #, c-format msgid "Plugin Download" msgstr "Ladda ner Plugin" -#: Merge.rc:1338 +#: Merge.rc:1339 #, c-format msgid "Options" msgstr "Inst\xE4llningar" -#: Merge.rc:1349 +#: Merge.rc:1350 #, c-format msgid " Categories" msgstr " Kategorier" -#: Merge.rc:1351 +#: Merge.rc:1352 #, c-format msgid "Import..." msgstr "Importera..." -#: Merge.rc:1352 +#: Merge.rc:1353 #, c-format msgid "Export..." msgstr "Exportera..." -#: Merge.rc:1360 +#: Merge.rc:1361 #, c-format msgid "Keywords:" msgstr "Nyckelord:" -#: Merge.rc:1361 +#: Merge.rc:1362 #, c-format msgid "Function names:" msgstr "Funktionsnamn:" -#: Merge.rc:1362 +#: Merge.rc:1363 #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1363 +#: Merge.rc:1364 #, c-format msgid "Numbers:" msgstr "Nummer:" -#: Merge.rc:1364 +#: Merge.rc:1365 #, c-format msgid "Operators:" msgstr "Operatorer:" -#: Merge.rc:1365 +#: Merge.rc:1366 #, c-format msgid "Strings:" msgstr "Str\xE4ngar:" -#: Merge.rc:1366 +#: Merge.rc:1367 #, c-format msgid "Preprocessor:" msgstr "Preprocessor:" -#: Merge.rc:1367 +#: Merge.rc:1368 #, c-format msgid "User 1:" msgstr "Anv\xE4ndare 1:" -#: Merge.rc:1368 +#: Merge.rc:1369 #, c-format msgid "User 2:" msgstr "Anv\xE4ndare 2:" -#: Merge.rc:1373 -#: Merge.rc:1378 -#: Merge.rc:1383 -#: Merge.rc:1388 -#: Merge.rc:1393 -#: Merge.rc:1398 -#: Merge.rc:1403 -#: Merge.rc:1408 -#: Merge.rc:1413 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 +#: Merge.rc:1414 #, c-format msgid "Bold" msgstr "Fet" -#: Merge.rc:1421 +#: Merge.rc:1422 #, c-format msgid "Folder Compare Report" msgstr "Rapport f\xF6r Katalogj\xE4mf\xF6relse" -#: Merge.rc:1424 +#: Merge.rc:1425 #, c-format msgid "Report &File:" msgstr "Rapport&fil:" -#: Merge.rc:1427 -#: Merge.rc:1601 -#: Merge.rc:1605 -#: Merge.rc:1632 +#: Merge.rc:1428 +#: Merge.rc:1602 +#: Merge.rc:1606 +#: Merge.rc:1633 #, c-format msgid "Browse..." msgstr "Bl\xE4ddra..." -#: Merge.rc:1428 +#: Merge.rc:1429 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1431 +#: Merge.rc:1432 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiera till klippbordet" -#: Merge.rc:1439 +#: Merge.rc:1440 #, c-format msgid "Shared or Private Filter" msgstr "Delat eller privat filter?" -#: Merge.rc:1442 +#: Merge.rc:1443 #, c-format msgid "Which type of filter do you want to create?" msgstr "Vilken typ av filter vill du skapa?" -#: Merge.rc:1444 +#: Merge.rc:1445 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delat filter (f\xF6r alla anv\xE4ndare p\xE5 denna dator)" -#: Merge.rc:1446 +#: Merge.rc:1447 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat filter (bara f\xF6r den aktuella anv\xE4ndaren)" -#: Merge.rc:1454 -#: Merge.rc:1937 +#: Merge.rc:1455 +#: Merge.rc:1938 #, c-format msgid "Archive Support" msgstr "Arkivst\xF6d" -#: Merge.rc:1457 +#: Merge.rc:1458 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Arkivst\xF6det kr\xE4ver att 7-Zip-plugin \xE4r installerad:" -#: Merge.rc:1459 +#: Merge.rc:1460 #, c-format msgid "Download 7-zip Plugin" msgstr "Ladda ner 7-zip-plugin" -#: Merge.rc:1460 +#: Merge.rc:1461 #, c-format msgid "&Enable archive file support" msgstr "&Aktivera arkivfilst\xF6d" -#: Merge.rc:1462 +#: Merge.rc:1463 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Anv\xE4nd frist\xE5ende 7-Zip om det finns" -#: Merge.rc:1465 +#: Merge.rc:1466 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "A&nv\xE4nd lokal 7-Zip fr\xE5n WinMerges katalog" -#: Merge.rc:1467 +#: Merge.rc:1468 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detektera arkivtyp fr\xE5n filsignatur" -#: Merge.rc:1475 +#: Merge.rc:1476 #, c-format msgid "Compare Statistics" msgstr "J\xE4mf\xF6relsestatistik" -#: Merge.rc:1478 +#: Merge.rc:1479 #, c-format msgid "Folders:" msgstr "Kataloger:" -#: Merge.rc:1479 +#: Merge.rc:1480 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1480 -#: Merge.rc:2316 +#: Merge.rc:1481 +#: Merge.rc:2319 #, c-format msgid "Different" msgstr "Olika" -#: Merge.rc:1481 +#: Merge.rc:1482 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1484 -#: Merge.rc:1503 +#: Merge.rc:1485 +#: Merge.rc:1504 #, c-format msgid "Binary:" msgstr "Bin\xE4r:" -#: Merge.rc:1487 +#: Merge.rc:1488 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1488 +#: Merge.rc:1489 #, c-format msgid "Left:" msgstr "V\xE4nster:" -#: Merge.rc:1493 +#: Merge.rc:1494 #, c-format msgid "Right:" msgstr "H\xF6ger:" -#: Merge.rc:1498 -#: Merge.rc:2310 +#: Merge.rc:1499 +#: Merge.rc:2313 #, c-format msgid "Identical" msgstr "Identisk" -#: Merge.rc:1507 +#: Merge.rc:1508 #, c-format msgid "Total:" msgstr "Totalt:" -#: Merge.rc:1512 +#: Merge.rc:1513 #, c-format msgid "Close" msgstr "St\xE4ng" -#: Merge.rc:1521 +#: Merge.rc:1522 #, c-format msgid "Affects" msgstr "P\xE5verkar" -#: Merge.rc:1524 -#: Merge.rc:1527 +#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "(Affects)" msgstr "(P\xE5verkar)" -#: Merge.rc:1528 +#: Merge.rc:1529 #, c-format msgid "Select Codepage for" msgstr "V\xE4lj Codepage f\xF6r" -#: Merge.rc:1529 +#: Merge.rc:1530 #, c-format msgid "&File Loading:" msgstr "&Fil\xF6ppnande:" -#: Merge.rc:1531 -#: Merge.rc:1534 +#: Merge.rc:1532 +#: Merge.rc:1535 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1532 +#: Merge.rc:1533 #, c-format msgid "File &Saving:" msgstr "Filsparande:" -#: Merge.rc:1535 +#: Merge.rc:1536 #, c-format msgid "&Use same codepage for both" msgstr "&Anv\xE4nd samma Codepage f\xF6r b\xE5da" -#: Merge.rc:1538 +#: Merge.rc:1539 #, c-format msgid "&Apply" msgstr "&Verkst\xE4ll" -#: Merge.rc:1539 -#: Merge.rc:1903 +#: Merge.rc:1540 +#: Merge.rc:1904 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1544 +#: Merge.rc:1545 #, c-format msgid "Test Filter" msgstr "Testa Filter" -#: Merge.rc:1547 +#: Merge.rc:1548 #, c-format msgid "Testing filter ..." msgstr "Testar filter ..." -#: Merge.rc:1549 +#: Merge.rc:1550 #, c-format msgid "&Enter text to test:" msgstr "&Skriv in text att testa:" -#: Merge.rc:1551 +#: Merge.rc:1552 #, c-format msgid "&Folder Name" msgstr "&Katalognamn" -#: Merge.rc:1553 +#: Merge.rc:1554 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1557 +#: Merge.rc:1558 #, c-format msgid "&Test" msgstr "&Testa" -#: Merge.rc:1558 +#: Merge.rc:1559 #, c-format msgid "&Close" msgstr "&St\xE4ng" -#: Merge.rc:1566 +#: Merge.rc:1567 #, c-format msgid "&Use customized text colors" msgstr "&Anv\xE4nd anpassade textkul\xF6rer" -#: Merge.rc:1569 +#: Merge.rc:1570 #, c-format msgid "Custom text colors" msgstr "Anpassade textkul\xF6rer" -#: Merge.rc:1571 +#: Merge.rc:1572 #, c-format msgid "Whitespace:" msgstr "Mellanslag:" -#: Merge.rc:1572 +#: Merge.rc:1573 #, c-format msgid "Regular text:" msgstr "Vanlig text:" -#: Merge.rc:1573 +#: Merge.rc:1574 #, c-format msgid "Selection:" msgstr "Markering:" -#: Merge.rc:1596 +#: Merge.rc:1597 #, c-format msgid "Paths" msgstr "S\xF6kv\xE4gar" -#: Merge.rc:1602 +#: Merge.rc:1603 #, c-format msgid "R&ead-only" msgstr "Bara& l\xE4sbar" -#: Merge.rc:1606 +#: Merge.rc:1607 #, c-format msgid "Re&ad-only" msgstr "Bara& l\xE4sbar" -#: Merge.rc:1612 +#: Merge.rc:1613 #, c-format msgid "Open..." msgstr "\xD6ppna..." -#: Merge.rc:1613 +#: Merge.rc:1614 #, c-format msgid "Save..." msgstr "Spara..." -#: Merge.rc:1618 -#: Merge.rc:1938 +#: Merge.rc:1619 +#: Merge.rc:1939 #, c-format msgid "Backup Files" msgstr "Backup p\xE5 filer" -#: Merge.rc:1621 +#: Merge.rc:1622 #, c-format msgid "Create backup files in:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1626 +#: Merge.rc:1627 #, c-format msgid "Create backup files into:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1627 +#: Merge.rc:1628 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens katalog" -#: Merge.rc:1629 +#: Merge.rc:1630 #, c-format msgid "&Global backup folder:" msgstr "&Global backupkatalog:" -#: Merge.rc:1633 +#: Merge.rc:1634 #, c-format msgid "Backup filename:" msgstr "Backupfilnamn:" -#: Merge.rc:1634 +#: Merge.rc:1635 #, c-format msgid "&Append .bak -extension" msgstr "&L\xE4gg till filsuffixet .bak" -#: Merge.rc:1636 +#: Merge.rc:1637 #, c-format msgid "A&ppend timestamp" msgstr "L&\xE4gg till tidsmarkering" -#: Merge.rc:1643 -#: Merge.rc:2225 +#: Merge.rc:1644 +#: Merge.rc:2228 #, c-format msgid "Confirm Copy" msgstr "Bekr\xE4fta kopiering" -#: Merge.rc:1647 +#: Merge.rc:1648 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "\xC4r du s\xE4ker p\xE5 att du vill kopiera XXX objekt?" -#: Merge.rc:1649 +#: Merge.rc:1650 #, c-format msgid "From left" msgstr "Fr\xE5n v\xE4nster" -#: Merge.rc:1652 +#: Merge.rc:1653 #, c-format msgid "To right" msgstr "Till h\xF6ger" -#: Merge.rc:1655 +#: Merge.rc:1656 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1656 +#: Merge.rc:1657 #, c-format msgid "No" msgstr "Nej" -#: Merge.rc:1662 +#: Merge.rc:1663 #, c-format msgid "Plugins" -msgstr "" +msgstr "Plugins" -#: Merge.rc:1665 +#: Merge.rc:1666 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "&Starta Plugins" #. StringFileInfo.Block -#: Merge.rc:1695 +#: Merge.rc:1696 #, c-format msgid "040904e4" msgstr "041d04e4" #. VarFileInfo.Translation -#: Merge.rc:1711 +#: Merge.rc:1712 #, c-format msgid "0x409, 1252" msgstr "0x41d, 1252" -#: Merge.rc:1726 +#: Merge.rc:1727 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1732 +#: Merge.rc:1733 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1733 +#: Merge.rc:1734 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1734 +#: Merge.rc:1735 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1735 +#: Merge.rc:1736 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1736 +#: Merge.rc:1737 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1737 +#: Merge.rc:1738 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1743 +#: Merge.rc:1744 #, c-format msgid "" "Create empty documents\n" @@ -2659,7 +2664,7 @@ "Skapar nya dokument\n" "Nya Dokument (Ctrl+N)" -#: Merge.rc:1744 +#: Merge.rc:1745 #, c-format msgid "" "Open an existing document\n" @@ -2668,7 +2673,7 @@ "\xD6ppnar ett befintligt dokument\n" "\xD6ppna (Ctrl+O)" -#: Merge.rc:1745 +#: Merge.rc:1746 #, c-format msgid "" "Close the active document\n" @@ -2677,7 +2682,7 @@ "St\xE4nger det aktiva dokumentet\n" "St\xE4ng" -#: Merge.rc:1746 +#: Merge.rc:1747 #, c-format msgid "" "Save the active document\n" @@ -2686,7 +2691,7 @@ "Sparar det aktiva dokumentet\n" "Spara (Ctrl+S)" -#: Merge.rc:1747 +#: Merge.rc:1748 #, c-format msgid "" "Save the active document with a new name\n" @@ -2695,7 +2700,7 @@ "Sparar det aktiva dokumentet med ett nytt namn\n" "Spara som" -#: Merge.rc:1748 +#: Merge.rc:1749 #, c-format msgid "" "Change the printing options\n" @@ -2704,7 +2709,7 @@ "\xC4ndrar Utskriftsinst\xE4llningar\n" "Sidinst\xE4llningar" -#: Merge.rc:1749 +#: Merge.rc:1750 #, c-format msgid "" "Change the printer and printing options\n" @@ -2713,7 +2718,7 @@ "\xC4ndrar skrivare och skrivarinst\xE4llningar\n" "Skrivarinst\xE4llningar" -#: Merge.rc:1750 +#: Merge.rc:1751 #, c-format msgid "" "Print the active document\n" @@ -2722,7 +2727,7 @@ "Skriver ut det aktiva dokumentet\n" "Skriv ut" -#: Merge.rc:1751 +#: Merge.rc:1752 #, c-format msgid "" "Display full pages\n" @@ -2731,27 +2736,27 @@ "Visar helsidor\n" "F\xF6rhandsgranska" -#: Merge.rc:1756 +#: Merge.rc:1757 #, c-format msgid "Make all hidden items visible again" msgstr "G\xF6r alla dolda objekt synliga igen" -#: Merge.rc:1757 +#: Merge.rc:1758 #, c-format msgid "Toggle tree mode" -msgstr "" +msgstr "V\xE4xla tr\xE4dmod" -#: Merge.rc:1758 +#: Merge.rc:1759 #, c-format msgid "Expand all subfolders" -msgstr "" +msgstr "Expandera alla underkataloger" -#: Merge.rc:1759 +#: Merge.rc:1760 #, c-format msgid "Collapse all subfolders" -msgstr "" +msgstr "Minimera alla underkataloger" -#: Merge.rc:1765 +#: Merge.rc:1766 #, c-format msgid "" "Open project file\n" @@ -2760,32 +2765,32 @@ "\xD6ppna Projektfil\n" "Projektfil(Ctrl+J)" -#: Merge.rc:1766 +#: Merge.rc:1767 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att \xF6ppna Projektfil" -#: Merge.rc:1767 +#: Merge.rc:1768 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att spara Projektfil" -#: Merge.rc:1768 +#: Merge.rc:1769 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:1769 +#: Merge.rc:1770 #, c-format msgid "Project file successfully loaded." msgstr "Projektfilen \xE4r framg\xE5ngsrikt \xF6ppnad." -#: Merge.rc:1770 +#: Merge.rc:1771 #, c-format msgid "Project file successfully saved." msgstr "Projektfilen \xE4r framg\xE5ngsrikt sparad." -#: Merge.rc:1771 +#: Merge.rc:1772 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2794,7 +2799,7 @@ "Sparar aktuella s\xF6kv\xE4gar och inst\xE4llningar till Projektfil\n" "Spara Projektfil" -#: Merge.rc:1776 +#: Merge.rc:1777 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2803,7 +2808,7 @@ "Visar Programinformation, Versionsnummer och Copyright\n" "Om" -#: Merge.rc:1777 +#: Merge.rc:1778 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2812,7 +2817,6 @@ "Avslutar WinMerge och fr\xE5gar om du vill spara dokument\n" "Avsluta" -#: Merge.rc:1783 #: Merge.rc:1784 #: Merge.rc:1785 #: Merge.rc:1786 @@ -2828,11 +2832,12 @@ #: Merge.rc:1796 #: Merge.rc:1797 #: Merge.rc:1798 +#: Merge.rc:1799 #, c-format msgid "Open this document" msgstr "\xD6ppna detta dokument" -#: Merge.rc:1803 +#: Merge.rc:1804 #, c-format msgid "" "Switch to the next window pane\n" @@ -2841,7 +2846,7 @@ "V\xE4xlar till n\xE4sta f\xF6nster\n" "N\xE4sta f\xF6nster" -#: Merge.rc:1804 +#: Merge.rc:1805 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2850,7 +2855,7 @@ "V\xE4xlar till f\xF6rra f\xF6nstret\n" "F\xF6rra f\xF6nstret" -#: Merge.rc:1810 +#: Merge.rc:1811 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2859,7 +2864,7 @@ "Arrangerar f\xF6nstren s\xE5 att de \xF6verlappar varandra\n" "\xD6verlappande f\xF6nster" -#: Merge.rc:1811 +#: Merge.rc:1812 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2868,7 +2873,7 @@ "Ordnar f\xF6nstren icke-\xF6verlappande horisontellt\n" "Ordna horisontellt" -#: Merge.rc:1812 +#: Merge.rc:1813 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2877,7 +2882,7 @@ "Ordnar f\xF6nstren icke-\xF6verlappande vertikalt\n" "Ordna vertikalt" -#: Merge.rc:1818 +#: Merge.rc:1819 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2886,7 +2891,7 @@ "Kopierar den markerade texten och l\xE4gger det i klippbordet\n" "Kopiera" -#: Merge.rc:1819 +#: Merge.rc:1820 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2895,7 +2900,7 @@ "Klipper ut den markerade texten och l\xE4gger det i klippbordet\n" "Klipp ut" -#: Merge.rc:1820 +#: Merge.rc:1821 #, c-format msgid "" "Find the specified text\n" @@ -2904,7 +2909,7 @@ "S\xF6ker den angivna texten\n" "S\xF6k" -#: Merge.rc:1821 +#: Merge.rc:1822 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2913,7 +2918,7 @@ "Klistrar in inneh\xE5llet i klippbordet\n" "Klistra in" -#: Merge.rc:1822 +#: Merge.rc:1823 #, c-format msgid "" "Repeat the last action\n" @@ -2922,7 +2927,7 @@ "Upprepar den senaste \xE5tg\xE4rden\n" "Upprepa" -#: Merge.rc:1823 +#: Merge.rc:1824 #, c-format msgid "" "Replace specific text with different text\n" @@ -2931,7 +2936,7 @@ "Ers\xE4tter den markerade texten med annan text\n" "Ers\xE4tt" -#: Merge.rc:1824 +#: Merge.rc:1825 #, c-format msgid "" "Select the entire document\n" @@ -2940,7 +2945,7 @@ "V\xE4ljer hela dokumentet\n" "V\xE4lj allt" -#: Merge.rc:1825 +#: Merge.rc:1826 #, c-format msgid "" "Undo the last action\n" @@ -2949,7 +2954,7 @@ "\xC5ngrar den senaste \xE5tg\xE4rden\n" "\xC5ngra" -#: Merge.rc:1826 +#: Merge.rc:1827 #, c-format msgid "" "Redo the previously undone action\n" @@ -2958,7 +2963,7 @@ "G\xF6r om den tidigare \xE5ngrade \xE5tg\xE4rden\n" "G\xF6r om" -#: Merge.rc:1832 +#: Merge.rc:1833 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2967,7 +2972,7 @@ "Visar eller g\xF6mmer verktygsf\xE4ltet\n" "V\xE4xla verktygsf\xE4lt" -#: Merge.rc:1833 +#: Merge.rc:1834 #, c-format msgid "" "Show or hide the status bar\n" @@ -2976,7 +2981,7 @@ "Visar eller g\xF6mmer statusf\xE4ltet\n" "V\xE4xla statusf\xE4ltet" -#: Merge.rc:1834 +#: Merge.rc:1835 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2985,62 +2990,62 @@ "Visar eller g\xF6mmer filraden\n" "V\xE4xla filraden" -#: Merge.rc:1835 +#: Merge.rc:1836 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Automatisk storleks\xE4ndring av placering\nL\xE5s Placering" -#: Merge.rc:1841 +#: Merge.rc:1842 #, c-format msgid "Change the window size" msgstr "\xC4ndra f\xF6nsterstorlek" -#: Merge.rc:1842 +#: Merge.rc:1843 #, c-format msgid "Change the window position" msgstr "Flytta f\xF6nster" -#: Merge.rc:1843 +#: Merge.rc:1844 #, c-format msgid "Reduce the window to an icon" msgstr "Minimera f\xF6nstret till en ikon" -#: Merge.rc:1844 +#: Merge.rc:1845 #, c-format msgid "Enlarge the window to full size" msgstr "Maximera f\xF6nstret till full storlek" -#: Merge.rc:1845 +#: Merge.rc:1846 #, c-format msgid "Switch to the next document window" msgstr "V\xE4xla till n\xE4sta dokumentf\xF6nster" -#: Merge.rc:1846 +#: Merge.rc:1847 #, c-format msgid "Switch to the previous document window" msgstr "V\xE4xla till f\xF6rra dokumentf\xF6nstret" -#: Merge.rc:1847 +#: Merge.rc:1848 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "St\xE4ng det aktiva f\xF6nstret och fr\xE5ga om dokumenten skall sparas" -#: Merge.rc:1852 +#: Merge.rc:1853 #, c-format msgid "Restore the window to normal size" msgstr "\xC5terst\xE4ll f\xF6nstret till normal storlek" -#: Merge.rc:1853 +#: Merge.rc:1854 #, c-format msgid "Activate Task List" msgstr "Lista med aktiva f\xF6nster" -#: Merge.rc:1854 +#: Merge.rc:1855 #, c-format msgid "Activate this window" msgstr "Aktiverar det h\xE4r f\xF6nstret" -#: Merge.rc:1860 +#: Merge.rc:1861 #, c-format msgid "" "Close print preview mode\n" @@ -3049,183 +3054,183 @@ "St\xE4nger F\xF6rhandsgranskning\n" "St\xE4ng F\xF6rhandsgranskning" -#: Merge.rc:1867 +#: Merge.rc:1868 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nFilj\xE4mf\xF6relse\n\n\n\nWinMerge.Filj\xE4mf\xF6relse\nWinMerge Filj\xE4mf\xF6relse" -#: Merge.rc:1868 +#: Merge.rc:1869 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nKatalogj\xE4mf\xF6relse\n\n\n\nWinMerge.Katalogj\xE4mf\xF6relse\nWinMerge Katalogj\xE4mf\xF6relse" -#: Merge.rc:1875 +#: Merge.rc:1876 #, c-format msgid "Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1882 +#: Merge.rc:1883 #, c-format msgid "Press any key" msgstr "Tryck p\xE5 en valfri tangent" -#: Merge.rc:1888 #: Merge.rc:1889 +#: Merge.rc:1890 #, c-format msgid "Right click on the path to copy" msgstr "H\xF6gerklicka p\xE5 s\xF6kv\xE4gen f\xF6r att kopiera" -#: Merge.rc:1895 +#: Merge.rc:1896 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Utvecklare:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1896 +#: Merge.rc:1897 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge kommer med ABSOLUT INGA GARANTIER. Detta \xE4r fri programvara och du \xE4r v\xE4lkommen att vidaredistribuera den under vissa omst\xE4ndigheter; se GNU General Public License i Hj\xE4lpmenyn f\xF6r detaljer." -#: Merge.rc:1902 +#: Merge.rc:1903 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1904 +#: Merge.rc:1905 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:1905 +#: Merge.rc:1906 #, c-format msgid "&Retry" msgstr "&F\xF6rs\xF6k igen" -#: Merge.rc:1906 +#: Merge.rc:1907 #, c-format msgid "&Ignore" msgstr "&Ignorera" -#: Merge.rc:1907 +#: Merge.rc:1908 #, c-format msgid "Ignore &all" msgstr "Ignorera &allt" -#: Merge.rc:1908 +#: Merge.rc:1909 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1914 +#: Merge.rc:1915 #, c-format msgid "Yes to &all" msgstr "Ja till &allt" -#: Merge.rc:1915 +#: Merge.rc:1916 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:1916 +#: Merge.rc:1917 #, c-format msgid "No to a&ll" msgstr "Nej till a&llt" -#: Merge.rc:1917 +#: Merge.rc:1918 #, c-format msgid "&Continue" msgstr "&Forts\xE4tt" -#: Merge.rc:1918 +#: Merge.rc:1919 #, c-format msgid "&Skip" msgstr "&Skippa" -#: Merge.rc:1919 +#: Merge.rc:1920 #, c-format msgid "Skip &all" msgstr "Skippa &allt" -#: Merge.rc:1921 +#: Merge.rc:1922 #, c-format msgid "Don't display this &message again." msgstr "Visa inte detta &meddelande igen." -#: Merge.rc:1922 +#: Merge.rc:1923 #, c-format msgid "Don't ask this &question again." msgstr "Fr\xE5ga inte denna &fr\xE5ga igen." -#: Merge.rc:1932 +#: Merge.rc:1933 #, c-format msgid "Syntax colors" msgstr "Syntaxkul\xF6rer" -#: Merge.rc:1933 +#: Merge.rc:1934 #, c-format msgid "Text Colors" msgstr "Textkul\xF6rer" -#: Merge.rc:1935 +#: Merge.rc:1936 #, c-format msgid "Version Control" msgstr "Versionskontroll" -#: Merge.rc:1945 +#: Merge.rc:1946 #, c-format msgid "To:" msgstr "Till:" -#: Merge.rc:1946 +#: Merge.rc:1947 #, c-format msgid "From left:" msgstr "Fr\xE5n v\xE4nster:" -#: Merge.rc:1947 +#: Merge.rc:1948 #, c-format msgid "To left:" msgstr "Till v\xE4nster:" -#: Merge.rc:1948 +#: Merge.rc:1949 #, c-format msgid "From right:" msgstr "Fr\xE5n h\xF6ger:" -#: Merge.rc:1949 +#: Merge.rc:1950 #, c-format msgid "To right:" msgstr "Till h\xF6ger:" -#: Merge.rc:1955 +#: Merge.rc:1956 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:1956 +#: Merge.rc:1957 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1962 +#: Merge.rc:1963 #, c-format msgid "Options (%1)" msgstr "Egenskaper (%1)" -#: Merge.rc:1963 +#: Merge.rc:1964 #, c-format msgid "All message boxes are now displayed again." msgstr "Alla meddelanderutor visas nu igen." -#: Merge.rc:1964 +#: Merge.rc:1965 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "\xC4ndringar har gjorts i den aktuella filj\xE4mf\xF6relsesessionen. Vissa inst\xE4llningar kanske inte syns f\xF6rr\xE4n den aktuella filj\xE4mf\xF6relsen startas om." -#: Merge.rc:1965 +#: Merge.rc:1966 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "\xC4ndringen av typsnitt kommer inte att synas i redan \xF6ppna f\xF6nster." -#: Merge.rc:1967 +#: Merge.rc:1968 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3236,7 +3241,7 @@ "\n" "Var god och anv\xE4nd v\xE4rden fr\xE5n 1 - %1." -#: Merge.rc:1969 +#: Merge.rc:1970 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3247,129 +3252,129 @@ "\n" "Var god och \xE5terstarta WinMerge efter \xE5terst\xE4llningen." -#: Merge.rc:1975 +#: Merge.rc:1976 #, c-format msgid "Open" msgstr "\xD6ppna" -#: Merge.rc:1976 +#: Merge.rc:1977 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||" -#: Merge.rc:1977 +#: Merge.rc:1978 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" -#: Merge.rc:1978 +#: Merge.rc:1979 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1980 +#: Merge.rc:1981 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Inst\xE4llningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||" -#: Merge.rc:1986 +#: Merge.rc:1987 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text-filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alla filer (*.*)|*.*||" -#: Merge.rc:1987 +#: Merge.rc:1988 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||" -#: Merge.rc:1988 +#: Merge.rc:1989 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" -#: Merge.rc:1994 +#: Merge.rc:1995 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1995 +#: Merge.rc:1996 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1996 +#: Merge.rc:1997 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1997 +#: Merge.rc:1998 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2003 +#: Merge.rc:2004 #, c-format msgid "Full Contents" msgstr "Total j\xE4mf\xF6relse" -#: Merge.rc:2004 +#: Merge.rc:2005 #, c-format msgid "Quick Contents" msgstr "Snabb j\xE4mf\xF6relse" -#: Merge.rc:2005 +#: Merge.rc:2006 #, c-format msgid "Modified Date" msgstr "Datum f\xF6r f\xF6r\xE4ndring" -#: Merge.rc:2006 +#: Merge.rc:2007 #, c-format msgid "Modified Date and Size" msgstr "\xC4ndrat Datum och Storlek" -#: Merge.rc:2007 +#: Merge.rc:2008 #, c-format msgid "Size" msgstr "Filstorlek" -#: Merge.rc:2013 -#: Merge.rc:2622 +#: Merge.rc:2014 +#: Merge.rc:2625 #, c-format msgid "Name" msgstr "Namn" -#: Merge.rc:2014 +#: Merge.rc:2015 #, c-format msgid "Location" msgstr "S\xF6kv\xE4g" -#: Merge.rc:2015 +#: Merge.rc:2016 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2016 +#: Merge.rc:2017 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2017 -#: Merge.rc:2624 +#: Merge.rc:2018 +#: Merge.rc:2627 #, c-format msgid "Description" msgstr "Beskrivning" -#: Merge.rc:2018 +#: Merge.rc:2019 #, c-format msgid "Select filename for new filter" msgstr "V\xE4lj filnamn f\xF6r nytt filter" -#: Merge.rc:2019 +#: Merge.rc:2020 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||" -#: Merge.rc:2021 +#: Merge.rc:2022 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3382,7 +3387,7 @@ "Var god och kopiera filen %1 till WinMerges Filterkatalog:\n" "%2." -#: Merge.rc:2023 +#: Merge.rc:2024 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3395,7 +3400,7 @@ "\n" "Var god och verifiera att katalogen finns och att den \xE4r skrivbar." -#: Merge.rc:2025 +#: Merge.rc:2026 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3406,7 +3411,7 @@ "\n" "Var god och v\xE4lj filterkatalog i Inst\xE4llningar/System." -#: Merge.rc:2027 +#: Merge.rc:2028 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3419,12 +3424,12 @@ "\n" "Kanske \xE4r filen bara l\xE4sbar?" -#: Merge.rc:2028 +#: Merge.rc:2029 #, c-format msgid "Locate filter file to install" msgstr "Ange s\xF6kv\xE4g f\xF6r filterfil att installera" -#: Merge.rc:2030 +#: Merge.rc:2031 #, c-format msgid "" "Installing filter file failed.\n" @@ -3435,213 +34... [truncated message content] |