From bd489ef23b3c12b5c280fedcf62875bd521a7c60 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Fri, 13 Feb 2015 21:20:03 +0900 Subject: [PATCH] Update translations --HG-- branch : stable --- Translations/WinMerge/Basque.po | 1310 +++++++++++++------------- Translations/WinMerge/Brazilian.po | 1310 +++++++++++++------------- Translations/WinMerge/Bulgarian.po | 1310 +++++++++++++------------- Translations/WinMerge/Catalan.po | 1310 +++++++++++++------------- Translations/WinMerge/ChineseSimplified.po | 1310 +++++++++++++------------- Translations/WinMerge/ChineseTraditional.po | 1310 +++++++++++++------------- Translations/WinMerge/Croatian.po | 1310 +++++++++++++------------- Translations/WinMerge/Czech.po | 1310 +++++++++++++------------- Translations/WinMerge/Danish.po | 1310 +++++++++++++------------- Translations/WinMerge/Dutch.po | 1310 +++++++++++++------------- Translations/WinMerge/English.pot | 1312 ++++++++++++++------------- Translations/WinMerge/French.po | 1310 +++++++++++++------------- Translations/WinMerge/Galician.po | 1310 +++++++++++++------------- Translations/WinMerge/German.po | 1310 +++++++++++++------------- Translations/WinMerge/Greek.po | 1310 +++++++++++++------------- Translations/WinMerge/Hungarian.po | 1310 +++++++++++++------------- Translations/WinMerge/Italian.po | 1310 +++++++++++++------------- Translations/WinMerge/Japanese.po | 1312 ++++++++++++++------------- Translations/WinMerge/Korean.po | 1310 +++++++++++++------------- Translations/WinMerge/Norwegian.po | 1310 +++++++++++++------------- Translations/WinMerge/Persian.po | 1310 +++++++++++++------------- Translations/WinMerge/Polish.po | 1310 +++++++++++++------------- Translations/WinMerge/Portuguese.po | 1310 +++++++++++++------------- Translations/WinMerge/Romanian.po | 1310 +++++++++++++------------- Translations/WinMerge/Russian.po | 1310 +++++++++++++------------- Translations/WinMerge/Serbian.po | 1310 +++++++++++++------------- Translations/WinMerge/Slovak.po | 1310 +++++++++++++------------- Translations/WinMerge/Slovenian.po | 1310 +++++++++++++------------- Translations/WinMerge/Spanish.po | 1310 +++++++++++++------------- Translations/WinMerge/Swedish.po | 1310 +++++++++++++------------- Translations/WinMerge/Turkish.po | 1310 +++++++++++++------------- Translations/WinMerge/Ukrainian.po | 1310 +++++++++++++------------- 32 files changed, 21410 insertions(+), 20514 deletions(-) diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index bd2fe61be..99a60afbc 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -331,7 +331,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Hutsik >" @@ -473,7 +473,7 @@ msgstr "Be&rezgaitasunezko Despaketatzea" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -537,7 +537,7 @@ msgstr "&Urjauzia" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Laguntza" @@ -865,7 +865,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Agiria Kodeatzen..." @@ -1469,37 +1469,37 @@ msgid "&Compare method:" msgstr "Alderaketa &metodoa:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Eduki Denak" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Eduki Azkarrak" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Eguna Aldatuta" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Eguna eta Neurria Aldatuta" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Neurria" @@ -1531,7 +1531,7 @@ msgstr "Ikusi WinMerge Webgunea!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "Ongi" @@ -1703,14 +1703,14 @@ msgid "&Versioning System:" msgstr "Bertsio &Sistema:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Helburutu hona cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Orokorra" @@ -1853,7 +1853,7 @@ msgid "&Find Next" msgstr "Bilatu &Hurrengoa" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ongi" @@ -1899,7 +1899,7 @@ msgid "Replace &All" msgstr "Ordeztu &Dena" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "KasuArgi Arrazionala" @@ -1951,7 +1951,7 @@ msgid "Remove" msgstr "Kendu" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Margoak" @@ -1980,7 +1980,7 @@ msgstr "Ezabatuta" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Idazkia" @@ -2031,13 +2031,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Berezkoak" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistema" @@ -2178,7 +2179,7 @@ msgid "Description:" msgstr "Azalpena:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Gelditu" @@ -2240,7 +2241,7 @@ msgid "&Go To" msgstr "&Joan Hona" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Alderatu" @@ -2291,7 +2292,7 @@ msgid "Filter Comments" msgstr "&Iragazki Aipamenak" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editatzailea" @@ -2443,7 +2444,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Kode-orrialdea" @@ -2733,7 +2734,7 @@ msgid "Private Filter (only for current user)" msgstr "Iragazki Pribatua (uneko erabiltzailearentzat bakarrik)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Agiri Sostengua" @@ -2784,7 +2785,7 @@ msgid "Files:" msgstr "Agiriak:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Ezberdin" @@ -2821,7 +2822,7 @@ msgid "Right:" msgstr "Eskuin:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Berdin" @@ -2874,7 +2875,7 @@ msgid "&Apply" msgstr "&Ezarri" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "E&zeztatu" @@ -2980,7 +2981,7 @@ msgid "Save..." msgstr "Gorde..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Babeskopia Agiriak" @@ -3021,7 +3022,7 @@ msgid "A&ppend timestamp" msgstr "Erantsi &denbora" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Berretsi Kopiatzea" @@ -3062,7 +3063,7 @@ msgid "&Enable plugins" msgstr "Gaitu &pluginak" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Shell Baterapena" @@ -3098,8 +3099,8 @@ msgid "Add &Shell menu to context menu" msgstr "Gehitu &Shell menua hitzinguru menura" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Agiritegia" @@ -3135,69 +3136,102 @@ msgid "&Quick compare limit (MB):" msgstr "&Alderaketa azkar muga (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binarioa" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x409, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Gertu" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "NUM" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3206,12 +3240,12 @@ msgstr "" "Agiri hutsak sortzen ditu\n" "Agiri Berriak (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3220,7 +3254,7 @@ msgstr "" "Dagoen agiri bat irekitzen du\n" "Ireki (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3229,7 +3263,7 @@ msgstr "" "Itxi uneko agiria\n" "Itxia" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3238,7 +3272,7 @@ msgstr "" "Eragindako agiria gordetzen du\n" "Gorde (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3247,7 +3281,7 @@ msgstr "" "Eragindako agiria izen berri batekin gordetzen du\n" "Gorde Honela" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3256,7 +3290,7 @@ msgstr "" "Irarketa aukerak aldatzen ditu\n" "Orrialde Ezarpena" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3265,7 +3299,7 @@ msgstr "" "Irarkailua eta irarketa aukerak aldatzen ditu\n" "Irarketa Ezarpena" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3274,7 +3308,7 @@ msgstr "" "Eragindako agiria irarkitzen du\n" "Irarkitu" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3283,27 +3317,27 @@ msgstr "" "Orrialde osoak erakusten ditu\n" "Irarketa Aurreikuspena" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Egin ezkutuko gai guztiak ikusgarri berriro" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Aldatu zuhaitz modua" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Hedatu azpiagiritegi guztiak" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Erauzi azpiagiritegi denak" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3312,32 +3346,32 @@ msgstr "" "Egitasmo agiria irekitzen du\n" "Egitasmo agiria (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Akats ezezagun bat egitasmo agiria irekitzen saiatzean" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Akats ezezagun bat egitasmo agiria gordetzen saiatzean" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Egitasmo Agiria" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Egitasmo agiria ongi gertatu da." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Egitasmo agiria ongi gorde da." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3346,7 +3380,7 @@ msgstr "" "Uneko helburuak eta aukerak egitasmoan gordetzen ditu\n" "Gorde Egitasmo Agiria" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3355,7 +3389,7 @@ msgstr "" "Programeren argibideak, bertsio zenbakia eta copyrighta erakusten ditu\n" "Honi Buruz" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3364,27 +3398,27 @@ msgstr "" "Utzi aplikazioa; agiriak gordetzeko oharrak\n" "Irten" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Ireki agiri hau" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3393,7 +3427,7 @@ msgstr "" "Aldatu hurrengo leiho panelera\n" "Hurrengo Panela" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3402,7 +3436,7 @@ msgstr "" "Aldatu atzera aurreko leiho panelera\n" "Aurreko Panela" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3411,7 +3445,7 @@ msgstr "" "Antolatu leihoak elkar gainjarriz\n" "Urjauzi Leihoak" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3420,7 +3454,7 @@ msgstr "" "Antolatu leihoak etzanen gainjartzen ez diren eradonkiak bezala\n" "Eradonki Leiho Etzana" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3429,7 +3463,7 @@ msgstr "" "Antolatu leihoak zutian gainjartzen ez diren eradonkiak bezala\n" "Eradonki Leiho Zutia" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3438,7 +3472,7 @@ msgstr "" "Kopiatu hautapena eta jarri Gakoan\n" "Kopiatu" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3447,7 +3481,7 @@ msgstr "" "Ebaki hautapena eta jarri Gakoan\n" "Ebaki" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3456,7 +3490,7 @@ msgstr "" "Bilatu adierazitako idazkia\n" "Bilatu" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3465,7 +3499,7 @@ msgstr "" "Sartu Gako edukiak\n" "Itsatsi" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3474,7 +3508,7 @@ msgstr "" "Birrekin azken ekintza\n" "Birrekin" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3483,7 +3517,7 @@ msgstr "" "Idazki bereizia idazki ezberdin batekin ordezten du\n" "Ordeztu" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3492,7 +3526,7 @@ msgstr "" "Agiri osoa hautatzen du\n" "Hautatu Dena" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3501,7 +3535,7 @@ msgstr "" "Desegin azken ekintza\n" "Desegin (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3510,7 +3544,7 @@ msgstr "" "Birregin aurrez desegindako ekintza\n" "Birregin (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3519,7 +3553,7 @@ msgstr "" "Erakutsi edo ezkutatu tresnabarra\n" "Aldatu Tresna-Barra" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3528,7 +3562,7 @@ msgstr "" "Erakutsi edo ezkutatu egoera barra\n" "Aldatu EgoeraBarra" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3537,7 +3571,7 @@ msgstr "" "Erakutsi edo ezkutatu fitxabarra\n" "Aldatu Fitxa-Barra" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3546,57 +3580,57 @@ msgstr "" "Berezgaitasunez birneurriratu panelak\n" "Blokeatu Panelak" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Aldatu leihoaren neurria" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Aldatu leihoaren kokapena" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Gutxitu leihoa ikur batera" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Handitu leihoa neurri osora" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Aldatu hurrengo agiri leihora" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Aldatu aurreko agiri leihora" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Itxi eragindako leihoa eta oharrak agiriak gordetzeko" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Birrezarri leihoa neurri arruntean" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Eragin Eginkizun Zerrenda" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Eragindu leiho hau" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3605,7 +3639,7 @@ msgstr "" "Aurreikuspena irarkitu modua isten du\n" "Ezeztatu Aurreikuspena" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3624,7 +3658,7 @@ msgstr "" "WinMerge.AgiriAlderaketa\n" "WinMerge Agiri Alderaketa" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3643,19 +3677,19 @@ msgstr "" "WinMerge.AgiritegiAlderketa\n" "WinMerge Agirtegi Alderaketa" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Heutsi jatorrizko EOL hizkiei" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Eskuin klikatzea helburuan kopiatzeko" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3664,143 +3698,143 @@ msgstr "" "Garatzaileak:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 BERME BAKAR BAT GABE dator. Hau software askea da eta ongi etorria zara birbanatzeko baldintza jakin batzuenpean ; ikusi GNU Baimen Publiko Orokorra, Laguntza menuan xehetasunetarako." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Utzi" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Birsaiatu" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Baztertu" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "&Baztertu denak" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Bai" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Bai g&uztiari" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Ez" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Ez gu&ztiari" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Jarraitu" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Jauzi" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Jauzi &guztiak" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Ez erakutsi &mezu hau berriro." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Ez egin ga&ldera hau berriro." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Joskera" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Bertsio Kontrola" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Ezberdintasunak" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Hona:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Ezkerretik:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Ezkerrera:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Eskuinetik:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Eskuinera:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Bertsioa %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Aukerak (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Mezu kutxatila guztiak erakusten dira berriro." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3811,84 +3845,84 @@ msgstr "" "\n" "Mesedez erabili balioak 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Ireki" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programak|*.exe;*.bat;*.cmd|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Agiri Denak (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Egitasmo Agiriak (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Aukera agiriak (*.ini)|*.ini|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Idazki Agiriak (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Agiriak (*.htm,*.html)|*.htm;*.html|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Agiriak (*.xml)|*.xml|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Izena" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Kokalekua" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Iragazkiak" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Azalpena" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Hautatu agirizena iragazki berriarentzat" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Agiri Iragazkiak (*.flt)|*.flt|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3901,7 +3935,7 @@ msgstr "" "Mesedez kopiatu agiri hau: %1 WinMerge/Iragazkiak -agiritegia:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3914,7 +3948,7 @@ msgstr "" "\n" "Mesedez zihurtatu zaitez dagoen agiritegia idazgarria dela." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3925,7 +3959,7 @@ msgstr "" "\n" "Mesedez hautatu iragazki agiritegia hemen: Aukerak/Sistema." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3938,12 +3972,12 @@ msgstr "" "\n" "Badaiteke irakurtzeko-bakarrik agiria izatea?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Aurkitu ezartzeko iragazki agiria" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3954,17 +3988,17 @@ msgstr "" "\n" "Ezinezkoa iragazki agiri berria iragazki agiritegira kopiatzea." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Iragazki agiria jadanik badago. Gainidatzi dagoen iragazkia?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Adierazpen arrunta" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3975,258 +4009,258 @@ msgstr "" "\n" "Ez badituzu nahi alderaketa guztiak orain berritzea hautatu Ez eta berritu alderaketak gero." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Helburutu SS.EXE-ra:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Agiritegi Alderaketa Emaitzak" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Agiri Alderaketa" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Izenburugabeko ezkerra" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Izenburugabeko eskuina" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Theirs Agiria" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Mine Agiria" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Agiriak mihatzen..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Hautapena irekitzen" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Ezkerra Eskuinera kopiatzen" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Eskuina Ezkerrera kopiatzen" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Dena Ezkerrera kopiatzen" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Dena Eskuinera kopiatzen" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Agiriak kopiatzen..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Agiriak ezabatzen..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Agiriak mugitzen..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Jakinarazpena sortzen..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Azken eragiketa desegiten..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Aurreko eragiketa birregiten..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Lerroa: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Batu" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Ezberdintasuna %1 %2-tik" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 Ezberdintasun Aurkiturik" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 Ezberdintasun Aurkituta" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Gaiak %1 %2-tik" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Gaiak:%1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Hautatu badauden bi agiritegi edo agiri alderatzeko" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Agirtegi Hautapena" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Hautatu bi agiritegiak edo bi agiriak alderatzeko." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Ezker helburua baliogabea da!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Eskuin helburua baliogabea da!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Bi helburuak baliogabeak dira!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Hautatu bi agiriak despaketatzaile hautapena gaitzeko" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Ezin dira agiria eta agiritegia alderatu!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Agiria ez da aurkitu: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Agiria ez da despaketatu: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4239,12 +4273,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Hutsegitea gatazka agiria aztertzerakoan." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4255,27 +4289,27 @@ msgstr "" "agiria\n" "ez da agiri gatazkatsu bat." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Gorde Honela" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Gorde aldaketak %1-ri?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 markatuta dago irrakurtzeko-bakarrik bezala. Nahi duzu ezabatzea irakurtzeko-bakarrik agiria? (Ez gordetzeko agirizen berri bezala.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Akatsa babeskopia agirian" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4288,7 +4322,7 @@ msgstr "" "\n" "Jarraitu horrela ere?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4305,7 +4339,7 @@ msgstr "" "\t-agirizen ezberdin bat erabiltzea (Sakatu Ongi)\n" "\t-uneko eragiketa uztea (Sakatu Ezeztatu)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4320,7 +4354,7 @@ msgstr "" "\n" "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4335,7 +4369,7 @@ msgstr "" "\n" "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4350,7 +4384,7 @@ msgstr "" "\n" "Gainidatzi aldatutako agiria?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4359,7 +4393,7 @@ msgstr "" "%1\n" "irakurtzeko-bakarrik markatuta dago. Irakurtzeko-bakarrik gaia ezeztatzea nahi duzu?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4374,22 +4408,22 @@ msgstr "" "\n" "Nahi duzu agiria birgertatzea?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Gorde Ezker Agiria Honela" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Gorde Eskuineko Agiria Honela" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4400,7 +4434,7 @@ msgstr "" "%1\n" "ezagertuta dago. Mesedez gorde agiriaren kopia bat jarraitzeko." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4411,42 +4445,42 @@ msgstr "" "\n" "Berritu agiriak jarraitu aurretik." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "SourceSafe egitasmo helburu bat adierazi behar duzu jarraitzeko (ie: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Egiaztatu agiriak VSS-tik..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Bertsio sistema akats bat itzuli du agiran egiaztatzen saiatzerakoan. Ezinezkoa jarraitzea..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Akatsa bertsio sistema komandoari ekitean." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS Lan Agirtegia eta uneko agiriaren kokalekua ez datoz bat. Jarraitu?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Ez da aurkitu VSS datubaserik!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Akatsa VSS-tik:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4457,7 +4491,7 @@ msgstr "" "Mesedez, egiaztatu erabilitako ikuspen itxurap. berez.\n" "Desegin eragiketa?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4466,164 +4500,164 @@ msgstr "" "Bertsio sistema akats bat itzuli du agiran egiaztatzen saiatzerakoan.\n" "Mesedez, egiaztatu erabilitako ikuspen itxurap. berez." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Bat ere ez" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 azpikoa)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 edo gainekoa)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Hautsi zurigunean" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Hautsi zurigunean edo puntuaketan" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiatu hautatutako gaia izendatutako zuzenbidera" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiatu hautatutako gaia egile zuzenbidera" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Ezabatu hautatutako gaia ezkerrean" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Ezabatu hautatutako gaia eskuinean" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Ezabatu hautatutako gaia(k) bi aldeetan" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ezkutatu hautatutako gaia(k) (orraz iragazkian)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Birrizendatu hautatuko gaiak bi aldeetan" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Eskuina Ezkerrera (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Ezkerra Eskuinera (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Eskuina Ezkerrera (%1 %2-tik)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ezkerra Eskuinera (%1 %2-tik)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Ezkerra hona... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Eskuina hona... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ezkerra hona... (%1 %2-tik)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Eskuina hona... (%1 %2-tik)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Ezkerra (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Eskuina (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Biak (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Ezkerra (%1 %2-tik)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Eskuina (%1 %2-tik)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Biak (%1 %2-tik)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Ezkerraldea - hautatu helmuga agiritegia:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Eskuinaldea - hautatu helmuga agiritegia:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Agiri Eraginda)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 Agiri %2-tik Eraginda)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4634,17 +4668,17 @@ msgstr "" "\n" "%1?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Zihur zaude hona kopiatzea nahi duzula:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Zihur zaude %d gaiak kopiatzea nahi dituzula:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4663,613 +4697,607 @@ msgstr "" "\n" "Mesedez berritu alderaketa." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Zihur zaude mugitzea nahi duzula:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Zihur zaude %d gaiak mugitzea nahi dituzula:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Berretsi Mugitzea" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Ireki ezkerreko agiria" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Ireki ezkerreko agiri kanpoko editatzailearekin" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Ireki ezkerreko agiria honekin..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Ireki eskuineko agiria" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Ireki eskuineko agiri kanpoko editatzailearekin" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Ireki eskuineko agiria honekin..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Hutsegitea kanpoko editatzailea ekiterakoan: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiatu agirizenak gakora?" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiatu ezkerraldeko helburu-izenak gakora" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiatu eskuinaldeko helburu-izenak gakora" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiatu bi aldeetako helburu-izenak gakora" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Ezkerreko Shell menua" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Eskuineko Shell menua" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Agiri heuskarri ezezaguna" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Gehitu gaiak ezkerraldetik agirira" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Gehitu gaiak eskuinaldetik agirira" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Gehitu gaiak bi aldeetatik agirira" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Gehitu gai ezberdinak agirira (bi aldeetatik)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mugitu ezkerrean hautatutako agiria egile zuzenbidera" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mugitu eskuinean hautatutako agiria egile zuzenbidera" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Agirizena" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Alderaketa emaitza" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Ezker Eguna" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Eskuin Eguna" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Luzapena" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Ezker Neurria" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Eskuin Neurria" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Eskuin Neurria (Laburra)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Ezker Neurria (Laburra)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Ezkerreko Sortze Denbora" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Eskuineko Sortze Denbora" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Agiri Berriena" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Ezkerreko Agiri Bertsioa" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Eskuineko Agiri Bertsioa" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Emaitz Laburra" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Ezkerraren Ezaugarriak" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Eskuinaren Ezaugarriak" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Ezker EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Eskuin EOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Ezker Kodeaketa" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Eskuin Kodeaketa" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ezikusitako Ezberd." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binarioa" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Ezinezkoa agiriak alderatzea" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Gaia utzita" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Agiria Jauzita" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Agiritegia jauzita" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Ezkerra bakarrik: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Eskuina bakarrik: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Agiri binarioak berdinak dira" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Agiri binarioak ezberdinak dira" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Agiriak ezberdinak dira" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Agiritegiak ezberdinak dira" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Ezkerra Bakarrik" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Eskuina Bakarrik" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Akatsa" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Idazki agiriak berdinak dira" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Idazki agiriak ezberdinak dira" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Igarotako denbora: %ld sm" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 gai hautatuta" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 gai hautatuta" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Agirizena edo agiritegi izena" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Azpiagiritegi izena azpiagiritegiak barne direnean." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Alderaketa emaitza, modu luzean." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Ezkerralde aldaketa eguna." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Eskuinalde aldaketa eguna." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Agiriaren luzapena." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Ezkerreko agiriaren neurria byte-tan" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Eskuineko agiriaren neurria byte-tan" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Ezkerreko agiri neurria laburtuta." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Eskuineko agiri neurria laburtuta." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Ezkerraldearen sortze denbora." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Eskuinaldearen sortze denbora." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Esaten du zein aldek duen aldaketa egun berriagoa." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Ezkerraldeko agiri bertsioa, agiri-mota batzuentzat bakarrik." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Eskuinaldeko agiri bertsioa, agiri-mota batzuentzat bakarrik." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Alderaketa laburraren emaitza." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Ezkerraldearen ezaugarriak." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Eskuinaldearen ezaugarriak." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Ezkerraldeko agiria EOL motakoa da" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Eskuinaldeko agiria EOL motakoa da" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Eskuinalde kodeaketa." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Ezkerralde kodeaketa." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Agirian ezikusitako ezberdintasun zenbatekoa. Ezberdintasun hauek WinMergek ezikusi ditu eta ezin dira batu." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Agirian dauden ezberdintasun zenbatekoa. Zenbateko honek ez ditu barnebiltzen ezikusitako ezberdintasunak." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Erakutsi asteriskoa (*) agiria binarioa bada." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Alderatu %1 %2-rekin" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Kakotxaz banandutako zerrenda" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Fitxaz banandutako zerrenda" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML Arrunta" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "XML Arrunta" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Jakinarazpen agiria jadanik badago. Dagoen agiria gainidaztea nahi duzu?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5278,32 +5306,32 @@ msgstr "" "Akatsa jakinarazpena sortzean:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Jakinarazpena ongi sortu da." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Agiri berdina dago irekita bi paneletan." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Hautatutako agiriak berdinak dira." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Akats bat gertatu da agiriak alderatzerakoan." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Aldibaterako agiriak ezin izan dira sortu. Egiaztatu zure aldibaterako helburu ezarpenak." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5318,17 +5346,17 @@ msgstr "" "\n" "Oharra: Gurdi itzulera mota guztiak berdin bezala tratatzea nahi badituzu, ezarri 'Ezikusi gurdi itzulera ezberdintasunak...' aukera Alderaketa fitxan aukeren elkarrizketan (eskuragarri hemen: Editatu/Aukerak)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Hautatutako agiritegia ez da baliogarria" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ezinenezkoa agiri binarioa editatzailera irekitzea" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5343,7 +5371,7 @@ msgstr "" "%1\n" "beste aldean eta agiritegi hauek irekitzea?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5354,168 +5382,168 @@ msgstr "" "Erakutsiz agiri bakoitza kode-orrialde horretan erakuspen hobeago bat emango du baina batzea/kopiatzea kaltegarria izango da.\n" "Nahi duzu agiri biak tratatzea windowsen kode-orrialde berezkoan (gomendatuta)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informazioa galduta kodeaketa akatsengaitik: bi agirietan" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Ezberdintasunik ez" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Lerro ezberdintasuna" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Ordeztuta %1 kate." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ezin da kate hau aurkitu: \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopiatu Helburu Osoa" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopiatu Agirizena" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Kokaleku Panela" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Ezberdint. Panela" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Eranskina agiria ongi idatzi da." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. gaia ez da aurkitu edo zuzenbidea da!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. gaia ez da aurkitu edo zuzenbidea da!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Eranskin agiria jadanik badago. Gainidaztea nahi duzu?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 agiri hautatuta]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normala" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Hitzingurua" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Bateratuta" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Ezin da %1 agirira idatzi." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Adierazitako irteera helburua ez helburu osoa: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Adierazi irteera agiri bat" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ezin da eranski agiria sortu agiri binarioetatik." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ezin da eranskina agiria sortu zuzenbideetatik" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5526,12 +5554,12 @@ msgstr "" "\n" "Eranskina sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Agiritegia ez dago." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5542,7 +5570,7 @@ msgstr "" "Beharrezko osagai guztiak (7-zip eta/edo Merge7z*.dll) agiri sostengurako ezin dira aurkitu.\n" "Ikusi eskuliburua argibide gehigorako agiri sostenguari buruz eta nola gaitzeaz." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5551,7 +5579,7 @@ msgstr "" "\n" "Oharra: 7-Zip baterapena ezgaituta dago WinMerge ezarpenetan." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5560,37 +5588,37 @@ msgstr "" "\n" "Oharra: 7-Zip baterapena eragotzita dago eragiketa askerako WinMerge ezarpenetan." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Hautatu esportatzeko agiria" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Hautatu inportatzeko agiria" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Agiritik inportatutako aukerak" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Agiritik esportatutako aukerak" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Hutsegitea agiritik aukerak inportatzerakoan." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Hutsegitea aukerak agirian idazterakoan." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5601,157 +5629,157 @@ msgstr "" "\n" "Jarraitzea nahi duzu?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Mota" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Despaketatzailea" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Aurrezberd" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Editatzaile eskripta" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Gorde ezkerreko agiria" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Gorde eskuineko agiria" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Gorde ezkerreko agiria izen honekin..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Gorde eskuineko agiria izen honekin..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Bihurtu EOL-ak Windows modura" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Bihurtu EOL-ak Unix modura" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Bihurtu EOL-ak Mac modura" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Aldatu editatzen eta batzen moduen artean" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5760,12 +5788,12 @@ msgstr "" "Ikusi eta zehaztu agiri kodeaketa ezaugarriak\n" "Agiri kodeaketa ezaugarriak" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Ireki eta konpondu gatazka agiria" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5774,7 +5802,7 @@ msgstr "" "Hautatu ezberdintasun eremua uneko lerroan\n" "Ezberdintasuna Uneko Lerroan" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5783,7 +5811,7 @@ msgstr "" "Joan lerrora edo ezberdintasunera\n" "Joan (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5792,7 +5820,7 @@ msgstr "" "Ezarri programaren aukerak\n" "Aukerak" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5801,37 +5829,37 @@ msgstr "" "Berritu erakuspena\n" "Berritu (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiatu hautatutako lerroak gakoan lerro-zenbakia gehituz hasierako lerroan" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Aldatu lastermarka" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Joan hurrengo lastermarkara" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Joan aurreko lastermarkara" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Garbitu lastermarka guztiak" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5840,7 +5868,7 @@ msgstr "" "Berdin-berdinak diren gaiak erakusten ditu\n" "Erakutsi Gai Berdinak" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5849,7 +5877,7 @@ msgstr "" "Ezberdintasunak ditzuten gaiak erakusten ditu\n" "Erakutsi Gai Ezberdinak" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5858,7 +5886,7 @@ msgstr "" "Ezkerraldean bakarrik dauden gaiak erakusten ditu\n" "Erakutsi Ezkerreko Gaiak Bakarrik" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5867,7 +5895,7 @@ msgstr "" "Eskuinaldean bakarrik dauden gaiak erakusten ditu\n" "Erakutsi Eskuineko Gaiak Bakarrik" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5876,7 +5904,7 @@ msgstr "" "Agiri binarioak erakutsi\n" "Erakutsi Agiri Binarioak" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5885,7 +5913,7 @@ msgstr "" "Jauzi egindako gaiak erakusten ditu\n" "Erakutsi Jauzitako Gaiak" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5894,7 +5922,7 @@ msgstr "" "Ikusteko hizkia hautatzen du\n" "Hautatu Ikus Hizkia" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5903,27 +5931,27 @@ msgstr "" "Berriro erabili sistemaren berezko hizkia ikusteko\n" "Berezko Hizkia" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Zurigune hizkiak erakusten ditu" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Aldatu Ezberd Panela" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Kokaleku panelak agirien ikuspegi orokor bat erakusten du" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Erakutsi agiritegi alderaketa estatistika elkarrizketa" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5932,7 +5960,7 @@ msgstr "" "Hautatu uneko erabiltzaile interfaze hizkuntza\n" "Hizkuntza" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5941,12 +5969,12 @@ msgstr "" "Lerroen arteko ezberdintasunak margo ezberdinez erakusten ditu\n" "Erakutsi Lerro Ezberdintasuna" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Trukatu bi panelen kokalekua" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5955,7 +5983,7 @@ msgstr "" "Lerroen zenbakia erakusten du\n" "Erakutsi Lerro Zenbakia" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5964,7 +5992,7 @@ msgstr "" "Gaitu hitz inguratzea\n" "Inguratu Lerroak" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5973,22 +6001,22 @@ msgstr "" "Bi panelentzako bazter hautapenak erakusten ditu\n" "Erakutsi Bazter Hautapena" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Handitu idazkiaren neurria" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Gutxitu idazkiaren neurria" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Birrezarri idazkiaren zooma berezko neurrian" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5997,7 +6025,7 @@ msgstr "" "Irristatu aurreko ezberdintasunera\n" "Aurreko Ezberdintasuna (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6006,77 +6034,77 @@ msgstr "" "Irristatu hurrengo ezberdintasunera\n" "Hurrengo Ezberdintasuna (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6085,7 +6113,7 @@ msgstr "" "Irristatu lehen ezberdintasunera\n" "Lehen Ezberdintasuna (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6094,7 +6122,7 @@ msgstr "" "Irristatu uneko ezberdintasunera\n" "Uneko Ezberdintasuna (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6103,7 +6131,7 @@ msgstr "" "Irristatu azken ezberdintasunera\n" "Azken Ezberdintasuna (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6112,7 +6140,7 @@ msgstr "" "Kopiatu hautatutako idazkia eskuineko agirira\n" "Kopiatu Eskuinera (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6121,7 +6149,7 @@ msgstr "" "Kopiatu hautatutako idazkia ezkerreko agirira\n" "Kopiatu Ezkerrera (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6130,7 +6158,7 @@ msgstr "" "Kopiatu ezberdintasuna eskuinera eta hurrengora joan\n" "Kopiatu Eskuinean eta Aurrera (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6139,7 +6167,7 @@ msgstr "" "Kopiatu ezberdintasuna ezkerrera eta hurrengora joan\n" "Kopiatu Ezkerrean eta Aurrera (Ctrl+Alt+Right)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6148,7 +6176,7 @@ msgstr "" "Kopiatu ezberdintasun guztiak eskuineko agirian\n" "Dena Eskuinera" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6157,92 +6185,92 @@ msgstr "" "Kopiatu ezberdintasun guztiak ezkerreko agirian\n" "Dena Ezkerrera" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Ezabatu hautatutako gaiak bien zuzenbideetatik" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Alderatu hautatutako gaiak (alderatu lehen gaia hautatuta gai anitz badaude)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Hautatu eta birrantolatu alderatu zutabeak zuzenbidea" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Eranskin-agiri bat sortu" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Hautatu eta aldatu iragazkiak" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Alderaketa emaitzekin jakinarazpen bat sortzen du" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Plugin eskuragarrien zerrenda bat erakusten du" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Erabiltzaileak hautatzen du despaketatzailea (ez da despaketatzen zuzenb. alderatzean)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Egokitutako despaketatzailea bi agiriei ezartzen zaie (agiri batek bakarrik behar du luzapena)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Hautatu depaketatzaile bat agiri hau editatzeko" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Ez aurrezberd (normala)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Iradokitutako pluginak" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Beste pluginak" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Desgertatu plugin guztiak eta birgertatu berriro (garatzaileentzat)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6251,12 +6279,12 @@ msgstr "" "Hurrengo agiri ikusgarria eragiten du\n" "Hurrengo Agiria Eragin" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Irekitako leiho guztiak isten ditu" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6265,22 +6293,22 @@ msgstr "" "WinMerge Laguntza irekitzen du\n" "WinMerge Laguntza" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Irteerak uneko WinMerge bertsio argibideak eta idazki agiri itxurapena " -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "GNU Baimen Publiko Orokorra erakusten du" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Bilduma Pribatua: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6289,7 +6317,7 @@ msgstr "" "Argitalpen oharrak irekitzen ditu\n" "Argitalpen Oharrak" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6298,292 +6326,292 @@ msgstr "" "Itzulpen webgunea irekitzen du\n" "Itzulpenak" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Plugin Ezarpenak" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Ez aurrezberd" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Aurrezberd ahal bada" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ez da aurkitu - .sct eskriptak ezgaituta" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Ireki agiria erregistratutako aplikazio batekin" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Ireki agiria kanpoko editatzaile batekin" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Ireki agiria programa jakin batekin" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Ez erakutsi mugitutako blokeak" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Erakutsi mugitutako bloke guztiak" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Erakutsi mugitutako blokeak uneko ezberd. bakarrik" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Joan kurtsorepeko ezberd." -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "&Joan lerro honetara: %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Ezgaituta" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Agiri sistematik" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "MRU zerrendatik" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Ez Nabarmenduta" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ezkutatu tresnabarra" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Erakutsi tresnabarra txikia" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Erakutsi tresnabarra handia" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index d56e36f68..2b2676003 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -330,7 +330,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -472,7 +472,7 @@ msgstr "&Desempacotamento Autom #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -536,7 +536,7 @@ msgstr "&Em Cascata" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -864,7 +864,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Codificação do Arquivo..." @@ -1468,37 +1468,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Conteúdos Completos" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Conteúdos Rápidos" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Data Modificada" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Tamanho" @@ -1530,7 +1530,7 @@ msgstr "Visitar a Home Page do WinMerge!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1702,14 +1702,14 @@ msgid "&Versioning System:" msgstr "&Sistema de Versões:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Geral" @@ -1852,7 +1852,7 @@ msgid "&Find Next" msgstr "&Achar o Próximo" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1898,7 +1898,7 @@ msgid "Replace &All" msgstr "Substituir &Tudo" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1950,7 +1950,7 @@ msgid "Remove" msgstr "Remover" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Cores" @@ -1979,7 +1979,7 @@ msgstr "Apagado" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Texto" @@ -2030,13 +2030,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Padrões" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistema" @@ -2177,7 +2178,7 @@ msgid "Description:" msgstr "Descrição:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Parar" @@ -2239,7 +2240,7 @@ msgid "&Go To" msgstr "&Ir Para" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Comparar" @@ -2290,7 +2291,7 @@ msgid "Filter Comments" msgstr "Comentários do Filtro" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2442,7 +2443,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Código da página" @@ -2728,7 +2729,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtro Privado (só para o usuário atual)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" @@ -2779,7 +2780,7 @@ msgid "Files:" msgstr "Arquivos:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Diferente" @@ -2816,7 +2817,7 @@ msgid "Right:" msgstr "Direita:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Idênticos" @@ -2869,7 +2870,7 @@ msgid "&Apply" msgstr "&Aplicar" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Cancelar" @@ -2975,7 +2976,7 @@ msgid "Save..." msgstr "Salvar..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" @@ -3016,7 +3017,7 @@ msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Confirmar a Cópia" @@ -3057,7 +3058,7 @@ msgid "&Enable plugins" msgstr "&Ativar plugins" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Integração com o Shell" @@ -3093,8 +3094,8 @@ msgid "Add &Shell menu to context menu" msgstr "Adicionar o &menu do Shell ao menu de contexto" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Pasta" @@ -3130,69 +3131,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binário" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3201,12 +3235,12 @@ msgstr "" "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3215,7 +3249,7 @@ msgstr "" "Abrir um documento existente\n" "Abrir" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3224,7 +3258,7 @@ msgstr "" "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3233,7 +3267,7 @@ msgstr "" "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3242,7 +3276,7 @@ msgstr "" "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3251,7 +3285,7 @@ msgstr "" "Mudar as opções de impressão\n" "Configurar Página" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3260,7 +3294,7 @@ msgstr "" "Mudar a impressora e as opções de impressão\n" "Configurar a impressão" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3269,7 +3303,7 @@ msgstr "" "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3278,27 +3312,27 @@ msgstr "" "Exibir páginas completas\n" "Pré-Visualizar Impressão" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos visíveis de novo" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Ativar o modo árvore" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas as sub-pastas" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Retrair todas as sub-pastas" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3307,32 +3341,32 @@ msgstr "" "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3341,7 +3375,7 @@ msgstr "" "Salvar os caminhos atuais e opções no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3350,7 +3384,7 @@ msgstr "" "Exibir as informações do programa, número da versão e copyright\n" "Sobre" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3359,27 +3393,27 @@ msgstr "" "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3388,7 +3422,7 @@ msgstr "" "Troca para o próximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3397,7 +3431,7 @@ msgstr "" "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3406,7 +3440,7 @@ msgstr "" "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3415,7 +3449,7 @@ msgstr "" "Organizar as janelas lado a lado não sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3424,7 +3458,7 @@ msgstr "" "Organizar as janelas lado a lado não sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3433,7 +3467,7 @@ msgstr "" "Copia a seleção e a põe na Área de Transferência\n" "Copiar" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3442,7 +3476,7 @@ msgstr "" "Corta a seleção e a põe na Área de Transferência\n" "Cortar" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3451,7 +3485,7 @@ msgstr "" "Achar o texto especificado\n" "Achar" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3460,7 +3494,7 @@ msgstr "" "Inserir os conteúdos da Área de Transferência\n" "Colar" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3469,7 +3503,7 @@ msgstr "" "Repetir a última ação\n" "Repetir" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3478,7 +3512,7 @@ msgstr "" "Substitui o texto específico com um texto diferente\n" "Substituir" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3487,7 +3521,7 @@ msgstr "" "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3496,7 +3530,7 @@ msgstr "" "Desfazer a última ação\n" "Desfazer" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3505,7 +3539,7 @@ msgstr "" "Refazer a ação desfeita anteriormente\n" "Refazer" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3514,7 +3548,7 @@ msgstr "" "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3523,7 +3557,7 @@ msgstr "" "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3532,7 +3566,7 @@ msgstr "" "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3541,57 +3575,57 @@ msgstr "" "Automaticamente redimensionar os painéis\n" "Trancar os Painéis" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Mudar a posição da janela" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um ícone" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a próxima janela do documento" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3600,7 +3634,7 @@ msgstr "" "Fechar o modo de pré-visualização da impressão\n" "Cancelar a Pré-Visualização" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3619,7 +3653,7 @@ msgstr "" "WinMerge.FileCompare\n" "Comparação dos Arquivos do WinMerge" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3638,19 +3672,19 @@ msgstr "" "WinMerge.FolderCompare\n" "Comparação das Pastas do WinMerge" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3659,143 +3693,143 @@ msgstr "" "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este é um software livre e você é bem vindo para redistribuí-lo sob certas circunstâncias; veja o GNU Licença para o Público em Geral no menu Ajuda para detalhes." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Não" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Não para t&odos" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Não exibir esta &mensagem de novo." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Não perguntar esta &questão de novo." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Controle da Versão" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Diferenças" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versão %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opções (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora serão exibidas de novo." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3806,84 +3840,84 @@ msgstr "" "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das opções (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Descrição" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3896,7 +3930,7 @@ msgstr "" "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3909,7 +3943,7 @@ msgstr "" "\n" "Por favor tenha certeza de que a pasta exista e é gravável." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3920,7 +3954,7 @@ msgstr "" "\n" "Por favor selecione a pasta do filtro em Opções/Sistema." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3933,12 +3967,12 @@ msgstr "" "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3949,17 +3983,17 @@ msgstr "" "\n" "Não pôde copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro já existe. Sobrescrever o filtro existente?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Expressão regular" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3970,258 +4004,258 @@ msgstr "" "\n" "Se você não quer atualizar todas as comparações agora você pode selecionar o Não e atualizar as comparações mais tarde." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Comparação dos Pastas" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Comparação de Arquivo" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Sem título a esquerda" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Sem título a direita" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Abrindo a seleção" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Criando o relatório..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Desfazendo a última operação..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Refazendo a operação anterior" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferenças Achadas" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 Diferença Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Seleção de Pastas" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo é inválido!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito é inválido!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos são inválidos!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a seleção do desempacotador." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Não pôde comparar o arquivo e a pasta!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Arquivo não achado: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo não desempacotado: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4234,12 +4268,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4250,27 +4284,27 @@ msgstr "" "%1\n" "não é um arquivo de conflito." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudanças em %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 está marcado como somente-leitura. Você gostaria de sobrescrever o arquivo somente-leitura ? (Não para salvar com um novo nome de arquivo.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Erro ao fazer o backup do arquivo" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4283,7 +4317,7 @@ msgstr "" "\n" "Continuar de qualquer maneira?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4300,7 +4334,7 @@ msgstr "" "\t-usar um nome de arquivo diferente (Pressione Ok)\n" "\t-abortar a operação atual (Pressione Cancelar)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4315,7 +4349,7 @@ msgstr "" "\n" "Você quer salvar a versão desempacotada em outro arquivo?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4330,7 +4364,7 @@ msgstr "" "\n" "Você quer salvar a versão despachada em outro arquivo?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4345,7 +4379,7 @@ msgstr "" "\n" "Sobrescrever o arquivo mudado?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4354,7 +4388,7 @@ msgstr "" "%1\n" "está marcado como somente-leitura. Você gostaria de sobrescrever o item somente-leitura?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4369,22 +4403,22 @@ msgstr "" "\n" "Você quer recarregar o arquivo?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Salvar o Arquivo a Esquerda Como" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Salvar o Arquivo a Direita Como" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4395,7 +4429,7 @@ msgstr "" "%1\n" "desapareceu. Por favor salve uma cópia do arquivo para continuar." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4406,42 +4440,42 @@ msgstr "" "\n" "Atualize os documentos antes de continuar." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Você deve especificar o caminho de um projeto do SourceSafe para continuar (ex: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Ver os arquivos da VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O Sistema de Versões retornou um erro enquanto tentava verificar o arquivo. Incapaz de continuar..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar o comando do sistema de versões." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A Pasta de Trabalho VSS e o local do arquivo atual não combinam. Continuar?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Não foram achadas base(s) de dados VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Erro da VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4452,7 +4486,7 @@ msgstr "" " Por favor, verifique a spec da config da visualização usada.\n" " Desfazer a operação de verificação?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4461,164 +4495,164 @@ msgstr "" "O Sistema de Versões retornou um erro enquanto tentava desfazer o checkout do arquivo.\n" " Por favor, verifique a spec da config da visualização usada." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor do que 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e acima)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Quebrar no espaço em branco" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebrar no espaço em branco ou pontuação" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar o item selecionado para o diretório nomeado" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar o item selecionado para o diretório personalizado" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Apagar o item selecionado a esquerda" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Apagar o item selecionado a direita" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Apagar o(s) item(ns) selecionado(s) em ambos os lados" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Esconder o(s) item(ns) selecionado(s) (filtro on the fly)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Renomear o item selecionado em ambos os lados" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Direita para a Esquerda (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Esquerda para a Direita (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Direita para a Esquerda (%1 de %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Esquerda para a Direita (%1 de %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Esquerda para... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Direita para... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Esquerda para... (%1 de %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Direita para... (%1 de %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Direita (%1 de %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - selecionar a pasta de destino:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - selecionar a pasta de destino:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Arquivos Afetados)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Arquivos Afetados)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4629,17 +4663,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Você tem certeza de que você quer copiar:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Você tem certeza que você quer copiar os itens %d:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4658,613 +4692,607 @@ msgstr "" "\n" "Por favor atualize a comparação." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Você tem certeza que você quer mover:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Você tem certeza que você quer mover os itens %d:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Confirmar o Movimento" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Abrir o arquivo a esquerda" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Abrir o arquivo a esquerda no editor externo" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Abrir o arquivo a esquerda com..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Abrir o arquivo a direita" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Abrir o arquivo a direita no editor externo" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Abrir o arquivo a direita com..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Falhou em executar o editor externo: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar os nomes dos arquivos para a área de transferência" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar os nomes dos caminhos do lado esquerdo para a área de transferência" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar os nomes dos caminhos do lado direito para a área de transferência" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar os nomes dos caminhos de ambos os lados para a área de transferência" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Menu do Shell Esquerdo" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Menu do Shell Direito" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Formato do arquivo desconhecido" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Adicionar os itens do lado esquerdo ao arquivo" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Adicionar os itens do lado direitos ao arquivo" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Adicionar os itens de ambos os lados ao arquivo" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Adicionar itens diferentes ao arquivo (de ambos os lados)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mover o arquivo selecionado a esquerda para o diretório personalizado" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mover o arquivo selecionado a direita para o diretório personalizado" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nome do Arquivo" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultado da comparação" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Data da Esquerda" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Data da Direita" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Tamanho a Esquerda" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Tamanho a Direita" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Tamanho a Direita (Curto)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Tamanho a Esquerda (Curto)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Hora da Criação a Esquerda" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Hora da Criação a Direita" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Arquivo Mais Novo" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Versão do Arquivo a Esquerda" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Versão do Arquivo a Direita" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Resultado Curto" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atributos da Esquerda" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atributos da Direita" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "EOL a esquerda" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "EOL a direita" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Codificação a Esquerda" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Codificação a Direita" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Diferença Ignorada." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binário" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Incapaz de comparar os arquivos" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Arquivo pulado" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Pasta pulada" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Apenas a esquerda: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Apenas a direita: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binários são idênticos" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Os arquivos binários são diferentes" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Os arquivos são diferentes" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "As pastas são diferentes" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Apenas a Esquerda" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Apenas a Direita" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Os arquivos texto são idênticos" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Os arquivos texto são diferentes" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 item selecionado" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 itens selecionados" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou nome da pasta." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome da sub-pasta quando as sub-pastas são incluídas." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparação, formulário longo" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Data de modificação do lado esquerdo." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Data de modificação do lado direito." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Extensão do arquivo." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do arquivo a esquerda em bytes." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do arquivo a direita em bytes." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do arquivo a esquerda abreviado." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do arquivo a direita abreviado." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Hora de criação do lado esquerdo." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Hora da criação do lado direito." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Diz qual lado tem a data de modificação mais nova." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versão do arquivo do lado esquerdo, só para alguns tipos de arquivos." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versão do arquivo do lado direito, só para alguns tipos de arquivos." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Resultado curto da comparação." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo do lado esquerdo" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo do lado direito" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Codificação do lado esquerdo." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Codficação do lado direito." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferenças ignoradas no arquivo. Estas diferenças são ignoradas pelo WinMerge e não podem ser unidas." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferenças no arquivo. Este número não inclui as diferenças ignoradas." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostrar um asterisco (*) se o arquivo é binário." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Comparar o %1 com o %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vírgula" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Lista separada por aba" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML Simples" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "XML Simples" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo do relatório já existe. Você quer sobrescrever o arquivo existente?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5273,32 +5301,32 @@ msgstr "" "Erro ao criar o relatório:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "O relatório foi criado com sucesso." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo está aberto em ambos os painéis." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Os arquivos selecionados são idênticos." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Um erro ocoreu enquanto comparava os arquivos." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Os arquivos temporários não puderam ser criados. Verifique suas configurações do caminho dos temporários." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5313,17 +5341,17 @@ msgstr "" "\n" "Nota: Se você quer sempre tratar todos os tipos de retorno de procedimentos como equivalentes, configure a opção 'Ignorar diferenças de retorno dos procedimentos..' na aba Comparar do diálogo das opções (disponível em Editar/Opções)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "A pasta selecionada é inválida." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Não pode abrir um arquivo binário no editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5338,7 +5366,7 @@ msgstr "" "%1\n" "no outro lado e abrir estas pastas?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5349,168 +5377,168 @@ msgstr "" "Exibir cada arquivo na sua página de código dará uma melhor exibição mas unir/copiar será perigoso.\n" "Você gostaria de tratar ambos os arquivos como estando na página do código padrão do windows? (recomendado)" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informação perdida devido a erros de codificação: em ambos os arquivos" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Sem diferença" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Diferença da linha" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituiu %1 string(s)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Não pôde achar a string \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copiar o Caminho Completo" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copiar o Nome do Arquivo" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Painel de Localização" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Painel das Diferenças" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Arquivo patch gravado com sucesso." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. o item não foi achado ou é diretório!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. o item não foi achado ou é diretório!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo do patch já existe. Você quer sobrescrevê-lo?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos selecionados]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Não pôde gravar no arquivo %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O caminho de saída especificado não é um caminho absoluto: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Especificar um arquivo de saída" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Não pode criar um arquivo patch dos arquivos binários." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Não pode criar um arquivo patch dos diretórios." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5521,12 +5549,12 @@ msgstr "" "\n" "Criar um patch requer que não hajam mudanças não salvas nos arquivos." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "A pasta não existe." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5537,7 +5565,7 @@ msgstr "" "Todos os componentes necessários (7-zip e/ou Merge7z*.dll) para o suporte para arquivos não podem ser achados.\n" "Veja o manual para mais info sobre o suporte para arquivos e como ativá-lo." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5546,7 +5574,7 @@ msgstr "" "\n" "Nota: A integração do 7-Zip está desativada nas configurações do WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5555,37 +5583,37 @@ msgstr "" "\n" "Nota: A integração do 7-Zip está restrita a operação isolada nas configurações do WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Selecione o arquivo para exportar" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Selecione o arquivo para importar" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Opções importadas do arquivo" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Opções exportadas para o arquivo." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Falhou em importar as opções do arquivo." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Falhou em gravar as opções no arquivo." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5596,157 +5624,157 @@ msgstr "" "\n" "Você quer continuar?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Desempacotador" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Script do editor" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Salvar o arquivo a esquerda" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Salvar o arquivo a direita" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Salvar o arquivo a esquerda com o nome..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Salvar o arquivo a direita com o nome..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Converter o EOL para o modo do Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converter o EOL para o modo do Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converter o EOL para o modo do Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Trocar entre os modos de edição e união" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5755,12 +5783,12 @@ msgstr "" "Visualizar e ajustar as propriedades da codificação do arquivo\n" "Propriedades da codificação do arquivo" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Abrir e determinar o arquivo do conflito" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5769,7 +5797,7 @@ msgstr "" "Selecionar a área da diferença na linha atual\n" "Diferença na Linha Atual" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5778,7 +5806,7 @@ msgstr "" "Ir para a linha ou diferença\n" "Ir para (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5787,7 +5815,7 @@ msgstr "" "Definir as opções do programa\n" "Opções" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5796,37 +5824,37 @@ msgstr "" "Atualizar a exibição\n" "Atualizar (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar as linhas selecionadas para a área de transferência adicionando números da linha ao começo da linha" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Ativar o bookmark" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ir para o bookmark seguinte" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ir para o bookmark anterior" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Limpar todos os bookmarks" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5835,7 +5863,7 @@ msgstr "" "Exibe itens que são exatamente os mesmos\n" "Mostrar Itens Idênticos" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5844,7 +5872,7 @@ msgstr "" "Exibe itens que tem diferenças\n" "Mostrar Itens Diferentes" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5853,7 +5881,7 @@ msgstr "" "Exibe itens que existem apenas no lado esquerdo\n" "Mostrar Itens Únicos a Esquerda" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5862,7 +5890,7 @@ msgstr "" "Exibe itens que existem apenas no lado direito\n" "Mostrar Itens Únicos a Direita" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5871,7 +5899,7 @@ msgstr "" "Exibe os arquivos binários\n" "Mostrar Arquivos Binários" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5880,7 +5908,7 @@ msgstr "" "Exibe os itens pulados\n" "Mostrar os Itens Pulados" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5889,7 +5917,7 @@ msgstr "" "Selecionar a fotne para a visualização\n" "Selecionar a Fonte para a Visualização" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5898,27 +5926,27 @@ msgstr "" "Reverter para usar a fonte padrão do sistema para a visualização\n" "Fonte Padrão" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Mostrar os caracteres do espaço em branco" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Ativar o Painel das Diferenças" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "O painel da localização mostra a fotografia global dos arquivos" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostrar o diálogo das estatísticas de comparação das pastas" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5927,7 +5955,7 @@ msgstr "" "Selecionar o idioma da interface do usuário atual\n" "Idioma" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5936,12 +5964,12 @@ msgstr "" "Mostra as diferenças dentro das linhas com cores diferentes\n" "Mostrar a Diferença das Linhas" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Trocar as posições dos dois painéis" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5950,7 +5978,7 @@ msgstr "" "Mostra os números das linhas\n" "Mostrar os Números das Linhas" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5959,7 +5987,7 @@ msgstr "" "Ativar a organização das palavras\n" "Organizar as Linhas" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5968,22 +5996,22 @@ msgstr "" "Mostra as margens da seleção para ambos os painéis\n" "Mostrar as Margens da Seleção" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Aumentar o tamanho do texto" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Diminuir o tamanho do texto" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Resetar o zoom do texto para o tamanho padrão" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5992,7 +6020,7 @@ msgstr "" "Rolar para o diferença anterior\n" "Diferença Anterior (Alt+Pra Cima)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6001,77 +6029,77 @@ msgstr "" "Rolar para a diferença seguinte\n" "Diferença Seguinte (Alt+Pra baixo)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6080,7 +6108,7 @@ msgstr "" "Rolar para a primeira diferença\n" "Primeira Diferença (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6089,7 +6117,7 @@ msgstr "" "Rolar para a diferença atual\n" "Diferença Atual (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6098,7 +6126,7 @@ msgstr "" "Rolar para a última diferença\n" "Última Diferença (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6107,7 +6135,7 @@ msgstr "" "Copiar o texto selecionado para o arquivo da direita\n" "Copiar para a Direita (Alt+Direita)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6116,7 +6144,7 @@ msgstr "" "Copiar o texto selecionado para o arquivo da esquerda\n" "Copiar para a Esquerda (Alt+Esquerda)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6125,7 +6153,7 @@ msgstr "" "Copiar a diferença para a direita e avançar para a próxima\n" "Copiar para a Direita e Avançar (Ctrl+Alt+Direita)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6134,7 +6162,7 @@ msgstr "" "Copiar a diferença para a esquerda e avançar para a próxima\n" "Copiar para a Esquerda e Avançar (Ctrl+Alt+Esquerda)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6143,7 +6171,7 @@ msgstr "" "Copiar todas as diferenças para o arquivo da direita\n" "Tudo para a Direita" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6152,92 +6180,92 @@ msgstr "" "Copiar todas as diferenças para o arquivo da esquerda\n" "Tudo para a Esquerda" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Apagar os itens selecionados de ambos os diretórios" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar o item selecionado (comparar o primeiro item se múltiplos itens estão selecionados)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selecionar e re-ordenar as colunas de comparação dos diretórios" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Gerar um arquivo-patch" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Selecionar e modificar os filtros" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Gera um relatório dos resultados da comparação" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Mostra uma lista de plugins disponíveis" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O usuário seleciona o desempacotador (sem desempacotamento quando comparando diretórios)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempacotador adaptado está aplicado a ambos os arquivos (um arquivo só precisa da extensão)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selecione um desempacotador para editar este arquivo" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Sem prediffer (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarregar todos os plugins e recarregá-los (para desenvolvedores)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6246,12 +6274,12 @@ msgstr "" "Ativa o próximo arquivo visível\n" "Ativar o próximo arquivo" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Fecha todas as janelas abertas" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6260,22 +6288,22 @@ msgstr "" "Abre a Ajuda do WinMerge\n" "Ajuda do WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Emite a info da versão atual do WinMerge e configuração para o arquivo texto" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Exibe a GNU Licença para o Público em Geral" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Build Privado: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6284,7 +6312,7 @@ msgstr "" "Abre o documento das notas do lançamento\n" "Notas do Lançamento" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6293,292 +6321,292 @@ msgstr "" "Abre o website das traduções\n" "Traduções" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Configurações dos Plugins" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Sem prediffer" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediff se possível" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH não achado - scripts .sct desativados" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Abrir o arquivo com o aplicativo registrado" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Abrir o arquivo com o editor externo" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Abrir o arquivo com um programa particular" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Não exibir os blocos movidos" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Exibir todos os blocos movidos" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Exibir os blocos movidos apenas da diferença atual" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ir para a diferença sob o cursor" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "I&r para a Linha %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Desativado" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Da lista da MRU" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Sem Destacamento" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Básico" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Objeto Portátil" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Esconder a barra de ferramentas" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra de ferramentas pequena" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra de ferramentas grande" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 0e72d7d83..6e76f11c1 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Ïðàçåí >" @@ -470,7 +470,7 @@ msgstr "& #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Ïîìîù" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Êîäèðàíå íà ôàéë..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Öÿëîòî ñúäúðæàíèå" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Áúðç äîñòúï" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Ïðîìåíåíà äàòà" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Ïðîìåíåíè äàòà è ðàçìåð" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Ðàçìåð" @@ -1528,7 +1528,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "ÎÊ" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "Ñèñòåìà çà âåðñèè" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïúò äî cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Îñíîâíè" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "&Íàìåðè" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&ÎÊ" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Çàì. &âñè÷êî" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Ïðåìàõíè" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Öâåòîâå" @@ -1977,7 +1977,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Òåêñò" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Âúçñòàíîâè" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Ñèñòåìíè" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Îïèñàíèå:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Ñïðè" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Îòèäè" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Ñðàâíÿâàíå" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Ôèëòúð çà êîìåíòàðè" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Êîäèðîâêà" @@ -2722,7 +2723,7 @@ msgid "Private Filter (only for current user)" msgstr "Ñîáñòâåí ôèëòúð (ñàìî çà òåêóùèÿ ïîòðåáèòåë)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Ïîääðúæêà íà àðõèâè" @@ -2773,7 +2774,7 @@ msgid "Files:" msgstr "Ôàéëà:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Ðàçëè÷íè" @@ -2810,7 +2811,7 @@ msgid "Right:" msgstr "Äÿñíî:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Èäåíòè÷íè" @@ -2863,7 +2864,7 @@ msgid "&Apply" msgstr "&Ïðèëîæè" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Îòìåíè" @@ -2969,7 +2970,7 @@ msgid "Save..." msgstr "Çàïèøè..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Ðåçåðâíè ôàéëîâå" @@ -3010,7 +3011,7 @@ msgid "A&ppend timestamp" msgstr "Äîáàâè âðåìå" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Ïîòâúðäè êîïèðàíå" @@ -3051,7 +3052,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3087,8 +3088,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Äèðåêòîðèÿ" @@ -3124,69 +3125,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Äâîè÷åí" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040204e3" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x402, 1251" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Ãîòîâ" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3195,12 +3229,12 @@ msgstr "" "Ñúçäàé íîâ äîêóìåíò\n" "Íîâ äîêóìåíò (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3209,7 +3243,7 @@ msgstr "" "Îòâîðè ñúùåñòâóâàù äîêóìåíò\n" "Îòâîðè (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3218,7 +3252,7 @@ msgstr "" "Çàòâîðè äåéñòâàùèÿ äîêóìåíò\n" "Çàòâîðè" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3227,7 +3261,7 @@ msgstr "" "Çàïèøè òåêóùèÿ äîêóìåíò\n" "Çàïèøè (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3236,7 +3270,7 @@ msgstr "" "Çàïèøè òåêóùèÿ äîêóìåíò ñ íîâî èìå\n" "Çàïèøè êàòî" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3245,7 +3279,7 @@ msgstr "" "Ïðîìåíè íàñòðîéêèòå íà ïðèíòåðà\n" "Íàñòðîéêè íà ñòðàíèöàòà" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3254,7 +3288,7 @@ msgstr "" "Ïðîìåíè íàñòðîéêèòå íà ïðèíòåðà è íàñòðîéêèòå çà ïðèíòèðàíå\n" "Íàñòðîéêè çà ïðèíòèðàíå" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3263,7 +3297,7 @@ msgstr "" "Ïðèíòèðàé òåêóùèÿ äîêóìåíò\n" "Ïðèíòèðàé" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3272,27 +3306,27 @@ msgstr "" "Âèæ ñòðàíèöàòà ïðåäè ïðèíòèðàíå\n" "Ïðåãëåä" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Íàïðàâè âñè÷êè ñêðèòè åëåìåíòè îòíîâî âèäèìè" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3301,32 +3335,32 @@ msgstr "" "Îòâîðè ôàéëîâ ïðîåêò\n" "Ôàéë ñ ïðîåêò (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåïîçíàòà ãðåøêà ïðè îòâàðÿíåòî íà ôàéëà ñ ïðîåêòà" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåïîçíàòà ãðåøêà ïðè çàïèñâàíåòî íà ôàéëà ñ ïðîåêòà" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Ïðîåêòîâ ôàéë" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Ïðîåêòîâèÿ ôàéë å çàðåäåí óñïåøíî." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Ïðîåêòîâèÿ ôàéë å çàïèñàí óñïåøíî." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3335,7 +3369,7 @@ msgstr "" "Çàïèøè òåêóùèòå ïúòèùà è íàñòðîéêè â ïðîåêòîâ ôàéë\n" "Çàïèøè ïðîåêòà âúâ ôàéë" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3344,7 +3378,7 @@ msgstr "" "Ïðåäñòàâÿ èíôîðìàöèÿ çà ïðîãðàìàòà, âåðñèÿòà è àâòîðñêîòî ïðàâî\n" "Çà" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3353,27 +3387,27 @@ msgstr "" "Èçëèçàíå îò ïðèëîæåíèåòî; íàïîìíÿíå äà çàïàçèòå äîêóìåíòà\n" "Èçõîä" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Îòâàðÿíå íà òîçè äîêóìåíò" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3382,7 +3416,7 @@ msgstr "" "Ïðåâêëþ÷è êúì ñëåäâàùèÿ ïðîçîðåö\n" "Ñëåäâàù ïðîçîðåö" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3391,7 +3425,7 @@ msgstr "" "Ïðåâêëþ÷è êúì ïðåäèøíèÿ ïðîçîðåö\n" "Ïðåäèøåí ïðîçîðåö" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3400,7 +3434,7 @@ msgstr "" "Ïîäðåæäà ïðîçîðöèòå êàñêàäíî\n" "Ïîäðåäè Êàñêàäíî" -#: Merge.rc:2112 +#: Merge.rc:2126 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3409,7 +3443,7 @@ msgstr "" "Ïîäðåæäà ïðîçîðöèòå áåç äà ñå ïîêðèâàò\n" "Ïîäðåäè ïðîçîðöèòå" -#: Merge.rc:2113 +#: Merge.rc:2127 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3418,7 +3452,7 @@ msgstr "" "Ïîäðåæäà ïðîçîðöèòå áåç äà ñå ïîêðèâàò\n" "Ïîäðåäè ïðîçîðöèòå" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3427,7 +3461,7 @@ msgstr "" "Êîïèðà èçáðàíîòî è ãî ñëàãà â Clipboard\n" "Êîïèðàé" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3436,7 +3470,7 @@ msgstr "" "Ðåæè èçáðàíîòî è ãî ñëàãà â Clipboard\n" "Èçðåæè" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3445,7 +3479,7 @@ msgstr "" "Òúðñè îïðåäåëåí òåêñò\n" "Òúðñè" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3454,7 +3488,7 @@ msgstr "" "Ñëîæè ñúäúðæàíèåòî íà Clipboard\n" "Ïîñòàâè" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3463,7 +3497,7 @@ msgstr "" "Ïîâòîðè ïîñëåäíîòî äåéñòâèå\n" "Ïîâòîðè" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3472,7 +3506,7 @@ msgstr "" "Çàìåñòè îïðåäåëåí òåêñò\n" "Çàìåñòè" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3481,7 +3515,7 @@ msgstr "" "Èçáåðè öåëèÿ äîêóìåíò\n" "Èçáåðè âñè÷êî" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3490,7 +3524,7 @@ msgstr "" "Îòìåíè ïîñëåäíîòî äåéñòâèå\n" "Îòìåíè (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3499,7 +3533,7 @@ msgstr "" "Âúðíè ïîñëåäíîòî äåéñòâèå\n" "Âúðíè (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3508,7 +3542,7 @@ msgstr "" "Ïîêàçâà èëè ñêðèâà èíñòðóìåíòèòå\n" "Ïîêàæè èíñòðóìåíòèòå" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3517,7 +3551,7 @@ msgstr "" "Ïîêàçâà èëè ñêðèâà ñòàòóñà\n" "Ñòàòóñ" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3526,62 +3560,62 @@ msgstr "" "Ïîêàæè èëè ñêðèé òàá áàðà\n" "Ïîêàæè TabBar" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Àâòîìàòè÷íî îðàçìåðè ïàíåëèòå\nÇàêëþ÷è ïàíåëèòå" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Ïðîìåíè ãîëåìèíàòà íà ïðîçîðåöà" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Ïðîìåíè ìÿñòîòî íà ïðîçîðåöà" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Íàïðàâè ïðîçîðåöà íà èêîíà" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Óâåëè÷è ïðîçîðåöà äî ïúëíèòå ìó ðàçìåðè" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Ïðåõâúðëè íà ñëåäâàùèÿ äîêóìåíò" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Ïðåõâúðëè íà ïðåäèøíèÿ äîêóìåíò" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Çàòâàðÿ ïðîçîðåöà è ïèòà äàëè äà çàïèøå äîêóìåíòèòå" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Íîðìàëíàòà ãîëåìèíà íà ïðîçîðåöà" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Àêòèâèðàé ñïèñúê íà çàäà÷èòå" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Àêòèâèðàé òîçè ïðîçîðåö" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3590,170 +3624,170 @@ msgstr "" "Çàòâîðè ðåæèìà íà ïðåãëåä\n" "Îòìåíè ïðåãëåäà" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Çàïàçè îðèãèíàëíèÿ ñèìâîë EOL" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Íàòèñíè äåñåí áóòîí çà êîïèðàíå íà ïúòÿ" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Ðàçðàáîò÷èöè:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 èäâà ÁÅÇ ÍÈÊÀÊÂÀ ÃÀÐÀÍÖÈß. Òîâà å áåçïëàòåí ñîôòóåð è ìîæåòå äà ãî ðàçïðîñòðàíÿâàòå ïîä îáùèòå óñëîâèÿ; çà äåòàéëè âèæòå GNU Ïóáëè÷åí ëèöåíç â ìåíþòî Ïîìîù." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Ïðåêúñíè" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Îïèòàé ïàê" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Èãíîðèðàé" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Èãíîðèðàé &âñè÷êî" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Äà çà &âñè÷êè" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Íå" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Íå çà Â&ñè÷êè" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Ïðîäúëæè" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Ïðåñêî÷è" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Ïðåñêî÷è &âñè÷êè" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçâàé òîâà ñúîáùåíèå îòíîâî." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Íå ïèòàé ïàê òîçè âúïðîñ." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Êîíòðîë íà âåðñèÿòà" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Ðàçëèêè" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Â:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Îò ëÿâî:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr " ëÿâî:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Îò äÿñíî:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr " äÿñíî:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Âåðñèÿ %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Óíèêîä" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Íàñòðîéêè (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Âñè÷êè ñúîáùåíèÿ ñå ïîêàçâàò îòíîâî." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3764,84 +3798,84 @@ msgstr "" "\n" "Ìîëÿ, èçïîëçâàéòå ñòîéíîñò îò 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Îòâîðè" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàìè|*.exe;*.bat;*.cmd|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ôàéëîâå ñ ïðîåêòè (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëîâå çà íàñòðîéêà (*.ini)|*.ini|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Òåêñòîâè ôàéëîâå (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ôàéëîâå (*.htm,*.html)|*.htm;*.html|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ôàéëîâå (*.xml)|*.xml|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Èìå" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Ìÿñòî" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Ôèëòðè" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Îïèñàíèå" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Èçáåðåòå èìå çà íîâèÿ ôèëòúð" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëîâè Ôèëòðè (*.flt)|*.flt|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3854,7 +3888,7 @@ msgstr "" "Ìîëÿ, êîïèðàéòå ôàéëà %1 â ïàïêàòà WinMerge/Filters:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3867,7 +3901,7 @@ msgstr "" "\n" "Ìîëÿ, óâåðåòå ñå ÷å ïàïêàòà ñúùåñòâóâà è ìîæå äà ñå çàïèñâà â íåÿ." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3878,7 +3912,7 @@ msgstr "" "\n" "Ìîëÿ, èçáåðåòå ïàïêà çà ôèëòðè â Íàñòðîéêè/Ñèñòåìíè." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3891,12 +3925,12 @@ msgstr "" "\n" "Ìîæå áè ôàéëúò å ñàìî çà ÷åòåíå?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Çàäàéòå ôèëòúðåí ôàéë çà èíñòàëèðàíå" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3907,273 +3941,273 @@ msgstr "" "\n" "Íå ìîæå äà ñå êîïèðà íîâèÿò ôàéë â ïàïêàòà ñ ôèëòðè." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëòúðíèÿò ôàéë âå÷å ñúùåñòâóâà. Äà ñå ïðåçàïèøå ëè ñúùåñòâóâàùèÿò ôèëòúð?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "×åñòè èçðàçè" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëòàòè îò ñðàâíÿâàíå íà äèðåêòîðèèòå" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Ñðàâíÿâàíå íà ôàéëîâå" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Áåç çàãëàâèå ëÿâ" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Áåç çàãëàâèå äåñåí" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Òåõåí ôàéë" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Ìîé ôàéë" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Ñêàíèðàíå íà ôàéëîâåòå..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Îòâàðÿ èçáðàíîòî" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Êîïèðà îò ëÿâî íà äÿñíî" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Êîïèðà îò äÿñíî íà ëÿâî" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Êîïèðà âñè÷êî â ëÿâî" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Êîïèðà âñè÷êî â äÿñíî" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Êîïèðàíå íà ôàéëîâå..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Èçòðèâàíå íà ôàéëîâå..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Ïðåìåñòâàíå íà ôàéëîâå..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Ñúçäàâàíå íà îò÷åò..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Ðåä: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Ñëèâàíå" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Ðàçëèêè %1 îò %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 Íàìåðåíè ðàçëèêè" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 Íàìåðåíà ðàçëèêà" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "Ñ×" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Åëåìåíò %1 îò %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Îáùî: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Èçáåðåòå äâå ÑÚÙÅÑÒÂÓÂÀÙÈ äèðåêòîðèè èëè ôàéëîâå çà ñðàâíåíèå" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Èçáîð íà äèðåêòîðèÿ" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Èçáåðåòå äâå ïàïêè èëè äâà ôàéëà çà ñðàâíåíèå." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Íåâàëèäåí ëÿâ ïúò!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Íåâàëèäåí äåñåí ïúò!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Äâàòà ïúòÿ ñà íåâàëèäíè!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Èçáåðåòå äâà ôàéëà çà àêòèâèðàíå íà èçáîðà çà ðàçàðõèâèðàíå." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Íå ìîæå äà ñå ñðàâíè ôàéë ñ äèðåêòîðèÿ!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Íå å íàìåðåí ôàéëà: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Íå å ðàçàðõèâèðàí ôàéëà: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4186,37 +4220,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Ãðåøêà ïðè ðàçáîðà íà êîíôëèêòåí ôàéë" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Ôàéëúò\n%1\níå å êîíôëèêòåí." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Çàïèøè êàòî" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Çàïèøè ïðîìåíèòå íà %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 å ñàìî çà ÷åòåíå. Äà çàïèøà ëè ôàéëà? (Íå, ùå ãî çàïèøà ñ íîâî èìå.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ðåçåðâíî êîïèå" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4229,7 +4263,7 @@ msgstr "" "\n" "Äà ïðîäúëæà ëè?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4246,7 +4280,7 @@ msgstr "" "\t-èçïîëçâàòå ðàçëè÷íî èìå (íàòèñíåòå Ok)\n" "\t-îòìåíèòå òåêóùàòà îïåðàöèÿ (íàòèñíåòå Îòìåíè)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4261,7 +4295,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4276,7 +4310,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4291,7 +4325,7 @@ msgstr "" "\n" "Äà çàìåíÿ ëè ïðîìåíåíèÿ ôàéë?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4300,32 +4334,32 @@ msgstr "" "%1\n" "å ìàðêèðàí ñàìî ç ÷åòåíå. Èñêàòå ëè äà çàìåíèòå åëåìåíòà ñàìî çà ÷åòåíå?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Çàïèøè ëåâèÿ ôàéë êàòî" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Çàïèøè äåñíèÿ ôàéë êàòî" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4336,42 +4370,42 @@ msgstr "" "\n" "Îáíîâåòå äîêóìåíòèòå ïðåäè äà ïðîäúëæèòå." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Âèå òðÿáâà äà èçáåðåòå SourceSafe ïðîåêò çà äà ïðîäúëæèòå (ïð: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Ïðîâåðÿâàíå íà ôàéëîâå îò VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versioning System âúðíà ãðåøêà ïðè îïèòà äà ïðîâåðè ôàéëà. Íå ìîæå äà ïðîäúëæè..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Ãðåøêà ïðè ñòàðòèðàíå íà êîìàíäà îò versioning system." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ðàáîòíàòà ïàïêà è ðàçïîëîæåíèåòî íà ôàéëà íå ñúâïàäàò. Ùå ïðîäúëæèòå ëè?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Íå å íàìåðåíà VSS áàçà äàííè!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Ãðåøêà îò VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4382,7 +4416,7 @@ msgstr "" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä.\n" " Äà îòìåíÿ ëè ïðîâåðêàòà?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4391,164 +4425,164 @@ msgstr "" "Versioning System âúðíà ãðåøêà äîêàòî ñå îïèòâà äà îòìåíè ïðîâåðêàòà íà ôàéëà.\n" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Íÿìà" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ïðåäè â.5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (â.5.0 è íàãîðå)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî èëè ïóíêòóàöèÿ" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Êîïèðàé èçáðàíèòå íåùà â çàäàäåíàòà ïàïêà" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Êîïèðàé èçáðàíèòå íåùà â ïîòðåáèòåëñêà ïàïêà" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò ëÿâî" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò äÿñíî" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò(è) îò äâåòå ñòðàíè" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ñêðèé èçáðàíèÿ îáåêò(è) ('on the fly' ôèëòúð)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Ïðåèìåíóâàé èçáðàíèÿ åëåìåíò â äâåòå ñòðàíè" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Îò äÿñíî êúì ëÿâî (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Îò ëÿâî êúì äÿñíî (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåñåí êúì ëÿâ (%1 îò %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ëÿâ êúì äåñåí (%1 îò %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Ëÿâ êúì... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Äåñåí êúì... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ëÿâ êúì... (%1 îò %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåñåí êúì... (%1 îò %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Ëÿâî (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Äÿñíî (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Äâåòå(%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Ëÿâ (%1 îò %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Äåñåí (%1 îò %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Äâåòå (%1 îò %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Ëÿâà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Äÿñíà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Ôàéëà çàñåãíàòè)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 îò %2 ôàéëà çàñåãíàòè)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4559,17 +4593,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Èñêàòå ëè äà êîïèðàòå:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Èñêàòå ëè äà êîïèðàòå %d åëåìåíòè:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4588,613 +4622,607 @@ msgstr "" "\n" "Ìîëÿ, îáíîâåòå ñðàâíÿâàíåòî." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë ñ âúíøåí ðåäàêòîð" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë ñ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë ñ âúíøåí ðåäàêòîð" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë ñ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íå ìîæå äà ñå ñòàðòèðà âúíøíèÿ ðåäàêòîð: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Êîïèðàé ôàéëîâèòå èìåíà â êëèïáîðäà" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â ëÿâî â êëèïáîðäà" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â äÿñíî â êëèïáîðäà" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â äâåòå ñòðàíè â êëèïáîðäà" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Íåïîçíàò àðõèâåí ôîðìàò" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Äîáàâè îáåêòèòå îò ëÿâàòà ñòðàíà â àðõèâ" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Äîáàâè îáåêòèòå îò äÿñíàòà ñòðàíà â àðõèâ" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Äîáàâè îáåêòèòå îò äâåòå ñòðàíè â àðõèâ" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Äîáàâè äðóãè îáåêòè â àðõèâ (îò äâåòå ñòðàíè)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Ïðåìåñòè èçáðàíèÿ ôàéë îò ëÿâî â äàäåíà ïàïêà" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ïðåìåñòè èçáðàíèÿ ôàéë îò äÿñíî â äàäåíà ïàïêà" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Èìå" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Ðåçóëòàòè ïðè ñðàâíÿâàíå" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Ëÿâà äàòà" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Äÿñíà äàòà" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Ðàçøèðåíèå" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Ðàçìåð íà ëÿâàòà ÷àñò" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Ðàçìåð íà äÿñíàòà ÷àñò" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð îò äÿñíî (Êðàòúê)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð îò ëÿâî (Êðàòúê)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Âðåìå çà íàïðàâà íà ëÿâàòà ÷àñò" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Âðåìå çà íàïðàâà íà äÿñíàòà ÷àñò" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Íîâè ôàéëîâå" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ íà ëåâèÿ ôàéë" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ íà äåñíèÿ ôàéë" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Áúðçè ðåçóëòàòè" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòè îò ëÿâî" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòè îò äÿñíî" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Ëÿâ EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Äåñåí EOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Ëÿâà êîäèðîâêà" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Äÿñíà êîäèðîâêà" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Èãíîðèðàíè ðàçëèêè" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Äâîè÷åí" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Íå ìîæå äà ñå ñðàâíÿò ôàéëîâåòå" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Ïðåêúñíàò ôàéë" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Ïðîïóñíàò ôàéë" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Ïðîïóñíàòà äèðåêòîðèÿ" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Îò ëÿâî ñàìî: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Îò äÿñíî ñàìî: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíèòå ôàéëîâå ñà åäíàêâè" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Áèíàðíèòå ôàéëîâå ñà ðàçëè÷íè" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Ðàçëè÷íè ôàéëîâå" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Ñàìî ëåâèÿò" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Ñàìî äåñíèÿò" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Ãðåøêà" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Îñòàâàùî âðåìå: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 èçáðàí îáåêò" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 èçáðàíè îáåêòà" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Èìå íà ïàïêàòà èëè ôàéëà." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìå íà ïîäïàïêàòà, êîãàòî ñà âêëþ÷åíè ïîäïàïêèòå." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëòàò íà ñðàâíåíèåòî, äúëãà ôîðìà." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Äàòà íà ïðîìÿíà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Äàòà íà ïðîìÿíà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Ðàçøèðåíèå íà ôàéëà." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð íà ëåâèÿ ôàéë â áàéòà." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð íà äåñíèÿ ôàéë â áàéòà." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â ëÿâî." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â äÿñíî." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Äàòà íà ñúçäàâàíå íà ëÿâàòà ñòðàíà." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Äàòà íà ñúçäàâàíå íà äÿñíàòà ñòðàíà." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçâà êîÿ ñòðàíà èìà ïî-íîâà äàòà íà ïðîìÿíà." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò ëÿâî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò äÿñíî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Êðàòêè ðåçóëòàòè íà ñðàâíÿâàíå." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòè íà ëÿâàòà ñòðàíà." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòè íà äÿñíàòà ñòðàíà." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "EOL òèï íà ëåâèÿ ôàéë" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "EOL òèï íà äåñíèÿ ôàéë" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâêà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâêà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áðîé íà èãíîðèðàíèòå ðàçëèêè âúâ ôàéë. Òåçè ðàçëèêè ñà èãíîðèðàíè îò WinMerge è íå ìîãàò äà áúäàò ñìåñåíè." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áðîé íà ðàçëè÷èÿòà âúâ ôàéë. Òîçè áðîé íå âêëþ÷âà èãíîðèðàíèòå ðàçëèêè." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàæè çâåçäè÷êà (*), àêî ôàéëúò å äâîè÷åí." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíÿâàíå íà %1 ñ %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñúñ çàïåòàÿ" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñ òàáóëàöèÿ" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "×èñò HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "×èñò XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéëúò ñ îò÷åòà âå÷å ñúùåñòâóâà. Èñêàòå ëè äà çàìåíèòå ñúùåñòâóâàùèÿ ôàéë?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5203,32 +5231,32 @@ msgstr "" "Ãðåøêà ïðè ñúçäàâàíå íà îò÷åòà:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åòúò áåøå ñúçäàäåí óñïåøíî." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Åäíàêâè ôàéëîâå ñà îòâîðåíè â äâàòà ïàíåëà." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Èçáðàíèòå ôàéëîâå ñà åäíàêâè." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïîëó÷è ñå ãðåøêà ïðè ñðàâíÿâàíå íà ôàéëîâåòå." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Íå ìîæå äà ñå ñúçäàäàò âðåìåííè ôàéëîâå. Ïðîâåðåòå íàñòðîéêèòå çà âðåìåííè ôàéëîâå." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5243,22 +5271,22 @@ msgstr "" "\n" "Áåëåæêà: Àêî èñêàòå äà ñ÷èòàòå âñè÷êè âúðíàòè òèïîâå êàòî åäíàêâè, çàäàéòå îïöèÿòà 'Èãíîðèðàé ðàçëè÷íèòå âúðíàòè òèïîâå..' â ðàçäåëà Ñðàâíÿâàíå îò ïðîçîðåöà ñ íàñòðîéêèòå (íàìèðà ñå îò Ðåäàêòèðàíå/Íàñòðîéêè)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Èçáðàíàòà ïàïêà å íåâàëèäíà." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íå ìîæå äà ñå îòâîðè äâîè÷åí ôàéë ñ ðåäàêòîð." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "Ïàïêàòà ñúùåñòâóâà ñàìî â äðóãàòà ñòðàíà è íå ìîæå äà ñå îòâîðè.\n\nÈñêàò ëè äà ñúçäàäåòå ñúîòâåòñòâàùè ïàïêè:\n%1\nâ äðóãàòà ñòðàíà è äà ãè îòâîðèòå?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5269,168 +5297,168 @@ msgstr "" "Ïîêàçâàíåòî íà âñåêè ôàéë ñ íåãîâàòà êîäèðîâêà ùå äàäå ïî-äîáðà âèäèìîñò, íî ñðàâíÿâàíåòî èëè êîïèðàíåòî ùå å îïàñíî.\n" "Èñêàòå ëè ôàéëîâåòå äà ñå îáðàáîòâàò, èçïîëçâàéêè çàäàäåíàòà êîäèðîâêà íà Windows (ïðåïîðú÷èòåëíî)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Çàãóáà íà èíôîðìàöèÿ, ïîðàäè ãðåøêà â êîäèðîâêàòà íà: äâàòà ôàéëà" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Áåç ðàçëèêè" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Ðàçëèêè â ðåäîâåòå" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíè %1 íèç(à)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå ìîæå äà ñå íàìåðè íèçà \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Êîïèðàé ïúëíèÿ ïúò" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Êîïèðàé èìåòî íà ôàéëà" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèå" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Ðàçëèêè" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Ïà÷úò å ãîòîâ." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïà÷à âå÷å ñúùåñòâóâà. Ùå ãî ïðåçàïèøåòå ëè?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 èçáðàíè ôàéëîâå]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Íîðìàëåí" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Óíèôèöèðàí" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Íå ìîæå äà ñå çàïèøå âúðõó %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Çàäàäåíèÿò ïúò íå å ïúëåí ïúò: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Çàäàéòå èçõîäåí ôàéë" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äâîè÷íè ôàéëîâå." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äèðåêòîðèè." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5441,12 +5469,12 @@ msgstr "" "\n" "Ñúçäàâàíåòî íà ïà÷ èçèñêâà äà íÿìà íåçàïèñàíè ïðîìåíè âúâ ôàéëîâåòå." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Ïàïêàòà íå ñúùåñòâóâà." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5457,7 +5485,7 @@ msgstr "" "Íå ñà íàìåðåíè íåîáõîäèìèòå êîìïîíåíòè (7-zip è/èëè Merge7z*.dll) çà ïîääðúæêàòà íà àðõèâè.\n" "Ïîãëåäíåòå ðúêîâîäñòâîòî çà ïîâå÷å èíôîðìàöèÿ îòíîñíî ïîääðúæêàòà íà àðõèâè è êàê äà ÿ âêëþ÷èòå." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5466,7 +5494,7 @@ msgstr "" "\n" "Áåëåæêà: Èíòåãðèðàíåòî íà 7-Zip å çàáðàíåíî â íàñòðîéêèòå íà WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5475,37 +5503,37 @@ msgstr "" "\n" "Áåëåæêà: Èíòåãðèðàíåòî íà 7-Zip å îãðàíè÷åíî äî ñîáñòâåíè äåéñòâèÿ â íàñòðîéêèòå íà WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Èçáåðåòå ôàéë çà åêñïîðò" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Èçáåðåòå ôàéë çà èìïîðò" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Íàñòðîéêèòå ñà èìïîðòèðàíè îò ôàéë." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Íàñòðîéêèòå ñà åêñïîðòèðàíè âúâ ôàéë." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Íå ìîæå äà ñå èìïîðòèðàò íàñòðîéêèòå îò ôàéë." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Íå ìîæå äà ñå åêñïîðòèðàò íàñòðîéêèòå âúâ ôàéë." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5516,157 +5544,157 @@ msgstr "" "\n" "Èñêàòå ëè äà ïðîäúëæèòå?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Ñìåñåí" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " á" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " Êá" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " Ìá" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " Ãá" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " Òá" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " Ïá" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Çàïàçâàíå íà ëåâèÿ ôàéë" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Çàïàçâàíå íà äåñíèÿ ôàéë" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Çàïàçâàíå íà ëåâèÿ ôàéë êàòî..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Çàïàçâàíå íà äåñíèÿ ôàéë êàòî..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Êîíâåðòèðàé EOL êúì Windows ðåæèì" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Êîíâåðòèðàé EOL êúì Unix ðåæèì" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Êîíâåðòèðàé EOL êúì Mac ðåæèì" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Ïðåâêëþ÷è ìåæäó ðåæèìèòå íà ðåäàêòèðàíå è ñðàâíåíèå" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5675,12 +5703,12 @@ msgstr "" "Âèæ è çàäàé íàñòðîéêèòå íà êîäèðîâêàòà íà ôàéëà\n" "Íàñòðîéêè íà êîäèðîâêàòà íà ôàéëà" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Îòâîðè è ïîïðàâè êîíôëèêòåí ôàéë" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5689,7 +5717,7 @@ msgstr "" "Èçáåðåòå ðàçëè÷íèòå íåùà â òåêóùèÿ ðåä\n" "Ðàçëè÷èÿ â òåêóùèÿ ðåä" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5698,7 +5726,7 @@ msgstr "" "Îòèäè íà ðåä èëè ðàçëèêà\n" "Îòèäè íà (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5707,7 +5735,7 @@ msgstr "" "Ïðîìÿíà íà ïðîãðàìíèòå íàñòðîéêè\n" "Íàñòðîéêè" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5716,37 +5744,37 @@ msgstr "" "Îáíîâè ïîêàçàíîòî\n" "Îáíîâè (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Êîïèðàíå íà èçáðàíèòå ðåäîâå â êëèïáîðäà, äîáàâÿéêè íîìåðà íà ðåäîâåòå â íà÷àëîòî" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Ïðèêðåïè îòìåòêà" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Îòèäè íà ñëåäâàùàòà îòìåòêà" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Îòèäè íà ïðåäèøíàòà îòìåòêà" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Èç÷èñòè âñè÷êè îòìåòêè" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5755,7 +5783,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî ñà àáñîëþòíî åäíàêâè\n" "Ïîêàæè åäíàêâèòå îáåêòè" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5764,7 +5792,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî èìàò ðàçëèêè\n" "Ïîêàæè ðàçëè÷íèòå îáåêòè" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5773,7 +5801,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî ñúùåñòâóâàò ñàìî â ëÿâàòà ñòðàíà\n" "Ïîêàæè óíèêàëíèòå îáåêòè â ëÿâî" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5782,7 +5810,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî ñúùåñòâóâàò ñàìî â äÿñíàòà ñòðàíà\n" "Ïîêàæè óíèêàëíèòå îáåêòè â äÿñíî" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5791,7 +5819,7 @@ msgstr "" "Ïîêàçâà äâîè÷íè ôàéëîâå\n" "Ïîêàæè äâîè÷íè ôàéëîâå" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5800,7 +5828,7 @@ msgstr "" "Ïîêàçâà ïðåñêî÷åíèòå åëåìåíòè\n" "Ïîêàæè ïðåñêî÷åíèòå åëåìåíòè" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5809,7 +5837,7 @@ msgstr "" "Èçáèðàíå íà øðèôò çà èçãëåäà\n" "Èçáåðåòå øðèôò çà èçãëåäà" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5818,42 +5846,42 @@ msgstr "" "Çàäàâàíå çà èçïîëçâàíå íà ñèñòåìíèÿ øðèôò\n" "Ñèñòåìåí øðèôò" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Ïîêàæè ïðàçíèòå ìåñòà" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Âêëþ÷âà/Èçêëþ÷âà ñïèñúêà ñ ðàçëè÷èÿ" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Ïðîçîðåöà ñ ïîëîæåíèåòî ïîêàçâà öÿëîñòíà êàðòèíà îò ôàéëà" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Ïîêàçâà ñòàòèñòèêàòà çà ñðàâíåíèå íà ïàïêèòå" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Èçáîð íà òåêóù ïîòðåáèòåëñêè èíòåðôåéñ\nÅçèê" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "Ïîêàçâà ðàçëèêèòå â ðåäîâåòå ñ ðàçëè÷íè öâåòîâå\nÏîêàæè ðàçëè÷èÿòà â ðåäà" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Ñìåíè ïîçèöèèòå íà äâàòà ïàíåëà" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5862,7 +5890,7 @@ msgstr "" "Ïîêàæè íîìåðà íà ðåäîâåòå\n" "Ïîêàæè íîìåðà íà ðåäîâåòå" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5871,7 +5899,7 @@ msgstr "" "Ïîçâîëè ïðåíàñÿíå íà äóìè\n" "Ïðåíàñÿé ðåäîâåòå" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5880,117 +5908,117 @@ msgstr "" "Ïîêàçâà èçáðàíèòå ïîëåòà â äâàòà ïàíåëà\n" "Ïîêàæè èçáðàíèòå ïîëåòà" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Óâåëè÷è ðàçìåðà íà òåêñòà" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Íàìàëè ðàçìåðà íà òåêñòà" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Âúçñòàíîâè ðàçìåðà íà òåêñòà äî íîðìàëíèÿ" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "Ïðåìåñòè äî ïðåäèøíàòà ðàçëèêà\nÏðåäèøíà ðàçëèêà (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "Ïðåìåñòè äî ñëåäâàùàòà ðàçëèêà\nÑëåäâàùà ðàçëèêà (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "Ïðåìåñòè äî ïúðâàòà ðàçëèêà\nÏúðâà ðàçëèêà (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "Ïðåìåñòè äî òåêóùàòà ðàçëèêà\nÒåêóùà ðàçëèêà (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "Ïðåìåñòè äî ïîñëåäíàòà ðàçëèêà\nÏîñëåäíà ðàçëèêà (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5999,7 +6027,7 @@ msgstr "" "Êîïèðàíå íà èçáðàíèÿ òåêñò â äåñíèÿ ôàéë\n" "Êîïèðàíå â äÿñíî (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6008,7 +6036,7 @@ msgstr "" "Êîïèðàíå íà èçáðàíèÿ òåêñò â ëåâèÿ ôàéë\n" "Êîïèðàíå â ëÿâî (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6017,7 +6045,7 @@ msgstr "" "Êîïèðàíå íà ðàçëèêàòà â äåñíèÿ ôàéë è ïðèäâèæâàíå êúì ñëåäâàùàòà\n" "Êîïèðàíå â äÿñíî è ïðèäâèæâàíå (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6026,7 +6054,7 @@ msgstr "" "Êîïèðàíå íà ðàçëèêàòà â ëåâèÿ ôàéë è ïðèäâèæâàíå êúì ñëåäâàùàòà\n" "Êîïèðàíå â ëÿâî è ïðèäâèæâàíå (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6035,7 +6063,7 @@ msgstr "" "Êîïèðàíå íà âñè÷êè ðàçëèêè â äåñíèÿ ôàéë\n" "Âñè÷êî â äÿñíî" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6044,417 +6072,417 @@ msgstr "" "Êîïèðàíå íà âñè÷êè ðàçëèêè â ëåâèÿ ôàéë\n" "Âñè÷êî â ëÿâî" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Èçòðèé èçáðàíèòå îáåêòè îò äâåòå ïàïêè" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Ñðàâíè èçáðàíèòå îáåêòè (ñðàâíè ïúðâèÿ åëåìåíò îò íÿêîëêî èçáðàíè òàêèâà)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Èçáåðè è ïîäðåäè êîëîíèòå çà ñðàâíÿâàíå íà äèðåêòîðèè" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Ñúçäàé ïà÷-ôàéë" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Èçáåðè è ïðîìåíè ôèëòðè" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Ãåíåðèðàíå íà îò÷åò îò ðåçóëòàòèòå çà ñðàâíåíèå" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Ïîòðåáèòåëÿ èçáèðà ðàçàðõèâàòîð (íÿìà ðàçàðõèâèðàíå ïðè ñðàâíÿâàíå íà ïàïêè)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Çàäàäåíèÿ ðàçàðõèâàòîð ùå ñå ïðèëîæè è çà äâàòà ôàéëà (íåîáõîäèìî å ðàçøèðåíèå ñàìî íà åäèíèÿ ôàéë)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Èçáèðàíå íà ðàçàðõèâàòîð çà ðåäàêòèðàíå íà òîçè ôàéë" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ (íîðìàëåí)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Ïðåäëîæåíà äîáàâêà" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Äðóãè äîáàâêè" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Çàòâàðÿ âñè÷êè äîáàâêè è ãè çàðåæäà îòíîâî (çà ðàçðàáîò÷èöè)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "Àêòèâèðà ñëåäâàùèÿò âèäèì ôàéë\nÀêòèâèðàé ñëåäâàù ôàéë" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Çàòâàðÿ âñè÷êè îòâîðåíè ïðîçîðöè" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "Îòâàðÿ ïîìîùòà íà WinMerge\nWinMerge ïîìîù" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Ïîêàçâàíå íà òåêóùèòå íàñòðîéêè íà WinMerge è èíôîðìàöèÿ çà âåðñèÿòà â òåêñòîâ ôàéë" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Ïîêàçâà GNU Îáù ïóáëè÷åí ëèöåíç" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Âúòðåøåí áèëä: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "Îòâàðÿ äîêóìåíòà ñ áåëåæêè çà ïðîãðàìàòà\nÁåëåæêè" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "Opens the translations website\nTranslations" msgstr "Îòâàðÿ ñòðàíèöàòà ñ ïðåâîäè\nÏðåâîäè" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè íà äîáàâêèòå" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Ïðåäâàðèòåëíè ðàçëèêè, àêî å âúçìîæíî" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå å íàìåðåí - .sct ñêðèïòîâåòå ñà çàáðàíåíè" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<Íÿìà>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<Àâòîìàòè÷íî>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Îòâîðè ôàéëúò ñ ðåãèñòðèðàíîòî ïðèëîæåíèå" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Îòâîðè ôàéëúò ñ âúíøåí ðåäàêòîð" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Îòâîðè ôàéëúò ñ ëè÷íà ïðîãðàìà" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Íå ïîêàçâàé ïðåìåñòåíèòå áëîêîâå" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Ïîêàæè âñè÷êè ïðåìåñòåíè áëîêîâå" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Ïîêàæè ïðåìåñòåíèòå áëîêîâå ñàìî îò òåêóùàòà ðàçëèêà" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Îòèäè íà ðàçëèêàòà ïîä êóðñîðà" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Îòèäè íà ðåä %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Çàáðàíåí" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Îò ôàéëîâàòà ñèñòåìà" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Îò MRU ñïèñúê" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Îñíîâåí" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Ðåñóðñè" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ñêðèé ëåíòàòà ñ èíñòðóìåíòè" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Ïîêàæè ìàëêà ëåíòà ñ èíñòðóìåíòè" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Ïîêàæè ãîëÿìà ëåíòà ñ èíñòðóìåíòè" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index d7d287cec..3cc0d814a 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -327,7 +327,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Buit >" @@ -469,7 +469,7 @@ msgstr "Desempaquetament &autom #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -533,7 +533,7 @@ msgstr "Finestres en &cascada" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -861,7 +861,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "" @@ -1465,37 +1465,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Tot el contingut" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Contingut en un cop d'ull" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Data de modificació" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Data de modificació i mida" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Mida" @@ -1527,7 +1527,7 @@ msgstr "Visiteu la plana web del WinMerge!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "D'acord" @@ -1699,14 +1699,14 @@ msgid "&Versioning System:" msgstr "Sistema de control de &versions" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Camí al cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "" @@ -1849,7 +1849,7 @@ msgid "&Find Next" msgstr "&Següent" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&D'acord" @@ -1895,7 +1895,7 @@ msgid "Replace &All" msgstr "Su&bstitueix-ho tot" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "" @@ -1947,7 +1947,7 @@ msgid "Remove" msgstr "Suprimeix" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "" @@ -1976,7 +1976,7 @@ msgstr "L #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "" @@ -2027,13 +2027,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Predeterminats" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistema" @@ -2174,7 +2175,7 @@ msgid "Description:" msgstr "&Descripció:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "&Atura" @@ -2236,7 +2237,7 @@ msgid "&Go To" msgstr "&Vés-hi" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Comparació" @@ -2287,7 +2288,7 @@ msgid "Filter Comments" msgstr "&Filtra els comentaris" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "" @@ -2439,7 +2440,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Pàgina de codis" @@ -2722,7 +2723,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtre privat (només per a l'usuari actual)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Suport d'arxivament" @@ -2773,7 +2774,7 @@ msgid "Files:" msgstr "Fitxers:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Diferents" @@ -2810,7 +2811,7 @@ msgid "Right:" msgstr "Dreta:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Idèntics" @@ -2863,7 +2864,7 @@ msgid "&Apply" msgstr "&Aplica" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Cancel·la" @@ -2969,7 +2970,7 @@ msgid "Save..." msgstr "De&sa..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Fitxers de còpia de seguretat" @@ -3010,7 +3011,7 @@ msgid "A&ppend timestamp" msgstr "A&fegeix una marca horària" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Confirmació de còpia" @@ -3051,7 +3052,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3087,8 +3088,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Directori" @@ -3124,69 +3125,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binari" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040304e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x403, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Preparat" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3195,12 +3229,12 @@ msgstr "" "Crea un document nou\n" "Nou (Control-N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3209,7 +3243,7 @@ msgstr "" "Obre un document existent\n" "Obrir (Control+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3218,7 +3252,7 @@ msgstr "" "Tanca el document actiu\n" "Tanca" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3227,7 +3261,7 @@ msgstr "" "Desa el document actiu\n" "Desa (Control+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3236,7 +3270,7 @@ msgstr "" "Desa el document actiu amb un nom nou\n" "Anomena i desa" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3245,7 +3279,7 @@ msgstr "" "Canvia les opcions d'impressió\n" "Format de pàgina" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3254,7 +3288,7 @@ msgstr "" "Canvia la impressora i les opcions d'impressió\n" "Configuració d'impressió" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3263,7 +3297,7 @@ msgstr "" "Imprimeix el document actiu\n" "Imprimeix" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3272,27 +3306,27 @@ msgstr "" "Visualitza pàgines senceres\n" "Visualització prèvia de la impressió" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Torna a fer visibles tots els elements amagats" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3301,32 +3335,32 @@ msgstr "" "Obre un fitxer de projecte\n" "Fitxer de projecte (Control+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "S'ha produït un error desconegut en intentar obrir un fitxer de projecte" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "S'ha produït un error desconegut en intentar desar un fitxer de projecte" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Fitxer de projecte" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "El fitxer de projecte s'ha carregat amb èxit." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "El fitxer de projecte s'ha desat amb èxit." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3335,7 +3369,7 @@ msgstr "" "Desa els camins i les opcions actuals a un fitxer de projecte\n" "Desa fitxer de projecte" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3344,7 +3378,7 @@ msgstr "" "Visualitza informació del programa, número de versió i copyright\n" "Quant a" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3353,27 +3387,27 @@ msgstr "" "Surt de l'aplicació i us demana que deseu els documents\n" "Surt" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Obre aquest document" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3382,7 +3416,7 @@ msgstr "" "Canvia a la següent subfinestra\n" "Subfinestra següent" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3391,7 +3425,7 @@ msgstr "" "Canvia de nou a la subfinestra anterior\n" "Subfinestra prèvia" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3400,7 +3434,7 @@ msgstr "" "Organitza les finestres perquè se sobreposin\n" "Finestres en cascada" -#: Merge.rc:2112 +#: Merge.rc:2126 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3409,7 +3443,7 @@ msgstr "" "Organitza les finestres en mosaic\n" "Finestres en mosaic" -#: Merge.rc:2113 +#: Merge.rc:2127 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3418,7 +3452,7 @@ msgstr "" "Organitza les finestres en mosaic\n" "Finestres en mosaic" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3427,7 +3461,7 @@ msgstr "" "Copia els elements seleccionats al Porta-retalls\n" "Copia" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3436,7 +3470,7 @@ msgstr "" "Elimina els elements seleccionats i els copia al Porta-retalls\n" "Retalla" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3445,7 +3479,7 @@ msgstr "" "Cerca el text especificat\n" "Cerca" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3454,7 +3488,7 @@ msgstr "" "Insereix el contingut del Porta-retalls\n" "Enganxa" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3463,7 +3497,7 @@ msgstr "" "Repeteix la darrera acció\n" "Repeteix" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3472,7 +3506,7 @@ msgstr "" "Substitueix un text específic per un altre de diferent\n" "Substitueix" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3481,7 +3515,7 @@ msgstr "" "Selecciona el document sencer\n" "Selecciona-ho tot" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3490,7 +3524,7 @@ msgstr "" "Desfà la darrera acció\n" "Desfés (Control+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3499,7 +3533,7 @@ msgstr "" "Refà la darrera acció desfeta\n" "Refés (Control+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3508,7 +3542,7 @@ msgstr "" "Mostra o amaga la barra d'eines\n" "Barra d'eines" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3517,7 +3551,7 @@ msgstr "" "Mostra o amaga la barra d'estat\n" "Barra d'estat" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3526,62 +3560,62 @@ msgstr "" "Mostra o amaga la barra de tabulacions\n" "Barra de tabulacions" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Canvia la mida de la finestra" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Canvia la posició de la finestra" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Redueix la finestra a una icona" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Engrandeix la finestra a la mida màxima" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Canvia a la següent finestra de document" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Canvia a la finestra de document prèvia" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Tanca la finestra activa i demana per a desar el document" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Restaura la finestra a la mida normal" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Activa la llista de tasques" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Activa aquesta finestra" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3590,170 +3624,170 @@ msgstr "" "Tanca el mode de visualització prèvia\n" "Tanca" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Preserva els caracters de salt de línia originals" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Clica amb el botó dret al camí a copiar" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 "" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Avorta" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Reintenta" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignora-ho &tot" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Sí" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Sí a &tot" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "No a t&ot" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Omet" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Omet-ho &tot" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "No tornis amostrar aquest missatge." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "No tornis a preguntar-ho." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Control de versions" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Diferències" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "D'esquerra:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "A esquerra:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "De dreta:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "A dreta:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versió %1 - Català" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opcions (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Tots el quadres de missatges es mostraran altre cop." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3764,84 +3798,84 @@ msgstr "" "\n" "Useu valors entre 1 i %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Obre" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programes|*.exe;*.bat;*.cmd|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fitxers de projecte del WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fitxers d'options de configuració (*.ini)|*.ini|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fitxers de text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fitxers HTML (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fitxers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Ubicació" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Descripció" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Selecciona un nom de fitxer per al nou filtre" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fitxer (*.flt)|*.flt|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3854,7 +3888,7 @@ msgstr "" "Copieu el fitxer %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3867,7 +3901,7 @@ msgstr "" "\n" "Verifiqueu que la carpeta existeix i s'hi pot escriure." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3878,7 +3912,7 @@ msgstr "" "\n" "Seleccioneu la carpeta de filtres a opcions/sistema." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3891,12 +3925,12 @@ msgstr "" "\n" "Potser el fitxer és només de lectura?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Localitza el fitxer de filtre a instal·lar" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3907,273 +3941,273 @@ msgstr "" "\n" "No s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Expressió regular" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultats de la comparació dels directoris" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Comparació de fitxers" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Fitxer esquerre sense títol" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Fitxer dret sense títol" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "S'estan examinant els fitxers..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "S'està obrint la selecció" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "S'està copiant de l'esquerra a la dreta" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "S'està copiant de la dreta a l'esquerra" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "S'està copiant tot a l'esquerra" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "S'està copiant tot a la dreta" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "S'estan copiant els fitxers..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "S'estan suprimint els fitxers..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "S'estan movent els fitxers..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Creant l'informe..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Línia: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Combina" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Diferència %1 de %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "S'han trobat %1 diferènces" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "S'ha trobat una diferència" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Element %1 de %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Elements: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecciona dos directoris o fitxers existents per a comparar" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Selecció de directori" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecciona dos directoris o dos fitxers per a comparar." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "El camí de l'esquerra és invalid!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "El camí de la dreta és invalid!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Ambdós camins són invalids!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Tria dos fitxers per a habilitar la selecció del desempaquetador." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "No es pot comparar un fitxer i un directori!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "El fitxer no s'ha trobat: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "El fitxer no s'ha desempaquetat: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4186,37 +4220,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Anomena i desa" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Voleu desar els canvis a %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "El fitxer %1 està marcat com a només de lectua. Voldríeu substituir el fitxer només de lectura? (No es tracta de desar amb un nom nou.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Hi ha hagut un error en crear una còpia de seguretat del fitxer" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4229,7 +4263,7 @@ msgstr "" "\n" "Voleu continuar tot i així?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4246,7 +4280,7 @@ msgstr "" "\t-desar-lo amb un nom diferent (premeu D'acord)\n" "\t-avortar l'operació actual (Premeu Cancel·lar)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4261,7 +4295,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4276,7 +4310,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4291,7 +4325,7 @@ msgstr "" "\n" "Voleu sobreescriure el fitxer?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4300,32 +4334,32 @@ msgstr "" "%1\n" "està marcat com a només de lectura. Voleu substituir l'element només de lectura?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Anomena i desa el fitxer de l'esquerra" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Anomena i desa el fitxer de la dreta" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4336,42 +4370,42 @@ msgstr "" "\n" "Cal que refresqueu els documents abans de continuar." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Cal que especifiqueu el camí a un projecte del SourceSafe per tal de continuar (p.ex.: $/ElMeuProjecte)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Extreu (check-out) fitxers del VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "El sistema de control de versions ha retornat un error en extreure (check-out) el fitxer. No es pot continuar..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "S'ha produït un error en executar una ordre del sistema de control de versions." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La carpeta de treball del VSS i la ubicació del fitxer actual no concorden. Voleu continuar?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "No s'han trobat cap base de dades del VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Error del VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4382,7 +4416,7 @@ msgstr "" "Reviseu les especificacions de configuració de la vista emprada.\n" "Voleu desfer la operació d'extracció (check-out)?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4391,164 +4425,164 @@ msgstr "" "El sistema de control de versions ha retornat un error en intentar desfer l'extracció (check-out) del fitxer.\n" "Reviseu les especificacions de configuració de la vista emprada." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Cap" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (anterior al 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i posterior)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Separa a l'espai" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Separa a l'espai o puntuació" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copia l'element seleccionat al directori indicat" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copia l'element seleccionat en un directori a triar" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Suprimeix els elements seleccionats a l'esquerra" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Suprimeix els elements seleccionats a la dreta" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Suprimeix els element(s) seleccionat(s) a ambdues bandes" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Amaga el(s) element(s) seleccionat(s) (filtratge al vol)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Canvia el nom de l'element seleccionat a ambdós costats" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Dreta a esquerra (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Esquerra a dreta (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Dreta a esquerra (%1 de %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Esquerra a dreta (%1 de %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Esquerra a... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Dreta a... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Esquerra a... (%1 de %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Dreta a... (%1 de %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Esquerra (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Dreta (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Ambdós (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerra (%1 de %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Dreta (%1 de %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Ambdós (%1 de %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Costat esquerre - seleccioneu la carpeta de destinació:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Costat dret - seleccioneu la carpeta de destinació:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fitxers afectats)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 fitxers afectats)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4559,17 +4593,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Esteu segur que voleu copiar:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Esteu segur que voleu copiar %d elements:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4588,613 +4622,607 @@ msgstr "" "\n" "Actualitzeu la comparació." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Obre el fitxer de l'esquerra" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Obre el fitxer de l'esquerra en un editor extern" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Obre el fitxer de l'esquerra amb..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Obre el fitxer de la dreta" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Obre el fitxer de la dreta en un editor extern" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Obre el fitxer de la dreta amb..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "No s'ha pogut executar l'editor extern: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copia els noms dels fitxers al Porta-retalls" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copia el camí al fitxer de l'esquerra al Porta-retalls" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copia el camí al fitxer de la dreta al Porta-retalls" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copia els camins als fitxers d'ambdós costats al Porta-retalls" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "El format de l'arxiu és desconegut" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Afegeix els elements del costat esquerre a l'arxiu" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Afegeix els elements del costat dret a l'arxiu" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Afegeix els elements d'ambdós costats a l'arxiu" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Afegeix els elements diferents a l'arxiu (d'ambdós costats)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mou els fitxers seleccionats de l'esquerra al directori especificat" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mou els fitxers seleccionats de la dreta al directori especificat" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nom" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultat de la comparació" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Data esquerra" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Data dreta" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extensió" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Mida esquerra" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Mida dreta" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Mida dreta (breu)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Mida esquerra (breu)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Data de creació esquerra" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Data de creació dreta" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Fitxer més nou" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Versió del fitxer esquerra" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Versió del fitxer dreta" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Resultat breu" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atributs esquerra" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atributs dreta" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Salt de línia esquerra" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Salt de línia dreta" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Codificació esquerra" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Codificació dreta" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Diferències ignorades" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binari" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "No es pot comparar els fitxers" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Element avortat" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Fitxer omès" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Directori omès" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Només esquerra: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Només dreta: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Els fitxers binaris són idèntics" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Els fitxers binaris són diferents" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Els fitxers són diferents" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Només l'esquerre" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Només el dret" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps transcorregut: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 element seleccionat" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 elements seleccionats" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nom del fitxer o directori." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom del subdirectori quan s'incloguin els subdirectoris." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparació, en forma llarga." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Data de modificació del costat esquerre." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Data de modificació del costat dret." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Extensió del fitxer." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Mida en bytes del fitxer esquerre." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Mida en bytes del fitxer dret." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Mida del fitxer esquerre en format abreujat." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Mida del fitxer dret en format abreujat." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Data de creació del fitxer esquerre." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Data de creació del fitxer dret." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Diu quin costat te una data de modificació més recent." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versió del fitxer del costat esquerre, només per a alguns tipus de fitxer." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versió del fitxer del costat dret. només per a alguns tipus de fitxer." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Resultat breu de la comparació." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atributs del costat esquerre." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atributs del costat dret." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat esquerre" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat dret" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Codificació del costat esquerre." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Codificació del costat dret." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nombre de diferències ignorades al fitxer. Aquestes diferències són ignorades pel WinMerge i no es poden combinar." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nombre de diferències al fitxer. Aquest nombre no inclou les diferències ignorades.." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisc (*) si el fitxer és binari." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Compara %1 amb %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Llista delimitada per comes" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Llista delimitada per tabulacions" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML símple" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "XML símple" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "El fitxer d'informe ja existeix. Voleu sobreescriure'l?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5203,32 +5231,32 @@ msgstr "" "Hi ha hagut un error creant l'informe:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "L'informe s'ha creat satisfactòriament." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "El mateix fitxer és obert a ambdues subfinestres." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Els fitxers seleccionats són idèntics." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "S'ha produït un error en comparar els fitxers." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "No s'han pogut obrir els fitxers temporals. Comproveu els ajustos de camí temporal." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5243,22 +5271,22 @@ msgstr "" "\n" "Nota: Si voleu tractar els salts de línia sempre com a equivalents, especifiqueu l'opció 'Ignora diferències de salt de línia...' al quadre d'opcions (disponible des del menú Edita/Opcions...)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada és invàlida." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "No es poden obrir fitxers binaris a l'editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5269,168 +5297,168 @@ msgstr "" "En mostrar cada fitxer en la seva pròpia pàgina de codis millora la seva visualització però fa perillosa la combinació/còpia.\n" "Voleu tractar ambdós fitxers com si fossin en la pàgina de codis predeterminada del Windows (recomanat)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "S'ha perdut informació degut a errors de codificació: ambdós fitxers" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Sense diferències" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Diferència de línia" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "S'ha(n) substituït %1 cadena(s)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "No s'ha trobat la cadena \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copia el camí sencer del fitxer" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copia el nom del fixer" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Subfinestra d'ubicació" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Subfinestra de diferències" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "El pedaç s'ha generat satisfactòriament." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. no s'ha trobat l'element o aquest és un directori!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. no s'ha trobat l'element o aquest és un directori!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "El fitxer de pedaç ja existeix. El voleu sobreescriure?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 fitxers seleccionats]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "No s'ha pogut escriure al fitxer %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "El camí de sortida especificat no és un camí absolut: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Especifiqueu un fitxer de sortida" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No es pot crear un pedaç de fitxers binaris." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "No es pot crear un pedaç de directoris." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5441,12 +5469,12 @@ msgstr "" "\n" "Cal que no hi hagi cap fitxer pendent de salvar per tal de crear un pedaç." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existeix." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5457,7 +5485,7 @@ msgstr "" "Els components necessaris (7-zip i/o Merge7z*.dll) per al suport d'arxivament no s'han pogut trobar.\n" "Vegeu el manual per a més informació quan al suport per a arxivament i com habilitar-lo." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5466,7 +5494,7 @@ msgstr "" "\n" "Nota: La integració del 7-Zip està desabilitada des dels ajustos del WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5475,37 +5503,37 @@ msgstr "" "\n" "Nota: La integració del 7-Zip està restringida com a operació independent des dels ajustos del WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Trieu el fitxer per a exportar" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Trieu el fitxer per a importar" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "S'ha importat les opcions des del fitxer." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "S'ha exportat les opcions al fitxer." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "No s'ha pogut importar les opcions del fitxer." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "No s'ha pogut escriure les opcions al fitxer." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5513,157 +5541,157 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Barrejat" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Desa el fitxer de l'esquerra" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Desa el fitxer de la dreta" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Desa i anomena el fitxer de l'esquerra..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Desa i anomena el fitxer de la dreta..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Commuta entre els modes d'edició i el de combinació" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5672,12 +5700,12 @@ msgstr "" "Mostra i ajusta les propietats de codificació de fixter\n" "Propietats de codificació de fitxer" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5686,7 +5714,7 @@ msgstr "" "Selecciona l'àrea de diferència a la línia actual\n" "Diferència a la línia actual (F4)" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5695,7 +5723,7 @@ msgstr "" "Va fins a una línia o una diferència\n" "Vés a (Control+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5704,7 +5732,7 @@ msgstr "" "Especifica opcions del programa\n" "Opcions" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5713,37 +5741,37 @@ msgstr "" "Actualitza la visualització\n" "Actualitza (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copia les línies seleccionades al Porta-retalls afegint-hi els números de línia al inici de línia" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Activa/desactiva el punt d'interès" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Va al següent punt d'interès" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Va al punt d'interès anterior" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Esborra tots els punts d'interès" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5752,7 +5780,7 @@ msgstr "" "Visualitza els elements que singuin exactament iguals\n" "Mostra elements idèntics" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5761,7 +5789,7 @@ msgstr "" "Visualitza els elements que tinguin diferències\n" "Mostra elements diferents" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5770,7 +5798,7 @@ msgstr "" "Visualitza els elements existents únicament a l'esquerra\n" "Mostra elements únics de l'esquerra" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5779,7 +5807,7 @@ msgstr "" "Visualitza els elements existents únicament a la dreta\n" "Mostra elements únics de la dreta" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5788,7 +5816,7 @@ msgstr "" "Visualitza els elements binaris\n" "Mostra elements binaris" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5797,7 +5825,7 @@ msgstr "" "Visualitza els elements omesos\n" "Mostra elements omesos" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5806,7 +5834,7 @@ msgstr "" "Selecciona el tipus de lletra per a les visualitzacions de diferències\n" "Selecciona tipus de lletra per a diferències" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5815,42 +5843,42 @@ msgstr "" "Recupera el tipus de lletra del sistema per a la visualització de diferències\n" "Tipus de lletra del sistema" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Mostra els caràcters d'espais" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Mostra la subfinestra de diferències" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Mostra la subfinestra d'ubicació amb una image general dels fitxers" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra el quadre de diàleg d'estadístiques de comparació de carpeta" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Intercanvia la posició d'ambdues subfinestres" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5859,7 +5887,7 @@ msgstr "" "Mostra els números de línia\n" "Mostra els números de línia" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5868,7 +5896,7 @@ msgstr "" "Permet l'ajustament de paraules\n" "Ajusta les línies" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5877,117 +5905,117 @@ msgstr "" "Mostra els marges de selecció per a ambdós subfinestres\n" "Mostra els marges de selecció" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5996,7 +6024,7 @@ msgstr "" "Copia el text seleccionat al fitxer de la dreta\n" "Copia al fitxer de la dreta (Alt+Dreta)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6005,7 +6033,7 @@ msgstr "" "Copia el text seleccionat al fitxer de l'esquerra\n" "Copia al fitxer de l'esquerra (Alt+Esquerra)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6014,7 +6042,7 @@ msgstr "" "Copia la diferència a la dreta i avança a al següent\n" "Copia a la dreta i avança (Control+Alt+Dreta)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6023,7 +6051,7 @@ msgstr "" "Copia la diferència a l'esquerra i avança a la següent\n" "Copia a l'esquerra i avança (Control+Alt+Esquerra)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6032,7 +6060,7 @@ msgstr "" "Copia totes les diferènces al fitxer de la dreta\n" "Tot a la dreta" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6041,417 +6069,417 @@ msgstr "" "Copia totes les diferènces al fitxer de l'esquerra\n" "Tot a l'esquerra" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Suprimeix els elements seleccionats d'ambdós directoris" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Compara l'element seleccionat (compara el primer element en cas de selecció múltiple)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Tria i reordena les columnes de comparació de directoris" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Genera un fitxer de pedaços" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Tria i modifica els filtres" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genera un informe a partir dels resultats de comparació" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "L'usuari tria el desempaquetador (no hi ha desempaquetament en comparar directoris)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "El desempaquetador adaptat s'aplica a ambdós fitxers (només hi cal l'extensió en un fitxer)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Tria un desempaquetador per a editar aquest fitxer" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "No prediferencia (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Connectors suggerits" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Altres connectors" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarrega el connectoris i els torna a carregar (per a desenvolupadors)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Tanca totes les finestres obertes" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Treu informació de versió i configuració actuals del WinMerge en un fitxer de text" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Muntatge privat: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Ajustos del connector" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "No prediferenciïs" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediferencia quan sigui possible" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "No s'ha trobat el WSH - seqüències d'ordres .sct inhabilitades" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Obre el fitxer amb l'apliació registrada" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Obre el fitxer amb l'editor extern" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Obre el fitxer amb una aplicació particular" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "No mostra els blocs moguts" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostra només els blocs moguts des de la diferència actual" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Va fins a la diferència sota la busca" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Va fins a la línia %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Inhabilitat" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Des del sistema de fitxers" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Des de la llista de recents" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Amaga la barra d'eines" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Mostra la barra d'eines petita" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Mostra la barra d'eines gran" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index d297df008..ab9a03c18 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< ¿Õ >" @@ -470,7 +470,7 @@ msgstr " #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "°ïÖú(&H)" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Îļþ±àÂë(&F)..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "È«²¿ÄÚÈÝ" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "¿ìËÙÄÚÈÝ" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "ÐÞ¸ÄÈÕÆÚ" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "ÐÞ¸ÄÈÕÆÚºÍÎļþ´óС" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Îļþ´óС" @@ -1528,7 +1528,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "È·¶¨" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "°æ±¾¿ØÖÆϵͳ(&V)" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ·¾¶(&P):" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "³£¹æ" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "ÕÒÏÂÒ»¸ö(&F)" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "È·¶¨(&O)" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "È«²¿Ìæ»»(&A)" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "ɾ³ý" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "ÑÕÉ«" @@ -1977,7 +1977,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "ÎÄ×Ö" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "ĬÈÏ" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "ϵͳ" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "ÃèÊö:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Í£Ö¹" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "תµ½(&G)" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "¶Ô±È" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "¹ýÂË×¢ÊÍ" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "±à¼­Æ÷" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "´úÂëÒ³" @@ -2720,7 +2721,7 @@ msgid "Private Filter (only for current user)" msgstr "˽ÓйýÂËÆ÷(ֻΪµ±Ç°Óû§)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "ѹËõ°üÖ§³Ö" @@ -2771,7 +2772,7 @@ msgid "Files:" msgstr "Îļþ:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "²»Í¬" @@ -2808,7 +2809,7 @@ msgid "Right:" msgstr "ÓÒ²à:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "ÍêÈ«Ïàͬ" @@ -2861,7 +2862,7 @@ msgid "&Apply" msgstr "Ó¦ÓÃ(&A)" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "È¡Ïû(&C)" @@ -2967,7 +2968,7 @@ msgid "Save..." msgstr "±£´æ..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "±¸·ÝÎļþ" @@ -3008,7 +3009,7 @@ msgid "A&ppend timestamp" msgstr "Ìí¼Óʱ¼ä´Á(&P)" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "È·Èϸ´ÖÆ" @@ -3049,7 +3050,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3085,8 +3086,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Îļþ¼Ð" @@ -3122,69 +3123,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "¶þ½øÖÆ" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040903a8" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x804, 936" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "¾ÍÐ÷" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3193,12 +3227,12 @@ msgstr "" "н¨Ò»¸ö¿ÕÎĵµ\n" "н¨ (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3207,7 +3241,7 @@ msgstr "" "´ò¿ªÒ»¸öÏÖ´æÎļþ\n" "´ò¿ª (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3216,7 +3250,7 @@ msgstr "" "¹Ø±Õµ±Ç°Îļþ\n" "¹Ø±Õ" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3225,7 +3259,7 @@ msgstr "" "±£´æµ±Ç°Îļþ\n" "±£´æ (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3234,7 +3268,7 @@ msgstr "" "ÒÔÒ»¸öÐÂÃû³Æ±£´æµ±Ç°µÄÎļþ\n" "Áí´æΪ" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3243,7 +3277,7 @@ msgstr "" "¸ü¸Ä´òÓ¡Ñ¡Ïî\n" "°æÃæÉ趨" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3252,7 +3286,7 @@ msgstr "" "¸ü¸Ä´òÓ¡»úºÍ´òÓ¡Ñ¡Ïî\n" "´òÓ¡É趨" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3261,7 +3295,7 @@ msgstr "" "´òÓ¡µ±Ç°Îļþ\n" "´òÓ¡" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3270,27 +3304,27 @@ msgstr "" "Ô¤ÀÀ´òÓ¡µÄЧ¹û\n" "´òÓ¡Ô¤ÀÀ" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "ÖØÐÂÏÔʾËùÓÐÒþ²ØµÄÏîÄ¿" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3299,32 +3333,32 @@ msgstr "" "´ò¿ª¹¤³ÌÎļþ\n" "´ò¿ª¹¤³Ì (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "´ò¿ª¹¤³ÌÎļþʱ·¢Éúδ֪´íÎó" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "±£´æ¹¤³ÌÎļþʱ·¢Éúδ֪´íÎó" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "¹¤³ÌÎļþ" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "³É¹¦´ò¿ª¹¤³ÌÎļþ." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "³É¹¦±£´æ¹¤³ÌÎļþ." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3333,7 +3367,7 @@ msgstr "" "°Ñµ±Ç°µÄ·¾¶ºÍÑ¡Ïî±£´æµ½¹¤³ÌÎļþ\n" "±£´æ¹¤³ÌÎļþ" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3342,7 +3376,7 @@ msgstr "" "ÏÔʾ³ÌÐòÐÅÏ¢£¬°æ±¾ºÅÂëºÍ°æȨ\n" "¹ØÓÚ" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3351,27 +3385,27 @@ msgstr "" "Í˳öÓ¦ÓóÌÐò£»Ìáʾ±£´æÎļþ\n" "Í˳ö" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "´ò¿ªÕâ¸öÎļþ" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3380,7 +3414,7 @@ msgstr "" "Çл»µ½ÏÂÒ»¸ö´°¿Ú\n" "ÏÂÒ»´°¿Ú" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3389,7 +3423,7 @@ msgstr "" "Çл»µ½ÉÏÒ»¸ö´°¿Ú\n" "ÉÏÒ»´°¿Ú" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3398,7 +3432,7 @@ msgstr "" "ÅÅÁд°¿ÚÈÃËüÃDZ˴˸²¸Ç\n" "²ãµþ´°¿Ú" -#: Merge.rc:2112 +#: Merge.rc:2126 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3407,7 +3441,7 @@ msgstr "" "½«´°¿ÚºáÏòƽÆÌÏÔʾ\n" "ºáÏòƽÆÌ´°¿Ú" -#: Merge.rc:2113 +#: Merge.rc:2127 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3416,7 +3450,7 @@ msgstr "" "½«´°¿Ú×ÝÏòƽÆÌÏÔʾ\n" "×ÝÏòƽÆÌ´°¿Ú" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3425,7 +3459,7 @@ msgstr "" "¸´ÖÆÑ¡ÖÐÄÚÈݵ½¼ôÌù°å\n" "¸´ÖÆ" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3434,7 +3468,7 @@ msgstr "" "ɾ³ýÑ¡ÖÐÄÚÈݲ¢·ÅÖõ½¼ôÌù°å\n" "¼ôÇÐ" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3443,7 +3477,7 @@ msgstr "" "²éÕÒÖ¸¶¨ÎÄ×Ö\n" "²éÕÒ" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3452,7 +3486,7 @@ msgstr "" "²åÈë¼ôÌù°åÖеÄÄÚÈÝ\n" "Õ³Ìù" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3461,7 +3495,7 @@ msgstr "" "Öظ´ÉϴεĶ¯×÷\n" "Öظ´" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3470,7 +3504,7 @@ msgstr "" "²éÕÒÖ¸¶¨ÎÄ×Ö²¢Ìæ»»\n" "Ìæ»»" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3479,7 +3513,7 @@ msgstr "" "Ñ¡ÔñÈ«²¿ÄÚÈÝ\n" "È«Ñ¡" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3488,7 +3522,7 @@ msgstr "" "³·ÏúÉϴεĶ¯×÷\n" "³·Ïú" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3497,7 +3531,7 @@ msgstr "" "Öظ´Ö®Ç°Î´Íê³ÉµÄ¶¯×÷\n" "Öظ´" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3506,7 +3540,7 @@ msgstr "" "ÏÔʾ»òÒþ²Ø¹¤¾ßÀ¸\n" "Çл»¹¤¾ßÀ¸" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3515,7 +3549,7 @@ msgstr "" "ÏÔʾ»òÒþ²Ø״̬À¸\n" "Çл»×´Ì¬À¸" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3524,62 +3558,62 @@ msgstr "" "ÏÔʾ»òÒþ²Ø±êÇ©À¸\n" "Çл»±êÇ©À¸" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "×Ô¶¯µ÷Õû´°¸ñ´óС\nËø¶¨´°¸ñ" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "¸ü¸Ä´°¿Ú´óС" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "¸ü¸Ä´°¿ÚλÖÃ" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "ËõС´°¿ÚΪһ¸öͼ±ê" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "À©´ó´°¿Úµ½Õû¸öÆÁÄ»" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Çл»µ½ÏÂÒ»¸öÎļþ´°¿Ú" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Çл»µ½ÉÏÒ»¸öÎļþ´°¿Ú" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "¹Ø±Õµ±Ç°´°¿Ú²¢Ìáʾ±£´æ´ËÎļþ" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "½«´°¿Ú»¹Ô­³É±ê×¼µÄ´óС" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "ÆôÓÃÈÎÎñÇåµ¥" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "ÆôÓÃÕâ¸ö´°¿Ú" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3588,170 +3622,170 @@ msgstr "" "¹Ø±Õ´òÓ¡Ô¤ÀÀģʽ\n" "È¡ÏûÔ¤ÀÀ" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nnFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge Îļþ¶Ô±È" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "±£³Ö»»Ðзû²»±ä" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "ÓÒ¼üµã»÷·¾¶¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "¿ª·¢ÈËÔ±:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 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." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "ÖÐÖ¹(&A)" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "ÖØÊÔ(&R)" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "ºöÂÔ(&I)" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "ºöÂÔËùÓÐ(&A)" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "ÊÇ(&Y)" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "È«²¿¶¼ÊÇ(&A)" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "·ñ(&N)" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "È«²¿¶¼·ñ(&L)" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "¼ÌÐø(&C)" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Ìø¹ý(&S)" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "È«²¿Ìø¹ý(&A)" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "²»ÔÙÌáʾ´ËÏûÏ¢(&M)¡£" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "²»ÔÙѯÎÊ´ËÎÊÌâ(&Q)¡£" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "°æ±¾¿ØÖÆ" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "²»Í¬´¦" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "µ½:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "´Ó×ó²à:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "µ½×ó²à:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "´ÓÓÒ²à:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "µ½ÓÒ²à:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "°æ±¾ %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Ñ¡Ïî (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "ËùÓÐÌáʾÐÅÏ¢ÒѾ­ÖØÉèΪÏÔʾ¡£" -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3762,84 +3796,84 @@ msgstr "" "\n" "ÇëʹÓà 1 - %1 Ö®¼äµÄÖµ." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "´ò¿ª" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "³ÌÐò|*.exe;*.bat;*.cmd|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ¹¤³ÌÎļþ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "ÅäÖÃÎļþ (*.ini)|*.ini|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Îı¾Îļþ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Îļþ (*.htm,*.html)|*.htm;*.html|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Îļþ (*.xml)|*.xml|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Ãû³Æ" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "λÖÃ" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "¹ýÂËÆ÷" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "ÃèÊö" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Ñ¡ÔñйýÂËÆ÷µÄÎļþÃû" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "¹ýÂËÆ÷Îļþ (*.flt)|*.flt|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3851,7 +3885,7 @@ msgstr "" "\n" "Çë°ÑÎļþ %1 ¸´ÖƵ½ WinMerge/Filters Îļþ¼ÐÏÂ." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3864,7 +3898,7 @@ msgstr "" "\n" "ÇëÈ·ÈÏ´ËÎļþ¼Ð´æÔÚ²¢¿ÉÒÔдÈë." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3875,7 +3909,7 @@ msgstr "" "\n" "ÇëÔÚÑ¡Ïî/ϵͳÖÐÑ¡ÔñÒ»¸ö·¾¶." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3888,12 +3922,12 @@ msgstr "" "\n" "¸ÃÎļþÊÇ·ñΪֻ¶Á?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Ñ¡ÔñÒª°²×°µÄ¹ýÂËÆ÷Îļþ" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3904,273 +3938,273 @@ msgstr "" "\n" "»òÐíÊÇÎÞ·¨½«ÐÂÎļþ¸´ÖƵ½¹ýÂËÆ÷·¾¶?" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "¹ýÂËÆ÷ÎļþÒѾ­´æÔÚ. ÊÇ·ñ¸²¸ÇÔ­ÓйýÂËÆ÷?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "ÕýÔò±í´ïʽ" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Îļþ¼Ð¶Ô±È½á¹û" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Îļþ¶Ô±È" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "δÃüÃû ×ó" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "δÃüÃû ÓÒ" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "ËûÃǵÄÎļþ" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "ÎÒµÄÎļþ" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "ɨÃèÎļþ..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "´ò¿ªÑ¡Ôñ" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "ÕýÔÚ´Ó×ó²à¸´ÖƵ½ÓÒ²à" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "ÕýÔÚ´ÓÓҲิÖƵ½×ó²à" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½×ó²à" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ²à" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "ÕýÔÚ¸´ÖÆÎļþ..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "ÕýÔÚɾ³ýÎļþ..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "ÕýÔÚÒƶ¯Îļþ..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "´´½¨±¨¸æ..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "ÐÐ: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "ºÏ²¢" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "µÚ %1 ´¦²»Í¬(¹² %2 ´¦)" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "¹²ÕÒµ½ %1 ´¦²»Í¬" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "ÕÒµ½ 1 ´¦²»Í¬" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "Ö»¶Á" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "µÚ %1 ÏîÄ¿£¬¹² %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "ÏîÄ¿: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Ñ¡ÔñÁ½¸öÒÑ´æÔÚµÄÎļþ¼Ð»òÎļþ½øÐжԱÈ" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Ñ¡ÔñÎļþ¼Ð" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Ñ¡ÔñÒª½øÐжԱȵÄÁ½¸öÎļþ¼Ð»òÁ½¸öÎļþ¡£" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "×ó²à·¾¶²»´æÔÚ!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "ÓҲ෾¶²»´æÔÚ!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Á½¸ö·¾¶¶¼²»´æÔÚ!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Ñ¡ÔñÁ½¸öÎļþÒÔÆôÓýâ°ü³ÌÐò." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "²»ÄÜÔÚÎļþºÍÎļþ¼ÐÖ®¼ä½øÐжԱÈ!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "ÕÒ²»µ½Îļþ: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Îļþδ½â°ü: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4183,37 +4217,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "½âÎö³åÍ»Îļþʱʧ°Ü" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Îļþ\n%1\n²»ÊÇÒ»¸ö³åÍ»Îļþ" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Áí´æΪ" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "±£´æ¸ü¸Äµ½ %1£¿" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 ±ê¼ÇΪֻ¶Á¡£ÄúÏ£Íû¸²¸ÇÖ»¶ÁÎļþÂð£¿Ñ¡¡°·ñ¡±¿ÉÒÔÓÃÆäËüÎļþÃû±£´æ¡£" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "±¸·ÝÎļþʱ³ö´í" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4226,7 +4260,7 @@ msgstr "" "\n" "ÈÔÈ»¼ÌÐøÂð£¿" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4243,7 +4277,7 @@ msgstr "" "\t-ÓÃÆäËüÎļþÃû±£´æ(µã»÷¡°È·¶¨¡±)\n" "\t-ÖÐÖ¹µ±Ç°²Ù×÷(µã»÷¡°È¡Ïû¡±)" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4258,7 +4292,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4273,7 +4307,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4288,7 +4322,7 @@ msgstr "" "\n" "Òª¸²¸ÇÒѱ»Ð޸ĵÄÎļþÂð£¿" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4297,32 +4331,32 @@ msgstr "" "%1\n" "Îļþ±ê¼ÇΪֻ¶Á¡£ÄúÒª¸²¸ÇÖ»¶ÁµÄÎļþÂð£¿" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "×ó²àÎļþÁí´æΪ" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "ÓÒ²àÎļþÁí´æΪ" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4333,42 +4367,42 @@ msgstr "" "\n" "ÇëË¢ÐÂÎĵµºóÔÙ¼ÌÐø¡£" -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺 $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "´ÓVSSÖÐÇ©³öÎļþ..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "ÔÚÇ©³ö(Checkout)Îļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÒ»¸ö´íÎó¡£ÎÞ·¨¼ÌÐø..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Ö´Ðа汾¿ØÖÆϵͳÃüÁîʱ³ö´í¡£" -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¹¤×÷Îļþ¼Ð(Working Folder)Ó뵱ǰÎļþλÖò»·û¡£ÊÇ·ñ¼ÌÐø£¿" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "δÕÒµ½ VSS Êý¾Ý¿â£¡" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "VSS ·µ»Ø´íÎó:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4379,7 +4413,7 @@ msgstr "" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷.\n" " ³·ÏúÇ©³ö²Ù×÷Âð?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4388,164 +4422,164 @@ msgstr "" "ÔÚ³¢ÊÔ³·ÏúÇ©³öÎļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÁËÒ»¸ö´íÎó.\n" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "ÎÞ" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ÒÔÇ°°æ±¾)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ¼°ÒÔºó°æ±¾)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "ÒÔ¿Õ°×·Ö¸ô" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÒÔ¿Õ°×»ò±êµã·Ö¸ô" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "½«Ñ¡ÖеÄÏîÄ¿¸´ÖƵ½ÓÒ²àÎļþ¼Ð" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "½«Ñ¡ÖеÄÏîÄ¿¸´ÖƵ½Ö¸¶¨µÄÎļþ¼Ð" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "ɾ³ý×ó²àÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "ɾ³ýÓÒ²àÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "ɾ³ýÁ½²àÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Òþ²ØÑ¡ÖеÄÏîÄ¿(¼´Ê±¹ýÂË)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "ΪÁ½²àÑ¡ÖеÄÏîÄ¿¸ÄÃû" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "ÓҲൽ×ó²à (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "×ó²àµ½ÓÒ²à (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "ÓҲൽ×ó²à (%1 ¹²%2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "×ó²àµ½ÓÒ²à (%1 ¹²%2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "×ó²àµ½... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "ÓҲൽ... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "×ó²àµ½... (%1 ¹²%2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "ÓҲൽ... (%1 ¹²%2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "×ó²à (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "ÓÒ²à (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Á½²à (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "×ó²à (%1 ¹²%2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "ÓÒ²à (%1 ¹²%2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Á½²à (%1 ¹²%2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "×ó²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "ÓÒ²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(Ó°Ïì %1 ¸öÎļþ)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Ó°Ïì %2 ÎļþÖÐµÄ %1 ¸ö)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4557,17 +4591,17 @@ msgstr "" "%1\n" "Âð£¿" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆÂð:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆ %d ¸öÏîÄ¿Âð:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4586,613 +4620,607 @@ msgstr "" "\n" "ÇëˢбȽϴ°¿Ú." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "´ò¿ª×ó²àÎļþ" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ª×ó²àÎļþ" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ª×ó²àÎļþ ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "´ò¿ªÓÒ²àÎļþ" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ªÓÒ²àÎļþ" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ªÓÒ²àÎļþ ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íⲿ±à¼­Æ÷ÔËÐÐʧ°Ü: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "½«ÎļþÃû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "½«×ó²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "½«ÓÒ²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "½«Á½²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "δ֪µÄѹËõ°ü¸ñʽ" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "´Ó×ó²àÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "´ÓÓÒ²àÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "´ÓÁ½²àÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "½«Á½²àÖв»ÏàͬµÄÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "½«×ó²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "½«ÓÒ²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "ÎļþÃû³Æ" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "¶Ô±È½á¹û" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "×ó²àÈÕÆÚ" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "ÓÒ²àÈÕÆÚ" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "À©Õ¹Ãû" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "×ó²àÎļþ´óС" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "ÓÒ²àÎļþ´óС" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "ÓÒ²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "×ó²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "×ó²à½¨Á¢Ê±¼ä" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "ÓҲཨÁ¢Ê±¼ä" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "½ÏеÄÎļþ" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "×ó²àÎļþ°æ±¾" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "ÓÒ²àÎļþ°æ±¾" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "¼ò¶ÌµÄ½á¹û" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "×ó²àÊôÐÔ" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "ÓÒ²àÊôÐÔ" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "×ó²à»»Ðзû" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "ÓҲ໻Ðзû" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "×ó²àÎļþ±àÂë" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "ÓÒ²àÎļþ±àÂë" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "ºöÂԵIJ»Í¬´¦" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "¶þ½øÖÆ" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "ÎÞ·¨¶Ô±ÈÎļþ" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "ÏîÄ¿È¡Ïû" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "ÎļþÒÑÌø¹ý" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Îļþ¼ÐÒÑÌø¹ý" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "½öÔÚ×ó²à: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "½öÔÚÓÒ²à: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "¶þ½øÖÆÎļþÍêÈ«Ïàͬ" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "¶þ½øÖÆÎļþ²»Í¬" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Îļþ²»Í¬" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Ö»´æÔÚ×ó²à" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Ö»´æÔÚÓÒ²à" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "´íÎó" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ö´ÐÐʱ¼ä: %ld ºÁÃë" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "Ñ¡ÔñÁË 1 ¸öÏîÄ¿" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "Ñ¡ÔñÁË %1 ¸öÏîÄ¿" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "ÎļþÃû»òÎļþ¼ÐÃû¡£" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Ëù´¦µÄ×ÓÎļþ¼ÐÃû¡£" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "¶Ô±È½á¹û£¬½Ï³¤µÄ¸ñʽ¡£" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "×ó²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "ÓÒ²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "ÎļþµÄÀ©Õ¹Ãû¡£" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "×ó²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "ÓÒ²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "×ó²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "ÓÒ²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "×ó²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "ÓÒ²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "ÏÔʾ³öÄıßÊǽÏÍíÐ޸ĹýµÄ¡£" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "×ó²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "ÓÒ²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "¶Ì¸ñʽµÄ¶Ô±È½á¹û¡£" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "×ó²àµÄÊôÐÔ¡£" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "ÓÒ²àµÄÊôÐÔ¡£" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "×ó²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "ÓÒ²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "×ó²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "ÓÒ²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "±»ÂÔ¹ýµÄ²»Í¬Êý. ÓÉWinMergeºöÂԵIJ»Í¬, ÎÞ·¨¶ÔËüÃǽøÐкϲ¢." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÎļþÖеIJ»Í¬Êý. ²»°üÀ¨ºöÂԵIJ»Í¬." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "ÔÚ¶þ½øÖÆÎļþ´¦ÏÔʾÐǺÅ(*)¡£" -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "¶Ô±È %1 ºÍ %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "¶ººÅ·Ö¸ôµÄÁбí" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "ÖƱí·û·Ö¸ôµÄÁбí" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "¼òµ¥HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "¼òµ¥XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "±¨¸æÎļþÒѾ­´æÔÚ£¬Òª¸²¸ÇÂð£¿" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5201,32 +5229,32 @@ msgstr "" "´´½¨±¨¸æʱ³ö´í:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "³É¹¦´´½¨±¨¸æ¡£" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Á½²à´ò¿ªµÄÊÇͬһ¸öÎļþ¡£" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Ò»¸ö´íÎó·¢ÉúÓÚ¶Ô±ÈÎļþʱ¡£" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "ÎÞ·¨´´½¨ÁÙʱÎļþ¡£Çë¼ì²éÄúµÄÁÙʱ·¾¶ÉèÖá£" -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5241,22 +5269,22 @@ msgstr "" "\n" "Ìáʾ£ºÈç¹ûÄú×ÜÊǺöÂÔ»»ÐзûµÄ²»Í¬£¬ÇëÔÚ¡°±à¼­/Ñ¡ÏµÄ¡°¶Ô±È¡±Ò³Öй´Ñ¡¡°ºöÂÔ»»Ðзû²îÒ족¡£" -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Ñ¡ÖеÄÎļþ¼ÐÎÞЧ¡£" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "ÎÞ·¨Óñ༭Æ÷´ò¿ª¶þ½øÖÆÎļþ¡£" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "Õâ¸öÎļþ¼ÐÖ»´æÔÚÓÚÒ»²àËùÒÔÎÞ·¨´ò¿ª¡£\n\nÊÇ·ñÒªÔÚÁíÒ»²à´´½¨Ò»¸ö¶ÔÓ¦µÄÎļþ¼Ð£º\n%1\n²¢ÇÒ´ò¿ªÕâÁ½¸öÎļþ¼Ð£¿" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5267,168 +5295,168 @@ msgstr "" "·Ö±ðÒÔ²»Í¬´úÂëÒ³ÏÔʾ½«»áÓнϺõÄЧ¹û£¬µ«ÊǺϲ¢/¸´ÖÆ»áÓÐΣÏÕ¡£\n" "ÄúÒªÒÔWindowsĬÈϵĴúÂëÒ³ÏÔʾÁ½¸öÎļþÂð(ÍƼö)£¿" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ÓÉÓÚ×Ö·û±àÂë´íÎóÔì³ÉÁ½¸öÎļþÐÅÏ¢¶ªÊ§" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "ûÓв»Í¬" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "ÐÐÄÚ²»Í¬" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£" -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÎÞ·¨²éÕÒ×Ö·û´®¡¸%s¡¹" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "¸´ÖÆÈ«Ãû" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "¸´ÖÆÎļþÃû" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "λÖÃʾÒâ" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "²»Í¬´¦ÏÔʾ" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "³É¹¦Ð´ÈëpatchÎļþ¡£" -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "patchÎļþÒѾ­´æÔÚ£¬ÄúÒª¸²¸ÇËüÂð£¿" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[Ñ¡ÖÐ %1 ¸öÎļþ]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "ÆÕͨ" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "ÉÏÏÂÎÄ" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "ͳһ" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "ÎÞ·¨Ð´ÈëÎļþ %1¡£" -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ö¸¶¨µÄ·¾¶²»ÊǾø¶Ô·¾¶: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "ÇëÖ¸¶¨Êä³öÎļþ" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ÎÞ·¨Îª¶þ½øÖÆÎļþ´´½¨ patch¡£" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "ÎÞ·¨ÎªÎļþ¼Ð´´½¨ patch¡£" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5439,12 +5467,12 @@ msgstr "" "\n" "´´½¨ patch ÒªÇóÎļþÖÐûÓÐδ±£´æµÄ¸Ä¶¯¡£" -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Îļþ¼Ð²»´æÔÚ¡£" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5456,7 +5484,7 @@ msgstr "" "ûÕÒµ½Ö§³ÖѹËõ°üËùÐèÒªµÄ×é¼þ(7-zip »ò Merge7z*.dll)¡£\n" "Çë²é¿´ÊÖ²á»ñµÃÓйØѹËõ°üÖ§³Ö¼°ÈçºÎÆôÓõĸü¶àÐÅÏ¢¡£" -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5465,7 +5493,7 @@ msgstr "" "\n" "×¢Òâ: 7-Zip ¼¯³É¹¦ÄÜÔÚ WinMerge µÄÉèÖÃÖб»½ûÓÃ." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5474,37 +5502,37 @@ msgstr "" "\n" "×¢Òâ: 7-Zip ¼¯³É¹¦ÄÜÔÚ WinMerge µÄÉèÖÃÖÐÏÞÖÆΪµ¥¶À³ÌÐòʹÓÃ." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Ñ¡Ôñµ¼³öÎļþ" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Ñ¡Ôñµ¼ÈëÎļþ" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Ñ¡ÏîÒÑ´ÓÎļþµ¼Èë." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Ñ¡ÏîÒѾ­µ¼³öµ½Îļþ." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Ñ¡Ïîµ¼Èëʧ°Ü." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Ñ¡Ïîµ¼³öʧ°Ü." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5512,157 +5540,157 @@ msgid "" "Do you want to continue?" msgstr "ÄúÕýÒª¹Ø±Õ¶à¸ö¶Ô±È´°¿Ú¡£\nÊÇ·ñ¼ÌÐø£¿" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "»ìºÏ" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " ×Ö½Ú" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "±£´æ×ó²àµÄÎļþ" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "±£´æÓÒ²àµÄÎļþ" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "½«×ó²àÎļþ±£´æΪָ¶¨ÎļþÃû..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "½«ÓÒ²àÎļþ±£´æΪָ¶¨ÎļþÃû..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "½«»»Ðзûת»»ÎªWindowsģʽ" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "½«»»Ðзûת»»ÎªUnixģʽ" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "½«»»Ðзûת»»ÎªMacģʽ" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Ôڱ༭ģʽºÍºÏ²¢Ä£Ê½Ö®¼äÇл»" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5671,12 +5699,12 @@ msgstr "" "ÏÔʾ²¢ÐÞ¸ÄÎļþ±àÂëÊôÐÔ\n" "Îļþ±àÂëÊôÐÔ" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "´ò¿ª²¢½âÎö³åÍ»Îļþ" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5685,7 +5713,7 @@ msgstr "" "Ñ¡Öе±Ç°ÐÐÄÚ²»Í¬µÄ²¿·Ö\n" "µ±Ç°ÐÐÄÚ²»Í¬" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5694,7 +5722,7 @@ msgstr "" "תµ½ÐкŻòij´¦²»Í¬\n" "תµ½ (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5703,7 +5731,7 @@ msgstr "" "É趨³ÌÐòÑ¡Ïî\n" "Ñ¡Ïî" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5712,37 +5740,37 @@ msgstr "" "¸üÐÂÏÔʾ\n" "¸üР(F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "½«µ±Ç°Ñ¡ÖеÄÐи´ÖƵ½¼ôÌù°å²¢ÔÚÿÐÐÇ°Ìí¼ÓÐкÅ" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "ÉèÖÃ/È¡ÏûÊéÇ©" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "תµ½ÏÂÒ»¸öÊéÇ©" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "תµ½ÉÏÒ»¸öÊéÇ©" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Çå³ýËùÓÐÊéÇ©" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5751,7 +5779,7 @@ msgstr "" "ÏÔʾÍêÈ«ÏàͬµÄÏîÄ¿\n" "ÏÔʾÍêÈ«ÏàͬµÄÏîÄ¿" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5760,7 +5788,7 @@ msgstr "" "ÏÔʾº¬Óв»Í¬µÄÏîÄ¿\n" "ÏÔʾ²»Í¬µÄÏîÄ¿" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5769,7 +5797,7 @@ msgstr "" "ÏÔʾֻÔÚ×ó²à´æÔÚµÄÏîÄ¿\n" "ÏÔʾֻÔÚ×ó²àÏîÄ¿" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5778,7 +5806,7 @@ msgstr "" "ÏÔʾֻÔÚÓÒ²à´æÔÚµÄÏîÄ¿\n" "ÏÔʾֻÔÚÓÒ²àÏîÄ¿" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5787,7 +5815,7 @@ msgstr "" "ÏÔʾ¶þ½øÖÆÎļþ\n" "ÏÔʾ¶þ½øÖÆÎļþ" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5796,7 +5824,7 @@ msgstr "" "ÏÔʾÌø¹ýµÄÎļþ\n" "ÏÔʾÌø¹ýµÄÎļþ" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5805,7 +5833,7 @@ msgstr "" "ΪÊÓͼѡÔñ×ÖÌå\n" "Ñ¡ÔñÊÓͼ×ÖÌå" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5814,42 +5842,42 @@ msgstr "" "°ÑÊÓͼµÄ×ÖÌå»Ö¸´ÎªÏµÍ³×ÖÌå\n" "ĬÈÏ×ÖÌå" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "ÏÔʾ¿Õ°×ºÍÖƱí·û×Ö·û" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "ÏÔʾ/Òþ²Ø¶Ô±È´°¸ñ" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "λÖô°¸ñÏÔʾÎļþµÄ×ÜÌåÇé¿ö" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "ÏÔʾÎļþ¼Ð¶Ô±È½á¹ûͳ¼Æ" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Ñ¡Ôñµ±Ç°Óû§½çÃæµÄÓïÑÔ\nÓïÑÔ" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "ÒÔ²»Í¬ÑÕÉ«ÏÔʾÐÐÄڵIJ»Í¬\nÏÔʾÐÐÄÚ²»Í¬" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "½»»»×óÓÒ´°¸ñµÄλÖÃ" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5858,7 +5886,7 @@ msgstr "" "ÏÔʾÐкÅ\n" "ÏÔʾÐкÅ" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5867,7 +5895,7 @@ msgstr "" "ÔÊÐí×Ô¶¯»»ÐÐ\n" "×Ô¶¯»»ÐÐ" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5876,117 +5904,117 @@ msgstr "" "ÔÚÁ½¸ö´°¸ñÄÚÏÔʾÓÃÒÔÑ¡ÔñµÄÒ³±ß\n" "ÏÔʾѡÔñÒ³±ß" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Ôö´óÎÄ×ֳߴç" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "¼õСÎÄ×ֳߴç" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "°ÑÎÄ×ֳߴç»Ö¸´µ½Ä¬ÈÏ´óС" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "¹ö¶¯µ½ÉÏÒ»´¦²»Í¬\nÉÏÒ»´¦²»Í¬(Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "¹ö¶¯µ½ÏÂÒ»´¦²»Í¬\nÏÂÒ»´¦²»Í¬(Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "¹ö¶¯µ½µÚÒ»´¦²»Í¬\nµÚÒ»´¦²»Í¬(Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "¹ö¶¯µ½µ±Ç°²»Í¬´¦\nµ±Ç°²»Í¬(Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "¹ö¶¯µ½×îºóÒ»´¦²»Í¬\n×îºóÒ»´¦²»Í¬(Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5995,7 +6023,7 @@ msgstr "" "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½ÓÒ²àÎļþ\n" "¸´ÖÆÓÒ²à (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6004,7 +6032,7 @@ msgstr "" "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½×ó²àÎļþ\n" "¸´ÖÆ×ó²à (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6013,7 +6041,7 @@ msgstr "" "½«µ±Ç°²»Í¬´¦¸´ÖƵ½ÓҲಢǰ½øµ½ÏÂÒ»´¦²»Í¬\n" "¸´ÖƵ½ÓҲಢǰ½ø (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6022,7 +6050,7 @@ msgstr "" "½«µ±Ç°²»Í¬´¦¸´ÖƵ½×ó²à²¢Ç°½øµ½ÏÂÒ»´¦²»Í¬\n" "¸´ÖƵ½×ó²à²¢Ç°½ø (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6031,7 +6059,7 @@ msgstr "" "¸´ÖÆËùÓв»Í¬µ½ÓÒ²àÎļþ\n" "ËùÓе½ÓÒ²à" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6040,417 +6068,417 @@ msgstr "" "¸´ÖÆËùÓв»Í¬µ½×ó²àÎļþ\n" "ËùÓе½×ó²à" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "ɾ³ýÁ½²àÖÐÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "¶Ô±ÈÑ¡ÖеÄÏîÄ¿(µ±¶àѡʱ¶Ô±ÈµÚÒ»¸öÏîÄ¿)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Ñ¡Ôñ¼°ÅÅÐòÎļþ¼Ð¶Ô±ÈÏÔʾµÄÁÐ" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Éú³ÉÒ»¸öpatchÎļþ" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Ñ¡Ôñ¼°Ð޸ĹýÂËÆ÷" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "ÓɶԱȽá¹ûÉú³É±¨¸æ" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "ÈÃÓû§Ñ¡Ôñ½â°ü³ÌÐò (¶Ô±ÈÎļþ¼Ðʱ²»½øÐнâ°ü)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "ÔÚÁ½¸öÎļþÉÏÓ¦ÓÃÊʵ±µÄ½â°ü³ÌÐò (ÎļþÖ»ÐèÒªÓÐÊʵ±µÄÀ©Õ¹Ãû)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Ñ¡ÔñÒ»¸ö½â°ü³ÌÐòÀ´±à¼­Õâ¸öÎļþ" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò (ÆÕͨ)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "ÍƼöµÄ²å¼þ" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "ÆäËü²å¼þ" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "жÔØËùÓвå¼þ²¢ÖØÐÂÔØÈë (¿ª·¢ÕßÓÃ)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "Çл»½¹µãµ½ÏÂÒ»¸ö¿É¼ûµÄÎļþ\nÇл»µ½ÏÂÒ»Îļþ" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "¹Ø±ÕËùÓдò¿ªµÄ´°¿Ú" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "´ò¿ªWinMergeµÄ°ïÖú\nWinMerge°ïÖú" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "½«µ±Ç°µÄ WinMerge °æ±¾ÐÅÏ¢¼°ÅäÖÃÊä³öµ½Îı¾Îļþ" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "ÏÔʾGNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "´ò¿ª·¢ÐÐÎĵµ\n·¢ÐÐÎĵµ" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "Opens the translations website\nTranslations" msgstr "´ò¿ª·­ÒëÍøÕ¾\n·­Òë" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "²å¼þÉèÖÃ" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Èç¹û¿ÉÄÜ£¬½øÐÐÔ¤¶Ô±È" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH δÕÒµ½ - .sct ½Å±¾ÒѽûÓÃ" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<ÎÞ>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<×Ô¶¯>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "ÓÃϵͳĬÈϳÌÐò´ò¿ªÎļþ" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ªÎļþ" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ªÎļþ" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "²»ÏÔʾÒƶ¯Çø¿é" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "ÏÔʾËùÓÐÒƶ¯Çø¿é" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Ö»ÏÔʾµ±Ç°´¦µÄÒƶ¯Çø¿é" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "תµ½¹â±ê´¦²»Í¬" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "תµ½µÚ %1 ÐÐ(&O)" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "½ûÓÃ" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "ÓÉÎļþϵͳѡÔñ" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "ÓÉ×î½üʹÓõÄÎļþÑ¡Ôñ" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Åú´¦Àí" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "×ÊÔ´Îļþ" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Òþ²Ø¹¤¾ßÀ¸" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "ÏÔʾС¹¤¾ßÀ¸" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "ÏÔʾ´ó¹¤¾ßÀ¸" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 00785ca38..6441512a6 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< µL >" @@ -472,7 +472,7 @@ msgstr " #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -536,7 +536,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "»¡©ú(&H)" @@ -864,7 +864,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "ÀÉ®×½s½X(&F)..." @@ -1472,37 +1472,37 @@ msgid "&Compare method:" msgstr "Àɮפñ¸û¤è¦¡(&C)¡G" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "§¹¾ã¤º®e" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "§Ö³t¤º®e" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "­×§ï¤é´Á" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "­×§ï¤é´Á»P¤j¤p" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "¤j¤p" @@ -1534,7 +1534,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "½T©w" @@ -1706,14 +1706,14 @@ msgid "&Versioning System:" msgstr "ª©¥»ºÞ²z¨t²Î(&V)¡G" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ¸ô®|(&P)¡G" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "¤@¯ë" @@ -1858,7 +1858,7 @@ msgid "&Find Next" msgstr "§ä¤U¤@­Ó(&F)" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "½T©w(&O)" @@ -1904,7 +1904,7 @@ msgid "Replace &All" msgstr "¥þ³¡¨ú¥N(&A)" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1956,7 +1956,7 @@ msgid "Remove" msgstr "²¾°£" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "¦â±m" @@ -1985,7 +1985,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "«e´º¤å" @@ -2036,13 +2036,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "¹w³]­È" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "¨t²Î" @@ -2183,7 +2184,7 @@ msgid "Description:" msgstr "´y­z¡G" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "°±¤î" @@ -2245,7 +2246,7 @@ msgid "&Go To" msgstr "²¾¦Ü(&G)" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "¤ñ¸û" @@ -2296,7 +2297,7 @@ msgid "Filter Comments" msgstr "¿z¿ï¾¹¤§µù" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "½s¿è¾¹" @@ -2448,7 +2449,7 @@ msgstr " #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "½s½X­¶" @@ -2744,7 +2745,7 @@ msgid "Private Filter (only for current user)" msgstr "­Ó¤H¿z¿ï¾¹(¶È¾A¥Î²{¦b¨Ï¥ÎªÌ)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "¤ä´©À£ÁY" @@ -2801,7 +2802,7 @@ msgid "Files:" msgstr "ÀɮסG" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "¤£¦P" @@ -2838,7 +2839,7 @@ msgid "Right:" msgstr "¥kÃä¡G" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "¥þ¦P" @@ -2891,7 +2892,7 @@ msgid "&Apply" msgstr "®M¥Î(&A)" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "¨ú®ø(&C)" @@ -2997,7 +2998,7 @@ msgid "Save..." msgstr "Àx¦s..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "³Æ¥÷ÀÉ®×" @@ -3038,7 +3039,7 @@ msgid "A&ppend timestamp" msgstr "ªþ¤W®É¶¡ÂW°O(&P)" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "½T»{½Æ»s" @@ -3079,7 +3080,7 @@ msgid "&Enable plugins" msgstr "±Ò¥Î¥~±¾(&E)" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "¨Ö¤JÀÉ®×Á`ºÞ¤¶­±" @@ -3115,8 +3116,8 @@ msgid "Add &Shell menu to context menu" msgstr "±N WinMerge ¿ï³æ¥[¨ì¥kÁä¿ï³æ(&S)" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "¸ê®Æ§¨" @@ -3152,69 +3153,102 @@ msgid "&Quick compare limit (MB):" msgstr "§Ö³t¤ñ¸û¤§Àɮפj¤p¤W­­ (MB)(&Q)¡G" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "¤G¶i¨î" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040403B6" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x404, 950" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "´Nºü" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3223,12 +3257,12 @@ msgstr "" "«Ø¥ßªÅ¥Õ¤å¥ó\n" "·s¤å¥ó (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3237,7 +3271,7 @@ msgstr "" "¶}±Ò²{¦s¤å¥ó\n" "¶}±Ò (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3246,7 +3280,7 @@ msgstr "" "Ãö³¬¥Ø«e½s¿è¤å¥ó\n" "Ãö³¬" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3255,7 +3289,7 @@ msgstr "" "Àx¦s¥Ø«e½s¿è¤å¥ó\n" "Àx¦s (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3264,7 +3298,7 @@ msgstr "" "¥H·s¦WºÙÀx¦s¥Ø«e½s¿è¤å¥ó\n" "¥t¦s·sÀÉ" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3273,7 +3307,7 @@ msgstr "" "Åܧó¦C¦L¿ï¶µ\n" "ª©­±³]©w" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3282,7 +3316,7 @@ msgstr "" "Åܧó¦Lªí¾÷©M¦C¦L¿ï¶µ\n" "¦C¦L³]©w" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3291,7 +3325,7 @@ msgstr "" "¦C¦L¥Ø«e½s¿è¤å¥ó\n" "¦C¦L" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3300,27 +3334,27 @@ msgstr "" "Åã¥Ü¾ã­¶\n" "¹wÄý¦C¦L" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "¨Ï©Ò¦³ÁôÂöµ¥Ø¦AÅã¥Ü¥X¨Ó" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "¤Á´«¾ðª¬¼Ò¦¡" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "®i¶}©Ò¦³¤l¸ê®Æ§¨" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "¦¬¦X©Ò¦³¤l¸ê®Æ§¨" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3329,32 +3363,32 @@ msgstr "" "¶}±Ò±M®×ÀÉ\n" "±M®×ÀÉ (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "¶}±Ò±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Àx¦s±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "±M®×ÀÉ" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "±M®×Àɦ¨¥\¸ü¤J¡C" -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "±M®×Àɦ¨¥\Àx¦s¡C" -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3363,7 +3397,7 @@ msgstr "" "Àx¦s¥Ø«e¸ô®|¤Î¿ï¶µ¦Ü±M®×ÀÉ\n" "Àx¦s±M®×ÀÉ" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3372,7 +3406,7 @@ msgstr "" "Åã¥Üµ{¦¡¸ê°T¡Aª©¥»¸¹½X©MµÛ§@Åv\n" "Ãö©ó" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3381,27 +3415,27 @@ msgstr "" "Â÷¶}À³¥Îµ{¦¡¡F´£¿ôÀx¦s¤å¥ó\n" "µ²§ô" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "¶}±Ò¦¹¤å¥ó" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3410,7 +3444,7 @@ msgstr "" "¤Á´«¨ì¤U¤@µøµ¡\n" "¤U¤@µøµ¡" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3419,7 +3453,7 @@ msgstr "" "¤Á´«¦^¤W¤@µøµ¡\n" "¤W¤@µøµ¡" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3428,7 +3462,7 @@ msgstr "" "Å|¸mµøµ¡\n" "Å|¸mµøµ¡" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3437,7 +3471,7 @@ msgstr "" "«DÅ|¸m¤W¤U±Æ¦Cµøµ¡\n" "¤W¤U¨Ã¦Cµøµ¡" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3446,7 +3480,7 @@ msgstr "" "«DÅ|¸m¥ª¥k±Æ¦Cµøµ¡\n" "¥ª¥k¨Ã¦Cµøµ¡" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3455,7 +3489,7 @@ msgstr "" "½Æ»s©Ò¿ï¨ì°Å¶Kï\n" "½Æ»s" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3464,7 +3498,7 @@ msgstr "" "°Å¤U©Ò¿ï¨ì°Å¶Kï\n" "°Å¤U" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3473,7 +3507,7 @@ msgstr "" "´M§ä«ü©w¤å¦r\n" "´M§ä" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3482,7 +3516,7 @@ msgstr "" "´¡¤J°Å¶K鷺®e\n" "¶K¤W" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3491,7 +3525,7 @@ msgstr "" "­«½Æ¤W¦¸ªº°Ê§@\n" "­«½Æ" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3500,7 +3534,7 @@ msgstr "" "¥H¤£¦P¤å¦r¨ú¥N«ü©w¤å¦r\n" "¨ú¥N" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3509,7 +3543,7 @@ msgstr "" "¿ï¨ú¾ã¥÷¤å¥ó\n" "¥þ¿ï" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3518,7 +3552,7 @@ msgstr "" "ºM¦^¤W¦¸°Ê§@\n" "´_­ì" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3527,7 +3561,7 @@ msgstr "" "¦A°µ¤W¦¸ªººM¦^\n" "¦A°µ" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3536,7 +3570,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂäu¨ã¦C\n" "±Ò³¬¤u¨ã¦C" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3545,7 +3579,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂꬺA¦C\n" "±Ò³¬ª¬ºA¦C" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3554,7 +3588,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂí¶ÅÒ¦C\n" "±Ò³¬­¶ÅÒ¦C" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3563,57 +3597,57 @@ msgstr "" "¦Û°Ê½Õ¾ãµ¡®æ¤j¤p\n" "Âê¦íµ¡®æ" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "§ó§ïµøµ¡¤j¤p" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "§ó§ïµøµ¡¦ì¸m" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "ÁY¤pµøµ¡¦¨¹Ï¥Ü" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "ÂX¤jµøµ¡¦¨¥þ¿Ã¹õ" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "¤Á´«¨ì¤U¤@¤å¥óµøµ¡" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "¤Á´«¨ì¤W¤@¤å¥óµøµ¡" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Ãö³¬¥Ø«e½s¿èµøµ¡¨Ã´£¿ôÀx¦s¤å¥ó" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "µøµ¡«ì´_¼Ð·Ç¤j¤p" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "±Ò¥Î¤u§@²M³æ" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "±Ò¥Î³o­Óµøµ¡" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3622,7 +3656,7 @@ msgstr "" "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n" "¨ú®ø¹wÄý" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3641,7 +3675,7 @@ msgstr "" "WinMerge.Àɮפñ¸û\n" "WinMerge Àɮפñ¸û" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3660,19 +3694,19 @@ msgstr "" "WinMerge.¸ê®Æ§¨¤ñ¸û\n" "WinMerge ¸ê®Æ§¨¤ñ¸û" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "«O¯d­ì©l EOL ¦r¤¸" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "¹«¥kÁäÂIÀ»«Ý½Æ»sªº¸ô®|" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3681,143 +3715,143 @@ msgstr "" "¬ãµoªÌ¡G\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 "µ´¤£«OÃҦۥѳnÅé WinMerge µL·å²«¡CÅwªï¦b¬Y¨Ç±ø¥ó¤U¦A´²µo¥¦¡F²Ó¸`¨£»¡©ú¿ï³æ¤¤ªº GNU ¤½¦@±ÂÅvÃÒ¡C" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "©ñ±ó(&A)" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "­«¸Õ(&R)" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "©¿²¤(&I)" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "¥þ³¡©¿²¤(&A)" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "¬O(&Y)" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "¥þ³¡¬Ò¬O(&A)" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "§_(&N)" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "¥þ³¡¬Ò§_(&L)" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "Ä~Äò(&C)" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "²¤¹L(&S)" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "¥þ³¡²¤¹L(&A)" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "¤£­n¦AÅã¥Ü³o­Ó°T®§(&M)" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "¤£­n¦A´£¥Ü³o­Ó°ÝÃD(&Q)" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "»yªk" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "ª©¥»±±¨î" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "®t²§" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "¨ì¡G" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "±q¥ªÃä¡G" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "¨ì¥ªÃä¡G" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "±q¥kÃä¡G" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "¨ì¥kÃä¡G" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "ª©¥» %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "¸U°ê½X" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "¿ï¶µ (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "©Ò¦³°T®§²°²{¦b·|¦AÅã¥Ü¡C" -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3828,85 +3862,85 @@ msgstr "" "\n" "½Ð¥Î­È 1 - %1¡C" -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "¶}±Ò" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "µ{¦¡|*.exe;*.bat;*.cmd|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ±M®×ÀÉ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "¿ï¶µÀÉ (*.ini)|*.ini|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text ÀÉ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÀÉ (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÀÉ (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "¦WºÙ" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "¦ì¸m" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "¿z¿ï¾¹" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "´y­z" # I suggest "Add new filter filename" instead. For it must not select a name, rather give one. -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "«Ø¥ß·s¿z¿ï¾¹ÀɦW" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Àɮ׿z¿ï¾¹ (*.flt)|*.flt|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3919,7 +3953,7 @@ msgstr "" "½Ð½Æ»sÀÉ®× %1 ¨ì WinMerge/Àɮ׿z¿ï¾¹-¸ê®Æ§¨¡G\n" "%2¡C" -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3932,7 +3966,7 @@ msgstr "" "\n" "½Ð½T©w¦³¸Ó¸ê®Æ§¨¡A¦Ó¥B¤¹³\¼g¤J¡C" -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3943,7 +3977,7 @@ msgstr "" "\n" "½Ð©ó¡u¿ï¶µ/¨t²Î¡v¤¤¿ï©wÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C" -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3956,12 +3990,12 @@ msgstr "" "\n" "¥¦¬O°ßŪÀÉ¡H" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "§ä¨ìÀɮ׿z¿ï¾¹ÀÉ¥H¦w¸Ë" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3972,17 +4006,17 @@ msgstr "" "\n" "¤£¯à½Æ»s·s¿z¿ï¾¹ÀɨìÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Àɮ׿z¿ï¾¹Àɤw¦s¦b¡CÂл\¤§¡H" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Ãþ«¬ªí¦¡" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3993,258 +4027,258 @@ msgstr "" "\n" "¦p¤£·Q²{¦b­«¾ã¡A¿ï¡u§_¡v¡A¥H«á¦A­«¾ã¡C" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "¦Ü SS.EXE ªº¸ô®|(&P)" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "¸ê®Æ§¨¤ñ¹ïµ²ªG" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Àɮפñ¹ï¤¤" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "¥¼³]¼ÐÃDªº¥ªÃä" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "¥¼³]¼ÐÃDªº¥kÃä" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "¥L­Ìªº(ÀÉ®×)" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "§Úªº(ÀÉ®×)" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "±½´yÀÉ®×..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "¶}±Ò¿ï¨ú" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "¥¿½Æ»s¥ªÃä¨ì¥kÃä" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "¥¿½Æ»s¥kÃä¨ì¥ªÃä" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "¥¿½Æ»s¥þ³¡¨ì¥ªÃä" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "¥¿½Æ»s¥þ³¡¨ì¥kÃä" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "¥¿½Æ»sÀÉ®×..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "¥¿§R°£ÀÉ®×..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "¥¿²¾°ÊÀÉ®×..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "¥¿²£¥Í³ø§i..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "ºM¦^¤W¦¸ªº¾Þ§@..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "¦A°µ¤W¦¸ªº¾Þ§@..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "¦æ¡G %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "¦X¨Ö" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "%2 ­Ó®t²§¤¤¤§²Ä %1" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "§ä¨ì %1 ­Ó®t²§" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "§ä¨ì 1 ­Ó®t²§" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "%2 ­Ó¶µ¥Ø¤§²Ä %1" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "¶µ¥Ø¡G%1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "¿ï¨ú¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "¸ê®Æ§¨¿ï¨ú" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "¿ï¨ú¨â­Ó¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï¡C" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "¥ªÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "¥kÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "¨âÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¿ï¨âÀÉ¥H±Ò¥Î¸Ñ¥]¾¹¿ï¨ú¡C" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "µLªk¤ñ¸ûÀɮשM¸ê®Æ§¨¡I" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "§ä¤£¨ìÀɮסG%1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "¥¼¸Ñ¥]ªºÀɮסG%1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4257,12 +4291,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "µLªk¸ÑªR½Ä¬ðÀÉ¡C" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4273,27 +4307,27 @@ msgstr "" "%1\n" "¤£¬O½Ä¬ðÀÉ¡C" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "¥t¦s·sÀÉ" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Àx¦s§ó§ï¨ì %1¡H" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 ¤w¼Ð°O¦¨°ßŪ¡C§A­nÂмg°ßŪÀɶܡH (§_¡A«h¥H·sÀɦWÀx¦s)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "³Æ¥÷Àɮ׮ɵo¥Í¿ù»~" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4306,7 +4340,7 @@ msgstr "" "\n" "¤´ÂÂÄ~Äò¶Ü¡H" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4323,7 +4357,7 @@ msgstr "" "\t-¥H¤£¦P¦WºÙÀx¦sÀÉ®× («ö¡u½T©w¡v)\n" "\t-©ñ±ó¥Ø«e¾Þ§@(«ö¡u¨ú®ø¡v)¡H" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4338,7 +4372,7 @@ msgstr "" "\n" "­nÀx¦s¸Ñ¥]ª©¦¨¥t¤@Àɮ׶ܡH" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4353,7 +4387,7 @@ msgstr "" "\n" "§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4368,7 +4402,7 @@ msgstr "" "\n" "­nÂмg¨º§ó·s¹LªºÀɮ׶ܡH" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4377,7 +4411,7 @@ msgstr "" "%1\n" "¤w¼Ð°O¦¨°ßŪ¡C¤´­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4392,22 +4426,22 @@ msgstr "" "\n" "­n­«·s¸ü¤J¥¦¶Ü¡H" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Àx¦s¥ªÃäÀɮ׬°" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Àx¦s¥kÃäÀɮ׬°" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4418,7 +4452,7 @@ msgstr "" "%1\n" "®ø¥¢¡C½ÐÀx¦sÀÉ®×°Æ¥»¦AÄ~Äò¡C" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4426,42 +4460,42 @@ msgid "" "Refresh documents before continuing." msgstr "¦p¥¼­«¾ãÀɮסAWinMerge ¤£¯à¨Ö¤J²§°Ê¡C" -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "¤@©w±o«ü©w¤@­Ó SourceSafe ±M®×¸ô®|¤~¯àÄ~Äò (¨Ò¦p¡G $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "¥Ñ VSS ¨ú¥XÀÉ®×..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "°e¦^§ï¹LÀɮɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡CµLªkÄ~Äò..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "°õ¦æª©¥»¨t²Î«ü¥O®Éµo¥Í¿ù»~¡C" -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS §@·~¸ê®Æ§¨©M¥Ø«eÀɮצì¸m¤£²Å¦X¡C­nÄ~Äò¶Ü¡H" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "§ä¤£¨ì VSS ¸ê®Æ®w¡I" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "VSS µo¥Í¿ù»~¡G" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4472,7 +4506,7 @@ msgstr "" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C\n" " ºM¦^¨ú¥X¡H" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4481,164 +4515,164 @@ msgstr "" "ºM¦^¨ú¥XÀɮ׮ɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡C\n" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "µL" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (¦­©ó 5.0 ª©)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ª©©M§ó±ßªºª©¥»)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "ªÅ¥Õ³B¤¤Â_" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "ªÅ¥Õ³B©Î¼ÐÂI³B¤¤Â_" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "½Æ»s¿ï¨ú¶µ¨ìnamed ¥Ø¿ý" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "½Æ»s¿ï¨ú¶µ¨ì¦Û­q¥Ø¿ý" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "§R°£¥ªÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "§R°£¥kÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "§R°£¨âÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "ÁôÂÿï¨ú¶µ¥Ø (¦Û°Ê¿z¿ï¾¹)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "¨âÃä¿ï¨ú¶µ¥Ø³£­«·s©R¦W" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "¥kÃä¨ì¥ªÃä (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "¥ªÃä¨ì¥kÃä (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "¥kÃä¨ì¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¥ªÃä¨ì¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "¥ªÃä¨ì... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "¥kÃä¨ì... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "¥ªÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "¥kÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "¥ªÃä (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "¥kÃä (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "¨âÃä (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "¨âÃä (%2 ¤§ %1)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "¥ªÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "¥kÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ¨ü¼vÅTÀÉ®×)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%2 ¨ü¼vÅTÀɮפ§ %1)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4649,17 +4683,17 @@ msgstr "" "\n" "%1¡H" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "½T©w­n½Æ»s¡G" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "½T©w­n½Æ»s %d ¶µ¥Ø¡G" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4678,613 +4712,607 @@ msgstr "" "\n" "½Ð­«¾ã¤ñ¸û¡C" -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "½T©w­n²¾°£¡G" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "½T©w­n²¾°£ %d ¶µ¥Ø¡G" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "½T»{²¾°£" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "¶}±Ò¥ªÃäÀÉ®×" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "¶}±Ò¥ªÃäÀɮרì¥~³¡½s¿è¾¹" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "¥H...¶}±Ò¥ªÃäÀÉ®×" -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "¶}±Ò¥kÃäÀÉ®×" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "¶}±Ò¥kÃäÀɮרì¥~³¡½s¿è¾¹" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "¥H...¶}±Ò¥kÃäÀÉ®×" -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "µLªk°õ¦æ¥~³¡½s¿è¾¹ %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "½Æ»sÀɦW¨ì°Å¶Kï" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "½Æ»s¥ªÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "½Æ»s¥kÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "½Æ»s¨âÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "¥ªÃ䤶­±¿ï³æ" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "¥kÃ䤶­±¿ï³æ" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "¥¼ª¾À£ÁY®æ¦¡" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "¥ªÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "¥kÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "¨âÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "¨âÃä¬Û²§¶µ¥Ø¥[¤J¨ìÀ£ÁYÀÉ" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "¥ªÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "¥kÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "ÀɮצWºÙ" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "¤ñ¹ïµ²ªG" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "¥ªÃä¤é´Á" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "¥kÃä¤é´Á" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "°ÆÀɦW" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "¥ªÃä¤j¤p" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "¥kÃä¤j¤p" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "¥kÃä¤j¤p (²)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "¥ªÃä¤j¤p (²)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "¥ªÃä«Ø¥ß®É¶¡" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "¥kÃä«Ø¥ß®É¶¡" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "¸û·sÀÉ®×" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "¥ªÃäÀɮת©¥»" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "¥kÃäÀɮת©¥»" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "²¦¡µ²ªG" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "¥ªÃäÄÝ©Ê" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "¥kÃäÄÝ©Ê" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "¥ªÃä EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "¥kÃä EOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "¥ªÃä½s½X" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "¥kÃä½s½X" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "©¿²¤ªº®t²§" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "¤G¶i¨î" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "µLªk¤ñ¸ûÀÉ®×" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "¤¤Â_ªº¶µ¥Ø" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "²¤¹LªºÀÉ®×" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "²¤¹Lªº¸ê®Æ§¨" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "¶È¥ªÃä¡G%1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "¶È¥kÃä¡G%1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "¤G¶i¨îÀɧ¹¥þ¬Û¦P" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "¤G¶i¨îÀɤ£¦P" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Àɮפ£¦P" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "¨â¸ê®Æ§¨¤£¦P" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "¶È¥ªÃä" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "¶È¥kÃä" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "¿ù»~" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "¤å¦rÀɤº®e¬Û¦P" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "¤å¦rÀɤº®e¤£¦P" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "¸g¹L®É¶¡¡G %ld ²@¬í" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "¤w¿ï¨ú 1 ­Ó¶µ¥Ø" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "¤w¿ï¨ú %1 ­Ó¶µ¥Ø" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "ÀɮצWºÙ©Î¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¥]¬A¤l¸ê®Æ§¨®É¤§¤l¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "¤ñ¸ûµ²ªG¡Aªø¦¡ªí³æ¡C" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "°ÆÀɦW¡C" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "¥ªÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "¥kÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "¥ªÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "¥kÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "¥ªÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "¥kÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "§iª¾¨ºÃ䦳¸û·sªº­×§ï¤é´Á¡C" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¥ªÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¥kÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "µu¦¡¤ñ¸ûµ²ªG¡C" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "¥ªÃäÄÝ©Ê¡C" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "¥kÃäÄÝ©Ê¡C" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "¥ªÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "¥kÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "¥ªÃä½s½X¡C" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "¥kÃä½s½X¡C" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "³Q©¿²¤ªºÀɮפ¤ªº®t²§­Ó¼Æ¡C¬J³Q©¿²¤¡A´N¤£¯à¦X¨Ö¡C" -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Àɮפ¤ªº®t²§­Ó¼Æ¡C¦¹¼Æ¤£¥]¬A³Q©¿²¤ªº®t²§¡C" -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¬O¤G¶i¨îÀÉ¡A´NÅã¥Ü¬P¸¹ (*)" -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "¤ñ¸û %1 ©M %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "³r¸¹¤À¹j¦Cªí" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "¸õ®æ¸¹¤À¹j¦Cªí" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "³æ¯Â HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "³æ¯Â XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "³ø§iÀɤw¸g¦s¦b¡CÂл\¤§¡H" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5293,32 +5321,32 @@ msgstr "" "²£¥Í³ø§i®Éµo¥Í¿ù»~¡G\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "¦¨¥\²£¥Í³ø§i¡C" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "¬Û¦PÀɮ׶}±Ò¨ì¨âÃä¡C" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "©Ò¿ïÀɮק¹¥þ¬Û¦P¡C" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "¤ñ¹ïÀɮ׮ɵo¥Í¿ù»~¡C" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "µLªk«Ø¥ß¼È¦sÀɮסC½ÐÀˬd¼È¦s¸ô®|¤§³]©w¡C" -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5333,17 +5361,17 @@ msgstr "" "\n" "ª`·N¡G¦p­n±N©Ò¦³´«¦æ¦r¤¸µø­Y¬Û¦P¡A±o¦b(½s¿è > ¿ï¶µ) ¿ï¶µ¹ï¸Ü²°¤§¡u¤ñ¸û¡v­¶ÅÒ³]©w¿ï¶µ¦¨¡u©¿²¤´«¦æ¦r¤¸¤§®t²§¡v¡C" -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "©Ò¿ïªº¸ê®Æ§¨µL®Ä¡C" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "½s¿è¾¹¤£¯à¶}±Ò¤G¶i¨îÀÉ¡C" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5358,7 +5386,7 @@ msgstr "" "%1\n" "¨ì¥t¤@Ãä¡AµM«á¶}±Ò¨â§¨¶Ü¡H" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5369,172 +5397,172 @@ msgstr "" "§Y¨Ïºû«ù¦U§O½X­¶·|¤À§O¬Ý¨ì¤å¦r¡A¦ý¦X¨Ö/½Æ»s·|¦³¦MÀI¡C\n" "­n¨Ï¥Î¬Û¦Pªº¹w³] windows ½s½X­¶¥h¬Ý¨âÃä¶Ü¡H(«Øij)" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "¦]½s½X°ÝÃD¾É­P¤º®eµLªk¥¿±`§e²{¡G¨â­ÓÀɮ׬Ҧp¦¹¡C" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "µL®t²§" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "¦æ¤º®t²§" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "¤w¨ú¥N %1 ­Ó¦r¦ê¡C" -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "§ä¤£¨ì \"%s\" ¦r¦ê" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "½Æ»s§¹¾ã¸ô®|" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "½Æ»sÀɦW" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" # also refer to line 5584 # ¦ì¸mµ¡®æ -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "»·±æµ¡®æ" # also refer to line 5578 # ®t²§µ¡®æ -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "ªñ¹îµ¡®æ" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "¸ÉºóÀɦ¨¥\¼g¤J¡C" -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "¸ÉºóÀɤw¦s¦b¡C­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 ­ÓÀɮפw¿ï¨ú]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "¤@¯ë" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "¯ßµ¸" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "¦P¤@¤Æ" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "µLªk¼g¤J¨ìÀÉ®× %1¡C" -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "«ü©wªº¿é¥X¸ô®|¤£¬Oµ´¹ï¸ô®|¡G%1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "«ü©w¤@­Ó¿é¥XÀÉ" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "µLªk±q¤G¶i¨îÀɫظɺóÀÉ¡C" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "µLªk±q¥Ø¿ý«Ø¸ÉºóÀÉ¡C" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5545,12 +5573,12 @@ msgstr "" "\n" "«Ø¸ÉºóÀÉ«e±o¥ýÀx¦sÀɤº©Ò¦³²§°Ê¡C" -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "¸ê®Æ§¨¤£¦s¦b¡C" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5561,7 +5589,7 @@ msgstr "" "§ä¤£¨ì¤ä´©À£ÁYªº©Ò¦³¥²­n¤¸¥ó (7-Zip ©M/©Î Merge7z*.dll)¡C\n" "½Ð°Ñ¦Ò¤â¥U¨ú±o§ó¦h¦³ÃöÀ£ÁY¤ä´©©M±Ò¥ÎÀ£ÁYªº¸ê°T¡C" -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5570,7 +5598,7 @@ msgstr "" "\n" "ª`·N¡GWinMerge ³]©w¤¤¤wÃö³¬ 7-Zip ¤§¾ã¦X¡C" -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5579,37 +5607,37 @@ msgstr "" "\n" "ª`·N¡GWinMerge ³]©w¤¤ 7-Zip ¤w³]¦¨¿W¥ß¹B§@¡C" -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "¿ï¨úÀÉ®×¥H¶×¥X" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "¿ï¨úÀÉ®×¥H¶×¤J" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "µLªk±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "µLªk¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5620,158 +5648,158 @@ msgstr "" "\n" "­nÄ~Äò¶Ü¡H" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "²V¦X" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Ãþ«¬" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "¸Ñ¥]¾¹" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "¥ý¦æ³B²z¾¹" # What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"? -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "½s¿è¾¹ÀHĶ§Y¦æ½X" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Àx¦s¥ªÃäÀÉ®×" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Àx¦s¥kÃäÀÉ®×" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Àx¦s¥ªÃäÀÉ®×¥H¦WºÙ..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Àx¦s¥kÃäÀÉ®×¥H¦WºÙ..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Âà´«¦æ§À¦r¤¸¬° Windows ¦¡" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Âà´«¦æ§À¦r¤¸¬° Unix ¦¡" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Âà´«¦æ§À¦r¤¸¬° Mac ¦¡" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "½s¿è©M¦X¨Ö¼Ò¦¡¤Á´«" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5780,12 +5808,12 @@ msgstr "" "À˵ø»P½Õ¾ãÀÉ®×½s½X\n" "ÀÉ®×½s½X" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "¶}±Ò¨Ã¸Ñ¨M½Ä¬ðÀÉ" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5794,7 +5822,7 @@ msgstr "" "¿ï¨ú¥Ø«e¦æ¤§®t²§³¡¥÷\n" "¥Ø«e¦æ¤§®t²§" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5803,7 +5831,7 @@ msgstr "" "²¾¦Ü¬Y¦æ©Î¬Y¬Û²§°Ï¶ô\n" "²¾¦Ü (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5812,7 +5840,7 @@ msgstr "" "³]©wµ{¦¡¿ï¶µ\n" "¿ï¶µ" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5821,37 +5849,37 @@ msgstr "" "­«¾ã«áÅã¥Ü\n" "­«¾ã (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "½Æ»s¿ï¨ú¦æ¨ì°Å¶Kï(ªþ¥[¦æ¸¹©ó¦æ­º)" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "¶}Ãö®ÑÅÒ" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "¦Ü¤U¤@®ÑÅÒ" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "¦Ü¤W¤@®ÑÅÒ" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "²M°£©Ò¦³®ÑÅÒ" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5860,7 +5888,7 @@ msgstr "" "Åã¥Ü§¹¥þ¬Û¦Pªº¶µ¥Ø\n" "Åã¥Ü¬Û¦P¶µ¥Ø" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5869,7 +5897,7 @@ msgstr "" "Åã¥Ü¬Û²§ªº¶µ¥Ø\n" "Åã¥Ü¬Û²§¶µ¥Ø" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5878,7 +5906,7 @@ msgstr "" "Åã¥Ü¥u¦b¥ªÃ䦳ªº¶µ¥Ø\n" "Åã¥Ü¥ªÃä¿W¦³¶µ¥Ø" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5887,7 +5915,7 @@ msgstr "" "Åã¥Ü¥u¦b¥kÃ䦳ªº¶µ¥Ø\n" "Åã¥Ü¥kÃä¿W¦³¶µ¥Ø" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5896,7 +5924,7 @@ msgstr "" "Åã¥Ü¤G¶i¨îÀÉ®×\n" "Åã¥Ü¤G¶i¨îÀÉ®×" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5905,7 +5933,7 @@ msgstr "" "Åã¥Ü²¤¹Lªº¶µ¥Ø\n" "Åã¥Ü²¤¹Lªº¶µ¥Ø" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5914,7 +5942,7 @@ msgstr "" "¿ï¨úÀ˵ø¥Î¦r«¬\n" "¿ï¨úÀ˵ø¦r«¬" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5923,30 +5951,30 @@ msgstr "" "«ì´_¨Ï¥Î¹w³]ªº¨t²Î¦r«¬©óÀ˵ø\n" "¹w³]ªº¦r«¬" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Åã¥ÜªÅ¥Õ©M¸õ®æ¦r¤¸" # I would suggest "Toggle Microview Pane" instead. # "¶}Ãö®t²§µ¡®æ" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "¶}Ãöªñ¹îµ¡®æ" # ¦ì¸mµ¡®æÅã¥ÜÀÉ®×¥þ¹³ -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "»·±æµ¡®æÅã¥ÜÀÉ®×¥þ¹³" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Åã¥Ü¸ê®Æ§¨¤ñ¸û¤§²Î­p¹ï¸Ü²°" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5955,7 +5983,7 @@ msgstr "" "¿ï¨ú¥Ø«e¨Ï¥ÎªÌ¤¶­±»y¨¥\n" "»y¨¥" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5964,12 +5992,12 @@ msgstr "" "¥H¤£¦P¦â±mÅã¥Ü¦æ¤º®t²§\n" "Åã¥Ü¦æ¤º®t²§" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "¹ï½Õ¨âµ¡®æ¦ì¸m" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5978,7 +6006,7 @@ msgstr "" "Åã¥Ü¦æ¸¹\n" "Åã¥Ü¦æ¸¹" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5987,7 +6015,7 @@ msgstr "" "±Ò¥Î¦Û°Ê§é¦æ\n" "¦Û°Ê§é¦æ" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5996,22 +6024,22 @@ msgstr "" "Åã¥Ü¨âµ¡¤§Ãä°Ï\n" "Åã¥Ü¨âµ¡Ãä°Ï" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "¥[¤j¤å¦r" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "ÁY¤p¤å¦r" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "«ì´_¤å¦r­ì©l¤j¤p" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6020,7 +6048,7 @@ msgstr "" "±²¨ì¤W¤@®t²§\n" "¤W¤@®t²§ (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6029,77 +6057,77 @@ msgstr "" "±²¨ì¤U¤@®t²§\n" "¤U¤@®t²§ (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6108,7 +6136,7 @@ msgstr "" "±²¨ì³Ìªì®t²§\n" "³Ìªì®t²§ (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6117,7 +6145,7 @@ msgstr "" "±²¨ì¥Ø«e®t²§\n" "¥Ø«e®t²§ (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6126,7 +6154,7 @@ msgstr "" "±²¨ì³Ì¥½®t²§\n" "³Ì¥½®t²§ (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6135,7 +6163,7 @@ msgstr "" "½Æ»s®t²§°Ï¶ô¨ì¥kÃäÀÉ®×\n" "½Æ»s¨ì¥kÃä (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6144,7 +6172,7 @@ msgstr "" "½Æ»s®t²§°Ï¶ô¨ì¥ªÃäÀÉ®×\n" "½Æ»s¨ì¥ªÃä (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6153,7 +6181,7 @@ msgstr "" "½Æ»s®t²§¨ì¥kÃä¨Ã¨ì¤U¤@®t²§\n" "½Æ»s¨ì¥kÃä¨Ã«e¶i (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6162,7 +6190,7 @@ msgstr "" "½Æ»s®t²§¨ì¥ªÃä¨Ã¨ì¤U¤@®t²§\n" "½Æ»s¨ì¥ªÃä¨Ã«e¶i (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6171,7 +6199,7 @@ msgstr "" "½Æ»s©Ò¦³®t²§¨ì¥kÃäÀÉ®×\n" "©Ò¦³¨ì¥kÃä" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6180,96 +6208,96 @@ msgstr "" "½Æ»s©Ò¦³®t²§¨ì¥ªÃäÀÉ®×\n" "©Ò¦³¨ì¥ªÃä" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "±q¨âÃä¥Ø¿ý°»´ú©Ò¦³¶µ¥Ø" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "¤ñ¸û¿ï¨ú¶µ¥Ø(­Y¬°¦h­«¿ï¨ú¶µ¥Ø¡A¤ñ¸û¨ä²Ä¤@­Ó¶µ¥Ø)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "¿ï¨ú¨Ã¬ö¿ý¸ê®Æ§¨¤ñ¸ûÄæ¦ì" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "²£¥Í¸ÉºóÀÉ" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "¿ï¨ú¨Ã­×§ï¿z¿ï¾¹" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "±q¤ñ¸ûµ²ªG²£¥Í³ø§i" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "¦C¥X¥i¥Îªº¥~±¾" # "¨Ï¥ÎªÌ¿ï¨ú¸ÑÀ£¾¹(¤ñ¸û¸ê®Æ§¨®É¤£¸ÑÀ£) # " I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)" instead. -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "¨Ï¥ÎªÌ¿ï¨ú¸Ñ¥]¾¹(¤ñ¸û¸ê®Æ§¨®É¤£¦Û°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ®×)" # Instead of "one file only needs the extension" I would suggest "at least one file should have a needed extension". -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¥H¿ï¥Îªº¸Ñ¥]¾¹¥Î¨ì¨â­ÓÀÉ (¦Ü¤Ö¤@­ÓÀɮ׻ݰÆÀɦW)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "¿ï¤@­Ó¸Ñ¥]¾¹¥H½s¿è³o­ÓÀÉ®×" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "¤£­n¥ý¦æ³B²z¾¹ (±`ºA)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "«Øijªº¥~±¾" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "¨ä¥L¥~±¾" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "¨ø¸ü©Ò¦³¥~±¾¦A­«·s¸ü¤J (¾A¥Îµo®iªÌ)" # The original text is strange because the next file seems to be always visible. The correct one is "Activate next file" or "Change the focus to next file", etc. -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6278,12 +6306,12 @@ msgstr "" "¤Á´«µJÂI¦Ü¥t¤@ÀÉ\n" "¤Á´«¦Ü¥t¤@ÀÉ" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Ãö³¬©Ò¦³¶}±Òµøµ¡" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6292,22 +6320,22 @@ msgstr "" "¶}±Ò WinMerge »¡©úÀÉ\n" "WinMerge »¡©ú" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "¿é¥X¥Ø«e WinMerge ª©¥»¸ê°T¤Î¨ä²ÕºA¨ì¤å¦rÀÉ®×" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Åã¥Ü GNU ¤@¯ë¤½¦@±ÂÅvÃÒ" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "¨p¤H½sĶ¡G%1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6316,7 +6344,7 @@ msgstr "" "¶}±Òµo¦æ»¡©ú\n" "µo¦æ»¡©ú" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6325,292 +6353,292 @@ msgstr "" "¶}±Ò½Ķ¤åºô¯¸\n" "½Ķ" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "¥~±¾³]©w" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "¤£­n¥Î¥ý¦æ³B²z¾¹" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "¦p¥i¯à´N¥Î¥ý¦æ³B²z¾¹" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "§ä¤£¨ì WSH - °±¥Î .sct «ü¥O½X" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<µL>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<¦Û°Ê>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "¥Hµn¿ýªºÀ³¥Îµ{¦¡¶}±ÒÀÉ®×" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "¥H¥~¦b½s¿è¾¹¶}±ÒÀÉ®×" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "¥H¯S©wÀ³¥Îµ{¦¡¶}±ÒÀÉ®×" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "¤£Åã¥Ü²¾¦ìªº°Ï¶ô" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Åã¥Ü©Ò¦³²¾¦ìªº°Ï¶ô" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "¶È´N¥Ø«e¬Û²§³BÅã¥Ü¨ä²¾¦ìªº°Ï¶ô" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "¸õ¨ì²{¦b¹«¼Ð¤U©Ò¥Ü¦æ" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "¦Ü²Ä %1 ¦æ(&O)" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Ãö³¬" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "±qÀɮרt²Î" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "±q MRU ªí" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "µL°ª«G«×Åã¥Ü" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "¥iÄ⦡ª«¥ó" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "ÁôÂäu¨ã¦C" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Åã¥Ü¤p¤u¨ã¦C" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Åã¥Ü¤j¤u¨ã¦C" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index a48799efc..10e389994 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< ništa >" @@ -470,7 +470,7 @@ msgstr "&Automatsko raspakiravanje" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "Okna &kaskadno" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Pomoæ" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "De&kodiranje datoteke..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Potpun sadržaj" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Skraæeni sadržaj" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Datum promjene" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Datum promjene i velièina" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Velièina" @@ -1528,7 +1528,7 @@ msgstr "WinMerge stranica na Web-u" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "U redu" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "&Izbor programa:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Staza do cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Opæe" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "Traži &slijedeæi" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&U redu" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Zamijeni &sve" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Racionalno ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Ukloni" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Boje" @@ -1977,7 +1977,7 @@ msgstr "Obrisano" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Tekst" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Predpodešeno" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistem" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Opis:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stani" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "Idi &na" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Usporedba" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Filtriraj komentare" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Ureðivanje" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Kodna stranica" @@ -2726,7 +2727,7 @@ msgid "Private Filter (only for current user)" msgstr "Osobni filtar (samo za trenutnog korisnika)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Rad s arhivima" @@ -2777,7 +2778,7 @@ msgid "Files:" msgstr "Datoteke:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Razlika" @@ -2814,7 +2815,7 @@ msgid "Right:" msgstr "Desno:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identièno" @@ -2867,7 +2868,7 @@ msgid "&Apply" msgstr "&Primjeni" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Odustajem" @@ -2973,7 +2974,7 @@ msgid "Save..." msgstr "Pohrani..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Sigurnost" @@ -3014,7 +3015,7 @@ msgid "A&ppend timestamp" msgstr "&Dodaj datum i vrijeme" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Potvrdite kopiranje" @@ -3055,7 +3056,7 @@ msgid "&Enable plugins" msgstr "&Omoguæi dodatke" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Shell integracija" @@ -3091,8 +3092,8 @@ msgid "Add &Shell menu to context menu" msgstr "Dodaj &Shall izbornik u kontekstni izbornik" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Mapa" @@ -3128,69 +3129,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binarno" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041a04e2" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x41a, 1250" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Spreman" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3199,12 +3233,12 @@ msgstr "" "Stvaranje prazne usporedbe\n" "Nova usporedba (Ctrl+O)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3213,7 +3247,7 @@ msgstr "" "Otvaranje postojeæe datoteke\n" "Otvori (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3222,7 +3256,7 @@ msgstr "" "Zatvaranje aktivne usporedbe\n" "Zatvori" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3231,7 +3265,7 @@ msgstr "" "Pohrana aktivne datoteke\n" "Pohrani (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3240,7 +3274,7 @@ msgstr "" "Pohrana aktivne datoteke pod novim nazivom\n" "Pohrani kao" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3249,7 +3283,7 @@ msgstr "" "Promjena postavki ispisa\n" "Postava stranice" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3258,7 +3292,7 @@ msgstr "" "Podešavanje postavki pisaèa i ispisa\n" "Postavke ispisa" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3267,7 +3301,7 @@ msgstr "" "Ispis aktivnog dokumenta\n" "Ispis" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3276,27 +3310,27 @@ msgstr "" "Prikaz stranice ispisa\n" "Pregled ispisa" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Ponovo prikaži sve skrivene stsvke" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Zatvori prikaz stabla" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Otvara sve podmape" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Zatvara sve podmape" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3305,32 +3339,32 @@ msgstr "" "Otvaranje usporedbi\n" "Datoteka usporedbe (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nepoznata greška pri otvaranju usporedbe" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nepoznata greška pri pohrani usporedbe" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Usporedba" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Usporedba je uèitana." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Usporedba je pohranjena." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3339,7 +3373,7 @@ msgstr "" "Pohrana staze i datoteke usporedbe\n" "Pohrani usporedbu" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3348,7 +3382,7 @@ msgstr "" "Prikaz informacija o programu, br. inaèice i autorstva\n" "O" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3357,27 +3391,27 @@ msgstr "" "Zatvaranje programa; Podsjetnik za pohranu rada\n" "Izlaz" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Otvori ovu datoteku" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3386,7 +3420,7 @@ msgstr "" "Aktiviranje slijedeæeg panela\n" "Slijedeæi panel" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3395,7 +3429,7 @@ msgstr "" "Vraæanje na prethodni panel\n" "Prethodni panel" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3404,7 +3438,7 @@ msgstr "" "Sortiranje okna kaskadno\n" "Kaskadno" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3413,7 +3447,7 @@ msgstr "" "Postavljanje okna vodoravno, bez prekrivanja\n" "Okna vodoravno" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3422,7 +3456,7 @@ msgstr "" "Postavljanje okna okomito, bez prekrivanja\n" "Okna okomito" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3431,7 +3465,7 @@ msgstr "" "Kopiranje sadržaja meðumemorije\n" "Kopiraj" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3440,7 +3474,7 @@ msgstr "" "Uklanjanje oznaèenog u meðumemoriju\n" "Odreži" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3449,7 +3483,7 @@ msgstr "" "Traženje odreðenog pojma\n" "Traži" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3458,7 +3492,7 @@ msgstr "" "Umetanje sadržaja meðumemorije\n" "Zalijepi" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3467,7 +3501,7 @@ msgstr "" "Ponavljanje zadnje radnje\n" "Ponovi" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3476,7 +3510,7 @@ msgstr "" "Zamjena odreðenog teksta drugim\n" "Zamijeni" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3485,7 +3519,7 @@ msgstr "" "Oznaèavanje cijelog dokumenta\n" "Oznaèi sve" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3494,7 +3528,7 @@ msgstr "" "Poništenje zadnje radnje\n" "Poništi (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3503,7 +3537,7 @@ msgstr "" "Povratak prethodnog stanja\n" "Vrati (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3512,7 +3546,7 @@ msgstr "" "Prikaz ili skrivanje trake alata\n" "Traka alata" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3521,7 +3555,7 @@ msgstr "" "Prikaz ili skrivanje trake statusa\n" "Traka statusa" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3530,7 +3564,7 @@ msgstr "" "Prikaz ili skrivanje trake oznaka\n" "Traka oznaka" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3539,57 +3573,57 @@ msgstr "" "Automatska prilagodba velièine panela\n" "Zakljuèaj panele" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Promjena velièine okna" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Promjena položaja okna" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Smanji okno na ikonu" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Poveæaj preko cijelog zaslona" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Okno slijedeæe usporedbe" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Okno prethodne usporedbe" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zatvori aktivno okno i podsjeti na pohranu dokumenta" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Vraæanje na uobièajenu velièinu okna" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Popis aktivnih zadataka" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktiviraj ovo okno" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3598,7 +3632,7 @@ msgstr "" "Zatvaranje pregleda ispisa\n" "Zatvori pregled" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3617,7 +3651,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Usporedba datoteka" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3636,19 +3670,19 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Usporedba mapa" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Zadrži izvorne znake kraja retka" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Desni klik na stazu koju trba kopirati" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3657,143 +3691,143 @@ msgstr "" "Razvojni tim:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, fuzzy, 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 je program BEZ IKAKVE GARANCIJE. To je besplatan softver koji možete dalje distribuirati pod odreðenim okolnostima prema GNU javnoj licenci koju pogledajte u datoteci pomoæi." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Prekini" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Ponovi" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Zanemari" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Zanemari &sve" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Da za &sve" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Ne za s&ve" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Nastavi" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Izostavi" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Izostavi &sve" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Ne prikazuj više ovu poruku." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Ne &pitaj ponovo." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Programi" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Razlike" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "S lijeva:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "U lijevo:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "S desna:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "U desno:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "inaèica %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Postavke" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Ponovni prikaz svih poruka" -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3804,84 +3838,84 @@ msgstr "" "\n" "Molimo koristite vrijednosti 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programi |*.exe;*.bat;*.cmd|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Sve datoteke (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge datoteke (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "INI datoteke (*.ini)|*.ini|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Tekst datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Naziv" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Položaj" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtri..." -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Izaberite datoteku kao novi filtar" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "FLT datoteke (*.flt)|*.flt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3894,7 +3928,7 @@ msgstr "" "Molimo, kopirajte datoteku %1 u WinMerge/Filters -mapu:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3907,7 +3941,7 @@ msgstr "" "\n" "Provjerite postoji li mapa i njenu dostupnost." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3918,7 +3952,7 @@ msgstr "" "\n" "Molimo, odredite ju u 'Postavke/Sistem'." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3931,12 +3965,12 @@ msgstr "" "\n" "Možda je zaštiæena - samo za èitanje?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Locirajte datoteku filtriranja za instalaciju" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3947,17 +3981,17 @@ msgstr "" "\n" "Ne mogu je pohraniti u mapu filtara." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filtar veæ postoji. Natpisati ga?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Algoritam" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3968,258 +4002,258 @@ msgstr "" "\n" "Ako odaberete 'Ne', to možete uæiniti i kasnije.." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Staza do SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Rezultati usporedbe mapa" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Usporedba datoteka" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Neimenovan" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Neimenovan" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Tuðe datoteke" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Moje datoteke" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Pretraživanje datoteka..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Otvaranje odabranog" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopiranje lijevo u desno" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopiranje desno u lijevo" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopiranje sve u lijevo" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopiranje sve u desno" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopiranje datoteka..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Brisanje datoteka..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Premještanje datoteka..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Stvaranje izvještaja..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Poništenje zadnje operacije..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Ponavljanje prethodne operacije..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Redak: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Usporedo" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Razlika: %1 od %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "Naðeno razlika: %1" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "Naðeno razlika: 1" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "SÈ" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Stavka %1 od %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Stavke: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Odaberite dvije datoteke ili mape za usporedbu" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Izbor mape" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Odabir dvije datoteke ili mape za usporedbu." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Nedostaje staza do lijeve datoteke!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Nedostaje staza do desne datoteke!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Obje staze su krive!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Molim izaberite dvije datoteke koje prihvaæa arhiver." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne mogu usporediti datoteku i mapu." -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Nema datoteke: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka nije raspakirana: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4232,12 +4266,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Ne mogu podjeliti konfliktnu datoteku." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4248,27 +4282,27 @@ msgstr "" "%1\n" "nije konfliktna." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Pohrani kao" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Pohraniti izmjene %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je oznaèena smo za èitanje. Natpisati zaštiæenu datoteku? (Stisnite 'Ne', za pohranu pod novim nazivom.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Greška pri stvaranju rezervne datoteke" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4281,7 +4315,7 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4298,7 +4332,7 @@ msgstr "" "\t- Pritisnite 'U redu' za pohranu pod drugim nazivom\n" "\t- ili pritisnite 'Odustajem' za prekid postupka." -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4313,7 +4347,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4328,7 +4362,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4343,7 +4377,7 @@ msgstr "" "\n" "Natpisati datoteku?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4352,7 +4386,7 @@ msgstr "" "%1\n" "je oznaèena samo za èitanje. Natpisati zaštiæenu stavku?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4367,22 +4401,22 @@ msgstr "" "\n" "Želite li ponovno uèitanje datoteke?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Pohrani lijevu datoteku kao" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Pohrani desnu datoteku kao" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4393,7 +4427,7 @@ msgstr "" "%1\n" "je nestala. Za nastavak, pohranite kopiju." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4404,42 +4438,42 @@ msgstr "" "\n" "Osvježite dokumente prije nastavka." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Odredite SourceSafe stazu usporedbe, ako želite nastaviti (ie: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Provjera datoteka na VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistem pokazuje grešku dok pokušava provjeriti datoteku. Nastavak nemoguæ..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Greška pri izvršenju sistemske naredbe." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS radna mapa i lokacija aktivne datoteke se ne poklapaju. Nastaviti?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Nema VSS baze" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Greška iz VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4450,7 +4484,7 @@ msgstr "" " Molimo pregledajte podešenost korištenog izgleda. .\n" " Odustati?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4459,164 +4493,164 @@ msgstr "" "Versioning Sistem pokazuje grešku dok pokušava provjeriti datoteku.\n" " Molimo pregledajte podešenost korištenog izgleda. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Ništa" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Stani na razmaku" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Stani na razmaku ili interpunkciji" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiraj odabranu stavku u imenovanu mapu" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiraj odabranu stavku u korisnikovu mapu" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Obriši odabranu stavku s lijeva" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Obriši odabranu stavku s desna" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Obriši odabranu stavku na obje strane" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Sakrij odabranu(e) stavku(e) (filtar u letu)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Preimenuj odabranu stavku na obje strane" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Desno do lijevo (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Lijevo do desno (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Desno do lijevo (%1 od %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lijevo do desno (%1 od %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Lijevo do... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Desno do... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lijevo do... (%1 od %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Desno do... (%1 od %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Lijevo (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Desno (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Oba panela (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Lijevo (%1 od %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Desno (%1 od %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Oba panela (%1 od %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Lijeva strana - odaberite odredišnu mapu:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Desna strana - odaberite odredišnu mapu:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 datoteka doraðeno)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 od %2 datoteka doraðeno)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4627,17 +4661,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Kopirati? -" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Kopirati %d stavku:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4656,613 +4690,607 @@ msgstr "" "\n" "Osvježite usporedbu." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Premjestiti?" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Premjestiti %d stavku?" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Potvrdite premještanje" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Otvori lijevu datoteku" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Otvori lijevu datoteku u vanjskom editoru" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Otvori lijevu datoteku s..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Otvori desnu datoteku" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Otvori desnu datoteku u vanjskom editoru" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Otvori desnu datoteku s..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Greška pri pokretanju vanjskog editora: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiraj nazive datoteka u meðumemoriju" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiraj stazu lijeve strane u meðumemoriju" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiraj stazu desne strane u meðumemoriju" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiraj staze obiju strana u meðumemoriju" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Lijevi Shell izbornik" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Desni Shell izbornik" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Nepoznat oblik arhiva" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj stavke s lijeva u arhiv" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj stavke s desna u arhiv" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj stavke obiju strana u arhiv" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj stavke razlika u arhiv (obje strane)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Premještaj oznaèene datoteke s lijeva u izabranu mapu" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Premještaj oznaèene datoteke s desna u izabranu mapu" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Naziv datoteke" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Rezultat usporedbe" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Datum lijevo" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Datum sadašnji" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Tip" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Velièina lijevo" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Velièina desno" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Velièina desno (skraæeno)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Velièina lijevo (skraæeno)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Tim lijeve datoteke" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Tim desne datoteke" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Novija datoteka" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Verzija lijeve datoteke" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Rezultat skraæeno" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atributi lijevo" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atributi desno" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Završetak reda lijevo" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Završetak retka desne datoteke." -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Kodiranje lijevo" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Zanemari razlike" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binarno" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Ne mogu usporediti datoteke" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Odbaèena stavka" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Izostavljene datoteke" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Izostavljene mape" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Samo lijevi: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Samo desni: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binarne datoteke su identiène" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binarne datoteke su razlièite" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Datoteke su razlièite" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Mape su razlièite" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Samo lijevo" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Samo desno" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Greška" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Tekstovi su identièni" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Tekstovi su razlièiti" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Proteklo vrijeme: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 stavka oznaèena" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 stavki oznaèeno" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Naziv datoteke ili mape." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazivi podmapa ako su podmape ukljuèene." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Rezultat usporedbe, duži oblik." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Lijeva strana - datum promjene." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Desna strana - datum promjene." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Tip (ekstenzija) datoteke" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Velièina u bajtima, lijeve datoteke." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Velièina u bajtima, desne datoteke." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Skraæenice lijeve datoteke" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Skraæenice desne datoteke" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Lijeva strana - vrijeme stvaranja." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Desna strana - vrijeme stvaranja." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Koja strana je promijenjena ranije?" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija na lijevoj strani, samo za neke tipove." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija na desnoj strani, samo za neke tipove." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Rezultat usporedbe, kraæi oblik." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atributi lijeve datoteke" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atributi desne strane" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Naèin završetka retka lijeve datoteke." -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Naèin završetka retka desne datoteke." -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Kodirana lijeva strana" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Kodiranje desne strane" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Broj zanemarenih razlika u datoteci. Zanemarene razlike ne mogu biti spajane u WinMergeu." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Broj razlika u datoteci. Zanemarene razlike nisu ukljuèene." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaži zvjezdicu (*) uz binarnu datoteku." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Usporedi %1 s %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Popis odvojen zarezom" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Popis odvojen tabulatorom" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Jednostavni HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Jednostavni HTML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Datoteka izvještaja veæ postoji. Natpisati?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5271,32 +5299,32 @@ msgstr "" "Greška pri stvaranju izvještaja:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Izvještaj je uspješno stvoren." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je otvorena u oba panela." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Datoteke su identiène." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Greška pri usporedbi datoteka." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ne mogu stvoriti privremenu datoteku. Provjerite postavke staze." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5311,17 +5339,17 @@ msgstr "" "\n" "Napomena: Želite li uvijek zadržati li razlièitost prijelaza u drugi redak, odaberite 'Zanemari razlièitost prijelaza u drugi redak..' u kartici usporedbi u oknu dijaloga 'Ureðivanje/Postavke." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Odabrana mapa je pogrešna." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne mogu otvoriti binarnu datoteku u ureðivaèu" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5336,7 +5364,7 @@ msgstr "" "%1\n" "na drugoj strani i otvoriti je?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5347,168 +5375,168 @@ msgstr "" "Prikaz svake datoteke u vlastitoj ks je ljepši, ali dovodi do teškoæa prilikom spajanja ili kopiranja.\n" "Preporuèamo obje datoteke prikazati u Windows prednamještenoj kodnoj stranici?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Greškom pri kodiranju izgubljena je informacija: obje datoteke" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Nema razlike" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Razlièiti redak" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamijenjeno %1 pojam (pojmova)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne mogu naæi pojam \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopiraj stazu" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopiraj naziv datoteke" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Položaj panela" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Panel razlika" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Datoteka razlika je pohranjena." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. stavka ili mapa ne postoji!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. stavka ili mapa ne postoji!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Datoteka razlika veæ postoji. Natpisati?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 datoteka odabrano]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Uobièajeno" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Detaljnije" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Združeno" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Ne mogu pohraniti u datoteku" -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Dana staza ne odgovara: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Odredite izlaznu datoteku" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne mogu stvoriti datoteku razlika mapa." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5519,12 +5547,12 @@ msgstr "" "\n" "Prije stvaranja datoteke razlika, sve datoteke trebaju biti pohranjene." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Mapa ne postoji" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5535,7 +5563,7 @@ msgstr "" "Nema nužnih komponenata (7-zip i/ili Merge7z*.dll) .\n" "Pregledajte upute kako omoguæiti rad s arhivama." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5544,7 +5572,7 @@ msgstr "" "\n" "Napomena: Integracija 7-Zip je onemoguæena u WinMerge postavkama." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5553,37 +5581,37 @@ msgstr "" "\n" "Napomena: Integrirani 7-Zip je ogranièen na samostalno djelovanje unutar WinMerge postavki." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Odabir datoteke za izvoz" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Odabir datoteke za uvoz" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Uvoz postavki u datoteku" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Izvoz postavki u datoteku" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Greška pri uèitanju postavki" -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Greška pri pohrani odabranih postavki." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5594,157 +5622,157 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "NR" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "DR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "DRNR" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Tip" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Raspakiravaè" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Ureðivaè skripti" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Pohrani lijevu datoteku" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Pohrani desnu datoteku" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Pohrani lijevu datoteku pod nazivom..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Pohrani desnu datoteku pod nazivom..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Pretvori kraj retka na Windows naèin" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Pretvori kraj retka na Unix naèin" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Pretvori kraj retka na Mac naèin" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Naèina rada: Ureðivanje - Usporedo" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5753,12 +5781,12 @@ msgstr "" "Prikaz i podešavanje moguænosti kodiranja datoteka\n" "Moguænosti kodiranja" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Otvaranje i rješavanje konfliktnih datoteka" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5767,7 +5795,7 @@ msgstr "" "Isticanje razlike u aktivnom retku\n" "Razlike u aktivnom retku" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5776,7 +5804,7 @@ msgstr "" "Idi na redak razlike\n" "Idi na (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5785,7 +5813,7 @@ msgstr "" "Postavke programa\n" "Postavke " -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5794,37 +5822,37 @@ msgstr "" "Osvježavanje prikaza\n" "Osvježi (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiraj redak u meðumemoriju s brojem retka na poèetku" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Zamijeni oznake" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Slijedeæa oznaka" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Prethodna oznaka" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Ukloni sve oznake" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5833,7 +5861,7 @@ msgstr "" "Prikaz jednakih stavki\n" "Identiène stavke" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5842,7 +5870,7 @@ msgstr "" "Prikazivanje stavki koje se razlikuju\n" "Prikaz razlièitih stavki" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5851,7 +5879,7 @@ msgstr "" "Prikaz jedinih stavki razlika lijeve strane\n" "Lijevi unikati" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5860,7 +5888,7 @@ msgstr "" "Prikaz jedinih stavki raznika desne strane\n" "Desni unikati" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5869,7 +5897,7 @@ msgstr "" "Prikazivanje binarnih datoteka\n" "Prikaz binarnih datoteka" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5878,7 +5906,7 @@ msgstr "" "Prikazivanje zanemarenih stavki\n" "Prikaz zanemarenih stavki" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5887,7 +5915,7 @@ msgstr "" "Odabir fonta\n" "Odabir fonta" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5896,42 +5924,42 @@ msgstr "" "Vraæanje na prednamješteni font za pregledanje\n" "Standardni font" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Skriveni znaci i razmaci" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Zamjeni panele" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panel prikazuje položaj razlike u datoteci" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Prikaži okno statistike usporedbe mapa" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Izaberite vaš jezik suèelja\nJezik" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "Bojom isticanje razlika u recima\nOboji razlièite retke" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Meðusobno zamijeni položaje panela" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5940,7 +5968,7 @@ msgstr "" "Prikaz brojeva redaka\n" "Prikaži brojeva redaka" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5949,7 +5977,7 @@ msgstr "" "Omoguæavanje prijeloma teksta\n" "Prijelom teksta" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5958,117 +5986,117 @@ msgstr "" "Prikaz odabranih margina za oba panela\n" "Prikaz odabranih margina" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Poveæaj velièinu teksta" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Smanji velièinu teksta" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Izvorna velièina teksta" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "Prikaz prethodne razlike\nPrethodna razlika (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "Prikaz slijedeæe razlike\nSlijedeæa razlika (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "Prikaz prve razlike\nPrva razlika (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "Prikaz aktivne razlike\nAktivna razlika (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "Posljednja razlika\nPosljednja razlika (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6077,7 +6105,7 @@ msgstr "" "Kopiranje oznaèenog teksta u desnu datoteku\n" "Kopiraj u desno (Alt+desno)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6086,7 +6114,7 @@ msgstr "" "Kopiranje oznaèenog teksta u lijevu datoteku\n" "Kopiraj u lijevo (Alt+lijevo)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6095,7 +6123,7 @@ msgstr "" "Kopiraj razliku u desno i idi na slijedeæu\n" "Kopiraj u desno i nastavi dalje (Ctrl+Alt+desno)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6104,7 +6132,7 @@ msgstr "" "Kopiraj razliku u lijevo i idi na slijedeæu\n" "Kopiraj u lijevo i nastavi dalje (Ctrl+Alt+lijevo)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6113,7 +6141,7 @@ msgstr "" "Kopiranje svih razlika u desno\n" "Sve u desno" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6122,92 +6150,92 @@ msgstr "" "Kopiranje svih razlika u lijevo\n" "Sve u lijevo" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Obriši odabrane stavke iz obje mape." -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Usporedba odabranih stavki (U višestrukom izboru, usporeðuje se prva)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selektiranje i razmještaj mape prema usporedbi kolona" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Stvaranje datoteke razlika" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Odaberi sve filtre za promjene" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Stvaranje izvještaja iz usporedbe" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Prikaži popis dobavljivih dodataka." -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Korisnik bira arhiver (ne djeluje na mapama)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Arhiver æe se koristiti za obje datoteke (jedna treba samo ekstenziju)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Odaberite arhiver za ovaj arhiv." -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Bez dodataka (uobièajeno)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Preporuèljivi dodaci" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Ostali dodaci" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Ponovo uèitaj sve dodatke (za znalce)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6216,12 +6244,12 @@ msgstr "" "Aktiviranje slijedeæe datoteke - vidljiva\n" "Aktiviraj slijedeæu datoteku" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Zatvori sve panele" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6230,22 +6258,22 @@ msgstr "" "Prkaz WinMerge pomoæi\n" "WinMerge Pomoæ" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Pohrana WinMerge informacija o inaèici i podešenosti u tekst datoteku" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "GNU javna licenca" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Osobni uradak: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6254,7 +6282,7 @@ msgstr "" "Otvori datoteku napomena uz inaèicu\n" "Release Notes" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6263,292 +6291,292 @@ msgstr "" "OtvoriWeb lokaciju prevoditelja\n" "Translations" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Postavke dodataka" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Bez dodataka" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediff ako je moguæe" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH dodatak nije naðen! - .sct skripte su onemoguæene" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "Ništa" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "Automatski" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Otvori datoteku u pridruženom ureðivaèu" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Otvori datoteku u vanjskom ureðivaèu" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Otvori datoteku u odreðenom ureðivaèu" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Ne prikazuj premještene blokove" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Prikaži sve premještene blokove" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Prikaži premještene blokove samo aktivnih razlika" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Idi na razliku pod kursorom" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Idi &na redak" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Onemoguæeno" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Sistem datoteka" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Popis zadnje korištenih" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Nije oznaèeno" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Prenosni objekt" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resursi" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Sakrij alatnu traku" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Male ikone alatne trake" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Velike ikone alatne trake" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index cdfa09f86..68891db43 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< žádné >" @@ -470,7 +470,7 @@ msgstr "P #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&Na sebe" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "Nápo&vìda" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Kódo&vání souborù" @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "&Zpùsob porovnání:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Plný obsah" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Rychlý obsah" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Datum zmìny" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Datum zmìny a velikost" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Velikost" @@ -1528,7 +1528,7 @@ msgstr "Nav #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "&Systém sledování verzí:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta k programu cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Obecné" @@ -1852,7 +1852,7 @@ msgid "&Find Next" msgstr "&Najít další" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&OK" @@ -1898,7 +1898,7 @@ msgid "Replace &All" msgstr "Nahradit &vše" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "" @@ -1950,7 +1950,7 @@ msgid "Remove" msgstr "O&dstranit" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Barvy" @@ -1979,7 +1979,7 @@ msgstr "Chyb #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Text" @@ -2030,13 +2030,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "&Pùvodní" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Systém" @@ -2177,7 +2178,7 @@ msgid "Description:" msgstr "Popis:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Zastavit" @@ -2239,7 +2240,7 @@ msgid "&Go To" msgstr "&Pøejít" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Porovnávání" @@ -2290,7 +2291,7 @@ msgid "Filter Comments" msgstr "Filtrovat kom&entáøe" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "" @@ -2442,7 +2443,7 @@ msgstr "Zru #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Kódování" @@ -2720,7 +2721,7 @@ msgid "Private Filter (only for current user)" msgstr "Vlastní filtr (pouze pro souèasného uživatele)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Podpora archivace" @@ -2771,7 +2772,7 @@ msgid "Files:" msgstr "Soubory:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Rozdílné" @@ -2808,7 +2809,7 @@ msgid "Right:" msgstr "Vpravo:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Shodné" @@ -2861,7 +2862,7 @@ msgid "&Apply" msgstr "P&oužít" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "Storno" @@ -2967,7 +2968,7 @@ msgid "Save..." msgstr "&Uložit..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Zálohování souborù" @@ -3008,7 +3009,7 @@ msgid "A&ppend timestamp" msgstr "Pøipojit è&asové razítko" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Potvrdit kopírování" @@ -3049,7 +3050,7 @@ msgid "&Enable plugins" msgstr "&Povolit pluginy" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Systémová integrace" @@ -3085,8 +3086,8 @@ msgid "Add &Shell menu to context menu" msgstr "Pøidat systémovou &místní nabídku" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Složky" @@ -3122,69 +3123,102 @@ msgid "&Quick compare limit (MB):" msgstr "&Omezení pro rychlé porovnání (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binární" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040504e2" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x405, 1250" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Pøipraven" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3193,12 +3227,12 @@ msgstr "" "Vytvoøí nové dokumenty\n" "Nové dokumenty (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3207,7 +3241,7 @@ msgstr "" "Otevøe existující dokument\n" "Otevøít (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3216,7 +3250,7 @@ msgstr "" "Zavøe aktivní dokument\n" "Zavøít" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3225,7 +3259,7 @@ msgstr "" "Uloží aktivní dokument\n" "Uložit (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3234,7 +3268,7 @@ msgstr "" "Uloží aktivní dokument pod novým názvem\n" "Uložit jako" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3243,7 +3277,7 @@ msgstr "" "Zmìní možnosti tisku\n" "Vzhled stránky" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3252,7 +3286,7 @@ msgstr "" "Zmìní možnosti tiskárny\n" "Nastavení tisku" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3261,7 +3295,7 @@ msgstr "" "Vytiskne aktivní dokument\n" "Tisk" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3270,27 +3304,27 @@ msgstr "" "Zobrazí celé stránky\n" "Náhled tisku" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Znovu zviditelní všechny skryté položky" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Pøepne stromový režim" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Rozbalí všechny podsložky" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Sbalí všechny podsložky" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3299,32 +3333,32 @@ msgstr "" "Otevøe projekt ze souboru\n" "Otevøít projekt (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznámá chyba pøi pokusu o otevøení souboru projektu" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznámá chyba pøi pokusu o uložení souboru projektu" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Projekt" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Soubor s projektem byl úspìšnì naèten." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Soubor s projektem byl úspìšnì uložen." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3333,7 +3367,7 @@ msgstr "" "Uloží aktuální cesty a volby do souboru projektu\n" "Uložit projekt" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3342,7 +3376,7 @@ msgstr "" "Zobrazí informace o programu, èíslo verze a copyright\n" "O aplikaci" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3351,27 +3385,27 @@ msgstr "" "Ukonèí aplikaci; dotáže se na uložení dokumentù\n" "Konec" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Otevøe tento dokument" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3380,7 +3414,7 @@ msgstr "" "Pøepne do dalšího panelu v oknì\n" "Další panel" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3389,7 +3423,7 @@ msgstr "" "Pøepne do pøedchozího panelu v oknì\n" "Pøedchozí panel" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3398,7 +3432,7 @@ msgstr "" "Uspoøádá okna tak, aby se pøekrývala\n" "Na sebe" -#: Merge.rc:2112 +#: Merge.rc:2126 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3407,7 +3441,7 @@ msgstr "" "Uspoøádá okna vodorovnì tak, aby se nepøekrývala\n" "Vedle sebe" -#: Merge.rc:2113 +#: Merge.rc:2127 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3416,7 +3450,7 @@ msgstr "" "Uspoøádá okna svisle tak, aby se nepøekrývala\n" "Vedle sebe" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3425,7 +3459,7 @@ msgstr "" "Zkopíruje výbìr a umístí jej do schránky\n" "Kopírovat" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3434,7 +3468,7 @@ msgstr "" "Vyjme výbìr a umístí jej do schránky\n" "Vyjmout" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3443,7 +3477,7 @@ msgstr "" "Najde zadaný text\n" "Najít" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3452,7 +3486,7 @@ msgstr "" "Vloží obsah schránky\n" "Vložit" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3461,7 +3495,7 @@ msgstr "" "Opakuje poslední akci\n" "Opakovat" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3470,7 +3504,7 @@ msgstr "" "Nahradí zadaný text jiným textem\n" "Nahradit" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3479,7 +3513,7 @@ msgstr "" "Vybere celý dokument\n" "Vybrat vše" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3488,7 +3522,7 @@ msgstr "" "Vrátí zpìt poslední akci\n" "Zpìt (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3497,7 +3531,7 @@ msgstr "" "Znovu provede pøedtím vrácenou akci\n" "Znovu (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3506,7 +3540,7 @@ msgstr "" "Zobrazí nebo skryje panel nástrojù\n" "Panel nástrojù" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3515,7 +3549,7 @@ msgstr "" "Zobrazí nebo skryje stavový øádek\n" "Stavový øádek" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3524,62 +3558,62 @@ msgstr "" "Zobrazí nebo skryje panel záložek\n" "Panel záložek" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Automaticky zmìní velikost panelù\n" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Mìní velikost okna" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Mìní umístìní okna" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Zmenší okno do ikony" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Zvìtší okno na maximální velikost" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Pøepne do dalšího okna" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Pøepne do pøedchozího okna" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zavøe aktivní okno a dotáže se na uložení zmìn" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Obnoví normální velikost okna" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Vyvolat seznam úloh" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktivovat toto okno" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3588,170 +3622,170 @@ msgstr "" "Ukonèí režim náhledu tisku\n" "Zrušit náhled" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Zachovat pùvodní znaky na koncích øádkù" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Stisknìte pravé tlaèítko myši k možnostem zkopírování cesty nebo názvu souboru" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 "" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Pøerušit" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Zkusit znovu" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorovat" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "I&gnorovat vše" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Ano" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ano &všem" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Ne vš&em" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "Pok&raèovat" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Pøe&skoèit" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Pøes&koèit vše" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "T&uto zprávu již pøíštì nezobrazovat." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Na t&uto otázku se již pøíštì nedotazovat." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Syntaxe" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Kontrola verzí" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Rozdíly" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Zleva:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Doleva:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Zprava:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Doprava:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Verze %1 - Èesky" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Možnosti (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Všechna okna se zprávami budou nyní opìt zobrazována." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3762,84 +3796,84 @@ msgstr "" "\n" "Použijte prosím hodnoty mezi 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Otevøít" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Všechny soubory (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projekty WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Soubory nastavení (*.ini)|*.ini|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textové soubory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Soubory HTML (*.htm,*.html)|*.htm;*.html|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Soubory XML (*.xml)|*.xml|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Název" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Umístìní" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Zvolte název souboru pro nový filtr" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry (*.flt)|*.flt|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3852,7 +3886,7 @@ msgstr "" "Zkopírujte prosím soubor %1 do složky s filtry pro aplikaci WinMerge:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3865,7 +3899,7 @@ msgstr "" "\n" "Ujistìte se prosím, že složka existuje a je možné do ní zapisovat." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3876,7 +3910,7 @@ msgstr "" "\n" "Zvolte prosím složku v dialogovém oknì Možnosti, v kategorii Systém." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3889,12 +3923,12 @@ msgstr "" "\n" "Možná je soubor oznaèen pouze pro ètení?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Vyhledat soubor s filtrem k instalaci" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3905,273 +3939,273 @@ msgstr "" "\n" "Nový soubor nelze zkopírovat do složky filtrù." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Soubor s filtrem již existuje. Chcete nahradit stávající filtr?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Regulérní výraz" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "Filtry byly aktualizovány. Chcete obnovit všechna porovnání složek?\n\nPokud nechcete obnovit všechna porovnání teï, zvolte Ne a obnovte porovnání pozdìji." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Cesta k programu SS.EXE :" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Výsledky porovnání složek" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Porovnání souborù" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Bez názvu vlevo" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Bez názvu vpravo" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Prohledávaní souborù..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Otevírání výbìru" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopírování zleva doprava" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopírování zprava doleva" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopírování všech doleva" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopírování všech doprava" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopírování souborù..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Odstranìní souborù..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Pøesouvání souborù..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Vytváøení protokolu..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Vracení poslední operace..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Opakování pøedchozí operace..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Øádek: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Slouèit" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Rozdíl %1 z %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "Nalezeno %1 rozdílù" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "Nalezen 1 rozdíl" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "Pro ètení" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 z %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Položek: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vyberte dvì existující složky nebo soubory k porovnání" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Vybrat složku" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dvì složky nebo dva soubory k porovnání" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Levá cesta je chybná!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je chybná!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Obì cesty jsou chybné!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vyberte dva soubory k zpøístupnìní volby pøevadìèe" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Nelze porovnat soubor a složku!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Soubor nebyl nalezen: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Soubor nebyl pøeveden: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4184,37 +4218,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Uložit jako" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Uložit zmìny do %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je oznaèen pouze pro ètení. Chcete nahradit tento soubor? (Neukládat pod novým názvem.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Chyba pøi zálohování souboru" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4227,7 +4261,7 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4244,7 +4278,7 @@ msgstr "" "\t- použít jiný název souboru (stisknìte OK)\n" "\t- pøerušit souèasnou operaci (stisknìte Storno)" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4259,7 +4293,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4274,7 +4308,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4289,7 +4323,7 @@ msgstr "" "\n" "Pøepsat zmìnìný soubor?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4298,32 +4332,32 @@ msgstr "" "%1\n" "je oznaèen pouze pro ètení. Chcete nahradit tuto položku?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "Jiná aplikace provedla zmìny v souboru\n%1\nod jeho posledního prozkoumání aplikací WinMerge.\n\nChcete soubor naèíst znovu?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Uložit levý soubor jako" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Uložit pravý soubor jako" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "Soubor\n%1\nse ztratil. Pro pokraèování prosím uložte kopii souboru." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4334,42 +4368,42 @@ msgstr "" "\n" "Pøed dalším pokraèováním dokumenty obnovte." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4377,171 +4411,171 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Žádný" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (nižší než 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyšší)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Pøerušit v mezerách" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Pøerušit v mezerách nebo v interpunkci" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Zkopíruje vybrané položky do uvedené složky" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Zkopíruje vybrané položky do vlastní složky" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Odstraní vybrané položky vlevo" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Odstraní vybrané položky vpravo" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Odstraní vybrané položky na obou stranách" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Doèasnì skryje vybrané položky" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Pøejmenuje vybrané položky na obou stranách" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "P&ravé doleva (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "&Levé doprava (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "P&ravé doleva (%1 z %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "&Levé doprava (%1 z %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "L&evé do... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Pr&avé do... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "L&evé do... (%1 z %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Pr&avé do... (%1 z %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "&Levé (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "P&ravé (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "O&boje (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "&Levé (%1 z %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "P&ravé (%1 z %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "O&boje (%1 z %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z levé strany:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z pravé strany:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(ovlivnìno souborù: %1)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(ovlivnìno souborù: %1 z %2)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4552,17 +4586,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Opravdu chcete zkopírovat:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Opravdu chcete zkopírovat %d položek:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4581,613 +4615,607 @@ msgstr "" "\n" "Obnovte prosím porovnání." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Opravdu chcete pøesunout:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Opravdu chcete pøesunout %d položek:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Potvrdit pøesunutí" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Otevøe položku vlevo" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Otevøe soubor vlevo v externím editoru" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Otevøe soubor vlevo ve zvolené aplikaci" -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Otevøe položku vpravo" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Otevøe soubor vpravo v externím editoru" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Otevøe soubor vpravo ve zvolené aplikaci" -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nelze spustit externí editor: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Zkopíruje názvy položek do schránky" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Zkopíruje cesty položek vlevo do schránky" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Zkopíruje cesty položek vpravo do schránky" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Zkopíruje cesty položek na obou stranách do schránky" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Levá systémová nabídka" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Pravá systémová nabídka" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Neznámý formát archivu" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Pøidá položky z levé strany do archivu" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Pøidá položky z pravé strany do archivu" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Pøidá položky z obou stran do archivu" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Pøidá rozdílné položky do archivu (z obou stran)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Pøesune vybrané položky z levé strany do vlastní složky" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Pøesune vybrané položky z pravé strany do vlastní složky" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Název souboru" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Výsledek porovnání" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Datum vlevo" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Datum vpravo" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Pøípona" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Velikost vlevo" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Velikost vpravo" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Velikost vpravo (krátce)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Velikost vlevo (krátce)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Datum vytvoøení vlevo" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Datum vytvoøení vpravo" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Novìjší soubor" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Verze souboru vlevo" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Verze souboru vpravo" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Struèný výsledek" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atributy vlevo" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atributy vpravo" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Konce øádkù vlevo" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Konce øádkù vpravo" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Kódování vlevo" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Kódování vpravo" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ignor. rozdílù" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binární" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Soubory nelze porovnat" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Pøerušeno" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Soubor pøeskoèen" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Složka pøeskoèena" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Pouze vlevo: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Pouze vpravo: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binární soubory jsou shodné" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binární soubory jsou rozdílné" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Soubory jsou rozdílné" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Složky jsou rozdílné" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Pouze vlevo" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Pouze vpravo" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Textové soubory jsou shodné" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Textové soubory jsou rozdílné" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "Vybrána 1 položka" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "Vybráno %1 položek" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Název souboru nebo složky" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Název podsložky, pokud jsou porovnávány i soubory v podsložkách" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Výsledek porovnání, dlouhý popis" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Datum zmìny souboru na levé stranì" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Datum zmìny souboru na pravé stranì" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Pøípona souboru" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Velikost souboru na levé stranì v bytech" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Velikost souboru na pravé stranì v bytech" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Velikost souboru na levé stranì zkrácenì" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Velikost souboru na pravé stranì zkrácenì" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Datum vytvoøení souboru na levé stranì" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Datum vytvoøení souboru na pravé stranì" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Ukáže, na které stranì je novìjší datum zmìny" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verze souboru na levé stranì, pouze pro nìkteré typy souborù" -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verze souboru na pravé stranì, pouze pro nìkteré typy souborù" -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Struèný výsledek porovnání" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atributy souboru na levé stranì" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atributy souboru na pravé stranì" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Typ konce øádkù v souboru na levé stranì" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Typ konce øádkù v souboru na pravé stranì" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Kódování souboru na levé stranì" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Kódování souboru na pravé stranì" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Poèet ignorovaných rozdílù v souboru. Tyto rozdíly nelze slouèit." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Poèet rozdílù v souboru. Neobsahuje ignorované rozdíly." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ukáže hvìzdièku (*), pokud je soubor binární" -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Porovnání %1 s %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Seznam oddìlený èárkami" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Seznam oddìlený tabelátory" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Soubor HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Soubor XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Soubor protokolu již existuje. Chcete ho pøepsat?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5196,32 +5224,32 @@ msgstr "" "Chyba pøi vytváøení protokolu:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Protokol byl úspìšnì vytvoøen." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "V obou panelech je otevøen stejný soubor." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Vybrané soubory jsou shodné." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Bìhem porovnání souborù se vyskytla chyba." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nelze vytvoøit doèasné soubory. Zkontrolujte nastavení cesty k doèasným souborùm." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5236,22 +5264,22 @@ msgstr "" "\n" "Poznámka: Pokud chcete vždy sjednocovat konce øádkù, nastavte možnost 'Ignorovat rozdíly v koncích øádkù' v nastavení Porovnávání v Možnostech dostupných z nabídky Úpravy." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Zvolená složka je chybná." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Binární soubor nelze otevøít pro úpravy." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "Složka existuje pouze na jedné stranì a nelze ji otevøít.\n\nChcete vytvoøit odpovídající složku na druhé stranì a otevøít ji?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5262,168 +5290,168 @@ msgstr "" "Zobrazení každého souboru v jeho znakové stránce poskytne lepší náhled, ale sluèování nebo kopírování bude nebezpeèné.\n" "Chcete kódování u obou souborù upravit na výchozí znakovou stránku Windows (doporuèeno)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Došlo ke ztrátì informací zpùsobené chybami kódování u obou souborù." -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Žádný rozdíl" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Rozdíl v øádku" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahrazeno %1 øetìzcù." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nelze najít øetìzec \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Zkopíruje celou cestu k souboru do schránky" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Zkopíruje název souboru do schránky" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Poloha" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Rozdíly" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Opravný soubor byl úspìšnì vytvoøen." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Opravný soubor již existuje. Chcete ho pøepsat?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[vybráno %1 souborù]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Nelze zapisovat do souboru %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Zadaná cesta pro výstup není cesta k souboru: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Zadejte výstupní soubor" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nelze vytvoøit opravný soubor z binárních souborù." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nelze vytvoøit opravný soubor ze složek." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5434,12 +5462,12 @@ msgstr "" "\n" "Vytvoøení opravného souboru vyžaduje, aby v souborech nebyly žádné neuložené zmìny." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Složka neexistuje." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5451,7 +5479,7 @@ msgstr "" "Nelze nalézt všechny potøebné souèásti (7-Zip anebo Merge7z*.dll).\n" "Podívejte se do uživatelské pøíruèky, kde najdete další informace o podpoøe archivace a jak ji zpøístupnit." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5460,7 +5488,7 @@ msgstr "" "\n" "Poznámka: Integrace 7-Zip je vypnutá v nastavení WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5469,37 +5497,37 @@ msgstr "" "\n" "Poznámka: Integrace 7-Zip je omezená na samostatné operace v nastavení WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Uložit nastavení" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Naèíst nastavení" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Nastavení bylo naèteno ze souboru." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Nastavení bylo uloženo do souboru." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Naètení nastavení ze souboru se nezdaøilo." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Uložení nastavení do souboru se nezdaøilo." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5510,157 +5538,157 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Rùzné" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " kB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Pøevadìè" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Uloží levý soubor" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Uloží pravý soubor" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Uloží levý soubor pod názvem..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Uloží pravý soubor pod názvem..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Pøevede konce øádkù na typ Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Pøevede konce øádkù na typ Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Pøevede konce øádkù na typ Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Pøepíná mezi režimem úprav a režimem sluèování" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5669,12 +5697,12 @@ msgstr "" "Ukáže a pøizpùsobí vlastnosti kódování souboru\n" "Vlastnosti kódování souboru" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5683,7 +5711,7 @@ msgstr "" "Vybere oblast rozdílù v aktuálním øádku\n" "Rozdíl v aktuálním øádku" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5692,7 +5720,7 @@ msgstr "" "Pøejde na daný øádek nebo na daný rozdíl\n" "Pøejít na (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5701,7 +5729,7 @@ msgstr "" "Umožní zmìnit nastavení aplikace\n" "Možnosti" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5710,37 +5738,37 @@ msgstr "" "Obnoví zobrazení\n" "Obnovit (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Zkopíruje vybrané øádky do schránky a pøidá jim na zaèátek jejich èísla øádkù" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Založí nebo zruší záložku" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Pøejde na další záložku" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Pøejde na pøedchozí záložku" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Zruší všechny záložky" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5749,7 +5777,7 @@ msgstr "" "Zobrazí položky, které se pøesnì shodují\n" "Ukázat shodné položky" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5758,7 +5786,7 @@ msgstr "" "Zobrazí položky, ve kterých jsou rozdíly\n" "Ukázat rozdílné položky" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5767,7 +5795,7 @@ msgstr "" "Zobrazí položky, které existují pouze na levé stranì\n" "Ukázat levé jedineèné položky" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5776,7 +5804,7 @@ msgstr "" "Zobrazí položky, které existují pouze na pravé stranì\n" "Ukázat pravé jedineèné položky" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5785,7 +5813,7 @@ msgstr "" "Zobrazí binární soubory\n" "Ukázat binární soubory" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5794,7 +5822,7 @@ msgstr "" "Zobrazí pøeskoèené položky\n" "Ukázat pøeskoèené položky" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5803,7 +5831,7 @@ msgstr "" "Vybere písmo pro zobrazení\n" "Vybrat písmo" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5812,42 +5840,42 @@ msgstr "" "Vrátí výchozí písmo systému pro zobrazení\n" "Výchozí písmo" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Ukáže netisknutelné znaky" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Zobrazí nebo skryje rozdílový panel" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Polohový panel ukazuje celkový obraz porovnávaných souborù" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zobrazí statistiku porovnání složek" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Umožní zvolit jazyk uživatelského prostøedí aplikace\nJazyk" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "Ukáže rozdíly v øádcích odlišnou barvou\nRozdíly v øádcích" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Zamìní umístìní panelù s porovnáním souborù" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5856,7 +5884,7 @@ msgstr "" "Zobrazí nebo skryje èísla øádkù\n" "Zobrazit èísla øádkù" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5865,7 +5893,7 @@ msgstr "" "Pøepíná zalamování øádkù\n" "Zalamovat øádky" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5874,117 +5902,117 @@ msgstr "" "Zobrazí nebo skryje u obou panelù levé okraje pro výbìr\n" "Okraje pro výbìr" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Zvìtší velikost písma" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Zmenší velikost písma" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Vrátí písmo na pùvodní velikost" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "Posune na pøedchozí rozdíl\nPøedchozí rozdíl (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "Posune na další rozdíl\nDalší rozdíl (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "Posune na první rozdíl\nPrvní rozdíl (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "Posune na aktuální rozdíl\nAktuální rozdíl (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "Posune na poslední rozdíl\nPoslední rozdíl (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5993,7 +6021,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vpravo\n" "Kopírovat doprava (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6002,7 +6030,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vlevo\n" "Kopírovat doleva (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6011,7 +6039,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vpravo a pokraèuje na další rozdíl\n" "Kopírovat doprava a pokraèovat (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6020,7 +6048,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vlevo a pokraèuje na další rozdíl\n" "Kopírovat doleva a pokraèovat (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6029,7 +6057,7 @@ msgstr "" "Zkopíruje všechny rozdíly do souboru vpravo\n" "Vše doprava" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6038,417 +6066,417 @@ msgstr "" "Zkopíruje všechny rozdíly do souboru vlevo\n" "Vše doleva" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Odstraní vybrané položky z obou složek" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porovná vybranou položku (pokud je vybráno více položek, porovná první)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Zvolit a pøeskupit sloupce v oknì porovnání složek" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Vytvoøí opravný soubor" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Vybrat a upravit filtry" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Vytvoøí protokol o výsledku porovnání složek" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Zobrazí seznam dostupných pluginù" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Uživatel sám vybere pøevadìè (neplatí pøi porovnání složek)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Pøizpùsobený pøevadìè bude použit pro oba soubory (podle pøípony jednoho ze souborù)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Zvolí pøevadìè pro úpravy tohoto souboru" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Navržené pluginy" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Ostatní pluginy" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Uvolní všechny pluginy a znovu je naète (pro vývojáøe)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "Aktivovat následující viditelný soubor\nAktivovat následující soubor" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Zavøe všechna otevøená okna" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "Otevøe nápovìdu pro aplikaci WinMerge\nNápovìda aplikace WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Vytvoøí textový soubor obsahující informace o aktuální verzi aplikace WinMerge a o místní konfiguraci" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Zobrazí Obecnou veøejnou licenci GNU" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "Otevøe dokument s poznámkami k aktuální verzi aplikace WinMerge\nPoznámky k vydání" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "Opens the translations website\nTranslations" msgstr "Otevøe internetovou stránku s informacemi o jazykových pøekladech\nPøeklady" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Nastavení pluginù" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Program Windows Script Host nebyl nalezen - skripty .sct jsou vypnuté" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<žádný>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Otevøe soubor v pøidružené aplikaci" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Otevøe soubor v externím editoru" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Otevøe soubor v pøíslušném programu" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Potlaèí zobrazení pøesunutých blokù" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Zobrazí všechny pøesunuté bloky" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Zobrazí pøesunuté bloky týkající se pouze aktuálního výbìru" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Pøejde na øádek nebo rozdíl pod ukazatelem" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "&Pøejít na øádek %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Vypnuto" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Systém souborù" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Naposledy použité" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Žádné zvýraznìní" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Skryje panel nástrojù" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Zobrazí malý panel nástrojù" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Zobrazí velký panel nástrojù" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index d91c60f7d..850289d07 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -329,7 +329,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Tom >" @@ -471,7 +471,7 @@ msgstr "&Automatisk Udpakning" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -535,7 +535,7 @@ msgstr "&Kaskade" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Hjælp" @@ -863,7 +863,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Fil Kodning..." @@ -1467,37 +1467,37 @@ msgid "&Compare method:" msgstr "&Sammenligningsmetode:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Alt indhold" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Hurtigt indhold" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Ændringsdato" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Ændringsdato og størrelse" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Størrelse" @@ -1529,7 +1529,7 @@ msgstr "Bes #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1701,14 +1701,14 @@ msgid "&Versioning System:" msgstr "&Versionsstyringssystem" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sti til cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Generelt" @@ -1855,7 +1855,7 @@ msgid "&Find Next" msgstr "&Find næste" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&OK" @@ -1901,7 +1901,7 @@ msgid "Replace &All" msgstr "Erstat &alt" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1953,7 +1953,7 @@ msgid "Remove" msgstr "Fjern" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Farver" @@ -1982,7 +1982,7 @@ msgstr "Slettet" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Tekst" @@ -2033,13 +2033,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Standard" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "System" @@ -2180,7 +2181,7 @@ msgid "Description:" msgstr "Beskrivelse:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stop" @@ -2242,7 +2243,7 @@ msgid "&Go To" msgstr "&Gå til" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Sammenlign" @@ -2293,7 +2294,7 @@ msgid "Filter Comments" msgstr "Filter Kommentarer" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Redigering" @@ -2445,7 +2446,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Codepage" @@ -2745,7 +2746,7 @@ msgid "Private Filter (only for current user)" msgstr "Privat Filter (kun aktuel bruger)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Arkiv Support" @@ -2796,7 +2797,7 @@ msgid "Files:" msgstr "Filer:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Forskellige" @@ -2833,7 +2834,7 @@ msgid "Right:" msgstr "Højre:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identiske" @@ -2886,7 +2887,7 @@ msgid "&Apply" msgstr "&Anvend" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Annuller" @@ -2992,7 +2993,7 @@ msgid "Save..." msgstr "Gem..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Backup filer" @@ -3033,7 +3034,7 @@ msgid "A&ppend timestamp" msgstr "T&ilføj tidsstempel" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Bekræft kopi" @@ -3074,7 +3075,7 @@ msgid "&Enable plugins" msgstr "&Aktiver plugins" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Shell Integration" @@ -3110,8 +3111,8 @@ msgid "Add &Shell menu to context menu" msgstr "Tilføj &Shell menu til kontekstmenu" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Mappe" @@ -3147,69 +3148,102 @@ msgid "&Quick compare limit (MB):" msgstr "&Grænse for hurtig sammenligning (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binær" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x406, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3218,12 +3252,12 @@ msgstr "" "Opret tomme dokumenter\n" "Nye dokumenter (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3232,7 +3266,7 @@ msgstr "" "Åben et eksisterende dokument\n" "Åben (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3241,7 +3275,7 @@ msgstr "" "Luk det aktive dokument\n" "Luk" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3250,7 +3284,7 @@ msgstr "" "Gem det aktive dokument\n" "Gem (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3259,7 +3293,7 @@ msgstr "" "Gem det aktive dokument med et nyt navn\n" "Gem som" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3268,7 +3302,7 @@ msgstr "" "Ændrer på printerens indstillinger\n" "Sideopsætning" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3277,7 +3311,7 @@ msgstr "" "Ændrer printer og printerens indstillinger\n" "Printer setup" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3286,7 +3320,7 @@ msgstr "" "Print det aktive dokument\n" "Print" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3295,27 +3329,27 @@ msgstr "" "Vis de fulde sider\n" "Printer preview" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Gør alle skjulte emner synlige igen" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Skift tilstand for træ-mode" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Udvid alle undermapper" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Slå alle undermapper sammen" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3324,32 +3358,32 @@ msgstr "" "Åben projekt fil\n" "Projekt fil (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ukendt fejl ved forsøg på åbning af projekt fil" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ukendt fejl ved forsøg på at gemme projekt fil" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Projektfil indlæst succesfuldt" -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Projekt gemt succesfuldt." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3358,7 +3392,7 @@ msgstr "" "Gem aktuel sti og valg for projektfil\n" "Gem projektfil" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3367,7 +3401,7 @@ msgstr "" "Vis program information, versionsnummer og ophavsret\n" "Om" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3376,27 +3410,27 @@ msgstr "" "Afslut programmet; spørger om man vil gemme dokumenter\n" "Afslut" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Åben dette dokument" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3405,7 +3439,7 @@ msgstr "" "Skift til det næste vindue\n" "Næste vindue" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3414,7 +3448,7 @@ msgstr "" "Skift til det tidligere vindue\n" "Tidligere vindue" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3423,7 +3457,7 @@ msgstr "" "Arranger vinduerne så de overlapper\n" "Kaskade vinduer" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3432,7 +3466,7 @@ msgstr "" "Arranger vinduerne vandret og uden overlap\n" "Arranger vinduer vandret" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3441,7 +3475,7 @@ msgstr "" "Arranger vinduerne lodret og uden overlap\n" "Arranger vinduer lodret" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3450,7 +3484,7 @@ msgstr "" "Kopier det valgte og sæt det i udklipsholderen\n" "Kopier" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3459,7 +3493,7 @@ msgstr "" "Klip det valgte ud og sæt det i udklipsholderen\n" "Klip" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3468,7 +3502,7 @@ msgstr "" "Find den angivne tekst\n" "Find" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3477,7 +3511,7 @@ msgstr "" "Indsæt udklipsholderens indhold\n" "Indsæt" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3486,7 +3520,7 @@ msgstr "" "Gentag den sidste handling\n" "Gentag" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3495,7 +3529,7 @@ msgstr "" "Erstat den angivne tekst med en anden tekst\n" "Erstat" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3504,7 +3538,7 @@ msgstr "" "Vælg hele dokumentet\n" "Vælg alt" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3513,7 +3547,7 @@ msgstr "" "Fortryd den sidste handling\n" "Fortryd" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3522,7 +3556,7 @@ msgstr "" "Gendan den tidligere fortrudte handling\n" "Gendan fortrudt" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3531,7 +3565,7 @@ msgstr "" "Vis eller gem værktøjslinjen\n" "Vis/Skjul værktøjslinjen" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3540,7 +3574,7 @@ msgstr "" "Vis eller gem statuslinjen\n" "Vis/Skjul statuslinjen" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3549,7 +3583,7 @@ msgstr "" "Vis eller skjul fanelinjen\n" "Vis/Skjul faner" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3558,57 +3592,57 @@ msgstr "" "Tilpas fanestørrelse automatisk\n" "Lås faner" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Ændre vinduesstørrelse" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Ændre vinduesposition" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Minimer vindue til en icon" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Maximer vindue til fuld størrelse" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Skift til det næste dokument vindue" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Skift til det tidligere dokument vindue" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Luk det aktive vindue og spørg efter om dokumenter skal gemmes" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Gendan vindue i normal størrelse" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Liste med aktive vinduer" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktiver dette vindue" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3617,7 +3651,7 @@ msgstr "" "Luk print preview\n" "Annuller preview" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3636,7 +3670,7 @@ msgstr "" "WinMerge.FilSammenligning\n" "WinMerge FilSammenligning" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3655,19 +3689,19 @@ msgstr "" "WinMerge.Mappe sammenligning\n" "WinMerge Mappe sammenligning" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Bevar originale EOL tegn" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Højreklik på stien for at kopiere" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3678,7 +3712,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3689,138 +3723,138 @@ msgstr "" "velkommen til at videredistribuere det under visse omstændigheder, jf. GNU " "General Public License. Se Hjælp for yderligere oplysninger." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Fortryd" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Prøv igen" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "I&gnorer alle" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ja til &alle" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nej til a&lle" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Fortsæt" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Spring over" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Spring over all&e" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Vis ikke denne &besked igen." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Stil ikke dette sp&ørgsmål igen." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Syntaks" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Versionskontrol" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Forskelle" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Til:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Fra Venstre:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Til Venstre:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Fra Højre:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Til Højre:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Indstillinger (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle beskeder vises nu igen." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3831,32 +3865,32 @@ msgstr "" "\n" "Brug værdierne 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Åben" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Valg filer (*.ini)|*.ini|Alle filer (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3865,54 +3899,54 @@ msgstr "" "Tekst Filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle filer (*." "*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Filer (*.htm,*.html)|*.htm;*.html|Alle filer (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Filer (*.xml)|*.xml|Alle filer (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Sti" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Beskrivelse" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Vælg filnavn til nyt filter" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fil Filtre (*.flt)|*.flt|Alle Filer (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3925,7 +3959,7 @@ msgstr "" "Kopier filen %1 til WinMerge/Filtermappe:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3938,7 +3972,7 @@ msgstr "" "\n" "Undersøg om mappen eksisterer og kan ændres." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3949,7 +3983,7 @@ msgstr "" "\n" "Vælg filter mappe i valg/System." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3962,12 +3996,12 @@ msgstr "" "\n" "Måske er filen skrivebeskyttet?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Find filter fil til installering" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3978,17 +4012,17 @@ msgstr "" "\n" "Kunne ikke kopiere filter fil til filter mappe." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter filen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Regulært udtryk" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -4000,258 +4034,258 @@ msgstr "" "\n" "Hvis du ikke vil opdatere sammenligningerne så vælg Nej og opdater senere." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Sti til SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultat af sammenligning af mapper" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Ikke navngivet venstre" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Ikke navngivet højre" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Deres fil" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Skanner filer..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Åbner valgte" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopierer venstre til højre" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopierer højre til venstre" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopierer alt til venstre" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopierer alt til højre" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopierer filer..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Sletter filer..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Flytter filer..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Opretter rapport" -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Fortryd sidste handling..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Gentager sidste handling..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Flet" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Forskel %1 af %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 forskelle fundet" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 forskel fundet" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Emne %1 of %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Emner: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vælg to eksisterende mapper eller filer at sammenligne" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Valgt mappe" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Vælg to mapper eller to filer at sammenligne." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Ventre sti er ugyldig!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Højre sti er ugyldig!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldige!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vælg to filer for at aktivere udvælgelse af udpakker." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne en fil og en mappe!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Fil ikke fundet: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke udpakket: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4264,12 +4298,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Kunne ikke fortolke konfliktfil" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4280,17 +4314,17 @@ msgstr "" "%1\n" "er ikke en konfliktfil." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Gem som" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Gem ændringer til %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -4299,12 +4333,12 @@ msgstr "" "%1 er markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? " "(Nej for at gemme til et andet filnavn.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Fejl under backup af filen" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4317,7 +4351,7 @@ msgstr "" "\n" "Fortsæt alligevel?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4334,7 +4368,7 @@ msgstr "" "\t-bruge et andet filenavn (Tryk Ok)\n" "\t-afbryd aktuel operation (Tryk Annuller)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4350,7 +4384,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4366,7 +4400,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4381,7 +4415,7 @@ msgstr "" "\n" "Vil du overskrive den ændrede fil?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4391,7 +4425,7 @@ msgstr "" "er markeret som skrivebeskyttet. Vil du overskrive den skrivebeskyttede fil " "alligevel?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4406,22 +4440,22 @@ msgstr "" "\n" "Vil du genindlæse filen?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Gem venstre fil som" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Gem højre fil som" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4432,7 +4466,7 @@ msgstr "" "%1\n" "er forsvundet. Gem en kopi af filen for at fortsætte." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4443,7 +4477,7 @@ msgstr "" "\n" "Opdater dokumenter før du fortsætter." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -4451,12 +4485,12 @@ msgid "" msgstr "" "Du skal angive en SourceSafe projekt sti for at fortsætte (ie: $/MitProjekt)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout filer fra VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -4465,12 +4499,12 @@ msgstr "" "Versionsstyringssystemet returnerede en fejl under forsøget på at " "kontrollere filen. Kan ikke fortsætte..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Fejl under udførelse af versionsstyringssystem kommando." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -4479,17 +4513,17 @@ msgstr "" "Arbejdsmappen for VSS og mappen for den aktuelle fil er ikke ens. Vil du " "fortsætte?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) fundet!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Fejl fra VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4501,7 +4535,7 @@ msgstr "" "Kontroller konfiguration af visning.\n" "Fortryd kontrol operation?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -4512,164 +4546,164 @@ msgstr "" "filkontrol.\n" "Knotroller konfiguration af visning." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mindre end 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og over)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Bryd ved mellemrum" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Bryd ved mellemrum eller tegnsætning" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopier valgte element til navngivet mappe" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopier valgte element til tilpasset mappe" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Slet det valgte element til venstre" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Slet det valgte element til højre" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Slet de valgte element(er) på begge sider" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skjul valgt emne(r) (ad hoc filter)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Omdøb valgte emner på begge sider" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Højre til venstre (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til højre (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Højre til venstre (%1 af %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til højre (%1 af %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Højre til... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 af %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Højre til... (%1 af %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Højre (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 af %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Højre (%1 af %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 af %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Venstre side - vælg destinationsmappen" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Højre side - vælg destinationsmappen" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påvirket)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 af %2 filer påvirket)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4680,17 +4714,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Er du sikker på du vil kopiere:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Er du sikker på du vil kopiere %d emner:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4709,568 +4743,562 @@ msgstr "" "\n" "Opdater sammenligning." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Er du sikker på du vil flytte:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Er du sikker på du vil flytte: %d emner:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Bekræft flytning" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Åben venstre fil" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Åben venstre fil i ekstern editor" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Åben venstre fil med ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Åben højre fil" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Åben højre fil i ekstern editor" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Åben højre fil med ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunne ikke eksekvere ekstern editor: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopier filnavn til clipboard" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopier venstre sides mappenavne til clipboard" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopier højre sides mappenavne til clipboard" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopier begge siders mappenavne til clipboard" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Venstre Shell menu" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Højre Shell menu" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Ukendt arkivformat" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Tilføj elementer fra venstre side til arkiv" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Tilføj elementer fra højre side til arkiv" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Tilføj elementer fra begge sider til arkiv" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Tilføj elementer der er forskellige til arkiv (fra begge sider)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flyt den valgte fil på venstre side til udvalgt mappe" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flyt den valgte fil på højre side til udvalgt mappe" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultat af sammenligning" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Højre dato" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Udvidelse" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Højre størrelse" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Højre størrelse (kort)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Venstre oprettelsesdato" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Højre oprettelsesdato" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Nyeste fil" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Venstre filversion" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Højre filversion" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Højre attributter" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Venstre EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Højre EOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Venstre encoding" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Højre encoding" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ignoreret forskel" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binær" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Emne fortrudt" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Fil sprunget over" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Mappe sprunget over" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Venstre kun: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Højre kun: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskellige" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Filer er forskellige" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Mapper er forskellige" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Kun venstre" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Kun højre" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Fejl" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Tekstfiler er identiske" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Tekstfiler er forskellige" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tid forløbet: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Filnavn eller mappenavn." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkluderet." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultat af sammenligning, lang form." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Venstre side ændringsdato." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Højre side ændringsdato." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Filens extension." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i bytes." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Højre filstørrelse i bytes." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Venstre filstørrelse forkortet." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Højre filstørrelse forkortet." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Venstre side oprettelsesdato." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Højre side oprettelsesdato." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Fortæller hvilken side har den nyeste ændringsdato." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversion, kun for nogle filtyper." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Højre side filversion, kun for nogle filtyper." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Kort resultat af sammenligning." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Højre side attributter." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Venstre sidefil EOL type" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Højre sidefil EOL type" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Venstre side encoding." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Højre side encoding." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -5279,50 +5307,50 @@ msgstr "" "Antal ignorerede forskelle i filen. Disse forskelle er ignoreret af WinMerge " "og kan ikke blive flettet." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "" "Number of differences in file. This number does not include ignored " "differences." msgstr "Antel forskelle i filen. Dette tal omfatter ikke ignorerede forskelle." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Vis stjerne (*) hvis fil er binær." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Sammenlign %1 med %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Komma opdelt liste" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Tab opdelt liste" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Simpel HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Simpel XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "Rapportfilen eksisterer allerede. Ønsker du at overskrive eksisterende fil" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5331,27 +5359,27 @@ msgstr "" "Fejl ved opretning af rapporten:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Rapporten blev oprettet succesfuldt." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Den samme fil er åbnet på begge sider." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "De valgte filer er identiske." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Der skete en fejl under sammenligning af filerne." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -5359,7 +5387,7 @@ msgstr "" "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for " "midlertidig (temp) mappe." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5379,17 +5407,17 @@ msgstr "" "valget 'Ignorer returtegn forskelle ..' i Fanen: Indstillinger -> " "Sammenlign (findes under Redigér)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Den valgte mappe er ugyldig." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan ikke åbne en binær fil til editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5404,7 +5432,7 @@ msgstr "" "%1\n" "til den anden side og åbne disse mapper?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5419,168 +5447,168 @@ msgstr "" "Vil du behandle begge filer som værende i standard Windows codepage " "(anbefalet)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Oplysninger tabt, på grund af kodnings fejl: begge filer" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Ingen forskel" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Linje forskel" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(e)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finde strengen \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopier det fulde mappenavn" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopier filnavn" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Placerings vindue" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Forskels vindue" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Patch fil oprettet med succes." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element er ikke fundet eller er en mappe!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element er ikke fundet eller er en mappe!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Denne patch fil eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Samlet" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den angivne output sti er ikke en endelig sti: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Angiv en output fil" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke lave patch filer fra binære filer." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke lave patch filer fra mapper." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5591,12 +5619,12 @@ msgstr "" "\n" "Oprettelse af en patch kræver at alle ændringer i filen er gemt." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Mappen eksisterer ikke." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5610,7 +5638,7 @@ msgstr "" "Se manualen for mere information om arkiv support og hvordan man aktivere " "det." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5619,7 +5647,7 @@ msgstr "" "\n" "Note: 7-Zip integration er deaktiveret i WinMerge indstillinger." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5630,37 +5658,37 @@ msgstr "" "Note: 7-Zip integration er begrænset til standalone operationer i WinMerge " "indstillinger." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Vælg fil til eksport" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Vælg fil til import" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Indstillinger importeret fra filen." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Indstillinger eksporteret til filen." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Kunne ikke importere indstillinger fra filen." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Kunne ikke skrive indstillinger til filen." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5671,157 +5699,157 @@ msgstr "" "\n" "Vil du fortsætte?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Udpakker" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Editor script" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Gem den venstre fil" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Gem den højre fil" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Gem den venstre fil med navnet..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Gem den højre fil med navnet..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konverter EOL til Windows tilstand" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konverter EOL til Unix tilstand" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konverter EOL til Mac tilstand" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Skift mellem rediger og flette tilstande" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5830,12 +5858,12 @@ msgstr "" "Vis og juster fil kodnings egenskaber\n" "Fil kodnings egenskaber" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Åben og udbedre konfliktfil" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5844,7 +5872,7 @@ msgstr "" "Vælg forskellen i den aktuelle linje\n" "Forskel i aktuel linje" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5853,7 +5881,7 @@ msgstr "" "Gå til linje eller forskel\n" "Gå til (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5862,7 +5890,7 @@ msgstr "" "Sæt program indstillinger\n" "Indstillinger" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5871,38 +5899,38 @@ msgstr "" "Opdater display\n" "Opdater (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" "Kopier valgte linjer til udklipsholderen og tilføj numre til linjebegyndelsen" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Vis/Skjul bogmærke" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Gå til næste bogmærke" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Gå til forrige bogmærke" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Slet alle bogmærker" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5911,7 +5939,7 @@ msgstr "" "Viser emner der er nøjagtigt ens\n" "Vis identiske emner" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5920,7 +5948,7 @@ msgstr "" "Vis emner der har forskelle\n" "Vis emner med forskelle" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5929,7 +5957,7 @@ msgstr "" "Vis emner der kun eksisterer i venstre side\n" "Vis emner der kun er i venstre side" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5938,7 +5966,7 @@ msgstr "" "Vis emner der kun eksisterer i højre side\n" "Vis emner der kun er i højre side" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5947,7 +5975,7 @@ msgstr "" "Viser binære filer\n" "Vis binære filer" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5956,7 +5984,7 @@ msgstr "" "Viser skippede emner\n" "Vis skippede emner" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5965,7 +5993,7 @@ msgstr "" "Vælg skrifttype der vises\n" "Vælg skrifttype der vises" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5974,27 +6002,27 @@ msgstr "" "Skift tilbage til standard skrifttypevisning\n" "Standard Skrifttype" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Viser et tegn for mellemrum" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Vis/Skjul horisontalt panel" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Vis eller gem vertikalt panel" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Vis mappesammenlignings statistik dialog" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -6003,7 +6031,7 @@ msgstr "" "Vælg aktuelt brugerflade sprog\n" "Sprog" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -6012,12 +6040,12 @@ msgstr "" "Vis forskelle i selve linjen med forskellige farver\n" "Vis linjeforskelle" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Byt de to vinduers placering" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -6026,7 +6054,7 @@ msgstr "" "Viser linjenumre\n" "Vis linjenumre" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -6035,7 +6063,7 @@ msgstr "" "Aktiver tekstombrydning\n" "Ombryd linjer" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6044,22 +6072,22 @@ msgstr "" "Viser udvælgelses margener for begge vinduer\n" "Vis Udvælgelses Margener" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Forstør tekst" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Formindsk Tekst" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Nulstil tekststørrelse til standard" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6068,7 +6096,7 @@ msgstr "" "Scroll til forrige forskel\n" "Forrige forskel (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6077,77 +6105,77 @@ msgstr "" "Scroll til næste forskel\n" "Næste forskel (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6156,7 +6184,7 @@ msgstr "" "Scroll til første forskel\n" "Første forskel (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6165,7 +6193,7 @@ msgstr "" "Scroll til aktuel forskel\n" "Aktuel forskel (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6174,7 +6202,7 @@ msgstr "" "Scroll til sidste forskel\n" "Sidste forskel (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6183,7 +6211,7 @@ msgstr "" "Kopier den valgte tekst til den højre fil\n" "Kopier højre (Alt Højre)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6192,7 +6220,7 @@ msgstr "" "Kopier den valgte tekst til den venstre fil\n" "Kopier venstre (Alt Venstre)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6201,7 +6229,7 @@ msgstr "" "Kopier forskel til højre side og gå til næste forskel\n" "Kopier til højre og gå til næste (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6210,7 +6238,7 @@ msgstr "" "Kopier forskel til venstre side og gå til næste forskel\n" "Kopier til venstre og gå til næste (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6219,7 +6247,7 @@ msgstr "" "Kopier alle forskelle til den højre fil\n" "Alt til højre" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6228,63 +6256,63 @@ msgstr "" "Kopier alle forskelle til den venstre fil\n" "Alt til venstre" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Slet valgte emner fra begge mapper" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Sammenlign valgte emner (sammenlign første emne hvis flere er valgt)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Vælg og gen-sorter sammenligning af mapper" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Lav en patch-fil" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Vælge og ændrer filtre" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genererer en rapport fra sammenlignings resultat" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Vis liste med tilgængelige Plugins" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" "Brugeren vælger udpakkeren (ingen udpakning under sammenligning af mapper)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -6293,32 +6321,32 @@ msgstr "" "Udpakkeren bruges på begge filer (kun den ene fil behøves en korrekt " "extension)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Vælg en udpakker til at redigere denne fil" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Anbefalede plugins" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Andre plugins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Fjern alle plugins og genindlæs dem (for udviklere)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6327,12 +6355,12 @@ msgstr "" "Aktiverer næste synlige fil\n" "Aktiverer næste fil" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Lukker alle åbne vinduer" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6341,24 +6369,24 @@ msgstr "" "Åben WinMerge Hjælp\n" "WinMerge Hjælp" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" "Skriver den nuværende WinMerge versionsinformation og konfiguration til en " "tekst fil" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Vis GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Privat Udgave: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6367,7 +6395,7 @@ msgstr "" "Åben udgivelses noter\n" "Udgivelses noter" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6376,292 +6404,292 @@ msgstr "" "Åben oversættelses websiden\n" "Oversættelser" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Plugin indstillinger" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Ingen prediffer" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediff hvis muligt" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke fundet - .sct scripts afbrudt" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Åben filen med registreret applikation" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Åben filen med ekstern editor" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Åben filen med et bestemt program" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Vis ikke flyttede blokke" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Vis alle flyttede blokke" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Vis kun flyttede blokke fra den nuværende forskel" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Gå til forskel under cursor" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Deaktiveret" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Fra filsystem" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Fra MRU liste" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Ingen fremhævning" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Transportabelt Objekt" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resourser" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Skjul værktøjslinje" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Vis lille værktøjslinje" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Vis stor værktøjslinje" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 0413e3e80..ff4362500 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -330,7 +330,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Leeg >" @@ -472,7 +472,7 @@ msgstr "&Automatisch uitpakken" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -536,7 +536,7 @@ msgstr "&Trapsgewijs" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Help" @@ -864,7 +864,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Bestandscodering..." @@ -1468,37 +1468,37 @@ msgid "&Compare method:" msgstr "Vergelijkingsmethode:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Volledige Inhoud" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Snelle Inhoud" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Datum gewijzigd" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Datum en grootte gewijzigd" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Grootte" @@ -1530,7 +1530,7 @@ msgstr "Bezoek deWinMerge HomePage!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1702,14 +1702,14 @@ msgid "&Versioning System:" msgstr "&Versiebeheersysteem:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pad naar cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Algemeen" @@ -1856,7 +1856,7 @@ msgid "&Find Next" msgstr "&Volgende" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1902,7 +1902,7 @@ msgid "Replace &All" msgstr "&Alles vervangen" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1954,7 +1954,7 @@ msgid "Remove" msgstr "Verwijderen" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Kleuren" @@ -1983,7 +1983,7 @@ msgstr "Verwijderd" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Tekst" @@ -2034,13 +2034,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Standaard" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Systeem" @@ -2181,7 +2182,7 @@ msgid "Description:" msgstr "Beschrijving:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stoppen" @@ -2243,7 +2244,7 @@ msgid "&Go To" msgstr "&Ga naar" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Vergelijken" @@ -2294,7 +2295,7 @@ msgid "Filter Comments" msgstr "Filter-commentaar" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2446,7 +2447,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Tekenset" @@ -2748,7 +2749,7 @@ msgid "Private Filter (only for current user)" msgstr "Persoonlijke filter (alleen voor huidige gebruiker)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Archiefondersteuning" @@ -2799,7 +2800,7 @@ msgid "Files:" msgstr "Bestanden:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Verschillend" @@ -2836,7 +2837,7 @@ msgid "Right:" msgstr "Rechts:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identiek" @@ -2889,7 +2890,7 @@ msgid "&Apply" msgstr "Toepassen" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "Annuleren" @@ -2995,7 +2996,7 @@ msgid "Save..." msgstr "Opslaan..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Backupbestanden" @@ -3036,7 +3037,7 @@ msgid "A&ppend timestamp" msgstr "Voeg tijdstem&pel toe" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Kopiëren bevestigen" @@ -3077,7 +3078,7 @@ msgid "&Enable plugins" msgstr "Plugins inschakelen" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Shell-integratie" @@ -3113,8 +3114,8 @@ msgid "Add &Shell menu to context menu" msgstr "&Shell-menu toevoegen aan contextmenu" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Map" @@ -3150,69 +3151,102 @@ msgid "&Quick compare limit (MB):" msgstr "Limiet snelvergelijking (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binair" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041304e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x413, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Gereed" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "UIT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "OPN" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3221,12 +3255,12 @@ msgstr "" "Lege documenten aanmaken\n" "Nieuwe documenten (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3235,7 +3269,7 @@ msgstr "" "Een bestaand document openen.\n" "Openen (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3244,7 +3278,7 @@ msgstr "" "Het actieve document sluiten.\n" "Sluiten" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3253,7 +3287,7 @@ msgstr "" "Actief document opslaan.\n" "Opslaan" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3262,7 +3296,7 @@ msgstr "" "Actief document opslaan met een andere naam.\n" "Opslaan als" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3271,7 +3305,7 @@ msgstr "" "De pagina-instellingen wijzigen.\n" "Pagina-instellingen" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3280,7 +3314,7 @@ msgstr "" "De printerinstellingen wijzigen.\n" "Printerinstellingen" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3289,7 +3323,7 @@ msgstr "" "Actief document afdrukken.\n" "Afdrukken" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3298,27 +3332,27 @@ msgstr "" "Toon volledige pagina's\n" "Afdrukvoorbeeld" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Maak alle verborgen items terug zichtbaar" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Tree-modus aan/uit" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Alle submappen uitklappen" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Alle submappen inklappen" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3327,32 +3361,32 @@ msgstr "" "Open projectbestand\n" "Projectbestand (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Onbekende fout bij poging tot openen van projectbestand" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Onbekende fout bij poging tot opslaan van projectbestand" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Projectbestand" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Projectbestand met succes geladen." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Projectbestand met succes opgeslagen." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3361,7 +3395,7 @@ msgstr "" "Huidige paden en opties opslaan naar projectbestand\n" "Projectbestand Opslaan" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3370,7 +3404,7 @@ msgstr "" "Programma-informatie, versienummer en auteursrechten weergeven.\n" "Info" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3379,27 +3413,27 @@ msgstr "" "Applicatie afsluiten, vraagt naar opslaan documenten\n" "Afsluiten" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Dit document openen" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3408,7 +3442,7 @@ msgstr "" "Ga naar het volgende venster deel.\n" "Volgende Venster" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3417,7 +3451,7 @@ msgstr "" "Ga naar het vorige venster deel.\n" "Vorige Venster" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3426,7 +3460,7 @@ msgstr "" "Alle vensters trapsgewijs rangschikken.\n" "Trapsgewijs" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3435,7 +3469,7 @@ msgstr "" "Alle vensters horizontaal rangschikken.\n" "Horizontaal rangschikken" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3444,7 +3478,7 @@ msgstr "" "Alle vensters verticaal rangschikken.\n" "Verticaal rangschikken" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3453,7 +3487,7 @@ msgstr "" "De selectie naar het klembord kopiëren\n" "Kopiëren" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3462,7 +3496,7 @@ msgstr "" "De slecetie naar het klembord verplaatsen.\n" "Knippen" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3471,7 +3505,7 @@ msgstr "" "De aangegeven tekst vinden.\n" "Vinden" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3480,7 +3514,7 @@ msgstr "" "Inhoud klembord invoegen\n" "Plakken" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3489,7 +3523,7 @@ msgstr "" "Laatste actie herhalen.\n" "Herhalen" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3498,7 +3532,7 @@ msgstr "" "Gespecificeerde tekst door een andere vervangen.\n" "Vervangen" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3507,7 +3541,7 @@ msgstr "" "Het hele document selecteren.\n" "Alles selecteren" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3516,7 +3550,7 @@ msgstr "" "Laatste actie ongedaan maken.\n" "Ongedaan maken" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3525,7 +3559,7 @@ msgstr "" "Ongedaangemaakte actie opnieuw uitvoeren.\n" "Opnieuw" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3534,7 +3568,7 @@ msgstr "" "De werkbalk weergeven of verbergen\n" "Werkbalk" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3543,7 +3577,7 @@ msgstr "" "De statusbalk weergeven of verbergen\n" "Statusbalk" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3552,7 +3586,7 @@ msgstr "" "Tab-balk weergeven of verbergen\n" "Tab-balk aan/uit" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3561,57 +3595,57 @@ msgstr "" "Stel venstergrootte automatisch in\n" "Vensters Vastzetten" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "De grootte van het venster wijzigen" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Het venster verplaatsen" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Venster minimaliseren" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Venster maximaliseren" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Naar volgend documentvenster" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Naar vorig documentvenster" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Het actieve venster sluiten, vraag naar opslaan van documenten." -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Venster terug naar vorige formaat" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Lijst actieve taken" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Dit venster inschakelen" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3620,7 +3654,7 @@ msgstr "" "Afdrukvoorbeeld sluiten\n" "Afsluiten voorbeeld" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3639,7 +3673,7 @@ msgstr "" "WinMerge.BestandsVergelijking\n" "WinMerge BestandsVergelijking" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3658,19 +3692,19 @@ msgstr "" "WinMerge.MapVergelijking\n" "WinMerge MapVergelijking" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Originele regeleindes behouden" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Klik rechts op het pad om het te kopiëren" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3681,7 +3715,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3692,138 +3726,138 @@ msgstr "" "herverdelen onder bepaalde omstandigheden; zie de GNU General Public License " "in het Help-menu voor details." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Afbreken" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Herhalen" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Negeren" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "&Alles negeren" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ja op &alles" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nee" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nee op a&lles" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Doorgaan" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Overslaan" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "&Alles overslaan" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Dit bericht niet &meer weergeven." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Deze &vraag niet meer stellen." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Versiebeheer" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Verschillen" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Naar:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Van links:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Naar links:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Van rechts:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Naar rechts:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versie %1 - Nederlands" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opties (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle berichtvensters worden terug weergegeven." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3834,32 +3868,32 @@ msgstr "" "\n" "Gebruik waarden 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Openen" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Uitvoerbare bestanden|*.exe;*.bat;*.cmd|Alle bestanden (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle bestanden (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projectbestanden (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Optie-bestanden (*.ini)|*.ini|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3868,54 +3902,54 @@ msgstr "" "Tekstbestanden (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle " "Bestanden (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Naam" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Locatie" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filters" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Beschrijving" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Selecteer bestandsnaam voor nieuwe filter" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3928,7 +3962,7 @@ msgstr "" "Kopieer bestand %1 naar map WinMerge/Filters:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3941,7 +3975,7 @@ msgstr "" "\n" "Ga na of de map bestaat en schrijfbaar is." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3952,7 +3986,7 @@ msgstr "" "\n" "Selecteer filtermap in Opties/Systeem." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3965,12 +3999,12 @@ msgstr "" "\n" "Misschien is het bestand alleen-lezen?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Localiseer te installeren filterbestand" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3981,17 +4015,17 @@ msgstr "" "\n" "Kon nieuwe filter niet kopiëren naar filtermap." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Reguliere expressie" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -4005,258 +4039,258 @@ msgstr "" "Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen " "later vernieuwen." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pad naar SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultaten mapvergelijking" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Restultaten bestandsvergelijking" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Geen titel links" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Geen titel rechts" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Hun bestand" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Mijn bestand" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Bestanden aan het scannen..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Bezig met openen van selectie" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Aan het kopiëren van links naar rechts" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Aan het kopiëren van rechts naar links" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Alles naar links aan het kopiëren" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Alles naar rechts aan het kopiëren" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Bezig met kopiëren van bestanden..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Bezig met verwijderen van bestanden..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Bezig met verplaatsen van bestanden..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Rapport genereren..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Laatste handeling ongedaan maken..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Vorige handeling opnieuw doen..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Regel: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Samenvoegen" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Verschil %1 van %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 verschillen gevonden" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "Eén verschil gevonden" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "AL" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Item %1 van %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Items: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Selectie van mappen" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecteer twee mappen of bestanden om te vergelijken." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Linker pad is ongeldig!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Rechter pad is ongeldig!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Beide paden zijn ongeldig!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan geen bestand met een map vergelijken!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Bestand niet gevonden: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Bestand niet uitgepakt: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4269,12 +4303,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Analyseren van conflictbestand mislukt." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4285,17 +4319,17 @@ msgstr "" "%1\n" "is geen conflictbestand." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Opslaan als" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Wijzigingen opslaan in %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -4304,12 +4338,12 @@ msgstr "" "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand " "overschrijven? (Niet opslaan onder nieuwe naam.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Fout bij het maken van een veiligheidskopie" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4322,7 +4356,7 @@ msgstr "" "\n" "Toch doorgaan?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4337,7 +4371,7 @@ msgstr "" "%2\n" "Wilt u het bestand onder een andere naam opslaan?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4352,7 +4386,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4367,7 +4401,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4382,7 +4416,7 @@ msgstr "" "\n" "Het gewijzigde bestand overschrijven?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4391,7 +4425,7 @@ msgstr "" "%1\n" "is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4406,22 +4440,22 @@ msgstr "" "\n" "Wilt u het bestand opnieuw laden?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Linker bestand opslaan als" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Rechter bestand opslaan als" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4432,7 +4466,7 @@ msgstr "" "%1\n" "is verdwenen. Sla een kopie van het bestand op om door te gaan." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4443,7 +4477,7 @@ msgstr "" "\n" "Vernieuw documenten voordat u doorgaat." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -4452,12 +4486,12 @@ msgstr "" "U moet een SourceSafe project path specificeren voordat u verder kunt (bv: " "$/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Bestanden vanuit VSS uitchecken..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -4466,12 +4500,12 @@ msgstr "" "SourceSafe gaf een foutmelding bij de check out van het bestand. Kan niet " "verder gaan..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -4480,17 +4514,17 @@ msgstr "" "De VSS werkmap en de lokatie van het huidige bestand komen niet overeen. " "Doorgaan?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Geen VSS database(s) gevonden!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Fout uit VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4501,7 +4535,7 @@ msgstr "" " Controleer configuratie-specificaties van de gebruikte weergave.\n" " Checkout ongedaan maken?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -4512,164 +4546,164 @@ msgstr "" "bestands-checkout.\n" " Controleer configuratie-specificaties van de gebruikte weergave." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Geen" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 of lager)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 en hoger)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Afbreken bij witruimte" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Afbreken bij witruimte of interpunctie" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopieer geselecteerd item naar genoemde map" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopieer geselecteerd item naar aangepaste map" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Geselecteerde item aan de linker kant verwijderen" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Geselecteerde item aan de rechter kant verwijderen" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Geselecteerde item(s) aan beide kanten verwijderen" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Verberg geselecteerd(e) item(s) (on-the-fly-filter)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Herbenoem geselecteerd item aan beide kanten" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Van rechts naar links (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Van links naar rechts (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Van rechts naar links (%1 van %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Van links naar rechts (%1 van %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Van links naar... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Van rechts naar... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Van links naar... (%1 van %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Van rechts naar... (%1 van %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 of %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 of %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 of %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Linkerkant - selecteer doelmap:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Rechterkant - selecteer doelmap:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Bestanden Aangepast)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 van %2 Bestanden Aangepast)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4681,17 +4715,17 @@ msgstr "" "%1\n" "wilt verwijderen?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Bent u zeker dat u het volgende wilt kopiëren:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Bent u zeker dat u %d items wilt kopiëren:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4710,572 +4744,566 @@ msgstr "" "\n" "Vernieuw a.u.b. de vergelijking." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Bent u zeker dat u wilt verplaatsen:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Bent u zeker dat u %d items wilt verplaatsen:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Bevestig Verplaatsen" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Linker bestand openen" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Het linker bestand met de externe editor openen" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Linker bestand openen met ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Rechter bestand openen" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Het rechter bestand met de externe editor openen" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Rechter bestand openen met..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Uitvoeren externe editor mislukt: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Bestandsnamen naar het klembord kopiëren" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Padnamen van de linker kant naar het klembord kopiëren" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Padnamen van de rechter kant naar het klembord kopiëren" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Padnamen van beide kanten naar het klembord kopiëren" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Linker shellmenu" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Rechter shellmenu" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Onbekend archiefformaat" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Items van de linker kant aan het archief toevoegen" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Items van de rechter kant aan het archief toevoegen" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Items van beide kanten aan het archief toevoegen" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Items die verschillen (van beide kanten) aan het archief toevoegen" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "" "Geselecteerd bestand van links naar door gebruiker gedefinieerde map " "verplaatsen" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "" "Geselecteerd bestand van rechts naar door gebruiker gedefinieerde map " "verplaatsen" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Bestandsnaam" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Vergelijkingsresultaat" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Datum links" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Datum rechts" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Grootte links" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Grootte rechts" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Grootte rechts (Kort)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Grootte links (Kort)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Aanmaaktijd links" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Aanmaaktijd rechts" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Nieuwer bestand" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Bestandsversie links" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Bestandsversie rechts" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Kort resultaat" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Attributen links" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Attributen rechts" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Links regeleinde" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Rechts regeleinde" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Tekenset links" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Tekenset rechts" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Genegeerde Versch." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binair" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Kan bestanden niet vergelijken" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Item afgebroken" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Bestand overgeslagen" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Map overgeslagen" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Alleen links: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Alleen rechts: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binaire bestanden zijn identiek" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binaire bestanden zijn niet gelijk" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Bestanden zijn niet gelijk" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Mappen zijn verschillend" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Alleen links" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Alleen rechts" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Fout" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Tekstbestanden zijn identiek" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Tekstbestanden zijn verschillend" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Verstreken tijd: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 item geselecteerd" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 items geselecteerd" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Bestandsnaam of mapnaam." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Naam van submap als submappen erbij horen." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultaat van vergelijking, lange vorm." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Wijzigingsdatum linker zijde." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Wijzigingsdatum rechter zijde." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Bestandsextensie." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Bestandsgrootte in bytes voor linker zijde." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Bestandsgrootte in bytes voor rechter zijde." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Linker bestandsgrootte ingekort." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Rechter bestandsgrootte ingekort." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Aanmaaktijdstip linker zijde." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Aanmaaktijdstip rechter zijde." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Geeft aan welke zijde het recentst gewijzigd is." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bestandsversie linker zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Bestandsversie rechter zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Kort vergelijkingsresultaat." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Attributen linker zijde." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Attributen rechter zijde." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Type regeleinde linker bestand" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Type regeleinde rechter bestand" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Tekenset linker zijde." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Tekenset rechter zijde." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -5284,7 +5312,7 @@ msgstr "" "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd " "door WinMerge en kunnen niet samengevoegd worden." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "" "Number of differences in file. This number does not include ignored " @@ -5292,43 +5320,43 @@ msgid "" msgstr "" "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Toont sterretje (*) als het een binair bestand is." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "%1 met %2 vergelijken" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Komma-gescheiden lijst" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Tab-gescheiden lijst" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Simpele html" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Simpele xml" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "Het rapportbestand bestaat reeds. Wilt u het bestaande bestand overschrijven?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5337,27 +5365,27 @@ msgstr "" "Fout bij maken van rapport:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Het rapport is met succes opgesteld." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Hetzelfde bestand is in beide vensters geopend." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "De geselecteerde bestanden zijn identiek" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Fout opgetreden tijdens het vergelijken van de bestanden" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -5365,7 +5393,7 @@ msgstr "" "Tijdelijke bestanden konden niet aangemaakt worden. Controleer de instelling " "voor het pad van tijdelijke bestanden." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5386,17 +5414,17 @@ msgstr "" "behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in " "de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)" -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "De geselecteerde map is ongeldig." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan geen binair bestand openen met de editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5411,7 +5439,7 @@ msgstr "" "%1\n" "maken aan de andere kant en deze mappen openen?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5427,168 +5455,168 @@ msgstr "" "Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel " "zijn (aangeraden)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Geen verschil" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Regelverschil" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 tekenreeks(en) vervangen." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan tekenreeks \"%s\" niet vinden" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Volledig pad kopiëren" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Bestandsnaam kopiëren" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Locatievenster" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Verschilvenster" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Patch-bestand met succes weggeschreven." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1ste item niet gevonden! (is het een map?)" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2de item niet gevonden! (is het een map?)" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Het patch-bestand bestaat al. Wilt u het overschrijven?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 bestanden geselecteerd]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normaal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Verenigd" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Kan niet schrijven naar bestand %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Specifieer een uitvoerbestand" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan geen patch-bestand maken uit binaire bestanden." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan geen patch-bestand maken uit mappen." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5600,12 +5628,12 @@ msgstr "" "Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in " "bestanden zijn." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Map bestaat niet." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5619,7 +5647,7 @@ msgstr "" "Zie de handleiding voor meer info over archiefondersteuning en hoe het in te " "schakelen." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5628,7 +5656,7 @@ msgstr "" "\n" "Opmerking: 7-Zip-integratie is uitgeschakeld in de instellingen van WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5639,37 +5667,37 @@ msgstr "" "Opmerking: 7-Zip-integratie is gelimiteerd tot standalone-operatie in de " "instellingen van WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Selecteer te exporteren bestand" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Selecteer te importeren bestand" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Opties geïmporteerd van bestand" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Opties geëxporteerd naar bestand." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Opties importeren van bestand mislukt." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Opties schrijven naar bestand mislukt." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5681,157 +5709,157 @@ msgstr "" "\n" "Wilt u doorgaan?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Gemengd" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Uitpakker" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Voorvergelijken" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Editor-script" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Het linker bestand opslaan" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Het rechter bestand opslaan" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Het linker bestand opslaan met de naam..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Het rechter bestand opslaan met de naam..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Converteer regeleinde naar Windows-modus" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converteer regeleinde naar Unix-modus" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converteer regeleinde naar Mac-modus" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Wisselen tussen bewerkmodus en samenvoegmodus" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5840,12 +5868,12 @@ msgstr "" "Bekijk en wijzig bestandscodering-eigenschappen\n" "Bestandscodering-eigenschappen" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Conflictbestand openen en oplossen" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5854,7 +5882,7 @@ msgstr "" "Selecteer verschilgebied in de huidige regel\n" "Verschil in Huidige Regel" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5863,7 +5891,7 @@ msgstr "" "Ga naar regel of verschil\n" "Ga naar (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5872,7 +5900,7 @@ msgstr "" "Programmaopties instellen\n" "Eigenschappen" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5881,39 +5909,39 @@ msgstr "" "Beeld verversen\n" "Verversen (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" "Kopieer geselecteerde regels naar het klembord en voeg regelnummers toe aan " "het begin van elke regel" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Bladwijzer aan/uit" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ga naar volgende bladwijzer" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ga naar vorige bladwijzer" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Alle bladwijzers wissen" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5922,7 +5950,7 @@ msgstr "" "Toont items die exact hetzelfde zijn\n" "Toon Identieke Items" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5931,7 +5959,7 @@ msgstr "" "Toont items die verschillen bevatten\n" "Toon Verschillende Items" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5940,7 +5968,7 @@ msgstr "" "Toont items die alleen aan de linkerkant bestaan\n" "Toon Linker Unieke Items" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5949,7 +5977,7 @@ msgstr "" "Toont items die alleen aan de rechterkant bestaan\n" "Toon Rechter Unieke Items" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5958,7 +5986,7 @@ msgstr "" "Toont binaire bestanden\n" "Toon Binaire Bestanden" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5967,7 +5995,7 @@ msgstr "" "Toont overgeslagen items\n" "Toon Overgeslagen Items" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5976,7 +6004,7 @@ msgstr "" "Het lettertype voor de verschilvensters selecteren\n" "Het verschil-lettertype selecteren" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5985,27 +6013,27 @@ msgstr "" "Terug naar gebruik standaard systeemlettertype voor verschilvensters \n" "Standaard lettertype" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Toont tekens witruimte" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Verschilvenster Aan/Uit" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Locatievenster toont overzichtsweergave van bestanden" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Toon venster met mapvergelijkingsstatistieken" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -6014,7 +6042,7 @@ msgstr "" "Selecteer de interfacetaal voor de huidige gebruiker\n" "Taal" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -6023,12 +6051,12 @@ msgstr "" "Toont verschillen binnen dezelfde regel met verschillende kleuren\n" "Toon Regelverschil" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Wissel de plaats van de twee vensters" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -6037,7 +6065,7 @@ msgstr "" "Toont regelnummers\n" "Toon Regelnummers" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -6046,7 +6074,7 @@ msgstr "" "Woordterugloop inschakelen\n" "Regelterugloop" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6055,22 +6083,22 @@ msgstr "" "Toont selectiemarges voor beide vensters\n" "Toon Selectiemarges" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Tekst vergroten" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Tekst verkleinen" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Tekst-zoom naar standaardgrootte herstellen" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6079,7 +6107,7 @@ msgstr "" "Scroll naar het Vorige verschil\n" "Vorige Verschil (Alt+Omhoog)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6088,77 +6116,77 @@ msgstr "" "Scroll naar het volgende verschil\n" "Volgende Verschil (Alt+Omlaag)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6167,7 +6195,7 @@ msgstr "" "Scroll naar het eerste verschil\n" "Eerste Verschil (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6176,7 +6204,7 @@ msgstr "" "Scroll naar het huidige verschil\n" "Huidig Verschil (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6185,7 +6213,7 @@ msgstr "" "Scroll naar het laatste verschil\n" "Laatste Verschil (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6194,7 +6222,7 @@ msgstr "" "De geselecteerde tekst naar het rechter bestand kopiëren.\n" "Nnaar rechts kopiëren (Pijl rechts)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6203,7 +6231,7 @@ msgstr "" "De geselecteerde tekst naar het linker bestand kopiëren.\n" "Naar links kopiëren (Pijl links)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6212,7 +6240,7 @@ msgstr "" "Het verschil naar rechts kopiëren en verder naar het volgende verschil.\n" "Naar rechts kopiëren en volgende (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6221,7 +6249,7 @@ msgstr "" "Het verschil naar links kopiëren en verder naar het volgende verschil.\n" "Naar links kopiëren en volgende (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6230,7 +6258,7 @@ msgstr "" "Alle verschillen naar het rechter bestand kopiëren.\n" "Alles naar rechts kopiëren" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6239,66 +6267,66 @@ msgstr "" "Kopieer alle verschillen naar het linker bestand. \n" "Alles naar links kopiëren" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Geselecteerde items uit beide mappen wissen" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" "Vergelijk geselecteerd item (vergelijk eerste item indien meerdere items " "geselecteerd)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Kolommen van mapvergelijk selecteren en herordenen" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Een patch-bestand genereren" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Filters selecteren en wijzigen" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genereert een rapport met vergelijkingsresultaten" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Toont een lijst met beschikbare plugins" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" "De gebruiker selecteert de uitpakker (niet uitpakken bij het vergelijken van " "mappen)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -6307,32 +6335,32 @@ msgstr "" "De overgenomen uitpakker wordt gebruikt voor beide bestanden (een bestand " "hoeft maar de extensie te hebben)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selecteer een uitpakker om dit bestand te wijzigen" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Geen voorvergelijking (normaal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Voorgestelde plug-ins" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Andere plug-ins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Alle plug-ins opnieuw inladen (voor ontwikkelaars)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6341,12 +6369,12 @@ msgstr "" "Activeert volgend zichtbaar bestand\n" "Activeer volgend bestand" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Sluit alle geopende vensters" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6355,23 +6383,23 @@ msgstr "" "Opent de WinMerge Help\n" "WinMerge Help" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" "De huidige WinMerge versie en configuratie naar een tekstbestand wegschrijven" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Toon de GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Private Versie: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6380,7 +6408,7 @@ msgstr "" "Opent het document met vrijgave-opmerkingen\n" "Vrijgave-opmerkingen" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6389,292 +6417,292 @@ msgstr "" "Opent de vertalingen-website\n" "Vertalingen" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Plug-in instellingen" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Geen voorvergelijking" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Voorvergelijking indien mogelijk" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH niet gevonden - .sct scripts uitgeschakeld" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Bestand openen met geregistreerde applicatie" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Bestand openen met externe editor" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Bestand openen met een bepaald programma" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Verplaatste blokken niet weergeven" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Alle verplaatste blokken weergeven" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Alleen verplaatse blokken van huidige vergelijking weergeven" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ga naar het verschil onder de cursor" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "G&a naar regel %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Uitgeschakeld" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Van bestandssysteem" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Van MRU-lijst" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Geen Markering" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Draagbaar Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Bronnen" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Werkbalk verbergen" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Kleine werkbalk weergeven" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Grote werkbalk weergeven" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 4401cbd2d..c68eeae12 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2015-02-11 14:08+0000\n" +"POT-Creation-Date: 2015-02-13 10:49+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -324,7 +324,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "" @@ -466,7 +466,7 @@ msgstr "" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -530,7 +530,7 @@ msgstr "" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "" @@ -858,7 +858,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "" @@ -1462,37 +1462,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "" @@ -1524,7 +1524,7 @@ msgstr "" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "" @@ -1696,14 +1696,14 @@ msgid "&Versioning System:" msgstr "" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "" @@ -1846,7 +1846,7 @@ msgid "&Find Next" msgstr "" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "" @@ -1892,7 +1892,7 @@ msgid "Replace &All" msgstr "" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "" @@ -1944,7 +1944,7 @@ msgid "Remove" msgstr "" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "" @@ -1973,7 +1973,7 @@ msgstr "" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "" @@ -2024,13 +2024,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "" @@ -2171,7 +2172,7 @@ msgid "Description:" msgstr "" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "" @@ -2233,7 +2234,7 @@ msgid "&Go To" msgstr "" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "" @@ -2284,7 +2285,7 @@ msgid "Filter Comments" msgstr "" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "" @@ -2436,7 +2437,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "" @@ -2706,7 +2707,7 @@ msgid "Private Filter (only for current user)" msgstr "" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "" @@ -2757,7 +2758,7 @@ msgid "Files:" msgstr "" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "" @@ -2794,7 +2795,7 @@ msgid "Right:" msgstr "" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "" @@ -2847,7 +2848,7 @@ msgid "&Apply" msgstr "" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "" @@ -2953,7 +2954,7 @@ msgid "Save..." msgstr "" #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "" @@ -2994,7 +2995,7 @@ msgid "A&ppend timestamp" msgstr "" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "" @@ -3035,7 +3036,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3071,8 +3072,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "" @@ -3108,2939 +3109,2966 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 #, c-format -msgid "Image" +msgid "Binary" msgstr "" #: Merge.rc:1957 #, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 +#, c-format +msgid "Image" +msgstr "" + +#: Merge.rc:1971 +#, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "Close the active document\nClose" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "Change the printing options\nPage Setup" msgstr "" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "Print the active document\nPrint" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "Display full pages\nPrint Preview" msgstr "" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "Find the specified text\nFind" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "Repeat the last action\nRepeat" msgstr "" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "Select the entire document\nSelect All" msgstr "" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 "" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 328a996d2..23d60b75f 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -332,7 +332,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Vide >" @@ -474,7 +474,7 @@ msgstr "D #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -538,7 +538,7 @@ msgstr "&Cascade" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "A&ide" @@ -866,7 +866,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Encodage de fic&hier" @@ -1470,37 +1470,37 @@ msgid "&Compare method:" msgstr "&Méthode de comparaison:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Contenu complet" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Contenu rapide" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Date de modification" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Date et taille modifiée" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Taille" @@ -1532,7 +1532,7 @@ msgstr "D #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1704,14 +1704,14 @@ msgid "&Versioning System:" msgstr "&Système utilisé:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Chemin vers cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Général" @@ -1854,7 +1854,7 @@ msgid "&Find Next" msgstr "&Suivant" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1900,7 +1900,7 @@ msgid "Replace &All" msgstr "&Tout Remplacer" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1952,7 +1952,7 @@ msgid "Remove" msgstr "Supprimer" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Couleurs" @@ -1981,7 +1981,7 @@ msgstr "Absence" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Texte" @@ -2032,13 +2032,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Défauts" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Système" @@ -2179,7 +2180,7 @@ msgid "Description:" msgstr "Description:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Arrêter" @@ -2241,7 +2242,7 @@ msgid "&Go To" msgstr "&Atteindre" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Comparaison" @@ -2292,7 +2293,7 @@ msgid "Filter Comments" msgstr "Filtrer les commentaires" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Éditeur" @@ -2444,7 +2445,7 @@ msgstr "Ignorer tout" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Page de code" @@ -2734,7 +2735,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtre privé (pour l'usager actuel seulement)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Support d'archives" @@ -2785,7 +2786,7 @@ msgid "Files:" msgstr "Fichiers:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Différent" @@ -2822,7 +2823,7 @@ msgid "Right:" msgstr "Droit:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identique" @@ -2875,7 +2876,7 @@ msgid "&Apply" msgstr "&Appliquer" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "Ann&uler" @@ -2981,7 +2982,7 @@ msgid "Save..." msgstr "Enregistrer..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Fichiers d'archive" @@ -3022,7 +3023,7 @@ msgid "A&ppend timestamp" msgstr "Apposer une estampille &temporelle" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Confirmation de copie" @@ -3063,7 +3064,7 @@ msgid "&Enable plugins" msgstr "&Activer les plugiciels" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Intégration à l'explorateur" @@ -3099,8 +3100,8 @@ msgid "Add &Shell menu to context menu" msgstr "Ajouter le menu de l'explorateur au menu contextuel" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Répertoire" @@ -3136,69 +3137,102 @@ msgid "&Quick compare limit (MB):" msgstr "&Limite de comparaison rapide (MO):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binaire" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040c04e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x40c, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Prêt" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "MAJ" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3207,12 +3241,12 @@ msgstr "" "Création de documents vides\n" "Nouveau (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3221,7 +3255,7 @@ msgstr "" "Ouvrir la fenêtre du choix des sélections\n" "Ouvrir (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3230,7 +3264,7 @@ msgstr "" "Ferme la fenêtre active\n" "Fermer" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3239,7 +3273,7 @@ msgstr "" "Enregistre le fichier actif\n" "Enregistrer (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3248,7 +3282,7 @@ msgstr "" "Enregistre le fichier actif sous un nouveau nom\n" "Enregistrer sous" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3257,7 +3291,7 @@ msgstr "" "Change les options d'impression\n" "Mise en page" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3265,7 +3299,7 @@ msgid "" msgstr "Change l'imprimante et les options d'impression\n" "Configuration de l'impression" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3274,7 +3308,7 @@ msgstr "" "Imprime le document actif\n" "Imprimer" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3283,27 +3317,27 @@ msgstr "" "Affiche les pages entières\n" "Aperçu avant impression" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Rendre visible à nouveau tous les éléments cachés" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Afficher ou masquer l'arborescence" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Dilater tous les sous-répertoires" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Contracter tous les sous-répertoires" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3312,32 +3346,32 @@ msgstr "" "Ouvrir un fichier de projet\n" "Fichier de projet (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erreur indéterminée lors de l'ouverture du projet" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erreur indéterminée lors de l'enregistrement du projet" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Fichier de projet" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Fichiers du projet correctement chargés." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Fichiers du projet correctement enregistrés." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3345,7 +3379,7 @@ msgid "" msgstr "Enregistrer les chemins et préférences au fichier de projet\n" "Enregistrer le fichier de projet" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3354,7 +3388,7 @@ msgstr "" "Affiche des informations sur le programme, le numéro de version et le copyright\n" "A propos de" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3362,27 +3396,27 @@ msgid "" msgstr "Quitte l'application et propose d'enregistrer les documents\n" "Quitter" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Ouvrir ce document" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3391,7 +3425,7 @@ msgstr "" "Passe au volet suivant\n" "Volet suivant" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3400,7 +3434,7 @@ msgstr "" "Revient au volet précédent\n" "Volet précédent" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3409,7 +3443,7 @@ msgstr "" "Réorganise les fenêtres en cascade\n" "Cascade" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3418,7 +3452,7 @@ msgstr "" "Réorganise les fenêtres en une mosaïque horizontale\n" "Mosaïque horizontale" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3427,7 +3461,7 @@ msgstr "" "Réorganise les fenêtres en une mosaïque verticale\n" "Mosaïque verticale" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3435,7 +3469,7 @@ msgid "" msgstr "Copie la sélection dans le presse-papiers\n" "Copier" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3444,7 +3478,7 @@ msgstr "" "Supprime la sélection et la place dans le presse-papiers\n" "Couper" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3453,7 +3487,7 @@ msgstr "" "Recherche le texte spécifié\n" "Rechercher" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3462,7 +3496,7 @@ msgstr "" "Insère le contenu du presse-papiers\n" "Coller" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3471,7 +3505,7 @@ msgstr "" "Répète la dernière action\n" "Répéter" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3480,7 +3514,7 @@ msgstr "" "Remplace le texte spécifique par un texte différent\n" "Remplacer" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3489,7 +3523,7 @@ msgstr "" "Sélectionne le document entier\n" "Sélectionner tout" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3498,7 +3532,7 @@ msgstr "" "Annule la dernière action\n" "Annuler" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3507,7 +3541,7 @@ msgstr "" "Rétablit l'action précédemment annulée\n" "Rétablir" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3516,7 +3550,7 @@ msgstr "" "Affiche ou masque la barre d'outils\n" "Barre d'outils" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3525,7 +3559,7 @@ msgstr "" "Affiche ou masque la barre d'état\n" "Barre d'état" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3534,7 +3568,7 @@ msgstr "" "Affiche ou masque la barre d'onglets\n" "Barre d'onglet" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3543,57 +3577,57 @@ msgstr "" "Redimensionne les fenêtres automatiquement\n" "Verrouiller les fenêtres" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Change la taille de la fenêtre" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Change la position de la fenêtre" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Réduit la fenêtre en icône" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Agrandit la fenêtre au format de l'écran" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Passe à la fenêtre du document suivant" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Passe à la fenêtre du document précédent" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Ferme la fenêtre active et propose l'enregistrement des documents" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Restaure la fenêtre à sa taille d'origine" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Active la liste des tâches" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Active cette fenêtre" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3602,7 +3636,7 @@ msgstr "" "Ferme le mode d'aperçu avant impression\n" "Fermer l'aperçu" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3621,7 +3655,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3640,19 +3674,19 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Conserver les caractères de fin de ligne d'origine" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Clic droit pour copier le chemin" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3661,143 +3695,143 @@ msgstr "" "Développeurs:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 est fourni SANS AUCUNE GARANTIE. C'est un logiciel libre et vous êtes invité à le redistribuer sous certaines conditions; Voir la licence publique générale GNU au menu d'aide pour tous les détails." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Avorter" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Réessayer" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorer &tout" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Oui" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Oui pour &tout" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Non pour t&out" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Continuer" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Ignorer" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Ignorer &tout" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Ne plus afficher ce &message." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Ne plus poser cette &question." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Syntaxe" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Contrôle de version" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Différences" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Vers:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "De la gauche:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Vers la gauche:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "De la droite:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Vers la droite:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Version %1 - Français" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Préférences (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Tous les messages seront réaffichés." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3807,84 +3841,84 @@ msgstr "La valeur de la taille des tabulations n'entre pas dans la plage accept "\n" "Voici la plage des valeurs acceptées 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Ouvrir" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmes|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fichiers d'options (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fichiers texte (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Emplacement" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Description" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Sélectionner un nom de fichier pour le nouveau filtre" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3897,7 +3931,7 @@ msgstr "" "Veuillez copier le fichier %1 dans WinMerge/Répertoire des filtres:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3910,7 +3944,7 @@ msgstr "" "\n" "Veuillez vous assurer de l'existance du répertore et qu'il soit inscriptible." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3921,7 +3955,7 @@ msgstr "" "\n" "Veuillez le définir sous Préférences/Système." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3934,12 +3968,12 @@ msgstr "" "\n" "Cause probable: fichier en lecture seule?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Localiser le fichier de filtre à installer" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3950,17 +3984,17 @@ msgstr "" "\n" "Ne peut copier le nouveau fichier de filtre au répertoire de filtre." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Le fichier de filtre existe déjà. Écraser le filtre existant?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Expression régulière" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3971,258 +4005,258 @@ msgstr "" "\n" "Si vous ne voulez pas actualiser la comparaison. Sélectionnez Non et l'actualisation se fera plus tard." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Chemin vers SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Résultats de la comparaison des répertoires" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Comparaison de fichiers" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Sans titre à gauche" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Sans titre à droite" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Leur fichier" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Mon fichier" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Balayage des fichiers en cours..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Ouverture en cours..." -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Copie de gauche à droite en cours..." -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Copie de droite à gauche en cours..." -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Copie de tout vers la gauche en cours..." -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Copie de tout vers la droite en cours..." -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Copie des fichiers en cours..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Suppression des fichiers en cours..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Déplacement des fichiers en cours..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Création du rapport..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Annuler la dernière opération..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Refaire l'opération précédente..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Ligne: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Fusion" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Différence %1 de %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 Différences trouvées" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 Différence trouvée" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "LS" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Élément %1 de %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Élément: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Comparez deux fichiers ou deux répertoires !" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Sélection de répertoire" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Sélectionner deux répertoires ou deux fichiers à comparer" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Le chemin de gauche est invalide !" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Le chemin de droite est invalide !" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Les deux chemins sont invalides !" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Choisissez deux fichiers pour activer la sélection du décompresseur." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne peut comparer un fichier et un répertoire !" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Fichier %1 non trouvé" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Fichier non décompressé : %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4235,12 +4269,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "L'analyse du fichier en conflit a échoué." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4251,27 +4285,27 @@ msgstr "" "%1\n" "n'est pas un fichier en conflit." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Enregistrer sous" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Enregistrer les changements de %1 ?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Erreur durant la prise de fichiers d'archive" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4284,7 +4318,7 @@ msgstr "" "\n" "Continuer quand même ?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4301,7 +4335,7 @@ msgstr "" "\t-utiliser un nom autre nom de fichier (Ok)\n" "\t-avorter l'opération en cours (Annuler)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4316,7 +4350,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4331,7 +4365,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4346,7 +4380,7 @@ msgstr "" "\n" "Voulez-vous écraser le fichier mis à jour ?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4355,7 +4389,7 @@ msgstr "" "%1\n" "est en lecture seule. Voulez-vous outrepasser ?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4370,22 +4404,22 @@ msgstr "" "\n" "Voulez-vous actualiser le fichier?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Enregistrer le fichier de gauche sous" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Enregistrer le fichier de droite sous" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4396,7 +4430,7 @@ msgstr "" "%1\n" "a disparu. Veuillez enregistrer une copie du fichier pour continuer." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4407,42 +4441,42 @@ msgstr "" "\n" "Actualiser les documents avant de poursuivre." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Vous dever indiquer un chemin d'accès au projet SourceSafe afin de pouvoir continuer (par ex. : $/MonProjet)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Extraire les fichiers de VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier. Ne peut continuer..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Erreur d'exécution d'une commande du système de contrôle de version." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Le répertoire de travail de VSS et l'emplacement du fichier courant ne correspondent pas. Continuer ?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Aucune base de données de VSS trouvée !" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Erreur de VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4453,7 +4487,7 @@ msgstr "" " Veuillez vérifier la configuration.\n" " Annuler l'operation d'extraction?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4462,164 +4496,164 @@ msgstr "" "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier.\n" " Veuillez vérifier la configuration. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Aucun" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inférieur à 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 et supérieur)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Distinguer sur espacement" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Distinguer sur espacement ou ponctuation" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copier le fichier sélectionné vers le répertoire indentifié" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copier le fichier sélectionné vers un répertoire à indentifer" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Supprimer l'élément sélectionné à gauche" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Supprimer l'élément sélectionné à droite" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Supprimer l'élément sélectionné de chaque côté" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Dissimuler l'élément sélectionné (filtre instantané)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Renommer l'élément sélectionné de chaque côté" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "De droite à gauche (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "De gauche à droite (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "De droite à gauche (%1 de %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "De gauche à droite (%1 de %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "De gauche vers... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "De droite vers... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "De gauche vers... (%1 de %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "De droite vers... (%1 de %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "À gauche (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "À droite (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Des deux côtés (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "À gauche (%1 de %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "À droite (%1 de %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Des deux côtés (%1 de %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Côté gauche - choisir répertoire de destination:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Côté droit - choisir répertoire de destination:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Fichiers concernés)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Fichiers concernés)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4630,17 +4664,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Voulez-vous vraiment copier:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Voulez-vous vraiment copier %d éléments:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4659,613 +4693,607 @@ msgstr "" "\n" "Veuillez actualiser la comparaison." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Êtes-vous sûr de vouloir déplacer:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Êtes-vous sûr de vouloir déplacer %d éléments:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Confirmez le déplacement" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Ouvrir le fichier de gauche" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Ouvrir le fichier de gauche avec l'éditeur externe" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Ouvrir le fichier de gauche avec ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Ouvrir le fichier de droite" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Ouvrir le fichier de droite avec l'éditeur externe" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Ouvrir le fichier de droite avec ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Lancement de l'éditeur externe a échoué: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copier les fichiers vers le presse-papiers" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copier les chemins de gauche vers le presse-papiers" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copier les chemins de droite vers le presse-papiers" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copier les chemins des deux côtés vers le presse-papiers" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Menu explorateur gauche" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Menu explorateur droit" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Format d'archives inconnu" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Ajouter les éléments du côté gauche au fichier d'archives" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Ajouter les éléments du côté droit au fichier d'archives" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Ajouter les éléments des deux côté au fichier d'archives" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Ajouter les éléments distincts des deux côté au fichier d'archives" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Déplacer le fichier sélectionné de gauche vers un répertoire à indentifer" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Déplacer le fichier sélectionné de droite vers un répertoire à indentifer" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nom du fichier" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Résultat de la comparaison" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Date mod. gauche" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Date mod. droite" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extension" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Taille gauche" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Taille droite" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Taille droite (abrégée)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Taille gauche (abrégée)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Date cré. gauche" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Date cré. droit" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Plus récent" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Version gauche" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Version droite" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Résultat" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Attributs gauches" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Attributs droits" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Fin de ligne gauche" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Fin de ligne droit" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Page de code gauche" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Page de code droite" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Différences ignorées" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binaire" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Impossible de comparer les fichiers" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Élément abandonné" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Fichier ignoré" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Répertoire ignoré" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Juste à gauche: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Juste à droite: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Les fichiers binaires sont identiques" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Les fichiers binaires sont différents" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Les fichiers sont différents" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Les répertoires sont différents" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Juste à gauche" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Juste à droite" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Erreur" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Les fichiers de texte sont identiques" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Les fichiers de texte sont différents" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps écoulé: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 élément sélectionné" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 éléments sélectionnés" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nom de fichier ou de répertoire." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom du sous-répertoire lorsque ceux-ci sont inclus." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparison, format étendu." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Date de modification du côté gauche." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Date de modification du côté droit." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Extension du fichier." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Taille du fichier du côté gauche en octets." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Taille du fichier du côté droit en octets." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Taille du fichier du côté gauche abrégée." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Taille du fichier du côté droit abrégée." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Date de creation du côté gauche." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Date de creation du côté droit." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Indique le côté ayant la date de modification la plus récente." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Version du fichier du côté gauche, certains fichiers seulement." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Version du fichier du côté droit, certains fichiers seulement." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Resultat de la comparison, format abrégé." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Attributs du côté gauche." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Attributs du côté droit." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Type de fin de ligne du côté gauche" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Type de fin de ligne du côté droit" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Page de code du côté gauche." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Page de code du côté droit." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nombre total des différences. Elles sont ignorées par WinMerge et ne peuvent être fusionnées." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nombre de différences à l'exclusion de celles ignorées." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Indique un astérisque (*) si le fichier est binaire." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Comparer %1 avec %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Liste délimitée par des virgules" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Liste délimitée par des tabulations" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Format HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Format XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Le rapport existe déjà. Voulez-vous écraser le fichier existant?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5274,32 +5302,32 @@ msgstr "" "Erreur à la création du rapport:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Le rapport a été créé avec succès." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Le même fichier est ouvert dans les deux volets." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Les fichiers sélectionnés sont identiques." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Erreur lors de la comparaison des fichiers." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Des fichiers temporaires ne peuvent être créés. Vérifiez la définition du chemin temporaire." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5314,17 +5342,17 @@ msgstr "" "\n" "Notez bien: Si vous voulez toujours considérer une telle égalité. Définnissez l'option: Ignorer les différences de fin de ligne à la fenêtre des Préférences sous l'onglet Comparaison (accessible avec le menu Edition/Préférences)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Le répertoire sélectionné est invalide." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne peut ouvrir un fichier binaire avec l'éditeur." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5339,7 +5367,7 @@ msgstr "" "%1\n" "à l'autre côté et ouvrir ces répertoires" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5350,168 +5378,168 @@ msgstr "" "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n" "Désirez-vous traiter les deux fichiers avec la page de code windows par défaut (recommandé)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information perdue à cause d'erreurs d'encodage: pour les deux fichiers" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Aucune différence" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Ligne différente" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 remplacement(s) effectué(s)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Texte non trouvé \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copier le chemin complet" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copier le nom du fichier" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Barre de localisation" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Détail des différences" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Fichier de retouche écrit avec succès." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. élément non trouvé ou il s'agit d'un répertoire !" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. élément non trouvé ou il s'agit d'un répertoire !" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Le fichier de retouche existe déja. Voulez-vous l'écraser ?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 fichiers sélectionnés]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Contexte" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unifié" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Ne peut écrire au fichier %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Le chemin spécifié n'est pas un chemin absolu: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Indiquez un fichier de sortie" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne peut créer un fichier de retouche depuis un fichier binaire." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne peut créer un fichier de retouche depuis des répertoires." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5522,12 +5550,12 @@ msgstr "" "\n" "Générer une retouche requiert l'état non modifié des fichiers." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Le répertoire n'existe pas." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5538,7 +5566,7 @@ msgstr "" "Tous les composants requis (7-zip et/ou Merge7z*.dll) pour le support d'archives ne peuvent être trouvés.\n" "Consulter la documentation au sujet du support d'archives indiquant comment l'activer." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5547,7 +5575,7 @@ msgstr "" "\n" "Note: l'intégration de 7-Zip est désactivée avec les préférences de WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5556,37 +5584,37 @@ msgstr "" "\n" "Note: l'intégration de 7-Zip est restreinte au mode autonome avec les préférences de WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Sélectionner le fichier pour exportation" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Sélectionner le fichier pour importation" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Préférences importées du fichier." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Préférences exportées au fichier." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "L'importation (lecture) du fichier des préférences a échoué." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "L'exportation (écriture) du fichier des préférences a échoué." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5597,157 +5625,157 @@ msgstr "" "\n" "Voulez-vous continuer ?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Combiné" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " O" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KO" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MO" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GO" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TO" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PO" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Décompresseur" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Pré-comparaison" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Éditeur de script" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Enregistrer le fichier de gauche" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Enregistrer le fichier de droite" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Enregistrer le fichier de gauche sous..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Enregistrer le fichier de droite sous..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Convertir la fin de ligne en mode Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Convertir la fin de ligne en mode Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Convertir la fin de ligne en mode Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Basculer entre les modes d'édition et de fusion" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5756,12 +5784,12 @@ msgstr "" "Voir et ajuster les propriétés d'encodage de fichier\n" "Propriétés d'encodage de fichier" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Ouvrir et résoudre le fichier en conflit" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5770,7 +5798,7 @@ msgstr "" "Sélectionner la différence de la ligne courante\n" "Différence de la ligne courante" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5779,7 +5807,7 @@ msgstr "" "Atteindre une ligne ou une différence\n" "Atteindre (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5788,7 +5816,7 @@ msgstr "" "Modifier les préférences du programme\n" "Préférences" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5797,37 +5825,37 @@ msgstr "" "Actualiser l'affichage\n" "Actualiser (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copier les lignes sélectionnés vers le presse-papiers en les précédants d'un numéro de ligne" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Placer ou retirer un signet" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Atteindre le signet suivant" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Atteindre le signet précédent" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Effacer tous les signets" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5836,7 +5864,7 @@ msgstr "" "Afficher les éléments strictement identiques\n" "Afficher les éléments identiques" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5845,7 +5873,7 @@ msgstr "" "Afficher les éléments comportants des différences\n" "Afficher les éléments différents" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5854,7 +5882,7 @@ msgstr "" "Afficher les éléments existant seulement au côté gauche\n" "Afficher les éléments de gauche seulement" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5863,7 +5891,7 @@ msgstr "" "Afficher les éléments existant seulement au côté droit\n" "Afficher les éléments de droite seulement" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5872,7 +5900,7 @@ msgstr "" "Afficher les éléments binaires\n" "Afficher les éléments binaires" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5881,7 +5909,7 @@ msgstr "" "Afficher les éléments ignorés\n" "Afficher les éléments ignorés" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5889,7 +5917,7 @@ msgid "" msgstr "Sélectionner la police utilisée pour l'affichage des différences\n" "Sélection de la Police d'affichage" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5898,27 +5926,27 @@ msgstr "" "Revenir à la police par défaut pour l'affichage des différences\n" "Police par Défaut" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Afficher ou masquer les espaces" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Afficher ou masquer le détail des différences courantes" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Afficher ou masquer la barre de localisation (vue d'ensemble des fichiers)" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Afficher la boîte de dialogue de comparaison des statistiques" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5927,7 +5955,7 @@ msgstr "" "Sélectionner le langage de l'interface\n" "Langage" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5936,12 +5964,12 @@ msgstr "" "Afficher les différences des lignes avec différentes couleurs\n" "Afficher différences des lignes" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Intervertir la position de deux fenêtres" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5950,7 +5978,7 @@ msgstr "" "Afficher la numérotation des lignes\n" "Afficher la numérotation des lignes" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5959,7 +5987,7 @@ msgstr "" "Afficher ou masquer le retour à la ligne automatique\n" "Retour à la ligne automatique" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5968,22 +5996,22 @@ msgstr "" "Afficher les marges des deux fenêtres\n" "Afficher les marges" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Augmenter la taille du texte" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Diminuer la taille du texte" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Rétablir le zoom du texte à la taille par défaut" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5992,7 +6020,7 @@ msgstr "" "Atteindre la différence précédente\n" "Diff Précédente (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6001,77 +6029,77 @@ msgstr "" "Atteindre la différence suivante\n" "Diff Suivante (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6080,7 +6108,7 @@ msgstr "" "Atteindre la première différence\n" "Première Diff (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6089,7 +6117,7 @@ msgstr "" "Atteindre la différence courante\n" "Diff Courante (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6098,7 +6126,7 @@ msgstr "" "Atteindre la dernière différence\n" "Dernière Diff (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6107,7 +6135,7 @@ msgstr "" "Copier le texte sélectionné vers le fichier de droite\n" "Copier à Droite (Alt Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6116,7 +6144,7 @@ msgstr "" "Copier le texte sélectionné vers le fichier de gauche\n" "Copier à Gauche (Alt Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6125,7 +6153,7 @@ msgstr "" "Copier la différence vers la droite et Avancer\n" "Copier vers la droite et Avancer (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6134,7 +6162,7 @@ msgstr "" "Copier la différence vers la gauche et Avancer\n" "Copier vers la gauche et Avancer (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6143,7 +6171,7 @@ msgstr "" "Copier toutes les différences vers le fichier de droite\n" "Copier Tout à Droite" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6152,92 +6180,92 @@ msgstr "" "Copier toutes les différences vers le fichier de gauche\n" "Copier Tout à Gauche" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Détruire les éléments sélectionnés pour les deux répertoires" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparer l'élément sélectionné (premier élément retenu si sélection multiple)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Sélectionner et ordonner les colonnes de la fenêtre de comparaison des répertoires" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Générer un fichier de retouche" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Sélectionner et modifier les filtres" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Générer un rapport des résultats de la comparaison" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Affiche une liste des plugiciels disponibles" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Choisir le décompresseur (pas de décompression lors de la comparaison des répertoires)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Appliquer automatiquement le décompresseur approprié (basé sur l'extension d'au moins un des deux fichiers)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Choisir le décompresseur pour éditer ce fichier" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Pas de pré-comparaison (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Plugiciels suggérés" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Plugiciels autres" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Recharger tous les plugiciels (pour les développeurs)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6246,12 +6274,12 @@ msgstr "" "Active le prochain fichier visible\n" "Active le prochain fichier" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Fermer toutes les fenêtres" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6260,22 +6288,22 @@ msgstr "" "Ouvre la rubrique d'aide de WinMerge\n" "Aide de WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Affiche les informations de version et de configuration de WinMerge avec un fichier de texte" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Afficher la licence publique générale GNU" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Compilation personnelle: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6284,7 +6312,7 @@ msgstr "" "Ouvre les notes de mise à jour\n" "Notes de mise à jour" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6293,292 +6321,292 @@ msgstr "" "Ouvre le site web des traductions\n" "Traductions" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Ajuster les plugiciels" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Pas de pré-comparaison" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Pré-comparer si possible" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH pas trouvé - .sct les scripts sont désactivés" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Ouvrir le fichier avec l'application désignée" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Ouvrir le fichier avec l'éditeur externe" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Ouvrir le fichier avec le programme indiqué" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Ne pas afficher les blocs déplacés" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Afficher tous les blocs déplacés" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Afficher le bloc déplacé de la différence courante" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Atteindre l'endroit pointé à la barre de localisation" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Atteindre la ligne %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Désactivé" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "A partir du système de fichier" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "A partir de la liste des fichiers récents" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Pas de surbrillance" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Objet portatif" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Ressources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Masquer la barre d'outils" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Afficher la petite barre d'outils" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Afficher la grande barre d'outils" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 5943a12d3..ce7be4ee8 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Baleiro >" @@ -470,7 +470,7 @@ msgstr "&Desempaquetado autom #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&En fervenza" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Axuda" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Codificación do ar&quivo" @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Contidos completos" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Contidos rápidos" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Data de modificación" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Data de modificación e tamaño" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Tamaño" @@ -1528,7 +1528,7 @@ msgstr "Visita a Web Oficial de WinMerge!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "Aceptar" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "&Sistema de versionado:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Camiño a cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Xeral" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "&Procurar seguinte" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Aceptar" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Substituír &todo" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Eliminar" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Cores" @@ -1977,7 +1977,7 @@ msgstr "Borrado" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Texto" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Predeterminados" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistema" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Descrición:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Parar" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Ir a" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Comparar" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Filtrar comentarios" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Páxina de códigos" @@ -2731,7 +2732,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtro privado (só para o usuario actual)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Soporte de Arquivos" @@ -2782,7 +2783,7 @@ msgid "Files:" msgstr "Arquivos:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Diferente" @@ -2819,7 +2820,7 @@ msgid "Right:" msgstr "Dereita" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Iguais" @@ -2872,7 +2873,7 @@ msgid "&Apply" msgstr "&Aplicar" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Cancelar" @@ -2978,7 +2979,7 @@ msgid "Save..." msgstr "Gardar..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Copias de seguridade(backups)" @@ -3019,7 +3020,7 @@ msgid "A&ppend timestamp" msgstr "&Engadir etiqueta coa data" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" @@ -3060,7 +3061,7 @@ msgid "&Enable plugins" msgstr "&Activar plugins" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Integración na Shell" @@ -3096,8 +3097,8 @@ msgid "Add &Shell menu to context menu" msgstr "Engadir menú &Shell ao menú de contexto" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Cartafol" @@ -3133,69 +3134,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binario" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x409, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Listo" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3204,12 +3238,12 @@ msgstr "" "Crear documentos baleiros\n" "Documentos novos (Ctrl+N) " -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3218,7 +3252,7 @@ msgstr "" "Abrir un documento existente\n" "Abrir (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3227,7 +3261,7 @@ msgstr "" "Pechar o documento activo\n" "Pechar" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3236,7 +3270,7 @@ msgstr "" "Gravar o documento activo\n" "Gardar (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3245,7 +3279,7 @@ msgstr "" "Gravar o documento activo cun novo nome\n" "Gardar como" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3254,7 +3288,7 @@ msgstr "" "Trocar as opcións de impresión\n" "Configuración de páxina" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3263,7 +3297,7 @@ msgstr "" "Trocar a impresora e as opcións de impresión\n" "Configurar impresión" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3272,7 +3306,7 @@ msgstr "" "Imprimir o documento activo\n" "Imprimir" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3281,27 +3315,27 @@ msgstr "" "Amosar todas as páxinas\n" "Previsualizar impresión" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Facer visibles outra vez todos os elementos agochados" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Conmutar modo árbore" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Expandir todos os subcartafoles" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Colapsar todos os subcartafoles" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3310,32 +3344,32 @@ msgstr "" "Abrir o arquivo do proxecto\n" "Arquivo do proxecto (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro descoñecido ao tentar abrir o arquivo do proxecto" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro descoñecido ao tentar gardar o arquivo do proxecto" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Arquivo do proxecto" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "O arquivo do proxecto cargouse correctamente." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "O arquivo do proxecto gardouse correctamente." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3344,7 +3378,7 @@ msgstr "" "Gardar os camiños e opcións actuais no arquivo do proxecto\n" "Gardar arquivo do proxecto" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3353,7 +3387,7 @@ msgstr "" "Amosar a información do programa, número da versión e copyright\n" "Acerca de" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3362,27 +3396,27 @@ msgstr "" "Pechar a aplicación, preguntar se se gardan os documentos\n" "Saír" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3391,7 +3425,7 @@ msgstr "" "Cambiar para o seguinte panel\n" "Panel seguinte" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3400,7 +3434,7 @@ msgstr "" "Cambiar para o panel anterior\n" "Panel anterior" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3409,7 +3443,7 @@ msgstr "" "Organizar as ventás en fervenza(sobrepostas)\n" "Fervenza" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3418,7 +3452,7 @@ msgstr "" "Organizar as ventás horizontalmente\n" "Organizar horizontalmente" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3427,7 +3461,7 @@ msgstr "" "Organizar as ventás verticalmente\n" "Organizar verticalmente" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3436,7 +3470,7 @@ msgstr "" "Copiar a selección e poñela no portapapeis\n" "Copiar" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3445,7 +3479,7 @@ msgstr "" "Cortar a selección e poñela no portapapeis\n" "Copiar" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3454,7 +3488,7 @@ msgstr "" "Procurar o texto especificado\n" "Procurar" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3463,7 +3497,7 @@ msgstr "" "Inserir o contido do portapapeis\n" "Pegar" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3472,7 +3506,7 @@ msgstr "" "Repetir a última acción\n" "Repetir" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3481,7 +3515,7 @@ msgstr "" "Substituír o texto especificado por outro\n" "Substituír" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3490,7 +3524,7 @@ msgstr "" "Seleccionar todo o documento\n" "Seleccionar todo" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3499,7 +3533,7 @@ msgstr "" "Desfacer a última acción\n" "Desfacer (CTRL+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3508,7 +3542,7 @@ msgstr "" "Refacer a acción previamente desfeita\n" "Refacer (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3517,7 +3551,7 @@ msgstr "" "Amosar ou ocultar a barra de ferramentas\n" "Barra de ferramentas" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3526,7 +3560,7 @@ msgstr "" "Amosar ou ocultar a barra de estado\n" "Barra de estado" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3535,7 +3569,7 @@ msgstr "" "Amosar ou agochar a barra dos separadores\n" "Separadores" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3544,57 +3578,57 @@ msgstr "" "Reaxustar o tamaño dos paneis de xeito automático\n" "Bloquear Paneis" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Cambiar o tamaño da fiestra" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Cambiar a posición da fiestra" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Reducir a fiestra a unha icona" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Agrandar a ventá a tamaño completo" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Cambiar para a fiestra do documento seguinte" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Cambiar para a fiestra do documento anterior" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Pechar a fiestra activa e preguntar se se gardan os documentos" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Voltar a fiestra para o tamaño normal" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Activar listaxe de tarefas" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Activar esta fiestra" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3603,7 +3637,7 @@ msgstr "" "Pechar o modo previsualización de impresión\n" "Cancelar previsualización" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3622,7 +3656,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3641,19 +3675,19 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Conservar caracteres EOL orixinais" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Premer co botón dereito no camiño a copiar" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3662,143 +3696,143 @@ msgstr "" "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 ofrécese sen GARANTÍA DE NINGUNHA CLASE. Este programa é software ceibe e animámoste a distribuílo baixo certas condicións; mira a Licenza Pública Xeral GNU no menú de Axuda para atopar máis información." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorar &todo" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Si" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Si a &todo" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "&Non a todo" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Saltar" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "S&altar todo" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Non amosar esta &mensaxe de novo." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Non preguntar &isto de novo." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Control de versións" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Diferenzas" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Dende a esquerda:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Dende a dereita:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Para a dereita:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versión %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opcións (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensaxes amosaranse outra vez." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3809,84 +3843,84 @@ msgstr "" "\n" "Emprega valores entre 1 e %1" -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos do proxecto de WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos de opcións (*.ini)|*.ini|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os arquivos(*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Localización" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Descrición" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Escoller un nome de arquivo para o filtro novo " -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos arquivos (*.flt)|*.flt|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3899,7 +3933,7 @@ msgstr "" "Copia o arquivo %1 ao cartafol de filtros:\n" "%2" -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3912,7 +3946,7 @@ msgstr "" "\n" "Asegúrate de que existe o cartafol e de que é escribible." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3923,7 +3957,7 @@ msgstr "" "\n" "Escolle un cartafol de filtros en Opcións/Sistema." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3936,12 +3970,12 @@ msgstr "" "\n" "Comprobe se o arquivo é do só-lectura." -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Procurar arquivo de filtros para instalar" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3952,17 +3986,17 @@ msgstr "" "\n" "Non se poden copiar novos filtros ao cartafol de filtros." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo de filtros xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Expresión regular" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3973,258 +4007,258 @@ msgstr "" "\n" "Se non queres regargar todas as comparacións agora podes seleccionar Non e actualizalas máis adiante." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Ruta ao SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da comparación dos cartafoles " -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Comparación de arquivos" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Cadro esquerdo sen título" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Cadro dereito sen título" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "O Meu Arquivo" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "A escanear arquivos..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Abrindo selección" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "A copiar da esquerda para a dereita" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "A copiar da dereita para a esquerda" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "A copiar todo para a esquerda" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "A copiar todo para a dereita" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "A copiar arquivos..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "A borrar arquivos..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "A mover arquivos..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "A crear o informe..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Desfacendo a última operación..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Refacendo a operación previa..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Liña: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Diferenza %1 de %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenzas atopadas" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 diferenza atopada" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 de %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Escolle dous cartafoles ou arquivos para comparar" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Selección de cartafol" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Escolle dous cartafoles ou arquivos para comparar." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "O camiño esquerdo non é válido!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "O camiño dereito non é válido!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os camiños non son válidos!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolle dous arquivos para activar a selección de desempaquetador." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Non se pode comparar un arquivo cun cartafol!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "No se atopou o arquivo: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "O arquivo non está desempaquetado: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4237,12 +4271,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Fallo na análise interpretativa do arquivo de conflito." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4253,27 +4287,27 @@ msgstr "" "%1\n" "non é un arquivo de conflito." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Gardar como" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Queres gardar os cambios en %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 está definido como de só-lectura. Queres sobre-escribilo? (Non gardar cun nome de arquivo novo.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Erro ao facer unha copia de seguridade do arquivo" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4286,7 +4320,7 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4303,7 +4337,7 @@ msgstr "" "\t-usar un nome de arquivo distinto (preme Aceptar)\n" "\t-abortar a operación (preme Abortar)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4318,7 +4352,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4333,7 +4367,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4348,7 +4382,7 @@ msgstr "" "\n" "Queres sobre-escribir o arquivo cambiado?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4357,7 +4391,7 @@ msgstr "" "%1\n" " está marcado como de só-lectura. Queres sobre-escribir o elemento?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4372,27 +4406,27 @@ msgstr "" "\n" "Queres recargar o arquivo?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Gardar o arquivo esquerdo como" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Gardar o arquivo dereito como" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4403,42 +4437,42 @@ msgstr "" "\n" "Actualizar os documentos antes de seguir." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Debes especificar o camiño do proxecto SourceSafe para continuar (p.e:$/ProxectoMeu)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Desprotexer arquivos de VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O Sistema de Versionado devolveu un erro mentres se intentaba desprotexer o arquivo. Imposible proseguir..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar un comando no sistema de versionado" -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "O cartafol de traballo VSS e a localización do arquivo actual non coinciden. Queres continuar?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Non se atopou banco de datos VSS ningún" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Erro de VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4449,7 +4483,7 @@ msgstr "" "Comproba a configuración da visualización.\n" "Queres anular a operación de desprotección?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4458,164 +4492,164 @@ msgstr "" "O sistema de versionado devolveu un erro ao intentar desfacer a desprotección do arquivo.\n" "Comproba a configuración da visualización." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Ningún" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior de 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiores)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Parar no espazo en branco" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Parar en espazo en branco ou puntuación" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar o elemento escollido para o cartafol chamado" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar o elemento escollido para o cartafol seleccionado" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Borrar o elemento escollido da banda esquerda " -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Borrar o elemento escollido da banda dereita" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Borrar os elementos escollidos en ambas as bandas" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Agochar os elementos seleccionados (filtro sobre a marcha)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Renomear os elementos escollidos en ambas as bandas" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Da dereita para a esquerda (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Da esquerda para a dereita(%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da dereita para a esquerda (%1 de %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da esquerda para a dereita (%1 de %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Banda esquerda a...(%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Banda dereita a...(%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Banda esquerda a...(%1 de %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Banda dereita a...(%1 de %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Dereita (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Ambas (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Dereita (%1 de %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Ambas as bandas (%1 de %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Banda esquerda - escoller cartafol de destino:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Banda dereita - escoller cartafol de destino:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 arquivos afectados)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 arquivos afectados)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4626,17 +4660,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Tes a certeza de quereres copiar:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Tes a certeza de quereres copiar %d elementos: " -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4655,645 +4689,639 @@ msgstr "" "\n" "Actualiza a comparación. " -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Tes a certeza de quereres mover:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Tes a certeza de quereres mover %d elementos: " -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Confirmar Movemento" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Abrir arquivo esquerdo" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Abrir o arquivo esquerdo cun editor externo" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Abrir arquivo esquerdo con..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Abrir arquivo dereito" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Abrir o arquivo dereito cun editor externo" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Abrir o arquivo dereito con..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Non se puido executar o editor externo: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar ao portapapeis os nomes dos arquivos" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar ao portapapeis os camiños da banda esquerda" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar ao portapapeis os camiños da banda dereita" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar ao portapapeis os camiños de ambas as bandas" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Menú Shell Esquerdo" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Menú Shell Dereito" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo descoñecido" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Engadir os elementos da banda esquerda ao arquivo" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Engadir os elementos da banda dereita ao arquivo" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Engadir os elementos de ambas as bandas ao arquivo" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Engadir ao arquivo elementos diferentes (ambas as bandas)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mover o arquivo seleccionado da esquerda para o cartafol escollido" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mover o arquivo seleccionado da dereita para o cartafol escollido" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nome do arquivo" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultado da comparación" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Data esquerda" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Data dereita" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Tamaño esquerda" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Tamaño dereita" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dereita (curto)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Tamaño esquerda (curto)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Data de creación esquerda" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Data de creación dereita" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Arquivo máis recente" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Versión do arquivo esquerdo" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Versión do arquivo dereito" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Resultado curto" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atributos da esquerda" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atributos da dereita" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "EOL esquerdo" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "EOL dereito" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Codificación esquerda" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Codificación dereita" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Diferenzas ignoradas" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binario" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Non é posible comparar os arquivos" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Elemento abortado" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Arquivo saltado" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Cartafol saltado" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Só esquerda: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Só dereita: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binarios son idénticos" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Os arquivos binarios son diferentes" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Os arquivos son diferentes" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Os cartafoles son diferentes" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Só esquerda" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Só dereita" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Os arquivos de texto son idénticos" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Os arquivos de texto son diferentes" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou cartafol." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome do sub-cartafol cando os sub-cartafoles están incluídos" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultados da comparación, formato completo." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Data de modificación da banda esquerda." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Data de modificación da banda dereita" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Extensión do arquivo." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Tamaño do arquivo esquerdo en bytes." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Tamaño do arquivo dereito en bytes." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño abreviado do arquivo esquerdo." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño abreviado do arquivo dereito. " -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Data de creación do arquivo esquerdo." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Data de creación do arquivo dereito." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Di que parte foi modificada máis recentemente." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versión do arquivo da banda esquerda, só para algúns tipos de arquivo." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versión do arquivo da banda dereita, só para algúns tipos de arquivo." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Resultados curtos da comparación." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atributos da banda esquerda." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atributos da banda dereita." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo esquerdo" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo dereito" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Codificación da banda esquerda." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Codificación da banda dereita." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferenzas ignoradas no arquivo. Estas diferenzas son ignoradas por WinMerge e non se poden combinar." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferenzas no arquivo. Este número non inclúe as diferenzas ignoradas." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Amosa un asterisco (*) se o arquivo é binario." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Listaxe separada por comas" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Listaxe separada por tabulacións" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML simple" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "XML simple" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo de informe xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "Erro ao crear o informe:n%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "O informe creouse correctamente." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo está aberto en ambos paneis." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Os arquivos escollidos son idénticos." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Produciuse un erro durante a comparación dos arquivos." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Non se puideron crear os arquivos temporais. Comproba as configuracións dos camiños." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5308,17 +5336,17 @@ msgstr "" "\n" "Aviso: Se queres tratar todos os tipos de quebra como equivalentes, marca a opción 'Ignorar diferenzas de quebras de liña..' no apartado de comparación do diálogo de opcións (dispoñible en Editar/Opcións)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "O cartafol seleccionado non é válido." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Non se pode abrir un arquivo binario no editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5333,7 +5361,7 @@ msgstr "" "%1\n" "que coincida co anterior e abrir ámbolos dous?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5344,168 +5372,168 @@ msgstr "" "Amosando cada arquivo coa súa páxina de códigos proporcionará unha mellor visualización pero combinar/copiar será perigoso.\n" "Preferirías tratar ambos arquivos como se tivesen a páxina de códigos predeterminada de windows (recomendado)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Perdeuse información debido a erros de codificación: en ambos os arquivos" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Non hai diferenzas" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Diferenzas de liña" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituídas %1 cadea(s)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Non se atopou a cadea \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copiar o camiño completo" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copiar o nome do arquivo" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Panel de situación" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Panel de diferenzas" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Escribiuse correctamente o arquivo de mendo." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo patch xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos seleccionados]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Non se puido escribir no arquivo %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O camiño de saída especificado non é un camiño absoluto: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Especifica un arquivo de saída" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Non se pode crear un arquivo patch desde arquivos binarios." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Non se pode crear un arquivo patch desde un cartafol." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5516,12 +5544,12 @@ msgstr "" "\n" "Crear un arquivo patch precisa que todos os cambios nos arquivos estean gardados." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "O cartafol non existe." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5532,7 +5560,7 @@ msgstr "" "Non foron atopados todos os compoñentes precisos (7-zip e/ou Merge7z*.dll).\n" "Mira o manual para máis información acerca do soporte de arquivos e como se activa. " -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5541,7 +5569,7 @@ msgstr "" "\n" "Aviso: a integración do 7-Zip está desactivada na configuración de Winmerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5550,37 +5578,37 @@ msgstr "" "\n" "Aviso: a integración de 7-Zip está restrinxida a unha operación independente na configuración de Winmerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Escolle un arquivo para exportar" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Escolle un arquivo para importar" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Opcións importadas desde o arquivo." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Opcións exportadas desde o arquivo." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Fallo na importación das opcións deste arquivo." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Fallo ao escribir as opcións no arquivo." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5591,157 +5619,157 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mesturado" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Desempaquetador" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Pre-comparación" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Script do Editor" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Gardar o arquivo esquerdo" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Gardar o arquivo dereito" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Gardar o arquivo esquerdo co nome..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Gardar o arquivo dereito co nome..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Coverter EOL ao modo Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converter EOL ao modo Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converter EOL ao modo Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Cambiar entre modo editar e modo combinar" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5750,12 +5778,12 @@ msgstr "" "Ver e axustar as propiedades de codificación de arquivos\n" "Propiedades de codificación de arquivos" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Abrir e resolver arquivo de conflito" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5764,7 +5792,7 @@ msgstr "" "Selecciona a área de diferenzas na liña actual\n" "Diferenzas na liña actual" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5773,7 +5801,7 @@ msgstr "" "Ir á liña ou á diferenza\n" "Ir (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5782,7 +5810,7 @@ msgstr "" "Establecer as opcións\n" "Opcións" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5791,37 +5819,37 @@ msgstr "" "Actualizar pantalla\n" "Actualizar (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar as liñas seleccionadas ao portapapeis engadindo o número de liña ao comezo" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Cambiar marcador" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ir ao seguinte marcador" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ir ao marcador anterior" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Limpar todos o marcadores" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5830,7 +5858,7 @@ msgstr "" "Amosa os elementos que son exactamente iguais\n" "Amosar elementos iguais" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5839,7 +5867,7 @@ msgstr "" "Amosa os elementos que teñen diferenzas\n" "Amosar elementos diferentes" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5848,7 +5876,7 @@ msgstr "" "Amosa elementos que só existen na banda esquerda\n" "Amosar elementos únicos da banda esquerda" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5857,7 +5885,7 @@ msgstr "" "Amosa elementos que só existen na banda dereita\n" "Amosar elementos únicos da banda dereita" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5866,7 +5894,7 @@ msgstr "" "Amosa os arquivos binarios\n" "Amosar arquivos binarios" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5875,7 +5903,7 @@ msgstr "" "Amosa os elementos que se saltaron\n" "Amosar elementos saltados" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5884,7 +5912,7 @@ msgstr "" "Escolle o tipo de fonte para a vista\n" "Escoller fonte" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5893,27 +5921,27 @@ msgstr "" "Volver a empregar a fonte predeterminada do sistema\n" "Fonte predeterminada" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Amosar espazos en branco" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Amosar panel de diferenzas" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "O panel de situación amosa unha visión xeral dos arquivos" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Amosa os diálogos de estadísticas de comparación dos cartafoles" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5922,7 +5950,7 @@ msgstr "" "Selecciona o idioma do interface de usuario actual\n" "Idioma" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5931,12 +5959,12 @@ msgstr "" "Amosa cunha cor distinta as diferenzas dentro das liñas\n" "Amosar Diferenzas nas Liñas" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Intercambia a posición dos dous paneis" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5945,7 +5973,7 @@ msgstr "" "Amosa os números de liña\n" "Amosar números de liña" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5954,7 +5982,7 @@ msgstr "" "Axusta as liñas á largura do panel\n" "Axustar liñas" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5963,22 +5991,22 @@ msgstr "" "Amosa as marxes en ambos os paneis\n" "Amosar marxes" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Aumentar tamaño de texto" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Reducir tamaño de texto" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Restaurar tamaño de texto predeterminado" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5987,7 +6015,7 @@ msgstr "" "Ir á diferenza anterior\n" "Diferenza Anterior (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5996,77 +6024,77 @@ msgstr "" "Ir á seguinte diferenza\n" "Seguinte Diferenza (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6075,7 +6103,7 @@ msgstr "" "Ir á primeira diferenza\n" "Primeira Diferenza (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6084,7 +6112,7 @@ msgstr "" "Ir á diferenza actual\n" "Diferenza Actual (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6093,7 +6121,7 @@ msgstr "" "Ir á derradeira diferenza\n" "Derradeira Diferenza (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6102,7 +6130,7 @@ msgstr "" "Copiar o texto seleccionado para a banda dereita\n" "Copiar para a dereita (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6111,7 +6139,7 @@ msgstr "" "Copiar o texto seleccionado para a banda esquerda\n" "Copiar para a esquerda (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6120,7 +6148,7 @@ msgstr "" "Copiar a diferenza para a banda dereita e ir á seguinte diferenza\n" "Copiar para a dereita e avanzar (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6129,7 +6157,7 @@ msgstr "" "Copiar a diferenza para a banda esquerda e avanzar á seguinte diferenza\n" "Copiar para a esquerda e avanzar (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6138,7 +6166,7 @@ msgstr "" "Copiar todas as diferenzas para o arquivo dereito\n" "Todas para a dereita" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6147,92 +6175,92 @@ msgstr "" "Copiar todas as diferenzas para o arquivo esquerdo\n" "Todas para a esquerda" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Borrar os elementos seleccionados de ambos cartafoles" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar elementos seleccionados (comparar o primeiro elemento se hai varios seleccionados)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleccionar e reordenar as columnas da comparación de cartafoles" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Xerar un arquivo patch" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Seleccionar e modificar filtros" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Xerar un informe cos resultados da comparación" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Amosa unha lista dos plugins dispoñibles" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O usuario selecciona o desempaquetador (non se desempaqueta cando se comparan cartafoles)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempaquetador escollido utilízase con ambos arquivos (unicamente un arquivo precisa a extensión)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleccionar un desempaquetador para editar este arquivo" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Sen pre-comparación (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Plugins recomendados" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Desbotar todos os plugins e recargalos (para desenvolvedores)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6241,12 +6269,12 @@ msgstr "" "Activa o seguinte arquivo visible\n" "Activar o seguinte Arquivo" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Pecha todas as xanelas abertas" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6255,22 +6283,22 @@ msgstr "" "Abre a Axuda do WinMerge\n" "Axuda do WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Esribe a información e a configuración da versión actual do WinMerge nun arquivo de texto" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Amosa a Licenza Pública Xeral GNU" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6279,7 +6307,7 @@ msgstr "" "Abre o documento coas notas da versión\n" "Notas da Versión" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6288,292 +6316,292 @@ msgstr "" "Abre o sitio web de traducións\n" "Traducións" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Configuración do plugin" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Sen pre-comparación" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Pre-comparar se é posible" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non atopado - scripts .sct desactivados" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Abrir o arquivo coa aplicación rexistrada" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Abrir o arquivo cun editor externo" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Abrir o arquivo cun programa específico" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Non amosar bloques movidos" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Amosa todos os bloques movidos" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Amosar só os bloques movidos desde a diferenza actual" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ir á diferenza baixo o cursor" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "I&r á liña %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Da listaxe MRU" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Sen Resaltar" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Obxecto Portable" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Agochar a barra de ferramentas" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra pequena de ferramentas" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra grande de ferramentas" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 02941410a..852125954 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -331,7 +331,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Leer >" @@ -473,7 +473,7 @@ msgstr "&Automatisch entpacken" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -537,7 +537,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Hilfe" @@ -865,7 +865,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Dateik&odierung..." @@ -1469,37 +1469,37 @@ msgid "&Compare method:" msgstr "Vergleichs&methode:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Voller Inhalt" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Schneller Inhalt" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Änderungsdatum" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Änderungsdatum und Größe" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Größe" @@ -1531,7 +1531,7 @@ msgstr "Besuchen Sie die WinMerge Homepage!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1703,14 +1703,14 @@ msgid "&Versioning System:" msgstr "&Versionskontrollsystem" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pfad zu cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Allgemein" @@ -1855,7 +1855,7 @@ msgid "&Find Next" msgstr "&Weitersuchen" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&OK" @@ -1901,7 +1901,7 @@ msgid "Replace &All" msgstr "A&lle ersetzen" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1953,7 +1953,7 @@ msgid "Remove" msgstr "Entfernen" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Farben" @@ -1982,7 +1982,7 @@ msgstr "Gel #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Text" @@ -2033,13 +2033,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Vorgaben" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "System" @@ -2180,7 +2181,7 @@ msgid "Description:" msgstr "Beschreibung:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stop" @@ -2242,7 +2243,7 @@ msgid "&Go To" msgstr "&Gehe" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Vergleichen" @@ -2293,7 +2294,7 @@ msgid "Filter Comments" msgstr "Kommentare filtern" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2445,7 +2446,7 @@ msgstr "&Alle verwerfen" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Zeichensatz" @@ -2735,7 +2736,7 @@ msgid "Private Filter (only for current user)" msgstr "Privater Filter (nur für den aktuellen Benutzer)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Archiv-Unterstützung" @@ -2786,7 +2787,7 @@ msgid "Files:" msgstr "Dateien:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Unterschiedlich" @@ -2823,7 +2824,7 @@ msgid "Right:" msgstr "Rechts:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identisch" @@ -2876,7 +2877,7 @@ msgid "&Apply" msgstr "An&wenden" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Abbrechen" @@ -2982,7 +2983,7 @@ msgid "Save..." msgstr "Speichern..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Sicherungsdateien" @@ -3023,7 +3024,7 @@ msgid "A&ppend timestamp" msgstr "&Zeitstempel anhängen" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Kopieren bestätigen" @@ -3064,7 +3065,7 @@ msgid "&Enable plugins" msgstr "&Plugins aktivieren" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Shell-Integration" @@ -3100,8 +3101,8 @@ msgid "Add &Shell menu to context menu" msgstr "&Shell-Menü zum Kontextmenü hinzufügen" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Ordner" @@ -3137,69 +3138,102 @@ msgid "&Quick compare limit (MB):" msgstr "&Limit für Schneller Inhalt (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binär" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040704e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x407, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Bereit" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "ER" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "FEST" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "RF" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "ÜB" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "MA" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3208,12 +3242,12 @@ msgstr "" "Erzeugt leere Dokumente.\n" "Neue Dokumente (Strg+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3222,7 +3256,7 @@ msgstr "" "Öffnet ein bestehendes Dokument.\n" "Öffnen (Strg+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3231,7 +3265,7 @@ msgstr "" "Schließt das aktive Dokument.\n" "Schließen" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3240,7 +3274,7 @@ msgstr "" "Speichert das aktive Dokument.\n" "Speichern (Strg+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3249,7 +3283,7 @@ msgstr "" "Speichert das aktive Dokument unter neuem Namen.\n" "Speichern unter" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3258,7 +3292,7 @@ msgstr "" "Ändert die Seiteneinstellungen.\n" "Seite einrichten" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3267,7 +3301,7 @@ msgstr "" "Ändert die Druckerkonfiguration.\n" "Drucker einrichten" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3276,7 +3310,7 @@ msgstr "" "Druckt das aktive Dokument.\n" "Drucken" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3285,27 +3319,27 @@ msgstr "" "Zeigt die Druckvorschau an.\n" "Druckvorschau" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Zeigt alle versteckten Objekte wieder an." -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Schaltet den Baummodus ein oder aus." -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Alle Unterordner erweitern." -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Alle Unterordner reduzieren." -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3314,32 +3348,32 @@ msgstr "" "Öffnet eine Projektdatei.\n" "Projektdatei (Strg+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu öffnen." -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu speichern." -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Projektdatei" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Projektdatei erfolgreich geladen." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Projektdatei erfolgreich gespeichert." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3348,7 +3382,7 @@ msgstr "" "Speichert die aktuellen Pfade und Einstellungen in eine Projektdatei.\n" "Projektdatei speichern" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3357,7 +3391,7 @@ msgstr "" "Zeigt Programm-Informationen, Versionsnummer und Copyright an.\n" "Info" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3366,27 +3400,27 @@ msgstr "" "Verläßt die Anwendung; fragt, ob Dokumente gespeichert werden sollen.\n" "Beenden" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Öffnet dieses Dokument." -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3395,7 +3429,7 @@ msgstr "" "Wechselt zum nächsten Fensterausschnitt.\n" "Nächster Ausschnitt" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3404,7 +3438,7 @@ msgstr "" "Springt zum vorherigen Fensterausschnitt zurück.\n" "Vorheriger Ausschnitt" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3413,7 +3447,7 @@ msgstr "" "Ordnet die Fenster überlappend an.\n" "Überlappende Fenster" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3422,7 +3456,7 @@ msgstr "" "Ordnet die Fenster untereinander an.\n" "Fenster untereinander" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3431,7 +3465,7 @@ msgstr "" "Ordnet die Fenster nebeneinander an.\n" "Fenster nebeneinander" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3440,7 +3474,7 @@ msgstr "" "Kopiert die Markierung und überträgt sie in die Zwischenablage.\n" "Kopieren" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3449,7 +3483,7 @@ msgstr "" "Entfernt die Markierung und überträgt sie in die Zwischenablage.\n" "Ausschneiden" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3458,7 +3492,7 @@ msgstr "" "Sucht den angegebenen Text.\n" "Suchen" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3467,7 +3501,7 @@ msgstr "" "Fügt den Inhalt der Zwischenablage ein.\n" "Einfügen" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3476,7 +3510,7 @@ msgstr "" "Wiederholt die letzte Aktion.\n" "Wiederholen" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3485,7 +3519,7 @@ msgstr "" "Ersetzt einen bestimmten Text durch einen anderen.\n" "Ersetzen" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3494,7 +3528,7 @@ msgstr "" "Markiert das gesamte Dokument.\n" "Alles markieren" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3503,7 +3537,7 @@ msgstr "" "Macht die letzte Aktion rückgängig.\n" "Rückgängig (Strg+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3512,7 +3546,7 @@ msgstr "" "Wiederholt die vorher rückgängig gemachte Aktion.\n" "Wiederherstellen (Strg+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3521,7 +3555,7 @@ msgstr "" "Blendet die Symbolleiste ein oder aus.\n" "Symbolleiste ein-/ausschalten" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3530,7 +3564,7 @@ msgstr "" "Blendet die Statusleiste ein oder aus.\n" "Statusleiste ein-/ausschalten" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3539,62 +3573,62 @@ msgstr "" "Blendet die Tab-Leiste ein oder aus.\n" "Tab-Leiste ein-/ausschalten" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Ausschnitte automatisch in der Größe anpassen.\nAusschnitte fixieren" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Ändert die Fenstergröße." -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Ändert die Position des Fensters." -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Verkleinert das Fenster zu einem Symbol." -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Vergrößert das Fenster zu voller Größe." -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Wechselt zum nächsten Dokumentfenster." -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Wechselt zum vorherigen Dokumentfenster." -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Schließt das aktive Fenster und fordert zur Dokumentspeicherung auf." -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Stellt das Fenster in seiner normalen Größe wieder her." -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Aktiviert die Task-Liste." -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktiviert dieses Fenster." -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3603,29 +3637,29 @@ msgstr "" "Beendet die Seitenansicht.\n" "Seitenansicht beenden" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nDateivergleich\n\n\n\nWinMerge.Dateivergleich\nWinMerge Dateivergleich" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nOrdnervergleich\n\n\n\nWinMerge.Ordnervergleich\nWinMerge Ordnervergleich" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Mischen der Zeilenumbruch-Formate erlauben" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Rechtsklick auf den Pfad zum Kopieren." -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3634,143 +3668,143 @@ msgstr "" "Entwickler:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie können sie unter bestimmten Bedingungen weiter vertreiben; für Details sehen Sie sich die GNU General Public License unter dem Hilfe-Menü an." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Abbruch" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Wiederholen" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorieren" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "&Alle ignorieren" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ja zu &allen" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nein" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nein zu a&llen" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Fortsetzen" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Über&springen" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "&Alle überspringen" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Diese &Meldung nicht erneut anzeigen." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Diese &Frage nicht erneut stellen." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Versionskontrolle" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Unterschiede" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Nach:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Von links:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Nach links:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Von rechts:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Nach rechts:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Version %1 - Deutsch" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Eigenschaften (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle Meldungen werden wieder angezeigt." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3781,84 +3815,84 @@ msgstr "" "\n" "Bitte benutzen Sie Werte von 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Öffnen" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle Dateien (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektdatei (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Einstellungsdateien (*.ini)|*.ini|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textdateien (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-Dateien (*.htm,*.html)|*.htm;*.html|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Name" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Pfad" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Beschreibung" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Dateinamen für neuen Filter auswählen" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3871,7 +3905,7 @@ msgstr "" "Bitte kopieren Sie die Datei %1 in den Filterordner:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3884,7 +3918,7 @@ msgstr "" "\n" "Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3895,7 +3929,7 @@ msgstr "" "\n" "Bitte wählen Sie den Filterordner unter Einstellungen/System aus." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3908,12 +3942,12 @@ msgstr "" "\n" "Ist die Datei möglicherweise schreibgeschützt?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Zu installierenden Filter auswählen" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3924,17 +3958,17 @@ msgstr "" "\n" "Die Filterdatei konnte nicht in den Filterordner kopiert werden." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterdatei existiert bereits. Existierenden Filter überschreiben?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Regulärer Ausdruck" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3945,260 +3979,260 @@ msgstr "" "\n" "Wenn Sie nicht jetzt alle Vergleiche aktualisieren möchten, können Sie Nein wählen und die Vergleiche später aktualisieren." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pfad zu SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Ordnervergleichs-Ergebnisse" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Dateivergleich" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Unbenannt links" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Unbenannt rechts" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Deren Datei" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Meine Datei" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Überprüfe Dateien..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Öffne Auswahl" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopiere links nach rechts" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopiere rechts nach links" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopiere alles nach links" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopiere alles nach rechts" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopiere Dateien..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Lösche Dateien..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Verschiebe Dateien..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Erzeugt den Bericht..." # Use action instead operation, like the rest of the undo/redo system. -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Rückgängigmachen der letzten Aktion..." # Use action instead operation, like the rest of the undo/redo system. -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Wiederholen der vorherigen Aktion..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Zeile: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Merge" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Unterschied %1 von %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 Unterschiede gefunden" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 Unterschied gefunden" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 von %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Objekte: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Ordnerauswahl" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen auswählen." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Der linke Pfad ist ungültig!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Der rechte Pfad ist ungültig!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Beide Pfade sind ungültig!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl auswählen." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Datei und Ordner können nicht verglichen werden!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Datei nicht gefunden: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Datei nicht entpackt: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4211,12 +4245,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Fehler beim Analysieren der Konflikt-Datei." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4227,27 +4261,27 @@ msgstr "" "%1\n" "ist keine Konflikt-Datei." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Speichern unter" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Änderungen in %1 speichern?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 ist als Schreibgeschützt markiert. Möchten Sie die schreibgeschützte Datei überschreiben? (Nicht unter neuem Dateinamen speichern.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Fehler beim Erstellen einer Sicherheitskopie" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4260,7 +4294,7 @@ msgstr "" "\n" "Trotzdem fortfahren?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4277,7 +4311,7 @@ msgstr "" "\t-einen anderen Dateinamen verwenden? (Ok drücken)\n" "\t-die aktuelle Operation abbrechen? (Abbruch drücken)" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4292,7 +4326,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4307,7 +4341,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4322,7 +4356,7 @@ msgstr "" "\n" "Geänderte Datei überschreiben?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4331,32 +4365,32 @@ msgstr "" "%1\n" "ist als schreibgeschützt markiert. Möchten Sie das schreibgeschützte Objekt überschreiben?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte Mal geprüft hat.\n\nMöchten Sie die Datei neu laden?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Speichere linke Datei unter" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Speichere rechte Datei unter" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "Die Datei\n%1\nist verlorengegangen. Bitte speichern Sie eine Kopie der Datei, um fortzufahren." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4367,42 +4401,42 @@ msgstr "" "\n" "Aktualisieren Sie die Dokumente, bevor Sie fortfahren." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Sie müssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Dateien auschecken vom VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Fehler beim Ausführen eines Befehles des Versionierungssystems." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht überein. Fortsetzen?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Keine VSS Datenbank(en) gefunden!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Fehler vom VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4413,7 +4447,7 @@ msgstr "" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht.\n" " Auschecken rückgängig machen?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4422,164 +4456,164 @@ msgstr "" "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei rückgängig zu machen.\n" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Keines" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (kleiner als 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 und höher)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "An Leerzeichen abbrechen" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "An Leerzeichen oder Interpunktion abbrechen" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiert ausgewähltes Objekt ins angegebene Verzeichnis." -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiert ausgewähltes Objekt in ein beliebiges Verzeichnis." -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Löscht ausgewähltes Objekt auf der linken Seite." -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Löscht ausgewähltes Objekt auf der rechten Seite." -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Löscht ausgewählte Objekte auf beiden Seiten." -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Versteckt ausgewählte Objekte (dynamischer Filter)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Nennt ausgewähltes Objekt auf beiden Seiten um." -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Rechts nach Links (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Links nach Rechts (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Rechts nach Links (%1 von %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Links nach Rechts (%1 von %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Links nach... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Rechts nach... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Links nach... (%1 von %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Rechts nach... (%1 von %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 von %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 von %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 von %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Linke Seite - Zielordner auswählen:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Rechte Seite - Zielordner auswählen:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dateien betroffen)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 von %2 Dateien betroffen)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4591,17 +4625,17 @@ msgstr "" "%1\n" "löschen?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Wollen Sie wirklich kopieren:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Wollen Sie wirklich %d Objekte kopieren:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4620,613 +4654,607 @@ msgstr "" "\n" "Bitte aktualisieren Sie den Vergleich." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Wollen Sie wirklich verschieben:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Wollen Sie wirklich %d Objekte verschieben:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Verschieben bestätigen" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Öffne linke Datei" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Öffnet die linke Datei im externen Editor." -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Öffne linke Datei mit..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Öffne rechte Datei" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Öffnet die rechte Datei im externen Editor." -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Öffne rechte Datei mit..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Konnte externen Editor nicht ausführen: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiere Dateinamen in die Zwischenablage" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiere linken Pfad in die Zwischenablage" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiere rechten Pfad in die Zwischenablage" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiere beide Pfade in die Zwischenablage" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Linkes Shell-Menü" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Rechtes Shell-Menü" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Unbekanntes Archiv Format" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Fügt Objekte von der linken Seite zum Archiv hinzu." -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Fügt Objekte von der rechten Seite zum Archiv hinzu." -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Fügt Objekte von beiden Seiten zum Archiv hinzu." -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Fügt unterschiedliche Objekte zum Archiv hinzu (beide Seiten)." -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Verschiebt die ausgewählte Datei in ein beliebiges Verzeichnis." -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Verschiebt die ausgewählte Datei in ein beliebiges Verzeichnis." -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Dateiname" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Vergleichsergebnis" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Linkes Datum" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Rechtes Datum" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Erweiterung" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Linke Größe" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Rechte Größe" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Rechte Größe (Kurz)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Linke Größe (Kurz)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Linkes Erstellungsdatum" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Rechtes Erstellungsdatum" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Neuere Datei" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Linke Dateiversion" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Rechte Dateiversion" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Kurz-Ergebnis" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Linke Attribute" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Rechte Attribute" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Linkes Zeilenende" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Rechtes Zeilenende" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Linke Kodierung" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Rechte Kodierung" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ignorierte Unter." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binär" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Dateien können nicht verglichen werden" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Objekt abgebrochen" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Datei übersprungen" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Ordner übersprungen" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Nur Links: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Nur Rechts: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binärdateien sind identisch" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binärdateien sind unterschiedlich" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Dateien sind unterschiedlich" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Ordner sind unterschiedlich" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Nur Links" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Nur Rechts" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Fehler" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Textdateien sind identisch" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Textdateien sind unterschiedlich" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ausführungszeit: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 Objekt ausgewählt" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 Objekte ausgewählt" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Dateiname oder Ordnername." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Unterordnername, wenn Unterordner vorhanden sind." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Vergleichsergebnis, langes Format." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Linkes Änderungsdatum." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Rechtes Änderungsdatum." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Dateierweiterung." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Linke Dateigröße in Byte." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Rechte Dateigröße in Byte." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Linke Dateigröße gekürzt." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Rechte Dateigröße gekürzt." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Linkes Erstellungsdatum." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Rechtes Erstellungsdatum." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Zeigt, welche Seite ein neueres Änderungsdatum hat." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Linke Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Rechte Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Vergleichsergebnis, kurzes Format." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Linke Attribute." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Rechte Attribute." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Linker Zeilenenden-Typ" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Rechter Zeilenenden-Typ" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Linke Zeichensatz-Kodierung." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Rechte Zeichensatz-Kodierung." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und können nicht vermischt werden." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Anzahl der Unterschiede in der Datei. Die Zahl enthält nicht die ignorierten Unterschiede." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zeigt ein Asterisk (*), wenn die Datei binär ist." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Vergleiche %1 mit %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Komma-getrennte Liste" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Tab-getrennte Liste" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Einfaches HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Einfaches XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Der Bericht existiert bereits. Überschreiben?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5235,32 +5263,32 @@ msgstr "" "Fehler beim Erzeugen des Berichtes:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Der Bericht wurde erfolgreich geschrieben." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Die gleiche Datei ist in beiden Feldern ausgewählt." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Die ausgewählten Dateien sind identisch." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Temporäre Dateien konnten nicht erzeugt werden. Überprüfen Sie Ihre Einstellungen für temporäre Dateien." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5275,17 +5303,17 @@ msgstr "" "\n" "Hinweis: Wenn Sie immer alle Zeilenumbruch-Formate als Gleichwertig behandeln wollen, aktivieren Sie die Option 'Zeilenumbruchunterschiede ignorieren' unter 'Vergleichen' im Einstellungsdialog (erreichbar unter Bearbeiten/Einstellungen)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Der ausgewählte Ordner ist ungültig." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kann keine Binärdatei im Editor öffnen." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5300,7 +5328,7 @@ msgstr "" "%1\n" "auf der anderen Seite erzeugen und die Ordner öffnen?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5311,168 +5339,168 @@ msgstr "" "Das Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gefährlich.\n" "Wollen Sie beide Dateien behandeln, als wären sie im gleichen Zeichensatz (empfohlen)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informationsverlust wegen Kodierungsfehlern: Beide Dateien" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Kein Unterschied" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Zeilen-Unterschied" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 Vorkommen ersetzt." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kann \"%s\" nicht finden" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopiere vollständigen Pfad" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopiere Dateiname" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Positionsleiste" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Unterschiedsleiste" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Die Patchdatei wurde erfolgreich geschrieben." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Die Patchdatei existiert bereits. Überschreiben?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 Dateien ausgewählt]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unified" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Konnte nicht in die Datei %1 schreiben." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Geben Sie eine Ausgabedatei an." -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kann keine Patchdatei von Binärdateien erzeugen." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kann keine Patchdatei von Verzeichnissen erzeugen." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5483,12 +5511,12 @@ msgstr "" "\n" "Das Erzeugen eines Patches erfordert, dass es keine ungespeicherten Änderungen in den Dateien gibt." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Der Ordner existiert nicht." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5499,7 +5527,7 @@ msgstr "" "Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) für die Archiv-Unterstützung können nicht gefunden werden.\n" "Entnehmen Sie dem Handbuch mehr Informationen über die Archiv-Unterstützung und wie sie aktiviert wird." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5508,7 +5536,7 @@ msgstr "" "\n" "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen deaktiviert." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5517,37 +5545,37 @@ msgstr "" "\n" "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen auf eigenständige Arbeitsweise beschränkt." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Datei zum Exportieren auswählen" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Datei zum Importieren auswählen" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Einstellungen aus der Datei importiert." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Einstellungen in die Datei exportiert." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Konnte die Einstellungen nicht aus der Datei importieren." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Konnte die Einstellungen nicht in die Datei exportieren." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5558,157 +5586,157 @@ msgstr "" "\n" "Möchten Sie wirklich fortfahren?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Gemischt" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Entpacker" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Editor-Skript" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Speichert die linke Datei." -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Speichert die rechte Datei." -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Speichert die linke Datei unter..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Speichert die rechte Datei unter..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konvertiert Zeilenumbrüche ins Windows-Format." -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konvertiert Zeilenumbrüche ins Unix-Format." -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konvertiert Zeilenumbrüche ins Macintosh-Format." -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Wechselt zwischen Bearbeitungs- und Merging-Modus." -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5717,12 +5745,12 @@ msgstr "" "Zeigt und passt die Dateikodierungs-Eigenschaften an.\n" "Dateikodierungs-Eigenschaften" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Öffnet und löst eine Konflikt-Datei." -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5731,7 +5759,7 @@ msgstr "" "Markiert den unterschiedlichen Bereich in der aktuellen Zeile.\n" "Unterschied in der aktuellen Zeile" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5740,7 +5768,7 @@ msgstr "" "Geht zur Zeile oder zum Unterschied.\n" "Gehe nach (Strg+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5749,7 +5777,7 @@ msgstr "" "Nimmt Programm-Einstellungen vor.\n" "Einstellungen" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5758,37 +5786,37 @@ msgstr "" "Aktualisiert die Anzeige\n" "Aktualisieren (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiert die ausgewählten Zeilen in die Zwischenablage und fügt Zeilennummern vor den Zeilenanfang." -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Lesezeichen setzen oder löschen." -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Zum nächsten Lesezeichen gehen." -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Zum vorherigen Lesezeichen gehen." -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Alle Lesezeichen löschen." -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5797,7 +5825,7 @@ msgstr "" "Objekte anzeigen die exakt gleich sind.\n" "Identische Objekte" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5806,7 +5834,7 @@ msgstr "" "Objekte anzeigen die Unterschiede haben.\n" "Unterschiedliche Objekte anzeigen" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5815,7 +5843,7 @@ msgstr "" "Zeigt eindeutige Objekte auf der linken Seite an.\n" "Eindeutige Objekte links anzeigen" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5824,7 +5852,7 @@ msgstr "" "Zeigt eindeutige Objekte auf der rechten Seite an.\n" "Eindeutige Objekte rechts anzeigen" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5833,7 +5861,7 @@ msgstr "" "Zeigt Binärdateien an.\n" "Binärdateien anzeigen" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5842,7 +5870,7 @@ msgstr "" "Zeigt übersprungene Objekte an.\n" "Übersprungene Objekte anzeigen" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5851,7 +5879,7 @@ msgstr "" "Wählt die Schrift für die Anzeige.\n" "Schrift auswählen" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5860,27 +5888,27 @@ msgstr "" "Stellt die Schrift für die Anzeige zurück auf die Standard-Systemschrift.\n" "Standard-Schrift verwenden" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Zeigt Leerzeichen an." -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Blendet die Unterschiedsleiste ein oder aus." -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien." -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zeigt die Vergleichsstatistik an." -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5889,7 +5917,7 @@ msgstr "" "Wählt die Sprache der Benutzeroberfläche.\n" "Sprache" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5898,12 +5926,12 @@ msgstr "" "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe an.\n" "Zeilenunterschied anzeigen" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Vertauscht die Position der beiden Ausschnitte." -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5912,7 +5940,7 @@ msgstr "" "Zeigt Zeilennummern an.\n" "Zeilennummern anzeigen" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5921,7 +5949,7 @@ msgstr "" "Aktiviert das Umbrechen der Zeilen.\n" "Zeilen umbrechen" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5930,22 +5958,22 @@ msgstr "" "Zeigt Markierungsränder für beide Ausschnitte an.\n" "Markierungsränder anzeigen" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Textgröße erhöhen." -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Textgröße verringern." -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Textzoom auf Standardgröße zurücksetzen." -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5954,7 +5982,7 @@ msgstr "" "Bewegt die Anzeige zum vorigen Unterschied.\n" "Vorheriger Unterschied (Alt+Hoch)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5963,77 +5991,77 @@ msgstr "" "Bewegt die Anzeige zum nächsten Unterschied.\n" "Nächster Unterschied (Alt+Runter)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6042,7 +6070,7 @@ msgstr "" "Bewegt die Anzeige zum ersten Unterschied.\n" "Erster Unterschied (Alt+Pos1)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6051,7 +6079,7 @@ msgstr "" "Bewegt die Anzeige zum aktuellen Unterschied.\n" "Aktueller Unterschied (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6060,7 +6088,7 @@ msgstr "" "Bewegt die Anzeige zum letzten Unterschied.\n" "Letzter Unterschied (Alt+Ende)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6069,7 +6097,7 @@ msgstr "" "Kopiert den ausgewählten Text in die rechte Datei.\n" "Nach rechts kopieren (Alt+Rechts)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6078,7 +6106,7 @@ msgstr "" "Kopiert den ausgewählten Text in die linke Datei.\n" "Nach links kopieren (Alt+Links)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6087,7 +6115,7 @@ msgstr "" "Kopiere Unterschied nach Rechts und springe zum nächsten Unterschied.\n" "Nach rechts kopieren und fortschreiten (Strg+Alt+Rechts)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6096,7 +6124,7 @@ msgstr "" "Kopiere Unterschied nach Links und springe zum nächsten Unterschied.\n" "Nach links kopieren und fortschreiten (Strg+Alt+Links)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6105,7 +6133,7 @@ msgstr "" "Kopiert alle Unterschiede in die rechte Datei.\n" "Alles nach rechts kopieren" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6114,92 +6142,92 @@ msgstr "" "Kopiert alle Unterschiede in die linke Datei.\n" "Alles nach links kopieren" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Löscht ausgewählte Objekte von beiden Seiten." -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Vergleicht ausgewählte Objekte. (Vergleicht das erste Objekt, wenn mehrere Objekte ausgewählt wurden.)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Auswählen und wieder ordnen der Spalten vom Ordnervergleich." -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Erzeugt eine Patchdatei." -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Auswählen und modifizieren von Filtern." -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Erzeugt einen Bericht von den Vergleichsergebnissen." -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Zeigt eine Liste der verfügbaren Plugins." -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Der Benutzer wählt den Entpacker (kein Entpacken beim Ordnervergleich)." -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Der passende Entpacker wird auf beide Dateien angewendet (nur eine Datei benötigt die Erweiterung)." -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Auswählen eines Entpackers zum Bearbeiten dieser Datei." -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Kein Prediffer (Normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Vorgeschlagene Plugins" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Andere Plugins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Entlädt alle Plugins und lädt sie neu (für Entwickler)." -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6208,12 +6236,12 @@ msgstr "" "Aktiviert die nächste sichtbare Datei\n" "Aktiviere nächste Datei" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Schließt alle geöffneten Fenster." -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6222,22 +6250,22 @@ msgstr "" "Öffnet die WinMerge Hilfe.\n" "WinMerge Hilfe" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Ausgeben der aktuellen WinMerge Versionsinformationen und Konfiguration in eine Textdatei." -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Zeigt die GNU General Public License an." -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6246,7 +6274,7 @@ msgstr "" "Öffnet das Versionshinweisen-Dokument.\n" "Versionshinweise" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6255,292 +6283,292 @@ msgstr "" "Öffnet die Übersetzungen-Webseite.\n" "Übersetzungen" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Plugin Einstellungen" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Kein Prediffer." -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediff ist möglich." -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nicht gefunden - .sct Skripte deaktiviert." -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Öffnet die Datei mit registrierter Anwendung." -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Öffnet die Datei mit externem Editor." -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Öffnet die Datei mit einem bestimmten Programm." -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Keine verschobene Blöcke anzeigen." -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Alle verschobene Blöcke anzeigen." -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Verschobenen Block nur für den aktuellen Unterschied anzeigen." -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Geht zum Unterschied unter dem Cursor." -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "G&ehe nach Zeile %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Deaktiviert" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Von Dateisystem" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Von MRU-Liste" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Keine Hervorhebung" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Ressourcen" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Versteckt die Symbolleiste." -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Zeigt kleine Symbolleiste an." -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Zeigt große Symbolleiste an." -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index dad9b4bef..3c40343d3 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -327,7 +327,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< ¢äåéï >" @@ -469,7 +469,7 @@ msgstr " #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -533,7 +533,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&ÂïÞèåéá" @@ -861,7 +861,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Êùäéêïóåëßäá Áñ÷åßïõ..." @@ -1465,37 +1465,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "ÐëÞñçò Ðåñéå÷ïìÝíùí" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Óýíôïìç Ðåñéå÷ïìÝíùí" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò êáé ÌÝãåèïò" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "ÌÝãåèïò" @@ -1527,7 +1527,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "ÏÊ" @@ -1699,14 +1699,14 @@ msgid "&Versioning System:" msgstr "&Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&ÄéáäñïìÞ ôïõ cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "ÃåíéêÜ" @@ -1849,7 +1849,7 @@ msgid "&Find Next" msgstr "Åýñåóç &ÅðïìÝíïõ" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&ÏÊ" @@ -1895,7 +1895,7 @@ msgid "Replace &All" msgstr "ÁíôéêáôÜóôáóç ¼&ëùí" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "" @@ -1947,7 +1947,7 @@ msgid "Remove" msgstr "ÄéáãñáöÞ" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "×ñþìáôá" @@ -1976,7 +1976,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Êåßìåíï" @@ -2027,13 +2027,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "&Áñ÷éêÝò Ñõèìßóåéò" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Óýóôçìá" @@ -2174,7 +2175,7 @@ msgid "Description:" msgstr "ÐåñéãñáöÞ:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Ôåñìáôéóìüò" @@ -2236,7 +2237,7 @@ msgid "&Go To" msgstr "ÌåôÜ&âáóç" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Óýãêñéóç" @@ -2287,7 +2288,7 @@ msgid "Filter Comments" msgstr "Ó÷üëéá Ößëôñùí" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Åðåîåñãáóßá ÊåéìÝíïõ" @@ -2439,7 +2440,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Êùäéêïóåëßäá" @@ -2725,7 +2726,7 @@ msgid "Private Filter (only for current user)" msgstr "Éäéùôéêü Ößëôñï (ìüíï ãéá ôïí ðáñüíôá ÷ñÞóôç)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "ÕðïóôÞñéîç ÓõìðéåóìÝíùí" @@ -2776,7 +2777,7 @@ msgid "Files:" msgstr "Áñ÷åßá:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "ÄéáöïñåôéêÜ" @@ -2813,7 +2814,7 @@ msgid "Right:" msgstr "ÄåîéÜ:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Ðáíïìïéüôõðá" @@ -2866,7 +2867,7 @@ msgid "&Apply" msgstr "Å&öáñìïãÞ" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "¢&êõñï" @@ -2972,7 +2973,7 @@ msgid "Save..." msgstr "ÁðïèÞêåõóç..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "ÅöåäñéêÜ Áñ÷åßá" @@ -3013,7 +3014,7 @@ msgid "A&ppend timestamp" msgstr "ÐñïóèÞêç &çìåñïìçíßáò ê´ þñáò" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Åðéâåâáßùóç ÁíôéãñáöÞò" @@ -3054,7 +3055,7 @@ msgid "&Enable plugins" msgstr "Åíåñãïðïßçóç ÁñèñùìÜôùí" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3090,8 +3091,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "ÖÜêåëïò" @@ -3127,69 +3128,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Äõáäéêü" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Óå Åôïéìüôçôá" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3198,12 +3232,12 @@ msgstr "" "Äçìéïõñãßá áäåßùí åããñÜöùí\n" "ÍÝá ¸ããñáöá (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3212,7 +3246,7 @@ msgstr "" "¢íïéãìá õðÜñ÷ïíôïò åããñÜöïõ\n" "¢íïéãìá (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3221,7 +3255,7 @@ msgstr "" "Êëåßóéìï ôñÝ÷ïíôïò åããñÜöïõ\n" "Êëåßóéìï" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3230,7 +3264,7 @@ msgstr "" "ÁðïèÞêåõóç ôñÝ÷ïíôïò åããñÜöïõ\n" "ÁðïèÞêåõóç (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3239,7 +3273,7 @@ msgstr "" "ÁðïèÞêåõóç ôñÝ÷ïíôïò åããñÜöïõ ìå íÝï üíïìá\n" "ÁðïèÞêåõóç Ùò" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3248,7 +3282,7 @@ msgstr "" "ÁëëáãÞ åðéëïãþí åêôõðþóåùò\n" "ÄéÜôáîç Óåëßäáò" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3257,7 +3291,7 @@ msgstr "" "ÁëëáãÞ åêôõðùôÞ êáé åðéëïãþí åêôõðþóåùò\n" "Ñõèìßóåéò ÅêôõðùôÞ" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3266,7 +3300,7 @@ msgstr "" "Åêôýðùóç ôñÝ÷ïíôïò åããñÜöïõ\n" "Åêôýðùóç" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3275,27 +3309,27 @@ msgstr "" "ÅìöÜíéóç ïëïêëÞñùí óåëßäùí\n" "Ðñïåðéóêüðçóç Åêôõðþóåùò" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "¼ëá ôá êñõöÜ áíôéêåßìåíá íá îáíáãßíïõí ïñáôÜ" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3304,32 +3338,32 @@ msgstr "" "¢íïéãìá áñ÷åßïõ Ýñãïõ\n" "Áñ÷åßï ¸ñãïõ (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ Ýñãïõ." -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôçí áðïèÞêåõóç ôïõ áñ÷åßïõ Ýñãïõ." -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "ÁðïèÞêåõóç ¸ñãïõ Ùò" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Áñ÷åßï ¸ñãïõ áíïß÷èçêå åðéôõ÷þò." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Áñ÷åßï ¸ñãïõ áðïèçêåýèçêå åðéôõ÷þò." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3338,7 +3372,7 @@ msgstr "" "ÁðïèÞêåõóç ôñå÷ïõóþí äéáäñïìþí êáé åðéëïãþí óôï áñ÷åßï Ýñãïõ\n" "ÁðïèÞêåõóç Áñ÷åßïõ ¸ñãïõ" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3347,7 +3381,7 @@ msgstr "" "ÅìöÜíéóç ðëçñïöïñéþí åöáñìïãÞò, áñéèìïý åêäüóåùò êáé copyright\n" "Ðåñß" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3356,27 +3390,27 @@ msgstr "" "¸îïäïò áðü ôçí åöáñìïãÞ· ðñïôñïðÞ ãéá áðïèÞêåõóç åããñÜöùí\n" "¸îïäïò" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "¢íïéãìá áõôïý ôïõ åããñÜöïõ" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3385,7 +3419,7 @@ msgstr "" "ÌåôÜâáóç óôï åðüìåíï ðåäßï ðáñáèýñïõ\n" "Åðüìåíï Ðåäßï" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3394,7 +3428,7 @@ msgstr "" "ÅðéóôñïöÞ óôï ðñïçãïýìåíï ðåäßï ðáñáèýñïõ\n" "Ðñïçãïýìåíï Ðåäßï" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3403,7 +3437,7 @@ msgstr "" "Ôáêôïðïßçóç ðáñáèýñùí ìå (ìåñéêÞ) áëëçëåðéêÜëõøç\n" "Ôáêôïðïßçóç Ðáñáèýñùí ìå ÁëëçëåðéêÜëõøç" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3412,7 +3446,7 @@ msgstr "" "Ôáêôïðïßçóç ðáñáèýñùí ïñéæïíôßùò ÷ùñßò áëëçëåðéêÜëõøç\n" "Ôáêôïðïßçóç Ðáñáèýñùí Ïñéæïíôßùò" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3421,7 +3455,7 @@ msgstr "" "Ôáêôïðïßçóç ðáñáèýñùí êáôáêïñýöùò ÷ùñßò áëëçëåðéêÜëõøç\n" "Ôáêôïðïßçóç Ðáñáèýñùí Êáôáêïñýöùò" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3430,7 +3464,7 @@ msgstr "" "ÁíôéãñáöÞ ôïõ åðéëåãìÝíïõ êåéìÝíïõ êáé ôïðïèÝôçóÞ ôïõ óôï Ðñü÷åéñï\n" "ÁíôéãñáöÞ" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3439,7 +3473,7 @@ msgstr "" "ÁðïêïðÞ ôïõ åðéëåãìÝíïõ êåéìÝíïõ êáé ôïðïèÝôçóÞ ôïõ óôï Ðñü÷åéñï\n" "ÁðïêïðÞ" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3448,7 +3482,7 @@ msgstr "" "ÁíáæÞôçóç ôïõ äïèÝíôïò êåéìÝíïõ\n" "ÁíáæÞôçóç" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3457,7 +3491,7 @@ msgstr "" "ÅéóáãùãÞ ôùí ðåñéå÷ïìÝíùí ôïõ Ðñï÷åßñïõ\n" "ÐñïóÜñôçóç" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3466,7 +3500,7 @@ msgstr "" "ÅðáíÜëçøç ôçò ôåëåõôáßáò åíåñãåßáò\n" "ÅðáíÜëçøç" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3475,7 +3509,7 @@ msgstr "" "ÁíôéêáôÜóôáóç äïèÝíôïò êåéìÝíïõ ìå äéáöïñåôéêü êåßìåíï\n" "ÁíôéêáôÜóôáóç" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3484,7 +3518,7 @@ msgstr "" "ÅðéëïãÞ üëïõ ôïõ åããñÜöïõ\n" "ÅðéëïãÞ üëùí" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3493,7 +3527,7 @@ msgstr "" "Áíáßñåóç ôçò ôåëåõôáßáò åíåñãåßáò\n" "Áíáßñåóç (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3502,7 +3536,7 @@ msgstr "" "ÅðáíÜëçøç ôçò ðñïçãïõìÝíçò áíáéñåèåßóçò åíåñãåßáò\n" "ÅðáíÜëçøç (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3511,7 +3545,7 @@ msgstr "" "ÅìöÜíéóç Þ áðüêñõøç ôçò ãñáììÞò åñãáëåßùí\n" "ÃñáììÞ Åñãáëåßùí" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3520,7 +3554,7 @@ msgstr "" "ÅìöÜíéóç Þ áðüêñõøç ôçò ãñáììÞò êáôáóôÜóåùò\n" "ÃñáììÞ ÊáôáóôÜóåùò" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3529,7 +3563,7 @@ msgstr "" "ÅìöÜíéóç Þ áðüêñõøç ôçò ãñáììÞò óåëéäïäåéêôþí\n" "ÃñáììÞ Óåëéäïäåéêôþí" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3538,57 +3572,57 @@ msgstr "" "Áõôüìáôç ñýèìéóç äéáóôÜóåùí ðåäßùí\n" "ÐÜãùìá Ðåäßùí" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "ÌåôáâïëÞ äéáóôÜóåùí ðáñáèýñïõ" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Ìåôáôüðéóç ðáñáèýñïõ" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Óìßêñõíóç ðáñáèýñïõ óå åéêïíßäéï" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Ìåãéóôïðïßçóç ðáñáèýñïõ" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "ÌåôÜâáóç óôï åðüìåíï ðáñÜèõñï åããñÜöïõ" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "ÌåôÜâáóç óôï ðñïçãïýìåíï ðáñÜèõñï åããñÜöïõ" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Êëåßíåé ôï åíåñãü ðáñÜèõñï êáé ðñïôñÝðåé ãéá áðïèÞêåõóç ôùí åããñÜöùí" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "ÅðáíáöïñÜ ôïõ ðáñáèýñïõ óôéò êáíïíéêÝò äéáóôÜóåéò" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Åíåñãïðïßçóç Êáôáëüãïõ Åñãáóéþí" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Åíåñãïðïßçóç áõôïý ôïõ ðáñáèýñïõ" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3597,7 +3631,7 @@ msgstr "" "¸îïäïò áðü ëåéôïõñãßá ðñïåðéóêïðÞóåùò åêôõðþóåùò\n" "¸îïäïò áðü Ðñïåðéóêüðçóç" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3616,7 +3650,7 @@ msgstr "" "WinMerge.ÓýãêñéóçÁñ÷åßùí\n" "Óýãêñéóç Áñ÷åßùí WinMerge" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3635,19 +3669,19 @@ msgstr "" "WinMerge.ÓýãêñéóçÖáêÝëùí\n" "Óýãêñéóç ÖáêÝëùí WinMerge" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "ÄéáôÞñçóç áñ÷éêþí ÷áñáêôÞñùí ôåñìáôéóìïý" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Äåõôåñåýïí êëéê óôç äéáäñïìÞ ãéá áíôéãñáöÞ" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3656,143 +3690,143 @@ msgstr "" "ÐñïãñáììáôéóôÝò:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 ðñïóöÝñåôáé ÷ùñßò ÊÁÌÌÉÁ ÁÐÏËÕÔÙÓ ÅÃÃÕÇÓÇ. Åßíáé åëåýèåñï ëïãéóìéêü êáé åßóèå åõðñüóäåêôïò íá ôï áíáäéáíåßìåôå õðü ïñéóìÝíåò ðåñéóôÜóåéò· äåßôå ôç ÃåíéêÞ Äçìïóßá ¢äåéá GNU óôéò åðéëïãÝò ôçò Âïçèåßáò ãéá ëåðôïìÝñåéåò." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Ìáôáßùóç" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&ÅðáíÜëçøç" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "Íá &áãíïçèåß" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Íá áãíïçèïýí &üëá" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Íáé" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Íáé óå &üëá" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&¼÷é" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "¼÷é óå ü&ëá" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&ÓõíÝ÷åéá" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&ÐáñÜëåéøç" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "ÐáñÜëåéøç ¼&ëùí" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Íá ìçí åìöáíéóèåß îáíÜ áõôü ôï &ÌÞíõìá." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Íá ìçí îáíáãßíåé áõôÞ ç &åñþôçóç." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Äéá÷åßñéóç Åêäüóåùí" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "ÄéáöïñÝò" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Ðñïò:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Åî áñéóôåñþí:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Ðñïò ôá áñéóôåñÜ:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Åê äåîéþí:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Ðñïò ôá äåîéÜ:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "¸êäïóç %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "ÅðéëïãÝò (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "¼ëá ôá ðëáßóéá ìçíõìÜôùí åßíáé ðÜëé ïñáôÜ." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3803,84 +3837,84 @@ msgstr "" "\n" "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôéìÝò 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "¢íïéãìá" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÐñïãñÜììáôá|*.exe;*.bat;*.cmd|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Áñ÷åßá ¸ñãïõ ôïõ WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Áñ÷åßá ñõèìßóåùí (*.ini)|*.ini|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Áñ÷åßá áðëïý ÊåéìÝíïõ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Áñ÷åßá HTML (*.htm,*.html)|*.htm;*.html|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Áñ÷åßá XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "¼íïìá" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Ôïðïèåóßá" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Ößëôñá" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "ÐåñéãñáöÞ" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "ÅðéëÝîáôå üíïìá áñ÷åßïõ ãéá ôï íÝï ößëôñï" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ößëôñá Áñ÷åßùí (*.flt)|*.flt|¼ëá ôá áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3893,7 +3927,7 @@ msgstr "" "Ðáñáêáëþ áíôéãñÜøáôå ôï áñ÷åßï %1 óôï öÜêåëï WinMerge/Filters:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3906,7 +3940,7 @@ msgstr "" "\n" "Ðáñáêáëþ âåâáéùèåßôå üôé ï öÜêåëïò õðÜñ÷åé êáé äåí Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\"." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3917,7 +3951,7 @@ msgstr "" "\n" "Ðáñáêáëþ åðéëÝîôå öÜêåëï áñ÷åßùí áðü ÅðéëïãÝò/Óýóôçìá." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3930,12 +3964,12 @@ msgstr "" "\n" "ÌÞðùò ôï áñ÷åßï Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\";" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Åíôïðéóìüò áñ÷åßïõ ößëôñïõ ðñïò åãêáôÜóôáóç" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3946,273 +3980,273 @@ msgstr "" "\n" "Ç áíôéãñáöÞ ôïõ íÝïõ áñ÷åßïõ ößëôñïõ óôï öÜêåëï ößëôñùí Þôáí áäýíáôç." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôï áñ÷åßï ößëôñïõ õðÜñ÷åé Þäç. ÁíôéêáôÜóôáóç ôïõ õðÜñ÷ïíôïò ößëôñïõ;" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "ÔõðïðïéçìÝíç ¸êöñáóç" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "Ôá ößëôñá åíçìåñþèçêáí. Åðéèõìåßôå íá áíáíåùèïýí üëåò ïé áíïéêôÝò óõãêñßóåéò öáêÝëùí;\n\nÅÜí äåí åðéèõìåßôå íá áíáíåùèïýí üëåò ïé óõãêñßóåéò ôþñá, ìðïñåßôå íá åðéëÝîåôå ¼÷é êáé íá áíáíåþóåôå ôéò óõãêñßóåéò áñãüôåñá." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "ÁðïôåëÝóìáôá Óõãêñßóåùò ÖáêÝëùí" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Óýãêñéóç Áñ÷åßùí" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "×ùñßò ôßôëï áñéóôåñÜ" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "×ùñßò ôßôëï äåîéÜ" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Áñ÷åßï Áõôþí" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Áñ÷åßï Äéêü ìïõ" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "ÁíÜëõóç Áñ÷åßùí..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "¢íïéãìá åðéëïãÞò" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "ÁíôéãñáöÞ åî Áñéóôåñþí ðñïò ôá ÄåîéÜ" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "ÁíôéãñáöÞ åê Äåîéþí ðñïò ôá ÁñéóôåñÜ" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "ÁíôéãñáöÞ üëùí ÁñéóôåñÜ" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "ÁíôéãñáöÞ üëùí ÄåîéÜ" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "ÁíôéãñáöÞ áñ÷åßùí..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "ÄéáãñáöÞ áñ÷åßùí..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Ìåôáêßíçóç áñ÷åßùí..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Äçìéïõñãßá ôçò áíáöïñÜò..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Áíáßñåóç ôçò ôåëåõôáßáò ëåéôïõñãßáò..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "ÅðáíÜëçøç ôçò ôåëåõôáßáò ëåéôïõñãßáò..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "ÃñáììÞ: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Óõã÷þíåõóç" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "ÄéáöïñÜ %1 áðü %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 ÄéáöïñÝò âñÝèçêáí" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 ÄéáöïñÜ âñÝèçêå" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "ÌãÁ" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Áíôéêåßìåíï %1 áðü %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Áíôéêåßìåíá: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "ÅðéëÝîáôå äýï õðÜñ÷ïíôåò öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "ÅðéëïãÞ ÖáêÝëùí" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "ÅðéëÝîáôå äýï öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ áñéóôåñïý!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ äåîéïý!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "ÓöÜëìá óå áìöüôåñåò ôéò äéáäñïìÝò!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "ÅðéëÝîáôå äýï áñ÷åßá þóôå íá åíåñãïðïéçèåß ç åðéëïãÞ áðïóõìðéåóôéêïý." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Ç óýãêñéóç áñ÷åßïõ êáé öáêÝëïõ äåí åßíáé äõíáôÞ!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Ôï áñ÷åßï äå âñÝèçêå: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Ôï áñ÷åßï äåí áðïóõìðéÝóèçêå: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4225,12 +4259,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Áðïôõ÷ßá áíáëýóåùò áñ÷åßïõ äéåíÝîåùí." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4241,27 +4275,27 @@ msgstr "" "%1\n" "äåí åßíáé áñ÷åßï äéåíÝîåùí." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "ÁðïèÞêåõóç Ùò" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "ÁðïèÞêåõóç ìåôáâïëþí óôï %1;" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "Ôï %1 Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Èá èÝëáôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï; (¼÷é ãéá áðïèÞêåõóç ùò äéáöïñåôéêü áñ÷åßï.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Áðïôõ÷ßá äçìéïõñãßáò åöåäñéêïý áñ÷åßïõ" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4274,7 +4308,7 @@ msgstr "" "\n" "ÓõíÝ÷åéá ùò Ý÷åé;" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4291,7 +4325,7 @@ msgstr "" "\t-÷ñçóéìïðïéÞóåôå Ýíá äéáöïñåôéêü üíïìá (ÐéÝóôå ÏÊ)\n" "\t-ìáôáéþóåôå ôçí ôñÝ÷ïõóá åíÝñãåéá (ÐéÝóôå ¢êõñï);" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4306,7 +4340,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4321,7 +4355,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4336,7 +4370,7 @@ msgstr "" "\n" "ÁíôéêáôÜóôáóç ìåôáâëçèÝíôïò áñ÷åßïõ?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4345,32 +4379,32 @@ msgstr "" "Ôï %1\n" "Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï;" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "ÁðïèÞêåõóç Áñéóôåñïý Áñ÷åßïõ Ùò" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "ÁðïèÞêåõóç Äåîéïý Áñ÷åßïõ Ùò" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4381,42 +4415,42 @@ msgstr "" "\n" "Áíáíåþóôå ôá áñ÷åßá ðñéí óõíå÷ßóåôå." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "ÐñÝðåé íá ïñßóåôå ìßá äéáäñïìÞ Ýñãïõ ôïõ SourceSafe þóôå íá óõíå÷ßóåôå (äçë. $/Ôï¸ñãïìïõ)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "¸ëåã÷ïò ê´ ¸îïäïò áðü ôï VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôïí Ýëåã÷ï ê´ Ýîïäï ôïõ áñ÷åßïõ. Ç óõíÝ÷åéá åßíáé áäýíáôç..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç åíôïëÞò ôïõ óõóôÞìáôïò äéá÷åéñßóåùò åêäüóåùí." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ï öÜêåëïò åñãáóßáò ôïõ VSS êáé ç èÝóç ôïõ ôñÝ÷ïíôïò áñ÷åßïõ äåí åßíáé óå óõìöùíßá. ÓõíÝ÷åéá;" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Äå âñÝèçêáí âÜóåéò äåäïìÝíùí ôïõ VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "ÓöÜëìá ôïõ VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4427,7 +4461,7 @@ msgstr "" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" " Áíáßñåóç åíåñãåßáò åëÝã÷ïõ ê´ åîüäïõ;" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4436,164 +4470,164 @@ msgstr "" "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôçí áíáßñåóç åëÝã÷ïõ ê´ åîüäïõ ôïõ áñ÷åßïõ.\n" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "×ùñßò" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (Ýêäïóç ðñï ôçò 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (Ýêäïóç 5.0 êáé ìåôáãåíÝóôåñï)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "ÓôÜóç óôá êåíÜ" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÓôÜóç óôá êåíÜ Þ óôá óçìåßá óôßîåùò" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "ÁíôéãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ óôïí êáôïíïìáæüìåíï öÜêåëï" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "ÁíôéãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ óôïí ðñïôéìþìåíï öÜêåëï" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "ÄéáãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ áñéóôåñÜ" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "ÄéáãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ äåîéÜ" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "ÄéáãñáöÞ åðéëåãìÝíïõ(-ùí) óôïé÷åßïõ(-ùí) óå áìöüôåñåò ôéò ðëåõñÝò" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Áðüêñõøç åðéëåãìÝíïõ(-ùí) áíôéêåéìÝíïõ(-ùí) (Üìåóï ößëôñï)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Ìåôïíïìáóßá åðéëåãìÝíïõ áíôéêåéìÝíïõ óå áìöüôåñåò ôéò ðëåõñÝò" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Äåîéü óôï Áñéóôåñü (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Áñéóôåñü óôï Äåîéü (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåîéü óôï Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Áñéóôåñü óôï Äåîéü (%1 áðü %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Áñéóôåñü óôï... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Äåîéü óôï... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Áñéóôåñü óôï... (%1 áðü %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåîéü óôï... (%1 áðü %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Áñéóôåñü (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Äåîéü (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Áìöüôåñá (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Äåîéü (%1 áðü %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Áìöüôåñá (%1áðü %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "ÁñéóôåñÞ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "ÄåîéÜ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 áðü %2 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4604,17 +4638,17 @@ msgstr "" "\n" "%1 ;" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå %d áíôéêåßìåíá:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4633,613 +4667,607 @@ msgstr "" "\n" "Ðáñáêáëþ áíáíåþóôå ôç óýãêñéóç." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå %d áíôéêåßìåíá:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Åðéâåâáéþóáôå Ìåôáêßíçóç" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "¢íïéãìá áñéóôåñïý áñ÷åßïõ" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "¢íïéãìá ôïõ áñéóôåñïý áñ÷åßïõ ìå Üëëç åöáñìïãÞ" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "¢íïéãìá áñéóôåñïý áñ÷åßïõ ìå..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "¢íïéãìá äåîéïý áñ÷åßïõ" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "¢íïéãìá ôïõ äåîéïý áñ÷åßïõ ìå Üëëç åöáñìïãÞ" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "¢íïéãìá äåîéïý áñ÷åßïõ ìå..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá Üëëçò åöáñìïãÞò: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "ÁíôéãñáöÞ ôùí ïíïìÜôùí áñ÷åßùí óôï ðñü÷åéñï" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "ÁíôéãñáöÞ äéáäñïìþí áñéóôåñÞò ðëåõñÜò óôï ðñü÷åéñï" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "ÁíôéãñáöÞ äéáäñïìþí äåîéÜò ðëåõñÜò óôï ðñü÷åéñï" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "ÁíôéãñáöÞ äéáäñïìþí áìöïôÝñùí ôùí ðëåõñþí óôï ðñü÷åéñï" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "¢ãíùóôç ìïñöÞ óõìðéåóìÝíïõ áñ÷åßïõ" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "ÐñïóèÞêç áíôéêåéìÝíùí áðü áñéóôåñÞ ðëåõñÜ óå óõìðéåóìÝíï áñ÷åßï" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "ÐñïóèÞêç áíôéêåéìÝíùí áðü äåîéÜ ðëåõñÜ óå óõìðéåóìÝíï áñ÷åßï" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "ÐñïóèÞêç áíôéêåéìÝíùí áðü áìöüôåñåò ôéò ðëåõñÝò óå óõìðéåóìÝíï áñ÷åßï" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "ÐñïóèÞêç äéáöïñåôéêþí áíôéêåéìÝíùí óôï óõìðéåóìÝíï áñ÷åßï (áìöüôåñåò ïé ðëåõñÝò)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Ìåôáêßíçóç åðéëåãìÝíïõ áñ÷åßïõ óôá áñéóôåñÜ óå ðñïôéìþìåíï öÜêåëï" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ìåôáêßíçóç åðéëåãìÝíïõ áñ÷åßïõ óôá äåîéÜ óå ðñïôéìþìåíï öÜêåëï" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "¼íïìá Áñ÷åßïõ" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "ÁðïôÝëåóìá Óõãêñßóåùò" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Çìåñïìçíßá Áñéóôåñïý" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Çìåñïìçíßá Äåîéïý" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "ÅðÝêôáóç" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "ÌÝãåèïò Áñéóôåñïý" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "ÌÝãåèïò Äåîéïý" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "ÌÝãåèïò Äåîéïý (Óýíôïìï)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "ÌÝãåèïò Áñéóôåñïý (Óýíôïìï)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Áñéóôåñïý" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Äåîéïý" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Íåþôåñï Áñ÷åßï" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "¸êäïóç Áñéóôåñïý Áñ÷åßïõ" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "¸êäïóç Äåîéïý Áñ÷åßïõ" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Óýíôïìï ÁðïôÝëåóìá" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Éäéüôçôåò Áñéóôåñïý" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Éäéüôçôåò Äåîéïý" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Áñéóôåñïý" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Äåîéïý" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Êùäéêïóåëßäá Áñéóôåñïý" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Êùäéêïóåëßäá Äåîéïý" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Áãíïçèåßóá ÄéáöïñÜ." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Äõáäéêü" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Ç óýãêñéóç ôùí áñ÷åßùí åßíáé áäýíáôç" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Ôï áíôéêåßìåíï ìáôáéþèçêå" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Ôï áñ÷åßï ðáñåëåßöèç" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Ï öÜêåëïò ðáñåëåßöèç" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "ÁñéóôåñÜ ìüíï: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "ÄåîéÜ ìüíï: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé ðáíïìïéüôõðá" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Ôá áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "ÁñéóôåñÜ ìüíï" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "ÄåîéÜ ìüíï" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "ÓöÜëìá" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ðáñåëèþí ÷ñüíïò: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 áíôéêåßìåíï åðéëåãìÝíï" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 áíôéêåßìåíá åðéëåãìÝíá" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "¼íïìá áñ÷åßïõ Þ üíïìá öáêÝëïõ." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¼íïìá õðïöáêÝëïõ üôáí ïé õðïöÜêåëïé ðåñéëáìâÜíïíôáé." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "ÁðïôÝëåóìá óõãêñßóåùò, ðëÞñçò áíÜðôõîç" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò äåîéÜò ðëåõñÜò." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "ÅðÝêôáóç áñ÷åßïõ." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óå byte." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óå byte." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "×ñüíïò äçìéïõñãßáò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "×ñüíïò äçìéïõñãßáò äåîéÜò ðëåõñÜò." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Ðëçñïöïñåß ðïéá ðëåõñÜ Ý÷åé ôçí ðëÝïí ðñüóöáôç çìåñïìçíßá ôñïðïðïéÞóåùò." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ áñéóôåñÞò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ äåîéÜò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Âñá÷ý áðïôÝëåóìá óõãêñßóåùò." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Éäéüôçôåò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Éäéüôçôåò äåîéÜò ðëåõñÜò." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý áñéóôåñÞò ðëåõñÜò" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý äåîéÜò ðëåõñÜò" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Êùäéêïóåëßäá áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Êùäéêïóåëßäá äåîéÜò ðëåõñÜò." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áñéèìüò áãíïçèåéóþí äéáöïñþí óôï áñ÷åßï. ÁõôÝò ïé äéáöïñÝò áãíïïýíôáé áðü ôï WinMerge êáé äåí åßíáé äõíáôüí íá óõã÷ùíåõèïýí." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áñéèìüò äéáöïñþí óôï áñ÷åßï. Áõôüò ï áñéèìüò äåí ðåñéëáìâÜíåé áãíïçèåßóåò äéáöïñÝò." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Åìöáíßæåé Ýíáí áóôåñßóêï (*) åÜí ôï áñ÷åßï åßíáé äõáäéêü." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Óýãêñéóç %1 ìå %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "ÊáôÜëïãïò ìå êüììá ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "ÊáôÜëïãïò ìå óôçëïèÝôç ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Áðëü HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Áðëü XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôï áñ÷åßï áíáöïñÜò áðïôåëåóìÜôùí õðÜñ÷åé Þäç. Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5248,32 +5276,32 @@ msgstr "" "ÓöÜëìá êáôÜ ôç äçìéïõñãßá ôçò áíáöïñÜò áðïôåëåóìÜôùí:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Ç áíáöïñÜ áðïôåëåóìÜôùí äçìéïõñãÞèçêå åðéôõ÷þò." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Ôï ßäéï áñ÷åßï áíïß÷èçêå óå áìöüôåñá ôá ðåäßá." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Ôá åðéëåãìÝíá áñ÷åßá åßíáé ðáíïìïéüôõðá." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôç óýãêñéóç ôùí áñ÷åßùí." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ç äçìéïõñãßá ðñïóùñéíþí áñ÷åßùí äåí Þôáí äõíáôÞ. ÅëÝãîôå ôéò ñõèìßóåéò óáò ôéò ó÷åôéêÝò ìå ôçí ðñïóùñéíÞ äéáäñïìÞ." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5288,17 +5316,17 @@ msgstr "" "\n" "Óçìåßùóç: ÅÜí åðéèõìåßôå ïé ÷áñáêôÞñåò ôåñìáôéóìïý íá èåùñïýíôáé ðÜíôïôå éóïäýíáìïé, åíåñãïðïéåßóôå ôçí åðéëïãÞ \"ÄéáöïñÝò ÷áñáêôÞñùí ôåñìáôéóìïý (Win/Unix/Mac) íá áãíïïýíôáé...\" óôçí êáñôÝëá Óýãêñéóç ôïõ äéáëüãïõ åðéëïãþí (åìöáíßæåôáé ìå ôçí åðéëïãÞ Åðåîåñãáóßá/ÅðéëïãÝò)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Ï åðéëåãìÝíïò öÜêåëïò äåí åßíáé Ýãêõñïò." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ôï Üíïéãìá äõáäéêïý áñ÷åßïõ óôï ðåäßï åðåîåñãáóßáò äåí åßíáé äõíáôüí." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5313,7 +5341,7 @@ msgstr "" "%1\n" "óôçí Üëëç ðëåõñÜ êáé íá áíïßîåôå áõôïýò ôïõò öáêÝëïõò;" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5324,168 +5352,168 @@ msgstr "" "Ç åìöÜíéóç êÜèå öáêÝëïõ ìå ôç äéêÞ ôïõ êùäéêïóåëßäá èá Ý÷åé åìöáíéóéáêÜ êáëýôåñá áðïôåëÝóìáôá áëëÜ ç óõã÷þíåõóç/áíôéãñáöÞ èá åßíáé åðéêßíäõíç.\n" "Åðéèõìåßôå íá èåùñçèåß üôé áìöüôåñá ôá áñ÷åßá ÷ñçóéìïðïéïýí ôçí ðñïêáèïñéóìÝíç êùäéêïóåëßäá ôïõ windows (óõíéóôÜôáé);" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Áðþëåéá ðëçñïöïñéþí ëüãù óöáëìÜôïò êùäéêïóåëßäáò: áìöüôåñá ôá áñ÷åßá" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "×ùñßò äéáöïñÜ" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "ÄéáöïñÜ ãñáììÞò" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "ÁíôéêáôáóôÜèçêáí %1 áêïëïõèßåò ÷áñáêôÞñùí." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ç áêïëïõèßá ÷áñáêôÞñùí \"%s\" äåí åßíáé äõíáôüí íá âñåèåß" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "ÁíôéãñáöÞ ðëÞñïõò ÄéáäñïìÞò" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "ÁíôéãñáöÞ Ïíüìáôïò Áñ÷åßïõ" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Ðåäßï Åíôïðéóìïý" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Ðåäßï Äéáöïñþí" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Ç åããñáöÞ ôïõ áñ÷åßïõ patch ïëïêëçñþèçêå åðéôõ÷þò." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ôï áñ÷åßï patch õðÜñ÷åé Þäç. Åðéèõìåßôå íá ôï áíôéêáôáóôÞóåôå;" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 åðéëåãìÝíá áñ÷åßá]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Êáíïíéêü" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Ìå ðåñéâÜëëïí êåßìåíï" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "ÅíïðïéçìÝíï" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Ç åããñáöÞ óôï áñ÷åßï %1 äåí Þôáí äõíáôÞ." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ç ïñéóèåßóá äéáäñïìÞ åîüäïõ äåí åßíáé áðüëõôç äéáäñïìÞ: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Ïñßóáôå Ýíá áñ÷åßï åîüäïõ" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü äõáäéêÜ áñ÷åßá äåí åßíáé äõíáôÞ." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü öáêÝëïõò äåí åßíáé äõíáôÞ." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5496,12 +5524,12 @@ msgstr "" "\n" "Ç äçìéïõñãßá patch áðáéôåß íá ìçí õðÜñ÷ïõí óå áñ÷åßá áëëáãÝò ïé ïðïßåò äåí Ý÷ïõí áðïèçêåõèåß." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Ï öÜêåëïò äåí õðÜñ÷åé." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5512,7 +5540,7 @@ msgstr "" "Äåí åßíáé äõíáôüí íá âñåèïýí üëá ôá áðáñáßôçôá óôïé÷åßá (ôï 7-zip êáé/Þ ôï Merge7z*.dll) ãéá ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí.\n" "Äåßôå óôï åã÷åéñßäéï ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí êáé ìå ôïí ôñüðï åíåñãïðïéÞóåùò áõôÞò." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5521,7 +5549,7 @@ msgstr "" "\n" "Óçìåßùóç: Ç åíóùìÜôùóç ôïõ 7-Zip åßíáé áðåíåñãïðïéçìÝíç óôéò ñõèìßóåéò ôïõ WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5530,37 +5558,37 @@ msgstr "" "\n" "Óçìåßùóç: Ç åíóùìÜôùóç ôïõ 7-Zip åßíáé ðåñéïñéóìÝíç óå áõôüíïìç ëåéôïõñãßá óôéò ñõèìßóåéò ôïõ WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åîáãùãÞ" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åéóáãùãÞ" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Ïé ñõèìßóåéò åéóÞ÷èçóáí áðü ôï áñ÷åßï." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Ïé ñõèìßóåéò åîÞ÷èçóáí óôï áñ÷åßï." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Áðïôõ÷ßá åéóáãùãÞò ñõèìßóåùí áðü ôï áñ÷åßï." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Áðïôõ÷ßá åããñáöÞò ñõèìßóåùí óôï áñ÷åßï." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5571,157 +5599,157 @@ msgstr "" "\n" "Åðéèõìåßôå íá óõíå÷ßóåôå;" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Ìéêôü" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Ôýðïò" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Áðïóõìðéåóôéêü" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "ÐñïåðåîåñãáóôÞò Äéáöïñþí" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "ÌáêñïåíôïëÝò ÅðåîåñãáóôÞ ÊåéìÝíïõ" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "ÁðïèÞêåõóç ôïõ áñéóôåñïý áñ÷åßïõ" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "ÁðïèÞêåõóç ôïõ äåîéïý áñ÷åßïõ" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "ÁðïèÞêåõóç ôïõ áñéóôåñïý áñ÷åßïõ ìå üíïìá..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "ÁðïèÞêåõóç ôïõ äåîéïý áñ÷åßïõ ìå üíïìá..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "ÌåôáôñïðÞ ôùí ÷áñáêôÞñùí ôåñìáôéóìïý óå ôýðïõ Windows (CRLF)" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "ÌåôáôñïðÞ ôùí ÷áñáêôÞñùí ôåñìáôéóìïý óå ôýðïõ Unix (LF)" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "ÌåôáôñïðÞ ôùí ÷áñáêôÞñùí ôåñìáôéóìïý óå ôýðïõ Mac (CR)" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "ÅíáëëáãÞ ìåôáîý ëåéôïõñãéþí åðåîåñãáóßáò êáé óõã÷ùíåýóåùò" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5730,12 +5758,12 @@ msgstr "" "ÅìöÜíéóç êáé ñýèìéóç éäéïôÞôùí êùäéêïðïéÞóåùò áñ÷åßïõ\n" "Éäéüôçôåò êùäéêïðïéÞóåùò áñ÷åßïõ" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "¢íïéãìá êáé åðßëõóç áñ÷åßïõ äéåíÝîåùí" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5744,7 +5772,7 @@ msgstr "" "ÅðéëÝîáôå ðåñéï÷Þ äéáöïñÜò óôçí ôñÝ÷ïõóá ãñáììÞ\n" "ÄéáöïñÜ óôçí ôñÝ÷ïõóá ÃñáììÞ" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5753,7 +5781,7 @@ msgstr "" "ÌåôÜâáóç óå ãñáììÞ Þ äéáöïñÜ\n" "ÌåôÜâáóç (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5762,7 +5790,7 @@ msgstr "" "Ñýèìéóç åðéëïãþí ôçò åöáñìïãÞò\n" "ÅðéëïãÝò" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5771,37 +5799,37 @@ msgstr "" "ÁíáíÝùóç Ïèüíçò\n" "ÁíáíÝùóç (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "ÁíôéãñáöÞ åðéëåãìÝíùí ãñáììþí óôï ðñü÷åéñï ìáæß ìå ôïõò áñéèìïýò ôïõò óôçí áñ÷Þ ôïõò" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "ÌåôáâïëÞ óçìÜíóåùò" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "ÌåôÜâáóç óôçí åðïìÝíç óÞìáíóç" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "ÌåôÜâáóç óôçí ðñïçãïõìÝíç óÞìáíóç" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "ÊáôÜñãçóç üëùí ôùí óçìÜíóåùí" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5810,7 +5838,7 @@ msgstr "" "ÅìöÜíéóç ðáíïìïéïôýðùí áíôéêåéìÝíùí\n" "ÅìöÜíéóç Ðáíïìïéïôýðùí ÁíôéêåéìÝíùí" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5819,7 +5847,7 @@ msgstr "" "ÅìöÜíéóç áíôéêåéìÝíùí ìå äéáöïñÝò\n" "ÅìöÜíéóç Äéáöïñåôéêþí ÁíôéêåéìÝíùí" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5828,7 +5856,7 @@ msgstr "" "ÅìöÜíéóç áíôéêåéìÝíùí õðáñ÷üíôùí ìüíï óôçí áñéóôåñÞ ðëåõñÜ\n" "ÅìöÜíéóç Ïñöáíþí ÁíôéêåéìÝíùí óôá ÁñéóôåñÜ" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5837,7 +5865,7 @@ msgstr "" "ÅìöÜíéóç áíôéêåéìÝíùí õðáñ÷üíôùí ìüíï óôç äåîéÜ ðëåõñÜ\n" "ÅìöÜíéóç Ïñöáíþí ÁíôéêåéìÝíùí óôá ÄåîéÜ" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5846,7 +5874,7 @@ msgstr "" "ÅìöÜíéóç äõáäéêþí áñ÷åßùí\n" "ÅìöÜíéóç Äõáäéêþí Áñ÷åßùí" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5855,7 +5883,7 @@ msgstr "" "ÅìöÜíéóç ðáñáëåéöèÝíôùí áíôéêåéìÝíùí\n" "ÅìöÜíéóç ÐáñáëåéöèÝíôùí ÁíôéêåéìÝíùí" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5864,7 +5892,7 @@ msgstr "" "ÅðéëïãÞ ãñáììáôïóåéñÜò ãéá ôçí åìöÜíéóç\n" "ÅðéëïãÞ ÃñáììáôïóåéñÜò Åìöáíßóåùò" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5873,27 +5901,27 @@ msgstr "" "ÅðéóôñïöÞ óôç ÷ñÞóç ôçò ðñïêáèïñéóìÝíçò ãñáììáôïóåéñÜò óõóôÞìáôïò ãéá ôçí åìöÜíéóç" "ÐñïêáèïñéóìÝíç ÃñáììáôïóåéñÜ" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Åìöáíßæåé ÷áñáêôÞñåò äéáóôÞìáôïò" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Áðüêñõøç/ÅìöÜíéóç ôïõ Ðåäßïõ Äéáöïñþí" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Ôï ðåäßï åíôïðéóìïý åìöáíßæåé ìßá ãåíéêÞ åéêüíá ôùí áñ÷åßùí" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "ÅìöÜíéóç äéáëüãïõ óôáôéóôéêþí óõãêñßóåùò öáêÝëùí" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5901,7 +5929,7 @@ msgid "" msgstr "" "ÅðéëïãÞ ôçò ÷ñçóéìïðïéïõìÝíçò ãëþóóáò ðåñéâÜëëïíôïò åñãáóßáò" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5910,12 +5938,12 @@ msgstr "" "Åðéóçìáßíåé ôéò äéáöïñÝò åíôüò ôùí ãñáììþí ìå äéáöïñåôéêïýò ÷ñùìáôéóìïýò\n" "ÅìöÜíéóç Äéáöïñþí Ãñáììþí" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "ÁíôéìåôÜèåóç ôùí äýï ðåäßùí" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5924,7 +5952,7 @@ msgstr "" "Åìöáíßæåé ôïõò áñéèìïýò ôùí ãñáììþí\n" "ÅìöÜíéóç ÁñéèìÞóåùò Ãñáììþí" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5932,7 +5960,7 @@ msgid "" msgstr "Åíåñãïðïßçóç áíáäéðëþóåùò êåéìÝíïõ\n" "Áíáäßðëùóç ÊåéìÝíïõ" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5941,22 +5969,22 @@ msgstr "" "ÅìöÜíéóç ðåñéèùñßùí åðéëïãÞò ãéá áìöüôåñá ôá ðåäßá\n" "ÅìöÜíéóç Ðåñéèùñßùí ÅðéëïãÞò" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Áýîçóç öáéíïìÝíïõ ìåãÝèïõò êåéìÝíïõ" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Ìåßùóç öáéíïìÝíïõ ìåãÝèïõò êåéìÝíïõ" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "ÅðáíáöïñÜ öáéíïìÝíïõ ìåãÝèïõò êåéìÝíïõ óôï ðñïåðéëåãìÝíï" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5965,7 +5993,7 @@ msgstr "" "Êýëéóç óôçí ðñïçãïõìÝíç äéáöïñÜ\n" "ÐñïçãïõìÝíç ÄéáöïñÜ (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5974,77 +6002,77 @@ msgstr "" "Êýëéóç óôçí åðïìÝíç äéáöïñÜ\n" "ÅðïìÝíç ÄéáöïñÜ (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6053,7 +6081,7 @@ msgstr "" "Êýëéóç óôçí ðñþôç äéáöïñÜ\n" "Ðñþôç ÄéáöïñÜ (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6062,7 +6090,7 @@ msgstr "" "Êýëéóç óôçí ôñÝ÷ïõóá äéáöïñÜ\n" "ÔñÝ÷ïõóá ÄéáöïñÜ (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6071,7 +6099,7 @@ msgstr "" "Êýëéóç óôçí ôåëåõôáßá äéáöïñÜ\n" "Ôåëåõôáßá ÄéáöïñÜ (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6080,7 +6108,7 @@ msgstr "" "ÁíôéãñáöÞ ôïõ åðéëåãìÝíïõ êåéìÝíïõ óôï äåîéü Áñ÷åßï\n" "ÁíôéãñáöÞ ÄåîéÜ (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6089,7 +6117,7 @@ msgstr "" "ÁíôéãñáöÞ ôïõ åðéëåãìÝíïõ êåéìÝíïõ óôï áñéóôåñü Áñ÷åßï\n" "ÁíôéãñáöÞ ÁñéóôåñÜ (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6098,7 +6126,7 @@ msgstr "" "ÁíôéãñáöÞ äéáöïñÜò äåîéÜ êáé ìåôÜâáóç óå åðïìÝíç\n" "ÁíôéãñáöÞ ÄåîéÜ êáé ìåôÜâáóç (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6107,7 +6135,7 @@ msgstr "" "ÁíôéãñáöÞ äéáöïñÜò áñéóôåñÜ êáé ìåôÜâáóç óå åðïìÝíç\n" "ÁíôéãñáöÞ ÁñéóôåñÜ êáé ìåôÜâáóç (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6116,7 +6144,7 @@ msgstr "" "ÁíôéãñáöÞ üëùí ôùí äéáöïñþí óôï äåîéü áñ÷åßï\n" "¼ëá ÄåîéÜ" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6125,92 +6153,92 @@ msgstr "" "ÁíôéãñáöÞ äéáöïñÜò äåîéÜ êáé ìåôÜâáóç óå åðïìÝíç\n" "ÁíôéãñáöÞ ÄåîéÜ êáé ìåôÜâáóç (Ctrl+Alt+Right)" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "ÄéáãñáöÞ åðéëåãìÝíùí áíôéêåéìÝíùí áðü áìöïôÝñïõò ôïõò öáêÝëïõò" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Óýãêñéóç åðéëåãìÝíïõ áíôéêåéìÝíïõ (óýãêñéóç ðñþôïõ áíôéêåéìÝíïõ åÜí Ý÷ïõí åðéëåãåß ðïëëÜ áíôéêåßìåíá)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "ÅðéëïãÞ êáé áíáäéÜôáîç óôçëþí óõãêñßóåùò öáêÝëùí" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Äçìéïõñãßá áñ÷åßïõ patch" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "ÅðéëïãÞ êáé ôñïðïðïßçóç ößëôñùí" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Äçìéïõñãåß ìßá áíáöïñÜ áðïôåëåóìÜôùí óõãêñßóåùò" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Åìöáíßæåé Ýíáí êáôÜëïãï ôùí äéáèåóßìùí áñèñùìÜôùí" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Ï ÷ñÞóôçò åðéëÝãåé ôï áðïóõìðéåóôéêü (÷ùñßò áðïóõìðßåóç êáôÜ ôç óýãêñéóç öáêÝëùí)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ôï óõíåñãáæüìåíï áðïóõìðéåóôéêü åíåñãåß óå áìöüôåñá ôá áñ÷åßá (ìüíï Ýíá áñ÷åßï ÷ñåéÜæåôáé íá Ý÷åé ôçí åðÝêôáóç)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "ÅðéëÝîáôå Ýíá áðïóõìðéåóôéêü ãéá ôçí åðåîåñãáóßá áõôïý ôïõ áñ÷åßïõ" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí (ÊáíïíéêÞ Ëåéôïõñãßá)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Ðñïôåéíüìåíá Áñèñþìáôá" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "¢ëëá áñèñþìáôá" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Áðïóýíäåóç üëùí ôùí áñèñùìÜôùí êáé åðáíáóýíäåóç áõôþí (ãéá ðñïãñáììáôéóôÝò)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6219,12 +6247,12 @@ msgstr "" "Åíåñãïðïéåß ôï åðüìåíï ïñáôü áñ÷åßï\n" "Åíåñãïðïßçóç ôïõ åðïìÝíïõ Áñ÷åßïõ" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Êëåßíåé üëá ôá áíïéêôÜ ðáñÜèõñá" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6233,22 +6261,22 @@ msgstr "" "Áíïßãåé ôï áñ÷åßï âïçèåßáò ôïõ WinMerge\n" "ÂïÞèåéá ãéá ôï WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Äçìéïõñãåß Ýíá áñ÷åßï (áðëïý) êåéìÝíïõ ìå ðëçñïöïñßåò ãéá ôçí Ýêäïóç êáé ôéò ñõèìßóåéò ôïõ WinMerge" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "ÅìöÜíéóç ôçò ÃåíéêÞò Äçìïóßáò Áäåßáò ôïõ GNU" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "ÉäéùôéêÞ Ìåôáãëþôôéóç: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6257,7 +6285,7 @@ msgstr "" "Áíïßãåé ôï Ýããñáöï ìå ôéò óçìåéþóåéò åêäüóåùò\n" "Óçìåéþóåéò Åêäüóåùò" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6266,292 +6294,292 @@ msgstr "" "Áíïßãåé ôçí éóôïóåëßäá ôùí ìåôáöñÜóåùí\n" "ÌåôáöñÜóåéò" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Ñõèìßóåéò ÁñèñùìÜôùí" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Ðñïåðåîåñãáóßá äéáöïñþí åß äõíáôüí" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Ôï ÐåñéâÜëëïí Äéåñìçíåßáò Windows (WSH) äå âñÝèçêå - ç ÷ñÞóç áñ÷åßùí äÝóìçò åíåñãåéþí .sct åßíáé áðåíåñãïðïéçìÝíç" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<ÏõäÝí>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<Áõôüìáôï>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "¢íïéãìá ôïõ áñ÷åßïõ ìå ôçí áíôéóôïé÷éóìÝíç åöáñìïãÞ" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "¢íïéãìá ôïõ áñ÷åßïõ ìå Üëëç åöáñìïãÞ" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "¢íïéãìá ôïõ áñ÷åßïõ ìå óõãêåêñéìÝíç åöáñìïãÞ" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "×ùñßò åðéóÞìáíóç ìåôáêéíçèÝíôùí ôìçìÜôùí" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "ÅðéóÞìáíóç ðÜíôùí ôùí ìåôáêéíçèÝíôùí ôìçìÜôùí" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "ÅðéóÞìáíóç ìåôáêéíçèÝíôùí ôìçìÜôùí ìüíï áðü ôçí ôñÝ÷ïõóá äéáöïñÜ" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "ÌåôÜâáóç óôç äéáöïñÜ üðïõ âñßóêåôáé ï äñïìÝáò" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "ÌåôÜ&âáóç óôç ÃñáììÞ %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "ÁðåíåñãïðïéçìÝíç" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Áðü Áñ÷åéïóýóôçìá" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Áðü ÊáôÜëïãï ðñïóöÜôùò ÷ñçóéìïðïéçèÝíôùí" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "×ùñßò ×ñùìáôéóìü Êþäéêá" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Áðüêñõøç ÃñáììÞò Åñãáëåßùí" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "ÅìöÜíéóç ÌéêñÞò ÃñáììÞò Åñãáëåßùí" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "ÅìöÜíéóç ÌåãÜëçò ÃñáììÞò Åñãáëåßùí" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 8807b7687..cbff792dd 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Üres >" @@ -470,7 +470,7 @@ msgstr "&Automatikus kicsomagol #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&Feloszt #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Súgó" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Fájl kódolás..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Teljes tartalmak" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Átfutott tartalmak" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Módosítási dátum" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Méret" @@ -1528,7 +1528,7 @@ msgstr "L #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "Vissza" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "&Verzió Rendszer:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "A &cleartool.exe elérési útvonala:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Általános" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "Kere&sés" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Rendben" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "&Mindet" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Eltávolítás" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Színek" @@ -1977,7 +1977,7 @@ msgstr "T #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Szöveg" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Alapértékek" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Rendszer" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Leírás:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Leállítás" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Ugrás" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Összehasonlítás" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Szerkesztõ" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Kódlap" @@ -2722,7 +2723,7 @@ msgid "Private Filter (only for current user)" msgstr "Saját szûrõ (csak a jelenlegi felhasználónak)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Archívum támogatás" @@ -2773,7 +2774,7 @@ msgid "Files:" msgstr "Fájlok:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Különbözõ" @@ -2810,7 +2811,7 @@ msgid "Right:" msgstr "Jobb:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Egyezõ" @@ -2863,7 +2864,7 @@ msgid "&Apply" msgstr "&Alkalmaz" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Mégsem" @@ -2969,7 +2970,7 @@ msgid "Save..." msgstr "Mentés..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Visszaállítási fájlok" @@ -3010,7 +3011,7 @@ msgid "A&ppend timestamp" msgstr "Idõpecsét hozzáfûzése" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Másolás megerõsítése" @@ -3051,7 +3052,7 @@ msgid "&Enable plugins" msgstr "Bõvítmény&ek bekapcsolása" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3087,8 +3088,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Könyvtár" @@ -3124,69 +3125,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Bináris" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040E04e2" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x040E, 1250" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Kész" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "ÁTÍR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3195,12 +3229,12 @@ msgstr "" "Új dokumentumok létrehozása\n" "Új dokumentum (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3209,7 +3243,7 @@ msgstr "" "Létezõ dokumentum megnyitása\n" "Megnyitás (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3218,7 +3252,7 @@ msgstr "" "Az aktív dokumentum bezárása\n" "Bezárás" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3227,7 +3261,7 @@ msgstr "" "Az aktív dokumentum mentése\n" "Mentés (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3236,7 +3270,7 @@ msgstr "" "Az aktív dokumntum mentése új néven\n" "Mentés mésként" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3245,7 +3279,7 @@ msgstr "" "A nyomtatási beállítások megváltoztatása\n" "Oldalbeállítás" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3254,7 +3288,7 @@ msgstr "" "A nyomtató és a nyomtatási opciók megváltoztatása\n" "Nyomtatóbeállítás" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3263,7 +3297,7 @@ msgstr "" "Az aktív dokumentum nyomtatása\n" "Nyomtatás" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3272,27 +3306,27 @@ msgstr "" "Az oldalak megjelenítése\n" "Nyomtatási elõnézet" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Minden rejtett elem legyen újból látható" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Fa mód ki/be" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Minden alkönyvtár kibontása" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Minden alkönyvtár bezárása" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3301,32 +3335,32 @@ msgstr "" "Projekt fájl megnyitása\n" "Projekt fájl (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ismeretlen hiba a projekt fájl megnyitásakor" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ismeretlen hiba a projekt fájl mentésekor" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Projekt fájl" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Projekt fájl sikeresen betöltve." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Projekt fájl sikeresen elmentve." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3335,7 +3369,7 @@ msgstr "" "Aktuális elérési utak és beállítások mentése a projekt fájlba\n" "Projekt fájl mentése" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3344,7 +3378,7 @@ msgstr "" "A programmal kapcsolatos információk megjelenítése\n" "Névjegy" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3353,27 +3387,27 @@ msgstr "" "A program bezárása; a nem mentett fájlok elmentésének lehetõségével\n" "Kilépés" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "A dokumentum megnyitása" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3382,7 +3416,7 @@ msgstr "" "Váltás a következõ ablak paneljára\n" "Következõ panel" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3391,7 +3425,7 @@ msgstr "" "Váltás az elõzõ ablak paneljára\n" "Elõzõ panel" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3400,7 +3434,7 @@ msgstr "" "Az Ablakok egymásra helyezése\n" "Ablakok egymásra elhelyezése" -#: Merge.rc:2112 +#: Merge.rc:2126 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3409,7 +3443,7 @@ msgstr "" "Az ablakok felosztása egymást nem fedõ módon\n" "Ablakok felosztása" -#: Merge.rc:2113 +#: Merge.rc:2127 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3418,7 +3452,7 @@ msgstr "" "Az ablakok felosztása egymást nem fedõ módon\n" "Ablakok felosztása" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3427,7 +3461,7 @@ msgstr "" "A kijelölés másolása a vágólapra\n" "Másolás" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3436,7 +3470,7 @@ msgstr "" "A kijelölés kivágása a vágólapra\n" "Kivágás" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3445,7 +3479,7 @@ msgstr "" "A megadott szöveg keresése\n" "Keresés" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3454,7 +3488,7 @@ msgstr "" "A vágólap tartalmának beillesztése\n" "Beillesztés" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3463,7 +3497,7 @@ msgstr "" "Az utolsó mûvelet megismétlése\n" "Ismét" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3472,7 +3506,7 @@ msgstr "" "A megadott szöveg cseréje a kívánt új szöveggel\n" "Csere" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3481,7 +3515,7 @@ msgstr "" "A teljes dokumentum kijelölése\n" "Kijelöl mindent" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3490,7 +3524,7 @@ msgstr "" "Az utolsó mûvelet visszavonása\n" "Visszavonás (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3499,7 +3533,7 @@ msgstr "" "Az utoljára visszavont mûvelet megismétlése\n" "Mégis (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3508,7 +3542,7 @@ msgstr "" "Megmutatja vagy elrejti az Eszköztárat\n" "Eszköztár" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3517,69 +3551,69 @@ msgstr "" "Megmutatja vagy elrejti az Állapotsort\n" "Állapotsor" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Panelek automatikus átméretezése\nPanelek rögzítése" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Az ablak méretének változtatása" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Az ablak pozíciójának változtatása" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Az ablak ikonállapotra kicsinyítése" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Az ablak teljes méretûvé tétele" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Váltás a következõ dokumentum ablakára" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Váltás az elõzõ dokumentum ablakára" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Az aktív ablak bezárása a változtatások mentésének lehetõségével" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Az ablak vissazállítása az eredeti méretére" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "A Feladat Lista aktiválása" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Ennek az ablaknak az aktiválása" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3588,170 +3622,170 @@ msgstr "" "A Nyomtatási elõnézet bezárása\n" "Nyomtatási elõnézet bezárása" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Az eredeti újsor-karakterek megõrzése" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Kattints a jobb egérgombbal az útvonalra annak másolásához" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 "" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Leállít" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Ismét" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Kihagy" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Kihagy M&indent" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Igen" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Igen &mindenre" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nem" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nem m&indenre" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Folytatás" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Kihagy" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Kihagy &mindent" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "&Ne jelenjen meg többet ez az üzenet." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "&Ne jelenjen meg többet ez a kérdés." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Verzió Kontroll" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Eltérések" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Balról:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Jobbra:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Jobbról:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Jobbra:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Verzió %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opciók (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Minden üzenet ezentúl újra megjelenik." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3759,84 +3793,84 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Megnyitás" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programok|*.exe;*.bat;*.cmd|Minden fájl (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Minden fájl (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projekt Fájlok (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Név" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Hely" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Szûrõk" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Leírás" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Válassz fájlnevet az új szûrõhöz" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fájl szûrõk (*.flt)|*.flt|Minden fájl (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3845,7 +3879,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3854,7 +3888,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3862,7 +3896,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3871,12 +3905,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3884,273 +3918,273 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Reguláris kifejezés" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Könyvtár összehasonlítási eredmények" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Fájl összehasonlítás" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Névtelen bal oldal" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Névtelen jobb oldal" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Fájlok vizsgálata..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Kijelölés megnyitása" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Másolás balról jobbra" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Másolás balról jobbra" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Másolás mindent balra" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Másolás mindent jobbra" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Fájlok másolása..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Fájlok törlése..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Fájlok áthelyezése..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Jelentés készítése..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Utolsó mûvelet visszavonása..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Elõzõ mûvelet újbóli alkalmazása..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Sor: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Olvasztás" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Ennyi különség: %1 ennyibõl: %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 különbséget találtam" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 különbséget találtam" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "%1 elem ennyibõl: %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "%1 elem" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Könytár kiválasztás" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "A bal oldali elérési út érvénytelen!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "A jobb oldali elérési út érvénytelen!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Mindkét elérési út érvénytelen!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Válassz ki két fájlt a kicsomagoló kijelöléshez." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Nem lehet fájlt könyvtárral összehasonlítani!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Ez a fájl nem található: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "A fájl nincs kicsomagolva: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4163,37 +4197,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Hiba a konfliktusfájl értelmezésekor." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "A fájl\n%1\nnem egy konfliktus fájl." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Mentés másként" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Mentsem a változtatásokat %1 néven?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "Ez a fájl: %1 csak olvasható. Szeretnéd ezt megváltoztatni? (Kattints a Nem gombra a fájl új néven való mentéséhez.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Hiba a fájl biztonsági másolatának készítésekor" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4206,7 +4240,7 @@ msgstr "" "\n" "Folytatni akarod?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4223,7 +4257,7 @@ msgstr "" "\t-másik fájlnév választása (Ok)\n" "\t-a jelenlegi folyamat megszakítása (Mégsem)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4238,7 +4272,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4253,7 +4287,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4268,7 +4302,7 @@ msgstr "" "\n" "Felülírjuk a megváltoztatott fájlt?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4277,32 +4311,32 @@ msgstr "" "%1\n" "csak olvasható. Szeretnéd ezt megváltoztatni?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "Egy másik alkalmazás módosította a fájlt\n%1\nmióta a WinMerge utoljára vizsgálta.\n\nSzeretné újra betölteni a fájlt?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Bal oldali fájl mentése más néven" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Jobb oldali fájl mentése más néven" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "A fájl\n%1\neltûnt. A folytatáshoz mentse el a fájlt." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4313,42 +4347,42 @@ msgstr "" "\n" "Frissítsd a dokumentumokat, mielõtt folytatnád." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Meg kell adnod a SourceSafe projekt elérési útvonalát a folytatáshoz (pl.: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Fájlok ellenõrzése VSS-bõl..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "A Verzió Rendszer hibát adott vissza a fájl ellenõrzése közben. Nem lehet folytatni..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Hiba a Verzió Rendszer futtatása közben." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A VSS Munka Könyvtár és a jelenlegi fájl útvonala nem egyezik. Folytassuk?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Nem található VSS adatbázis!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Hiba a VSS-bõl:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4356,171 +4390,171 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (régebbi mint 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 vagy újabb)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Megállás szóközöknél" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Megállás szóközöknél vagy írásjeleknél" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Kijelölt bal oldali elem törlése" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Kijelölt jobb oldali elem törlése" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Kijelölt elem(ek) törlése mindkét oldalon" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Kijelölt elem(ek) rejtése (gyors szûrés)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Jobbról balra (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Balról jobbra (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Jobbról balra (%1 of %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Balról jobbra (%1 of %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Balról... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Jobbról... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Balról... (%1 of %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Jobbról... (%1 of %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Bal (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Jobb (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Mindkettõ (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Bal (%1 ennyibõl: %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Jobb (%1 ennyibõl: %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Mindkettõ (%1 ennyibõl: %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Bal oldal - válassz úticél mappát:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Jobb oldal - válassz úticél mappát:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4531,17 +4565,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4553,613 +4587,607 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Mozgatás megerõsítése" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Bal oldali fájl megnyitása" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Bal oldali fájl megnyitása a belsõ szerkesztõvel" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Bal oldali fájl megnyitása a(z) ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Jobb oldali fájl megnyitása" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Jobb oldali fájl megnyitása a belsõ szerkesztõvel" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Jobb oldali fájl megnyitása a(z) ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nem sikerült elindítani a külsõ szerkesztõt: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Fájlnevek másolása a vágólapra" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Bal oldali fájlok útvonalainak másolása a vágólapra" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Jobb oldali fájlok útvonalainak másolása a vágólapra" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Mindkét oldali fájlok útvonalainak másolása a vágólapra" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Ismeretlen archívum formátum" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Bal oldali fájlok hozzáadása az archívumhoz" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Jobb oldali fájlok hozzáadása az archívumhoz" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Mindkét oldali fájlok hozzáadása az archívumhoz" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Különbözõ elemek hozzáadása az archívumhoz (mindkét oldalról)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "A kijelölt bal oldali fájlok áthelyezése tetszõleges könyvtárba" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "A kijelölt jobb oldali fájlok áthelyezése tetszõleges könyvtárba" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Fájlnév" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Összehasonlítási eredmények" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Bal oldali dátum" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Jobb oldali dátum" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Kiterjesztés" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Bal oldali méret" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Jobb oldali méret" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Bal oldali létrehozási idõ" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Jobb oldali létrehozási idõ" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Újabb fájl" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Bal oldali fájl verzió" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Jobb oldali fájl verzió" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Rövid eredmények" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Bal oldali attribútumok" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Jobb oldali attribútumok" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Bal oldali kódolás" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Jobb oldali kódolás" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Bináris" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Nem lehett összehasonlítani a fájlokat" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "A fájl kihagyva" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "A könyvtár kihagyva" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Csak bal: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Csak jobb: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "A bináris fájlok megegyezõek" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "A bináris fájlok különbözõek" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "A fájlok különbözõek" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "A könyvtárak különböznek" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Csak bal oldal" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Csak jobb oldal" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Hiba" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "A szövegfájlok megegyeznek" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "A szövegfájlok különböznek" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Eltelt idõ: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 elem kiválasztva" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 elem kiválasztva" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "fájlnév vagy könyvtárnév." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Alkönyvtár neve ha az alkönyvtárak is ki vannak választva." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Összehasonlítási eredmény bõvebb formában." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Bal oldali módosítási dátum." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Jobb oldali módosítási dátum." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Fájlok kiterjesztése." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Bal oldali fájl mérete bájtokban." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Jobb oldali fájl mérete bájtokban." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Bal oldal létrehozási ideje." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Jobb oldal létrehozási ideje." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Megmutatja, melyik oldalnak újabb a létrehozási dátuma." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bal oldali fájl verziója, csak bizonyos fájloknál." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Jobb oldali fájl verziója, csak bizonyos fájloknál." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Rövid összehasonlítási eredmények." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Bal oldali attribútumok." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Jobb oldali attribútumok." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Bal oldali kódolás." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Jobb oldali kódolás." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Mellõzött különbségek száma a fájlban. Ezeket a különbségeket a WinMerge mellõzte és nem olvaszthatók." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Különbségek száma a fájlban. Ez a szám nem tartalmazza a mellõzött különbségeket." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "(*) látható, ha a fájl bináris." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "%1 összehasonlítása ezzel: %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Vesszõvel elválasztott lista" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Tabulált lista" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Egyszerû HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Egyszerû XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "A jelentés fájl már létezik. Szeretnéd felülírni a létezõ fájlt?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5168,32 +5196,32 @@ msgstr "" "Hiba a jelentés készítése közben:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "A jelentés sikeresen elkészült." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Ugyanaz a fájl van megnyitva mindkét panelen." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "A kijelölt fájlok ugyanazok." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Hiba történt a fájlok összehasonlításakor." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nem lehetett létrehozni az ideiglenes fájlokat. Ellenõrizd az ideiglenes könyvtár beállításait." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5208,22 +5236,22 @@ msgstr "" "\n" "Megjegyzés: Amennyiben minden esetben ezt az opciót szeretnéd használni, kapcsold be a 'Sortörési eltérések kihagyása' opciót az Összehasonlítás menüpontban (a Szerkesztés/Opciók menüpont alatt találod meg)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5234,168 +5262,168 @@ msgstr "" "A különbözõ kódlapokkal történõ kijelzés könnyebben áttekinthetõ de az olvasztás/törlés kockázatos lehet.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Nincs eltérés" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Sor eltérés" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Cserélve lett %1 sztring." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nem található ez: \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Teljes elérési út másolása" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Fájlnév másolása" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "A Patch fájl sikeresen elkészült." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "Az 1. elem nem található vagy az egy könyvtár!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "A 2. elem nem található vagy az egy könyvtár!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "A patch fájl már létezik. Szeretnéd felülírni azt?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 kijelölt fájl]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normál" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Környezeti" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Egységesített" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Nem lehetett ebbe a fájlba írni: %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "A megadott kimeneti útvonal nem abszolút elérési út: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Adj meg egy kimeneti fájlt" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nem lehet patch fájlt létrehozni bináris fájlokból." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nem lehet patch fájlt létrehozni könyvtárakból." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5406,12 +5434,12 @@ msgstr "" "\n" "A patch létrehozásához elengedhetetlen, hogy ne legyenek el nem mentett változtatások a fájlokban." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "A mappa nem létezik." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5422,51 +5450,51 @@ msgstr "" "Az ehhez szükséges összetevõk (7-zip és/vagy Merge7z*.dll) nem találhatóak.\n" "Olvasd el a kézikönyv archívum támogatásról szóló részét." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5477,176 +5505,176 @@ msgstr "" "\n" "Biztosan folytatja?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Bal oldali fájl mentése" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Jobb oldali fájl mentése" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Bal oldali fájl mentése mint ..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Jobb oldali fájl mentése mint ..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Váltás olvasztó és szerkesztõ mód között" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5655,7 +5683,7 @@ msgstr "" "Ugrás sorra vagy eltérésre\n" "Ugrás (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5664,7 +5692,7 @@ msgstr "" "A program beállítása\n" "Beállítások" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5673,79 +5701,79 @@ msgstr "" "Kijezõ frissítése\n" "Frissítés (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "A kijelölt sorok vágólapra másolása a sorok elejéhez a sorszámokat hozzáfûzve" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Könyvjelzõ ki/be" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ugrás a következõ könyvjelzõre" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ugrás az elõzõ könyvjelzõre" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Összes könyvjelzõ törlése" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5754,7 +5782,7 @@ msgstr "" "Válaszd ki a kívánt betûtípust\n" "Nézet betûtípusának választása" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5763,173 +5791,173 @@ msgstr "" "Visszatérés az eredeti rendszer-betûtípushoz megjelenítéshez\n" "Alapért. betûtípus" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Szóköz karakterek mutatása" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Eltérés panel mutatása/rejtése" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "A Pozíció panel vizuális képet ad az összehasonlított fájlokról" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5938,7 +5966,7 @@ msgstr "" "A kijelölt szöveg másolása a jobb oldali fájlba\n" "Másolás jobbra (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5947,7 +5975,7 @@ msgstr "" "A kijelölt szöveg másolása a bal oldali fájlba\n" "Másolás balra (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5956,7 +5984,7 @@ msgstr "" "Az eltérés másolása jobbra és ugrás tovább\n" "Másolás jobbra és Ugrás (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5965,7 +5993,7 @@ msgstr "" "Az eltérés másolása balra és ugrás tovább\n" "Másolás balra és Ugrás (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5974,7 +6002,7 @@ msgstr "" "Az összes eltérés másolása jobbra\n" "Mind jobbra" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5983,417 +6011,417 @@ msgstr "" "Az összes eltérés másolása jobbra\n" "Mind balra" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "A kijelölt elemek törlése mindkét könyvtárból" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Kijelölt elem összehasonlítása (elõször az elsõé, ha több elem is ki van jelölve)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Könyvtár összehasonlítási oszlopok kijelölése és újrarendezése" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Patch-file generálása" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Szûrõk kijelölése és módosítása" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Jelentés készítése az összehasonlítási eredményekbõl" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "A felhasználó adja meg a kicsomagolót (nincs kicsomagolás könyvtárak összehasonlításakor)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "A választott kicsomagoló lesz használva mindkét fájlnál (az egyik fájlnak csak a kiterjesztése lényeges)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Válassz kicsomagolót a fájl szerkesztéséhez" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Nincs elõvizsgálat (normális)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Javasolt bõvítmények" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Egyéb bõvítmények" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Az összes bõvítmény betöltése újra (fejlesztõknek)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Minden megnyitott ablak bezárása" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "A jelenlegi WinMerge verziószámának és egyéb adatainak fájlba mentése" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Bõvítmény beállítások" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Nincs elõvizsgálat" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Elõvizsgálat ha lehetséges" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "A WSH nem található - Az .sct szkriptek le lesznek tiltva" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "A fájl megnyitása a társított alkalmazással" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "A fájl megnyitása a külsõ szerkesztõvel" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "A fájl megnyitása a kiválasztott programmal" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Ne mutassa a mozgatott blokkokat" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mutassa a kijelölt blokkokat a jelenlegi eltéréstõl kezdve" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ugrás a kurzor alatt eltérésre" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "&Ugrás a(z) %1. sorra" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index d1fd86fd7..e1909c988 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Vuoto >" @@ -470,7 +470,7 @@ msgstr "Scompattazione &automatica" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&Sovrapponi" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&?" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Codifica &file..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Contenuti completi" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Contenuti rapidi" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Data ultima modifica" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Data ultima modifica e dimens." #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Dimensioni" @@ -1528,7 +1528,7 @@ msgstr "Visita la pagina web di WinMerge!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "Sistema per il &versioning" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Percorso di cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Generale" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "&Trova succ." #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&OK" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Sost&ituisci tutto" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Rimuovi" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Colori" @@ -1977,7 +1977,7 @@ msgstr "Eliminata" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Testo" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Predefinito" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistema" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Descrizione:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stop" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Vai" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Confronto" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Filtra i commenti" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Codice di pagina" @@ -2724,7 +2725,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtro privato (solo per l'utente corrente)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Supporto per gli archivi" @@ -2775,7 +2776,7 @@ msgid "Files:" msgstr "File:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Diversi" @@ -2812,7 +2813,7 @@ msgid "Right:" msgstr "Destra:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identici" @@ -2865,7 +2866,7 @@ msgid "&Apply" msgstr "&Applica" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "Annu&lla" @@ -2971,7 +2972,7 @@ msgid "Save..." msgstr "Salva..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "File di backup" @@ -3012,7 +3013,7 @@ msgid "A&ppend timestamp" msgstr "Aggiungi il ×tamp" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Conferma la copia" @@ -3053,7 +3054,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3089,8 +3090,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Cartella" @@ -3126,69 +3127,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binario" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041004e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x410, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EST" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "MA" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "BS" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "SSC" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REG" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3197,12 +3231,12 @@ msgstr "" "Crea due nuovi documenti vuoti\n" "Nuovi documenti (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3211,7 +3245,7 @@ msgstr "" "Apre un documento esistente\n" "Apri" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3220,7 +3254,7 @@ msgstr "" "Chiude il documento attivo\n" "Chiudi" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3229,7 +3263,7 @@ msgstr "" "Salva il documento attivo\n" "Salva" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3238,7 +3272,7 @@ msgstr "" "Salva il documento attivo con un nuovo nome\n" "Salva con nome" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3247,7 +3281,7 @@ msgstr "" "Modifica le impostazioni di stampa\n" "Imposta pagina" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3256,7 +3290,7 @@ msgstr "" "Modifica le impostazioni relative alla stampante e alla stampa\n" "Imposta stampante" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3265,7 +3299,7 @@ msgstr "" "Stampa il documento attivo\n" "Stampa" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3274,27 +3308,27 @@ msgstr "" "Visualizza le pagine per intero\n" "Anteprima di stampa" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Rende nuovamente visibili tutti gli oggetti nascosti" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3303,32 +3337,32 @@ msgstr "" "Apre un file di progetto\n" "File di progetto (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Errore sconosciuto provando a aprire il file di progetto" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Errore sconosciuto provando a salvare il file di progetto" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "File di progetto" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "File di progetto caricato con successo." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "File di progetto salvato con successo." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3337,7 +3371,7 @@ msgstr "" "Salva i percorsi correnti e le opzioni in un file di progetto\n" "Salva il file di progetto" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3346,7 +3380,7 @@ msgstr "" "Visualizza le informazioni sul programma, il numero di versione e le informazioni di copyright\n" "Informazioni su" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3355,27 +3389,27 @@ msgstr "" "Esce dall'applicazione e chiede di salvare i documenti\n" "Esci" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Apre questo documento" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3384,7 +3418,7 @@ msgstr "" "Passa al riquadro della finestra successivo\n" "Riquadro successivo" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3393,7 +3427,7 @@ msgstr "" "Ritorna al riquadro della finestra precedente\n" "Riquadro precedente" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3402,7 +3436,7 @@ msgstr "" "Dispone le finestre sovrapponendole\n" "Sovrapponi finestre" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3411,7 +3445,7 @@ msgstr "" "Dispone le finestre in orizzontale senza sovrapporle\n" "Affianca finestre in orizzontale" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3420,7 +3454,7 @@ msgstr "" "Dispone le finestre in verticale senza sovrapporle\n" "Affianca finestre in verticale" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3429,7 +3463,7 @@ msgstr "" "Copia la selezione e la pone negli Appunti\n" "Copia" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3438,7 +3472,7 @@ msgstr "" "Taglia la selezione e la pone negli Appunti\n" "Taglia" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3447,7 +3481,7 @@ msgstr "" "Trova il testo specificato\n" "Trova" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3456,7 +3490,7 @@ msgstr "" "Inserisce il contenuto degli Appunti\n" "Incolla" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3465,7 +3499,7 @@ msgstr "" "Ripete l'ultima azione\n" "Ripeti" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3474,7 +3508,7 @@ msgstr "" "Sostituisce il testo specificato con un testo differente\n" "Sostituisci" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3483,7 +3517,7 @@ msgstr "" "Seleziona l'intero documento\n" "Seleziona tutto" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3492,7 +3526,7 @@ msgstr "" "Annulla l'ultima azione\n" "Annulla" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3501,7 +3535,7 @@ msgstr "" "Ripristina l'azione precedentemente annullata\n" "Ripristina" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3510,7 +3544,7 @@ msgstr "" "Mostra o nasconde la barra degli strumenti\n" "Mostra/nascondi barra degli strumenti" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3519,7 +3553,7 @@ msgstr "" "Mostra o nasconde la barra di stato\n" "Mostra/nascondi barra di stato" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3528,7 +3562,7 @@ msgstr "" "Mostra o nasconde la barra delle schede\n" "Mostra/nascondi barra delle schede" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3537,57 +3571,57 @@ msgstr "" "Ridimensiona automaticamente i pannelli\n" "Blocca pannelli" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Modifica le dimensioni della finestra" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Modifica la posizione della finestra" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Riduce la finestra ad icona" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Allarga la finestra a tutto schermo" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Passa alla finestra successiva del documento " -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Passa alla finestra precedente del documento" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Chiude la finestra attiva e chiede di salvare i documenti" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Ripristina la finestra alle dimensioni normali" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Attiva l'elenco dei task" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Attiva questa finestra" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3596,7 +3630,7 @@ msgstr "" "Chiude la modalità anteprima di stampa\n" "Annulla anteprima" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3615,7 +3649,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3627,19 +3661,19 @@ msgid "" "WinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Conserva caratteri di fine linea originali" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Clicca con il tasto destro sul percorso per copiare" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3648,143 +3682,143 @@ msgstr "" "Sviluppatori:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 viene fornito ASSOLUTAMENTE PRIVO DI GARANZIA. Questo è uin software gratuito e ne è apprezzata la ridistribuzione a determinate condizioni; per dettagli, vedere la GNU General Public License nel menu Guida." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Termina" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Riprova" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignora t&utto" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Sì" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Sì a &tutto" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "No a t&utto" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Salta" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "S&alta tutto" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Non visualizzare questo &messaggio di nuovo." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Non farmi più &questa domanda." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Controllo versioni" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Differenze" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Da sinistra:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "A sinistra:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Da destra:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "A destra:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versione %1 - Italiano" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opzioni (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Tutti i messaggi di avviso vengono ora visualizzati nuovamente." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3795,84 +3829,84 @@ msgstr "" "\n" "Utilizza per favore un valore compreso tra 1 e %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Apri" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmi|*.exe;*.bat;*.cmd|Tutti i file (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tutti i file (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "File di progetto di WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "File delle opzioni (*.ini)|*.ini|Tutti i file (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "File di testo (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tutti i file (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "File HTML (*.htm,*.html)|*.htm;*.html|Tutti i file (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Percorso" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtri" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Descrizione" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Inserisci il nome del file per il nuovo filtro" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtri di file (*.flt)|*.flt|Tutti i file (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3885,7 +3919,7 @@ msgstr "" "Copia per favore il file %1 nella cartella WinMerge/Filters :\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3898,7 +3932,7 @@ msgstr "" "\n" "Assicurati che questa cartella esista e si abbiano i permessi di scrittura." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3909,7 +3943,7 @@ msgstr "" "\n" "Scegli per favore una cartella per i filtri in Opzioni->Sistema." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3922,12 +3956,12 @@ msgstr "" "\n" "Il file potrebbe essere di sola lettura." -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Scegli il file con il filtro da installare" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3938,273 +3972,273 @@ msgstr "" "\n" "Impossibile copiare il nuovo file nella cartella dei filtri." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Il file del filtro esiste già. Desideri sovrascrivere il file esistente?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Espressione regolare" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Risultati del confronto tra cartelle" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Confronto tra file" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "File di sinistra senza titolo" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "File di destra senza titolo" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Loro file" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Miei file" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Scansione file in corso..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Apertura selezione" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Copia da sinistra a destra in corso" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Copia da destra a sinistra in corso" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Copia completa a sinistra in corso" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Copia completa a destra in corso" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Copia dei file in corso..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Eliminazione dei file in corso..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Spostamento dei file in corso..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Creazione del rapporto in corso..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Linea: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Unione" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Differenza %1 su %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 differenze trovate" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 differenza trovata" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 su %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Elementi: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleziona due cartelle o file esistenti da confrontare" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Selezione cartella" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleziona due cartelle o due file da confrontare." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Il percorso di sinistra non è valido!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Il percorso di destra non è valido!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Entrambi i percorsi non sono validi!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleziona due file per attivare la selezione dello scompattatore." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossibile confrontare file e cartelle!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "File non trovato: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "File non scompattato: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4217,12 +4251,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4233,27 +4267,27 @@ msgstr "" "%1\n" "non è un file di conflitto." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Salva con nome" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Vuoi salvare le modifiche in %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 è marcato come di sola lettura. Desideri non tenere conto di questa impostazione? (Premi No per salvare con un nuovo nome.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Errore durante il salvataggio di una copia di backup del file" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4266,7 +4300,7 @@ msgstr "" "\n" "Continuare comunque?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4283,7 +4317,7 @@ msgstr "" "\t-utilizzare un nome diverso per il file (Premi OK)\n" "\t-annullare l'operazione corrente (Premi Annulla)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4298,7 +4332,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4313,7 +4347,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4328,7 +4362,7 @@ msgstr "" "\n" "Sovrascrivere il file modificato?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4337,32 +4371,32 @@ msgstr "" "%1\n" "è marcato come di sola lettura. Desideri non tenere conto della voce di Sola lettura?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Salva il file di sinistra con nome" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Salva il file di destra con nome" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4373,42 +4407,42 @@ msgstr "" "\n" "Aggiorna i documenti prima di continuare." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "E' necessario specificare il percorso di un progetto SourceSafe per continuare (Es.: $/MioProgetto)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Estrazione dei file da VSS in corso..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "SourceSafe ha generato un errore tentando di estrarre il file. Impossibile continuare..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Errore nell'esecuzione di un comando del sistema di versioning." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La cartella di lavoro di VSS e la posizione del file corrente non coincidono. Continuare?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Nessun database di VSS trovato!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Errore di VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4419,7 +4453,7 @@ msgstr "" " Controlla per favore la configurazione della vista utilizzata.\n" " Annullare l'operazione di estrazione?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4428,164 +4462,164 @@ msgstr "" "Il sistema di versioning ha restituito un errore tentando di annullare l'estrazione del file.\n" " Controlla per favore la configurazione della vista utilizzata." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Nessuno" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (precedente a 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiore)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Interrompi agli spazi bianchi" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Interrompi agli spazi bianchi o punteggiatura" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copia elemento selezionato in una cartella specifica" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copia elemento selezionato in una cartella personalizzata" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Elimina la voce selezionata sulla sinistra" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Elimina la voce selezionata sulla destra" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Elimina gli elementi selezionati in entrambi i lati" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Nascondi gli elementi selezionati (filtro al volo)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Rinomina gli elementi selezionati su entrambi i lati" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Da Destra a Sinistra (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Da Sinistra a Destra (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da Destra a Sinistra (%1 su %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da Sinistra a Destra (%1 su %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Sinistra in... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Destra in... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Sinistra in... (%1 su %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Destra in... (%1 su %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Sinistra (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Destra (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Entrambi (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Sinistra (%1 su %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Destra (%1 su %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Entrambi (%1 su %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Lato sinistro - scegli cartella di destinazione:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Lato destro - scegli cartella di destinazione:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 file coinvolti)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 file su %2 coinvolti)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4596,17 +4630,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Sei sicuro di voler copiare:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Sei sicuro di voler copiare %d elementi:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4625,613 +4659,607 @@ msgstr "" "\n" "Aggiorna per favore il confronto." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Apre il file di sinistra" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Apre il file di sinistra con l'editor esterno" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Apre il file di sinistra con..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Apre il file di destra" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Apre il file di destra con l'editor esterno" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Apre il file di destra con..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Impossibile lanciare l'editor esterno: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copia i nomi dei file negli appunti" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copia i percorsi del lato sinistro negli appunti" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copia i percorsi del lato destro negli appunti" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copia i percorsi di entrambi i lati negli appunti" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Formato dell'archivio sconosciuto" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Aggiunge elementi del lato sinistro a un archivio" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Aggiunge elementi del lato destro a un archivio" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Aggiunge elementi di entrambi i lati a un archivio" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Aggiunge gli elementi diversi a un archivio (entrambi i lati)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Sposta il file selezionato sulla sinistra in una cartella personalizzata" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Sposta il file selezionato sulla destra in una cartella personalizzata" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nome del file" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Risultato del confronto" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Data file di sinistra" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Data file di destra" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Estensione" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Dimensioni file di sinistra" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Dimensioni file di destra" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Data creazione file sinistra" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Data creazione file destra" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "File più recente" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Versione file sinistra" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Versione file destra" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Risultato breve" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Attributi sinistra" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Attributi destra" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "EOL di sinistra" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "EOL di destra" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Codifica di sinistra" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Codifica di destra" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Diff. ignorate" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binario" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Impossibile confrontare i file" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Elemento annullato" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "File saltato" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Cartella saltata" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Solo sinistra: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Solo destra: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "I file binari sono identici" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "I file non di testo contengono delle differenze" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "I file contengono delle differenze" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Solo a sinistra" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Solo a destra" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Errore" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo trascorso: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 elemento selezionato" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 elementi selezionati" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nome del file o della cartella." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome della sottocartella quando le sottocartelle sono incluse." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Risultato del confronto nella forma completa." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Data ultima modifica del file di sinistra." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Data ultima modifica del file di destra." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Estensione del file." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Dimensioni del file di sinistra in byte." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Dimensioni del file di destra in byte." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Dimensioni abbreviate del file di sinistra." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Dimensioni abbreviate del file di destra." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Data e ora di creazione del file di sinistra." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Data e ora di creazione del file di destra." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Mostra quale file ha la data dell'ultima modifica più recente." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versione del file di sinistra, solo per alcuni tipi di file." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versione del file di destra, solo per alcuni tipi di file." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Risultato del confronto nella forma breve." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Attributi del file di sinistra." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Attributi del file di destra." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tipo di fine linea nel file di sinistra" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tipo di fine linea nel file di destra" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Codifica del file di sinistra." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Codifica del file di destra." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Numero di differenze ignorate nel file. Queste differenze sono ignorate da WinMerge e non possono venire unite." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Numero di differenze nel file. Questo numero non include le differenze ignorate." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisco (*) se il file è binario." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Confronto di %1 con %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Lista separata da virgole" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Lista separata da Tab" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML semplice" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "XML semplice" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Il file di rapporto esiste già. Vuoi sovrascrivere il file esistente?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5240,32 +5268,32 @@ msgstr "" "Errore nella creazione del rapporto:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Il rapporto è stato creato con successo." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Lo stesso file è aperto in entrambi i pannelli." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "I file selezionati sono identici." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Si è verificato un errore durante il confronto dei file." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Impossibile creare file temporanei. Controlla le impostazioni del percorso per i file temporanei." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5280,17 +5308,17 @@ msgstr "" "\n" "Nota: Se vuoi sempre trattare tutti i tipi di carriage return come equivalenti, imposta l'opzione 'Ignora le differenze di carriage return' nella linguetta Confronto delle Opzioni (raggiungibile dal menu Modifica->Opzioni)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "La cartella selezionata non è valida." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossibile aprire il file binario nell'editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5305,7 +5333,7 @@ msgstr "" "%1\n" "dall'altro lato ed aprirle entrambe?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5316,168 +5344,168 @@ msgstr "" "La visualizzazione di ciascun file con il proprio codice di pagina fornirà una migliore visualizzazione ma l'unione/copia sarà pericolosa.\n" "Desideri trattare entrambi i file come se avessero il codice di pagina predefinito di Windows (raccomandato)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informazioni perse a causa di errori nella codifica: entrambi i file" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Nessuna differenza" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Differenza della linea" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 stringhe sostituite." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Impossibile trovare la stringa '%s'" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copia percorso completo" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copia nome del file" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Pannello della locazione" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Pannello delle differenze" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "File di patch scritto con successo." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "Prima voce non trovata o è una cartella!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "Seconda voce non trovata o è una cartella!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Il file di patch esiste già. Desideri sovrascriverlo?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 file selezionati]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normale" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Contesto" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unificato" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Impossibile scrivere nel file %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Il percorso di output specificato non è un percorso assoluto: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Specifica un file di output" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossibile creare un file di patch da file binari." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossibile creare un file di patch da cartelle." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5488,12 +5516,12 @@ msgstr "" "\n" "La creazione di una patch richiede che non ci siano cambiamenti non salvati nei file." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "La cartella non esiste." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5504,7 +5532,7 @@ msgstr "" "Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto sono stati trovati.\n" "Guarda il manuale per ulteriori informazioni sugli archivi e come attivare il supporto per essi." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5513,7 +5541,7 @@ msgstr "" "\n" "Nota: l'integrazione con 7-Zip è stata disattivata nelle opzioni di WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5522,37 +5550,37 @@ msgstr "" "\n" "Note: l'integrazione con 7-Zip è limitata a una installazione indipendente nelle opzioni di WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Scegli file per l'esportazione" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Scegli file per l'importazione" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Opzioni importate dal file." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Opzioni esportate nel file." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Impossibile importare le opzioni dal file." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Impossibile esportare le opzioni nel file." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5563,157 +5591,157 @@ msgstr "" "\n" "Sei sicuro di voler proseguire?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mescolato" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Salva il file di sinistra" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Salva il file di destra" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Salva il file di sinistra con nome..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Salva il file di destra con nome..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Converte EOL nella modalità Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converte EOL nella modalità Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converte EOL nella modalità Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Passa dalla modalità di editing a quella di 'Unione', in cui l'integrazione delle differenzeè più rapida" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5722,12 +5750,12 @@ msgstr "" "Visualizza e regola le proprietà della codifica dei file\n" "Proprietà della codifica dei file" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5736,7 +5764,7 @@ msgstr "" "Seleziona l'area della differenza nella linea corrente\n" "Differenza nella linea corrente" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5745,7 +5773,7 @@ msgstr "" "Vai a una linea o una differenza\n" "Vai a (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5754,7 +5782,7 @@ msgstr "" "Imposta le opzioni del programma\n" "Opzioni" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5763,37 +5791,37 @@ msgstr "" "Aggiorna la visualizzazione\n" "Aggiorna (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copia le linee selezionate negli Appunti aggiungendo i numeri di linea all'inizio" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Imposta un segnalibro" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Va al segnalibro successivo" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Va al segnalibro precedente" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Cancella tutti i segnalibri" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5802,7 +5830,7 @@ msgstr "" "Mostra gli elementi che sono completamente identici\n" "Mostra elementi identici" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5811,7 +5839,7 @@ msgstr "" "Mostra gli elementi che hanno delle differenze\n" "Mostra elementi differenti" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5820,7 +5848,7 @@ msgstr "" "Mostra gli elementi che esistono solo sul lato sinistro\n" "Mostra elementi unici a sinistra" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5829,7 +5857,7 @@ msgstr "" "Mostra gli elementi che esistono solo sul lato destro\n" "Mostra elementi unici a destra" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5838,7 +5866,7 @@ msgstr "" "Mostra i file binari\n" "Mostra i file binari" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5847,7 +5875,7 @@ msgstr "" "Mostra gli elementi saltati\n" "Mostra gli elementi saltati" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5856,7 +5884,7 @@ msgstr "" "Seleziona il carattere per la visualizzazione\n" "Seleziona carattere visualizzazione" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5865,27 +5893,27 @@ msgstr "" "Ripristina il carattere predefinito del sistema per la visualizzazione\n" "Carattere predefinito" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Mostra gli spazi bianchi" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Mostra il pannello delle differenze" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Il pannello della locazione mostra un'immagine complessiva dei file" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra la finestra con le statistiche del confronto tra cartelle" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5894,7 +5922,7 @@ msgstr "" "Scegli la lingua dell'interfaccia per l'utente corrente\n" "Lingua" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5903,12 +5931,12 @@ msgstr "" "Mostra le differenze fra le righe con colori differenti\n" "Mostra differenze fra righe" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Scambia le posizioni dei due pannelli" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5917,7 +5945,7 @@ msgstr "" "Mostra i numeri delle righe\n" "Mostra numeri delle righe" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5926,7 +5954,7 @@ msgstr "" "Vai a capo automaticamente\n" "Va a capo automaticamente (word wrap)" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5935,22 +5963,22 @@ msgstr "" "Mostra i margini di selezione per entrambi i pannelli\n" "Mostra margini di selezione" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Aumenta la dimensione del testo" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Riduci la dimensione del testo" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Ripristina la dimensione predefinita del testo" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5959,7 +5987,7 @@ msgstr "" "Scorri alla differenza precedente\n" "Differenza precedente (Alt+Su)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5968,77 +5996,77 @@ msgstr "" "Scorri alla differenza successiva\n" "Differenza successiva(Alt+Giù)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6047,7 +6075,7 @@ msgstr "" "Scorri alla prima differenza\n" "Prima differenza (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6056,7 +6084,7 @@ msgstr "" "Passa alla differenza corrente\n" "Differenza corrente (Alt+Invio)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6065,7 +6093,7 @@ msgstr "" "Scorri all'ultima differenza\n" "Ultima differenza (Alt+Fine)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6074,7 +6102,7 @@ msgstr "" "Copia il testo selezionato dal file di sinistra a quello di destra\n" "Copia a destra (Freccia destra)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6083,7 +6111,7 @@ msgstr "" "Copia il testo selezionato dal file di destra a quello di sinistra\n" "Copia a sinistra (Freccia sinistra)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6092,7 +6120,7 @@ msgstr "" "Copia la differenza a destra e avanza alla prossima\n" "Copia a destra e avanza (Ctrl+Alt+Destra)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6101,7 +6129,7 @@ msgstr "" "Copia la differenza a sinistra e avanza alla prossima\n" "Copia a sinistra e avanza (Ctrl+Alt+Sinistra)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6110,7 +6138,7 @@ msgstr "" "Copia tutte le differenze dal file di sinistra a quello di destra\n" "Tutto a destra" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6119,92 +6147,92 @@ msgstr "" "Copia tutte le differenze dal file di destra a quello di sinistra\n" "Tutto a sinistra" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Elimina gli elementi selezionati da entrambe le cartelle" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Confronta l'elemento selezionato (confronta il primo elemento se ne sono stati selezionati più di uno)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleziona e riordina le colonne da visualizzare nei confronti tra cartelle" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Crea un file di patch" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Seleziona e modifica i filtri" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genera un rapporta con i risultati del confronto" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "L'utente seleziona lo scompattore (nessuna scompattazione nel confronto tra cartelle)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Lo scompattatore adatto è applicato a entrambi i file (è sufficiente che uno dei file abbia l'estensione)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleziona uno scomapattatore per modificare questo file" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "No prediffer (normale)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Plugin suggeriti" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Altri plugin" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Scarica tutti i plugin e ricaricali (per sviluppatori)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6213,12 +6241,12 @@ msgstr "" "Attiva il prossimo file visibile\n" "Attiva prossimo file" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Chiude tutte le finestre aperte" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6227,22 +6255,22 @@ msgstr "" "Apri la Guida di WinMerge\n" "Guida WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Mostra la GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Build privata: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6251,7 +6279,7 @@ msgstr "" "Apri il documento delle note di rilascio\n" "Note di rilascio" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6260,292 +6288,292 @@ msgstr "" "Apri il sito per le traduzioni\n" "Traduzioni" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Impostazioni plugin" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "No prediffer" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediff se possibile" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non trovato - script .sct disattivati" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Apri il file con l'applicazione registrata per esso" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Apri il file con l'editor esterno" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Apri il file con un programma specifico" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Non visualizzare i blocchi spostati" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Mostra tutti i blocchi spostati" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Visualizza i blocchi spostati solo dalla differenza corrente" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Vai alla differenza all'altezza del cursore" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Vai alla &linea %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Disattivato" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Dal file system" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Dalla lista dei file recenti" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Oggetto portabile" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Risorse" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Nascondi la barra degli strumenti" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Mostra barra degli strumenti piccola" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Mostra barra degli strumenti grande" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index f980f3cc1..8892cef6a 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2015-01-16 11:28+0900\n" +"PO-Revision-Date: 2015-02-13 10:47+0900\n" "Last-Tranuslator: Takashi Sawanaka \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -329,7 +329,7 @@ msgstr " #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< ‚È‚µ >" @@ -471,7 +471,7 @@ msgstr " #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‚ÅŠJ‚­(&E)..." @@ -535,7 +535,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "ƒwƒ‹ƒv(&H)" @@ -863,7 +863,7 @@ msgid "Re&load\tCtrl+F5" msgstr "Ä“Ǎž‚Ý(&L)\tCtrl+F5" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒO(&F)..." @@ -1467,37 +1467,37 @@ msgid "&Compare method:" msgstr "”äŠr•û–@(&C):" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "ƒtƒ‹ƒRƒ“ƒeƒ“ƒc" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "ƒNƒCƒbƒNƒRƒ“ƒeƒ“ƒc" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "ƒoƒCƒiƒŠƒRƒ“ƒeƒ“ƒc" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "XV“úŽž" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "XV“úŽž‚ƃTƒCƒY" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "ƒTƒCƒY" @@ -1529,7 +1529,7 @@ msgstr "WinMerge #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1701,14 +1701,14 @@ msgid "&Versioning System:" msgstr "ƒo[ƒWƒ‡ƒ“ƒVƒXƒeƒ€(&V):" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe‚ւ̃pƒX(&P):" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "ˆê”Ê" @@ -1855,7 +1855,7 @@ msgid "&Find Next" msgstr "ŽŸ‚ðŒŸõ(&F)" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1901,7 +1901,7 @@ msgid "Replace &All" msgstr "‚·‚ׂĒuŠ·(&A)" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1953,7 +1953,7 @@ msgid "Remove" msgstr "íœ(&R)" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "F" @@ -1982,7 +1982,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "ƒeƒLƒXƒg" @@ -2037,13 +2037,14 @@ msgstr "GitHub/Bitbucket" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "ƒfƒtƒHƒ‹ƒg" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "ƒVƒXƒeƒ€" @@ -2184,7 +2185,7 @@ msgid "Description:" msgstr "à–¾:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "’âŽ~" @@ -2246,7 +2247,7 @@ msgid "&Go To" msgstr "ˆÚ“®(&G)" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "”äŠr" @@ -2297,7 +2298,7 @@ msgid "Filter Comments" msgstr "ƒRƒƒ“ƒg‚̍·ˆÙ‚𖳎‹‚·‚é" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "ƒGƒfƒBƒ^" @@ -2449,7 +2450,7 @@ msgstr " #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "ƒR[ƒhƒy[ƒW" @@ -2754,7 +2755,7 @@ msgid "Private Filter (only for current user)" msgstr "ƒvƒ‰ƒCƒx[ƒgƒtƒBƒ‹ƒ^ (Œ»Ý‚̃†[ƒU[‚Ì‚Ý)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "ƒA[ƒJƒCƒuƒTƒ|[ƒg" @@ -2806,7 +2807,7 @@ msgid "Files:" msgstr "ƒtƒ@ƒCƒ‹:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "·ˆÙ" @@ -2843,7 +2844,7 @@ msgid "Right:" msgstr "‰E‘¤:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "“¯ˆê" @@ -2896,7 +2897,7 @@ msgid "&Apply" msgstr "“K—p(&A)" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "ƒLƒƒƒ“ƒZƒ‹(&C)" @@ -3002,7 +3003,7 @@ msgid "Save..." msgstr "•Û‘¶..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹" @@ -3043,7 +3044,7 @@ msgid "A&ppend timestamp" msgstr "ƒ^ƒCƒ€ƒXƒ^ƒ“ƒv‚ð’ljÁ‚·‚é(&P)" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "ƒRƒs[‚ÌŠm”F" @@ -3084,7 +3085,7 @@ msgid "&Enable plugins" msgstr "ƒvƒ‰ƒOƒCƒ“‚ð—LŒø‚É‚·‚é(&E)" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "ƒVƒFƒ‹“‡" @@ -3120,8 +3121,8 @@ msgid "Add &Shell menu to context menu" msgstr "ƒVƒFƒ‹ƒƒjƒ…[‚ðƒRƒ“ƒeƒLƒXƒgƒƒjƒ…[‚ɒljÁ(&S)" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "ƒtƒHƒ‹ƒ_" @@ -3157,69 +3158,102 @@ msgid "&Quick compare limit (MB):" msgstr "ƒNƒCƒbƒNƒRƒ“ƒeƒ“ƒc§ŒÀ(MB)(&Q):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "ƒoƒCƒiƒŠ" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹ƒpƒ^[ƒ“(&P):" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "Frhed Ý’è" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "•\Ž¦Ý’è(&S)..." + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "ƒoƒCƒiƒŠƒ‚[ƒh(&B)..." + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "ƒLƒƒƒ‰ƒNƒ^ƒZƒbƒg(&C)..." + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "‰æ‘œ" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "‰æ‘œƒtƒ@ƒCƒ‹ƒpƒ^[ƒ“(&P):" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "HEX•\Ž¦(&H)" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041103a4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x411, 932" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "ƒŒƒfƒB" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "ã‘" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "‹L˜^" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3228,7 +3262,7 @@ msgstr "" "V‚µ‚¢ƒhƒLƒ…ƒƒ“ƒg‚𐶐¬‚µ‚Ü‚·\n" "V‹KƒhƒLƒ…ƒƒ“ƒg (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "" "Create empty documents (3 panes)\n" @@ -3237,7 +3271,7 @@ msgstr "" "V‚µ‚¢ƒhƒLƒ…ƒƒ“ƒg‚𐶐¬‚µ‚Ü‚·(3ƒyƒCƒ“)\n" "V‹KƒhƒLƒ…ƒƒ“ƒg" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3246,7 +3280,7 @@ msgstr "" "Šù‘¶‚̃hƒLƒ…ƒƒ“ƒg‚ðŠJ‚«‚Ü‚·\n" "ŠJ‚­ (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3255,7 +3289,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ð•Â‚¶‚Ü‚·\n" "•Â‚¶‚é" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3264,7 +3298,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ð•Û‘¶‚µ‚Ü‚·\n" "•Û‘¶ (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3273,7 +3307,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ðV‚µ‚¢–¼‘O‚ð‚‚¯‚Ä•Û‘¶‚µ‚Ü‚·\n" "–¼‘O‚ð•t‚¯‚Ä•Û‘¶" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3282,7 +3316,7 @@ msgstr "" "ˆóüƒIƒvƒVƒ‡ƒ“‚ð•ÏX‚µ‚Ü‚·\n" "ƒy[ƒW ƒŒƒCƒAƒEƒg‚̐ݒè" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3291,7 +3325,7 @@ msgstr "" "ƒvƒŠƒ“ƒ^/ˆóüƒIƒvƒVƒ‡ƒ“‚̕ύX\n" "ˆóüÝ’è" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3300,7 +3334,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ðˆóü‚µ‚Ü‚·\n" "ˆóü" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3309,27 +3343,27 @@ msgstr "" "ˆóüƒCƒ[ƒW‚ð•\Ž¦‚µ‚Ü‚·\n" "ˆóüƒvƒŒƒrƒ…[" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "”ñ•\Ž¦‚É‚µ‚½€–Ú‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "ƒcƒŠ[•\Ž¦/ƒtƒ‰ƒbƒg•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "‚·‚ׂẴTƒuƒtƒHƒ‹ƒ_‚ð“WŠJ‚·‚é" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "‚·‚ׂẴTƒuƒtƒHƒ‹ƒ_‚ðÜ‚肽‚½‚Þ" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3338,32 +3372,32 @@ msgstr "" "ƒvƒƒWƒFƒNƒg‚ðŠJ‚«‚Ü‚·\n" "ƒvƒƒWƒFƒNƒg‚ðŠJ‚­ (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "–¢’m‚̃Gƒ‰[:ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ªŠJ‚¯‚Ü‚¹‚ñ" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "–¢’m‚̃Gƒ‰[:ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª•Û‘¶‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª“Ǎž‚Ü‚ê‚Ü‚µ‚½" -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª•Û‘¶‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3372,7 +3406,7 @@ msgstr "" "Œ»Ý‚̃pƒX‚ƃIƒvƒVƒ‡ƒ“Ý’è‚ðƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·\n" "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚Ì•Û‘¶" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3381,7 +3415,7 @@ msgstr "" "ƒvƒƒOƒ‰ƒ€‚̏î•ñAƒo[ƒWƒ‡ƒ“‚»‚µ‚Ä’˜ìŒ ‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒo[ƒWƒ‡ƒ“î•ñ" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3390,27 +3424,27 @@ msgstr "" "ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ðI—¹‚µAƒtƒ@ƒCƒ‹‚Ì•Û‘¶‚ðŽwŽ¦‚µ‚Ü‚·\n" "I—¹" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Žw’è‚̃tƒ@ƒCƒ‹‚ðŠJ‚­" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3419,7 +3453,7 @@ msgstr "" "ŽŸ‚̃EƒBƒ“ƒhƒEƒyƒCƒ“‚ɐ؂è‘Ö‚¦‚Ü‚·\n" "ŽŸ‚̃yƒCƒ“" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3428,7 +3462,7 @@ msgstr "" "‘O‚̃EƒBƒ“ƒhƒEƒyƒCƒ“‚ɐ؂è‘Ö‚¦‚Ü‚·\n" "‘O‚̃yƒCƒ“" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3437,7 +3471,7 @@ msgstr "" "ƒEƒBƒ“ƒhƒE‚ðd‚Ë‚Ä•\Ž¦‚µ‚Ü‚·\n" "d‚Ë‚Ä•\Ž¦" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3446,7 +3480,7 @@ msgstr "" "ƒEƒBƒ“ƒhƒE‚ðã‰º‚É•À‚ׂĕ\Ž¦‚µ‚Ü‚·\n" "ã‰º‚É•À‚ׂĕ\Ž¦" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3455,7 +3489,7 @@ msgstr "" "ƒEƒBƒ“ƒhƒE‚ð¶‰E‚É•À‚ׂĕ\Ž¦‚µ‚Ü‚·\n" "¶‰E‚É•À‚ׂĕ\Ž¦" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3464,7 +3498,7 @@ msgstr "" "‘I‘ð”͈͂ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·\n" "ƒRƒs[" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3473,7 +3507,7 @@ msgstr "" "‘I‘ð”͈͂ðØ‚èŽæ‚Á‚āAƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·\n" "Ø‚èŽæ‚è" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3482,7 +3516,7 @@ msgstr "" "Žw’肵‚½•¶Žš—ñ‚ðŒŸõ‚µ‚Ü‚·\n" "ŒŸõ" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3491,7 +3525,7 @@ msgstr "" "ƒNƒŠƒbƒvƒ{[ƒh‚Ì“à—e‚ð‘}“ü‚µ‚Ü‚·\n" "“\‚è•t‚¯" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3500,7 +3534,7 @@ msgstr "" "’¼‘O‚ɍs‚Á‚½“®ì‚ðŒJ‚è•Ô‚·\n" "ŒJ‚è•Ô‚µ" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3509,7 +3543,7 @@ msgstr "" "Žw’肳‚ꂽ•¶Žš—ñ‚ðA‚Ù‚©‚Ì•¶Žš—ñ‚É’u‚«Š·‚¦‚Ü‚·\n" "’uŠ·" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3518,7 +3552,7 @@ msgstr "" "ƒhƒLƒ…ƒƒ“ƒg‘S‘Ì‚ð‘I‘ð‚µ‚Ü‚·\n" "‚·‚ׂđI‘ð" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3527,7 +3561,7 @@ msgstr "" "’¼‘O‚ɍs‚È‚Á‚½‘€ì‚ðŽæ‚èÁ‚µ‚Ü‚·\n" "Œ³‚É–ß‚· (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3536,7 +3570,7 @@ msgstr "" "’¼‘O‚ɍs‚Á‚½“®ì‚ðŒJ‚è•Ô‚·\n" "ŒJ‚è•Ô‚· (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3545,7 +3579,7 @@ msgstr "" "ƒc[ƒ‹ƒo[‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·\n" "ƒc[ƒ‹ƒo[•\Ž¦‚̃gƒOƒ‹" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3554,7 +3588,7 @@ msgstr "" "ƒXƒe[ƒ^ƒXƒo[‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·\n" "ƒXƒe[ƒ^ƒXƒo[•\Ž¦‚̃gƒOƒ‹" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3563,7 +3597,7 @@ msgstr "" "ƒ^ƒuƒo[‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·\n" "ƒ^ƒuƒo[•\Ž¦‚̃gƒOƒ‹" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3572,57 +3606,57 @@ msgstr "" "Ž©“®“I‚ɃyƒCƒ“‚ðƒŠƒTƒCƒY‚µ‚Ü‚·\n" "ƒyƒCƒ“‚̃ƒbƒN" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "ƒEƒBƒ“ƒhƒE‚̃TƒCƒY‚ð•ÏX" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "ƒEƒBƒ“ƒhƒE‚̈ʒu‚ð•ÏX" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "ƒEƒBƒ“ƒhƒE‚ðÅ¬‰»‚·‚é" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "ƒEƒBƒ“ƒhƒE‚ðÅ‘剻‚·‚é" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "ŽŸ‚̃EƒBƒ“ƒhƒE‚ɐ؂è‘Ö‚¦‚é" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "‘O‚̃EƒBƒ“ƒhƒE‚ɐ؂è‘Ö‚¦‚é" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "ì‹Æ’†‚̃EƒBƒ“ƒhƒE‚ð•Â‚¶A•ÏX‚µ‚½ƒtƒ@ƒCƒ‹‚Ì•Û‘¶‚ðŽwŽ¦" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "ƒEƒBƒ“ƒhƒE‚ð’ʏí‚̃TƒCƒY‚É–ß‚·" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̐؂è‘Ö‚¦" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Žw’è‚̃EƒBƒ“ƒhƒE‚ð•\Ž¦" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3631,7 +3665,7 @@ msgstr "" "ˆóüƒvƒŒƒrƒ…[ƒ‚[ƒh‚ðI—¹‚µ‚Ü‚·\n" "ƒvƒŒƒrƒ…[‚̃Lƒƒƒ“ƒZƒ‹" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3650,7 +3684,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3669,19 +3703,19 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Œ³‚ÌEOL•¶Žš‚ð•ÛŽ‚µ‚Ü‚·" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "‰EƒNƒŠƒbƒN‚ŃpƒX‚ðƒRƒs[" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3692,7 +3726,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3703,138 +3737,138 @@ msgstr "" "are welcome to redistribute it under certain circumstances; see the GNU " "General Public License in the Help menu for details." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "’†Ž~(&A)" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "ÄŽŽs(&R)" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "–³Ž‹(&I)" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "‘S‚Ä–³Ž‹(&A)" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "‚Í‚¢(&Y)" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "‘S‚Ä‚Í‚¢(&A)" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "‚¢‚¢‚¦(&N)" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "‘S‚Ä‚¢‚¢‚¦(&L)" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "‘±s(&C)" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "ƒXƒLƒbƒv(&S)" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "‚·‚ׂăXƒLƒbƒv(&A)" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Ä‚Ñ‚±‚̃ƒbƒZ[ƒW‚ð•\Ž¦‚µ‚È‚¢(&M)" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Ä‚Ñ‚±‚ÌŽ¿–â‚ð‚µ‚È‚¢(&Q)" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "ƒVƒ“ƒ^ƒbƒNƒX" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "ƒo[ƒWƒ‡ƒ“ŠÇ—" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "·ˆÙ" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "To:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "¶‚©‚ç:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "¶‚Ö:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "‰E‚©‚ç:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "‰E‚Ö:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Version %1 - Japanese" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "ƒIƒvƒVƒ‡ƒ“ (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "‚·‚ׂẴƒbƒZ[ƒWƒ{ƒbƒNƒX‚ªAÄ‚Ñ•\Ž¦‚³‚ê‚Ü‚·B" -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3845,32 +3879,32 @@ msgstr "" "\n" "1‚©‚ç%1‚Ü‚Å‚Ì’l‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "ŠJ‚­" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ƒvƒƒOƒ‰ƒ€|*.exe;*.bat;*.cmd|‚·‚ׂẴtƒ@ƒCƒ‹(*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "‚·‚ׂẴtƒ@ƒCƒ‹ (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ý’èƒtƒ@ƒCƒ‹ (*.ini)|*.ini|‚·‚ׂẴtƒ@ƒCƒ‹(*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3879,54 +3913,54 @@ msgstr "" "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files " "(*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ƒtƒ@ƒCƒ‹ (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ƒtƒ@ƒCƒ‹ (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "–¼Ì" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "êŠ" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "ƒtƒBƒ‹ƒ^" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "à–¾" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "V‚µ‚¢ƒtƒBƒ‹ƒ^‚̃tƒ@ƒCƒ‹–¼‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "ƒtƒ@ƒCƒ‹ƒtƒBƒ‹ƒ^ (*.flt)|*.flt|All Files (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3939,7 +3973,7 @@ msgstr "" "ƒtƒ@ƒCƒ‹ %1 ‚ðˆÈ‰º‚Ì WinMerge/Filters ƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ä‚­‚¾‚³‚¢:\n" "%2" -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3951,7 +3985,7 @@ msgstr "" "\n" "ƒtƒHƒ‹ƒ_‚Ì‘¶Ý‚Ü‚½‚͏‘‚«ž‚݉”\‚Å‚ ‚é‚©Šm”F‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3962,7 +3996,7 @@ msgstr "" "\n" "[ƒIƒvƒVƒ‡ƒ“/ƒVƒXƒeƒ€]‚ŃtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3974,12 +4008,12 @@ msgstr "" "\n" "‚»‚̃tƒ@ƒCƒ‹‚Í“Ç‚ÝŽæ‚èê—p‚Å‚Í‚ ‚è‚Ü‚¹‚ñ‚©?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚̈ʒu" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3990,18 +4024,18 @@ msgstr "" "\n" "V‚µ‚¢ƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚ðƒtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_‚ɃRƒs[‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" "ƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B‘¶Ý‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "³‹K•\Œ»" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -4015,258 +4049,258 @@ msgstr "" "‚à‚µA‚¢‚Ü‚Í‚·‚ׂĂ̔äŠrƒEƒCƒ“ƒhƒE‚ðXV‚µ‚½‚­‚È‚¢ê‡A‚¢‚¢‚¦‚ð‘I‘ð‚µAŒã‚Å" "”äŠrƒEƒCƒ“ƒhƒE‚ðXV‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "SS.EXE‚ւ̃pƒX(&P):" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "ƒtƒHƒ‹ƒ_”äŠrŒ‹‰Ê" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "ƒtƒ@ƒCƒ‹”äŠr" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "¶–³‘è" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "’†–³‘è" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "‰E–³‘è" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Theirs File" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Mine File" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "ƒtƒ@ƒCƒ‹‚ðƒXƒLƒƒƒ“‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŠJ‚¢‚Ä‚¢‚Ü‚·" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "¶‚©‚ç‰E‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "‰E‚©‚獶‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "¶‚©‚ç’†‰›‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "‰E‚©‚ç’†‰›‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "¶‚©‚çƒRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "‰E‚©‚çƒRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "‘S‚Ä‚ð¶‚ÉƒRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "‘S‚Ä‚ð‰E‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "ƒtƒ@ƒCƒ‹‚ðƒRƒs[‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "ƒtƒ@ƒCƒ‹‚ðíœ‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "ƒtƒ@ƒCƒ‹‚ðˆÚ“®‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "ƒŒƒ|[ƒg‚𐶐¬‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "ÅŒã‚Ì‘€ì‚ðŒ³‚É–ß‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "‘O‚Ì‘€ì‚ð‚â‚è’¼‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "Ž©“®ƒ}[ƒW’†‚Å‚·..." -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "s: %s —ñ: %d/%d •¶Žš: %d/%d EOL: %s ƒR[ƒhƒy[ƒW: %d(%s)" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "s: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "s: %s —ñ: %d/%d •¶Žš: %d/%d ƒR[ƒhƒy[ƒW: %d(%s)" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "ƒ}[ƒW" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "·ˆÙ %1/%2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "€–Ú %1/%2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "€–Ú: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "‘¶Ý‚·‚éƒtƒHƒ‹ƒ_‚Ü‚½‚́Aƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Folder Selection" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "2‚‚̃tƒHƒ‹ƒ_‚Ü‚½‚́A2‚‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "¶‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "’†‰›‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "‰E‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "—¼‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "¶‘¤‚Æ’†‰›‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "¶‘¤‚ƉE‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "’†‰›‚ƉE‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "‘S‚ẴpƒX‚ª•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‘I‘ð‚ð—LŒø‚É‚·‚é‚ɂ̓tƒ@ƒCƒ‹‚ð“ñ‚‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "ƒtƒ@ƒCƒ‹‚ƃtƒHƒ‹ƒ_‚Í”äŠr‚Å‚«‚Ü‚¹‚ñ!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "ƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "ƒtƒ@ƒCƒ‹‚ª“WŠJ‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4279,12 +4313,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "ƒRƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚̉ðÍ‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4295,19 +4329,19 @@ msgstr "" "%1\n" "‚̓Rƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚Å‚Í‚ ‚è‚Ü‚¹‚ñB" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "" "ƒtƒ@ƒCƒ‹ %1 ‚Ì“à—e‚͕ύX‚³‚ê‚Ä‚¢‚Ü‚·B\n" "•ÏX‚ð•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -4316,12 +4350,12 @@ msgstr "" "%1‚Í“Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚Å‚·B “Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚©? (V‚µ‚¢" "ƒtƒ@ƒCƒ‹–¼‚Å‚Í•Û‘¶‚µ‚Ü‚¹‚ñB)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "ƒtƒ@ƒCƒ‹ƒoƒbƒNƒAƒbƒvƒGƒ‰[" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4334,7 +4368,7 @@ msgstr "" "‚ðƒoƒbƒNƒAƒbƒv‚Å‚«‚Ü‚¹‚ñB\n" "–³Ž‹‚µ‚Ä‘±‚¯‚Ü‚·‚©?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4350,7 +4384,7 @@ msgstr "" "•Ê–¼‚Å•Û‘¶‚·‚éê‡‚ÍOk‚ðA\n" "’†Ž~‚·‚éê‡‚́AƒLƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4366,7 +4400,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4382,7 +4416,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4395,7 +4429,7 @@ msgstr "" "‚±‚̃tƒ@ƒCƒ‹‚Í WinMerge ˆÈŠO‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ŏC³‚³‚ê‚Ä‚¢‚Ü‚·BC³‚³‚ꂽ" "ƒtƒ@ƒCƒ‹‚ɏ㏑‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4404,7 +4438,7 @@ msgstr "" "%1\n" "‚́A“Ç‚ÝŽæ‚èê—p‚Å‚·B “Ç‚ÝŽæ‚èê—p‚̍€–Ú‚ðã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4418,22 +4452,22 @@ msgstr "" "‚ðXV‚µ‚Ü‚µ‚½B\n" "ƒtƒ@ƒCƒ‹‚ðŠJ‚«‚È‚¨‚µ‚Ü‚·‚©?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "–¼‘O‚ð•t‚¯‚趑¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "–¼‘O‚ð•t‚¯‚Ä’†‰›‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "–¼‘O‚ð•t‚¯‚ĉE‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4444,7 +4478,7 @@ msgstr "" "%1\n" "‚͏Á–Å‚µ‚Ü‚µ‚½B‘±s‚·‚邽‚߂Ƀtƒ@ƒCƒ‹‚̃Rƒs[‚ð•Û‘¶‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4455,7 +4489,7 @@ msgstr "" "\n" "‘±s‚·‚é‘O‚ɃhƒLƒ…ƒƒ“ƒg‚ðF5ƒL[‚ōŐV‚É‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -4464,41 +4498,41 @@ msgstr "" "‘±s‚·‚邽‚߂ɂ́ASourceSafeƒvƒƒWƒFƒNƒgƒpƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B (—á: $/" "MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "VSS‚©‚çƒtƒ@ƒCƒ‹‚ðƒ`ƒFƒbƒNƒAƒEƒg‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " "Unable to continue..." msgstr "ƒtƒ@ƒCƒ‹‚̃`ƒFƒbƒNƒAƒEƒg‚ŃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B Œp‘±‚Å‚«‚Ü‚¹‚ñ..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "ƒo[ƒWƒ‡ƒ“ƒVƒXƒeƒ€ƒRƒ}ƒ“ƒh‚ÌŽÀsƒGƒ‰[B" -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " "Continue?" msgstr "VSSì‹ÆƒtƒHƒ‹ƒ_‚ÆŒ»Ý‚̃tƒ@ƒCƒ‹ˆÊ’u‚͈ê’v‚µ‚Ä‚¢‚Ü‚¹‚ñB‘±s‚µ‚Ü‚·‚©?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "VSS‚̃f[ƒ^ƒx[ƒX‚ª‚݂‚©‚è‚Ü‚¹‚ñ!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "VSS‚©‚ç‚̃Gƒ‰[:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4510,7 +4544,7 @@ msgstr "" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B\n" " ƒ`ƒFƒbƒNƒAƒEƒg‚ðƒLƒƒƒ“ƒZƒ‹‚µ‚Ü‚·‚©?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -4521,164 +4555,164 @@ msgstr "" "‚Ü‚µ‚½B\n" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "‚È‚µ" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 –¢–ž)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ˆÈã)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "‹ó”’‚Å‹æØ‚é" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "‹ó”’‚©‹å“Ç“_‚Å‹æØ‚é" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ðŽw’èƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ð‘I‘ð‚³‚ê‚½ƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "¶‚Ì‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "‰E‚Ì‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "—¼‘¤‚Ì‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ð”ñ•\Ž¦‚É‚µ‚Ü‚·(ƒIƒ“ƒUƒtƒ‰ƒC ƒtƒBƒ‹ƒ^)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "—¼‘¤‚Ì‘I‘ð‚³‚ê‚½€–Ú‚Ì–¼‘O‚ð•ÏX‚µ‚Ü‚·" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "‰E‚©‚獶 (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "¶‚©‚ç‰E (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "‰E‚ð¶‚É (%1 / %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¶‚ð‰E‚É (%1 / %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "¶‚ð... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "‰E‚ð... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "¶‚ð... (%1/%2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "‰E‚ð... (%1/%2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "¶ (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "‰E (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "—¼‘¤ (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "¶ (%1 / %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "‰E (%1 / %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "—¼‘¤ (%1 / %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "¶‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "‰E‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1/%2 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4690,17 +4724,17 @@ msgstr "" "%1\n" "‚ðíœ‚µ‚Ü‚·‚©?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "–{“–‚ɃRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "–{“–‚É%d€–Ú‚ðƒRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4719,22 +4753,22 @@ msgstr "" "\n" "Ä“x”äŠr‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "€–Ú‚ðˆÚ“®‚µ‚Ü‚·‚©?: " -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "%dŒÂ‚̍€–Ú‚ðˆÚ“®‚µ‚Ü‚·‚©?: " -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "ˆÚ“®‚ÌŠm”F" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "" "You are about to close the window that is comparing folders. Are you sure " @@ -4743,548 +4777,542 @@ msgstr "" "ƒtƒHƒ‹ƒ_”äŠr’†‚̃EƒCƒ“ƒhƒE‚ð•Â‚¶‚悤‚Æ‚µ‚Ä‚¢‚Ü‚·B–{“–‚ɃEƒCƒ“ƒhƒE‚ð•Â‚¶‚Ü‚·" "‚©?" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "¶‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚ō¶‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "¶‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ÅŠJ‚«‚Ü‚·..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "‰E‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚ʼnE‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "‰E‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ÅŠJ‚«‚Ü‚·..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "ŠO•”ƒGƒfƒBƒ^‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ƀtƒ@ƒCƒ‹–¼‚ðƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "¶‘¤‚̃pƒX–¼‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "‰E‘¤‚̃pƒX–¼‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "—¼‘¤‚̃pƒX–¼‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "‘I‘ð‚µ‚½€–ڂ̍¶‘¤‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "‘I‘ð‚µ‚½€–ڂ̉E‘¤‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "¶‘¤ƒVƒFƒ‹ƒƒjƒ…[" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "’†‰›ƒVƒFƒ‹ƒƒjƒ…[" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "‰E‘¤ƒVƒFƒ‹ƒƒjƒ…[" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "–¢’m‚̃A[ƒJƒCƒuŒ`Ž®‚Å‚·" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "ƒA[ƒJƒCƒu‚ɍ¶‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "ƒA[ƒJƒCƒu‚ɉE‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "ƒA[ƒJƒCƒu‚É—¼‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "ƒA[ƒJƒCƒu‚ɍ·ˆÙ‚Ì‚ ‚é—¼‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "¶‘¤‚Ì‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŽw’肵‚½ƒtƒHƒ‹ƒ_‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "‰E‘¤‚Ì‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŽw’肵‚½ƒtƒHƒ‹ƒ_‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "ƒtƒ@ƒCƒ‹–¼" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "”äŠrŒ‹‰Ê" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "¶“ú•t" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "‰E“ú•t" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "’†“ú•t" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Šg’£Žq" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "¶ƒTƒCƒY" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "‰EƒTƒCƒY" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "’†ƒTƒCƒY" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "‰EƒTƒCƒY (’Zk)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "¶ƒTƒCƒY (’Zk)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "’†ƒTƒCƒY (’Zk)" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "¶ì¬“úŽž" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "‰Eì¬“úŽž" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "’†ì¬“úŽž" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "V‚µ‚¢ƒtƒ@ƒCƒ‹" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "¶ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "‰Eƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "’†ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "ŠÈˆÕŒ‹‰Ê•\Ž¦" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "¶‘®«" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "‰E‘®«" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "’†‘®«" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "¶EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "’†EOL" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "‰EEOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "¶ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "‰EƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "’†ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "–³Ž‹‚³‚ꂽ·ˆÙ”" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "ƒoƒCƒiƒŠ" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "ƒtƒ@ƒCƒ‹‚ð”äŠr‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "’†’f‚³‚ꂽ€–Ú" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒ@ƒCƒ‹" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒHƒ‹ƒ_" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "¶‘¤‚Ì‚Ý: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "’†‰›‚Ì‚Ý: %1" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "‰E‘¤‚Ì‚Ý: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "%1 “à‚Ì‚Ý‘¶Ý‚µ‚Ü‚¹‚ñ" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "ƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "ƒtƒHƒ‹ƒ_‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "¶‘¤‚Ì‚Ý" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "‰E‘¤‚Ì‚Ý" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "’†‰›‚Ì‚Ý" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "¶‘¤‚É‚È‚¢" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "‰E‘¤‚É‚È‚¢" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "’†‰›‚É‚È‚¢" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "ƒGƒ‰[" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚͈قȂè‚Ü‚·" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Œo‰ßŽžŠÔ: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "ƒtƒ@ƒCƒ‹–¼‚Ü‚½‚́AƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ƒTƒuƒtƒHƒ‹ƒ_‚ªŠÜ‚܂ꂽ‚Æ‚«‚̃TƒuƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "’·‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "¶‘¤‚̍XV“ú•t" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "‰E‘¤‚̍XV“ú•t" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "’†‰›‚̍XV“ú•t" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "ƒtƒ@ƒCƒ‹Šg’£Žq" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "¶‘¤‚̍쐬Žž" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "‰E‘¤‚̍쐬Žž" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "’†‰›‚̍쐬Žž" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "‚Ç‚¿‚炪ÅV‚̕ύX“ú•t‚©‚ðŽ¦‚µ‚Ü‚·B" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "’Z‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "¶‘¤‚Ì‘®«" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "‰E‘¤‚Ì‘®«" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "’†‰›‚Ì‘®«" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "¶‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "‰E‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "’†‰›‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "¶‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "‰E‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "’†‰›ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -5293,50 +5321,50 @@ msgstr "" "ƒtƒ@ƒCƒ‹“à‚Å–³Ž‹‚³‚ꂽ·ˆÙ”B‚±‚̍·ˆÙ‚ÍWinMerge‚É‚æ‚Á‚Ä–³Ž‹‚³‚êAƒ}[ƒW‚³‚ê" "‚Ü‚¹‚ñB" -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "" "Number of differences in file. This number does not include ignored " "differences." msgstr "ƒtƒ@ƒCƒ‹“à·ˆÙ”B‚±‚̍·ˆÙ”‚Í–³Ž‹‚³‚ꂽ·ˆÙ”‚ðŠÜ‚Ý‚Ü‚¹‚ñB" -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "‚à‚µAƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚È‚çƒAƒXƒ^ƒŠƒXƒN(*)‚ð•\Ž¦‚µ‚Ü‚·B" -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "%1 ‚Æ %2 ‚Ì”äŠr" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "CSVŒ`Ž®" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "TAB‹æØ‚èŒ`Ž®" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "ƒVƒ“ƒvƒ‹HTMLŒ`Ž®" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "ƒVƒ“ƒvƒ‹XMLŒ`Ž®" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "ƒŒƒ|[ƒgƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ä‚¢‚Ü‚·B‘¶Ý‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚ª?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5345,27 +5373,27 @@ msgstr "" "ƒŒƒ|[ƒg¶¬ƒGƒ‰[:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "ƒŒƒ|[ƒg¶¬‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "“¯‚¶ƒtƒ@ƒCƒ‹‚ª—¼‘¤‚̃pƒlƒ‹‚ÅŠJ‚©‚ê‚Ä‚¢‚Ü‚·B" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·B" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "ƒtƒ@ƒCƒ‹‚Ì”äŠrŽž‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -5373,7 +5401,7 @@ msgstr "" "ƒeƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹‚ªì¬‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½Bƒeƒ“ƒ|ƒ‰ƒŠƒpƒXÝ’è‚ðŠm”F‚µ‚Ä‚­‚¾‚³" "‚¢B" -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5393,17 +5421,17 @@ msgstr "" "[•ÒW]¨[Ý’è]¨[”äŠr]‚Ì'‰üs•¶Žš‚̈Ⴂ‚𖳎‹‚·‚é'ƒIƒvƒVƒ‡ƒ“‚ð\n" "ƒZƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "‘I‘ð‚³‚ê‚½ƒtƒHƒ‹ƒ_‚Í–³Œø‚Å‚·B" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ðƒGƒfƒBƒ^‚ÅŠJ‚­‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5417,7 +5445,7 @@ msgstr "" "‘¼•û‚Ƀ}ƒbƒ`‚·‚éˆÈ‰º‚̃tƒHƒ‹ƒ_‚ðì¬‚µAƒtƒHƒ‹ƒ_‚ðŠJ‚«‚Ü‚·‚©?:\n" "%1" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5431,57 +5459,57 @@ msgstr "" "ƒRƒs[‚ªŠëŒ¯‚É‚È‚è‚Ü‚·B\n" "ƒR[ƒhƒy[ƒW‚ðƒfƒtƒHƒ‹ƒgƒR[ƒhƒy[ƒW‚Æ‚µ‚Ĉµ‚¢‚Ü‚·‚ªA‚æ‚낵‚¢‚Å‚·‚©(„§)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(—¼‘¤‚̃tƒ@ƒCƒ‹)" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(ˆê”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(“ñ”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(ŽO”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "·ˆÙ‚Í‚ ‚è‚Ü‚¹‚ñ" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "s‚̍·ˆÙ" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "%1ŒÂ‚Ì•¶Žš—ñ‚ð’uŠ·‚µ‚Ü‚µ‚½" -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "•¶Žš—ñ\"%s\"‚ªŒŸõ‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "ƒtƒ‹ƒpƒX‚ðƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "ƒtƒ@ƒCƒ‹–¼‚ðƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "" "You are now entering Merge Mode. If you want to turn off Merge Mode, press " @@ -5491,7 +5519,7 @@ msgstr "" "‚̍·ˆÙ‚Ɉړ®‚Å‚«‚郂[ƒh‚Å‚·Bƒ}[ƒWƒ‚[ƒh‚ðƒIƒt‚É‚µ‚½‚¢ê‡‚́AF9ƒL[‚ð‰Ÿ‚µ" "‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "" "The number of automatically merged changes: %1\n" @@ -5500,108 +5528,108 @@ msgstr "" "Ž©“®“I‚Ƀ}[ƒW‚³‚ꂽ•ÏX‚̐”: %1\n" "‰ðŒˆ‚³‚ê‚Ä‚¢‚È‚¢ƒRƒ“ƒtƒŠƒNƒg‚̐”: %2" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "ƒR[ƒhƒy[ƒW‚̕ύX‚ªƒ}[ƒW‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "ƒR[ƒhƒy[ƒW‚̕ύX‚ªƒRƒ“ƒtƒŠƒNƒg‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "‰üsƒR[ƒh‚̕ύX‚ªƒ}[ƒW‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "‰üsƒR[ƒh‚̕ύX‚ªƒRƒ“ƒtƒŠƒNƒg‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Location Pane" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Diff Pane" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "ƒpƒbƒ`ƒtƒ@ƒCƒ‹‚̏‘‚«ž‚݂ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "o—ÍŒ‹‰Êƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B ã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚·]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "ƒm[ƒ}ƒ‹" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "ƒRƒ“ƒeƒLƒXƒg" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "ƒ†ƒjƒtƒ@ƒCƒh" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "ƒtƒ@ƒCƒ‹ %1‚ɏ‘‚«ž‚ß‚Ü‚¹‚ñB" -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Žw’肵‚½o—̓pƒX‚́Aâ‘΃pƒX‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "o—̓pƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "ƒtƒHƒ‹ƒ_‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5612,12 +5640,12 @@ msgstr "" "\n" "ƒpƒbƒ`¶¬‚ɂ́A•ÏX‚ª‘S‚Ä•Û‘¶‚³‚ê‚Ä‚¢‚é•K—v‚ª‚ ‚è‚Ü‚·B" -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "ƒtƒHƒ‹ƒ_‚Í‘¶Ý‚µ‚Ü‚¹‚ñB" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5631,7 +5659,7 @@ msgstr "" "ƒA[ƒJƒCƒuƒTƒ|[ƒg‚Æ‚»‚ê‚ð—LŒø‚É‚·‚é•û–@‚ɂ‚¢‚Ă̏î•ñ‚́Aƒ}ƒjƒ…ƒAƒ‹‚ðŽQÆ‚µ" "‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5640,7 +5668,7 @@ msgstr "" "\n" "’ˆÓ: 7-Zip “‡‚́AWinMerge‚̐ݒè‚É‚æ‚è–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·B" -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5651,37 +5679,37 @@ msgstr "" "’ˆÓ: 7-Zip “‡‚́AWinMerge‚̐ݒè‚É‚æ‚èƒXƒ^ƒ“ƒhƒAƒƒ“‘€ì‚ɐ§ŒÀ‚³‚ê‚Ä‚¢‚Ü" "‚·B" -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "ƒGƒNƒXƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "ƒCƒ“ƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Ý’èî•ñ‚ªƒtƒ@ƒCƒ‹‚©‚çƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Ý’èî•ñ‚ðƒtƒ@ƒCƒ‹‚ɃGƒNƒXƒ|[ƒg‚µ‚Ü‚µ‚½B" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "ƒtƒ@ƒCƒ‹‚©‚çÝ’èî•ñ‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "ƒtƒ@ƒCƒ‹‚ւ̐ݒèî•ñ‚̏‘‚«ž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5692,157 +5720,157 @@ msgstr "" "\n" "‘±s‚µ‚Ü‚·‚©?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "ƒ^ƒCƒv" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "ƒGƒfƒBƒ^ƒXƒNƒŠƒvƒg" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "¶‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚Ü‚·" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "’†‰›‚̃tƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚Ü‚·" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "‰E‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚Ü‚·" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "¶‘¤‚̃tƒ@ƒCƒ‹‚𖼑O‚ð•t‚¯‚Ä•Û‘¶‚µ‚Ü‚·..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "’†‰›‚̃tƒ@ƒCƒ‹‚𖼑O‚ð•t‚¯‚Ä•Û‘¶‚µ‚Ü‚·..." -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "‰E‘¤‚̃tƒ@ƒCƒ‹‚𖼑O‚ð•t‚¯‚Ä•Û‘¶‚µ‚Ü‚·..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "¶‘¤ƒtƒ@ƒCƒ‹/ƒtƒHƒ‹ƒ_‚Ì“Ç‚ÝŽæ‚èê—pó‘Ô‚ð•ÏX‚·‚é" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "’†‰›ƒtƒ@ƒCƒ‹/ƒtƒHƒ‹ƒ_‚Ì“Ç‚ÝŽæ‚èê—pó‘Ô‚ð•ÏX‚·‚é" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "‰E‘¤ƒtƒ@ƒCƒ‹/ƒtƒHƒ‹ƒ_‚Ì“Ç‚ÝŽæ‚èê—pó‘Ô‚ð•ÏX‚·‚é" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "EOL‚ðWindowsƒ^ƒCƒv‚É•ÏŠ·‚µ‚Ü‚·" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "EOL‚ðUnixƒ^ƒCƒv‚É•ÏŠ·‚µ‚Ü‚·" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "EOL‚ðMacƒ^ƒCƒv‚É•ÏŠ·‚µ‚Ü‚·" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Œ»Ý‚̃‚[ƒh‚©‚ç•ÒWƒ‚[ƒh‚Ü‚½‚̓}[ƒWƒ‚[ƒh‚ðØ‚è‘Ö‚¦‚Ü‚·" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5851,12 +5879,12 @@ msgstr "" "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒOî•ñ‚Ì•\Ž¦‚Ɛݒè‚ðs‚¢‚Ü‚·B\n" "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒvƒƒpƒeƒB" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "ƒRƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚ðŠJ‚¢‚Ä‹£‡‚ð‰ðÁ‚µ‚Ü‚·" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5865,7 +5893,7 @@ msgstr "" "Œ»Ýs‚̍·ˆÙ•”•ª‚ð‘I‘ð‚µ‚Ü‚·\n" "Œ»Ý‚̍s“à·ˆÙ" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5874,7 +5902,7 @@ msgstr "" "Žw’肵‚½s‚Ü‚½‚́A·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ˆÚ“®(Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5883,7 +5911,7 @@ msgstr "" "ƒvƒƒOƒ‰ƒ€ƒIƒvƒVƒ‡ƒ“‚ðÝ’肵‚Ü‚·\n" "ƒIƒvƒVƒ‡ƒ“" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5892,37 +5920,37 @@ msgstr "" "ÅV‚̏î•ñ‚ɍXV‚µ‚Ü‚·\n" "•\Ž¦XV (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "‘I‘ð‚³‚ê‚½s‚̐擪‚ɍs”ԍ†‚ð•t‰Á‚µ‚ăNƒŠƒbƒvƒ{[ƒh‚ÖƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "‘I‘ð‚µ‚½€–Ú‚ðÅV‚̏ó‘ԂɍXV‚·‚é" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "ƒuƒbƒNƒ}[ƒN‚̍쐬Eíœ‚ðs‚¢‚Ü‚·" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "ŽŸ‚̃uƒbƒNƒ}[ƒN‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "‘O‚̃uƒbƒNƒ}[ƒN‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "‘S‚ẴuƒbƒNƒ}[ƒN‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5931,7 +5959,7 @@ msgstr "" "³Šm‚Ɉê’v‚µ‚Ä‚¢‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "“¯ˆê€–Ú‚Ì•\Ž¦" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5940,7 +5968,7 @@ msgstr "" "·ˆÙ‚Ì‚ ‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "·ˆÙ€–Ú‚Ì•\Ž¦" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5949,7 +5977,7 @@ msgstr "" "‰E‘¤‚É‚Ì‚Ý‘¶Ý‚·‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "¶‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5958,7 +5986,7 @@ msgstr "" "‰E‘¤‚É‚Ì‚Ý‘¶Ý‚·‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "‰E‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5967,7 +5995,7 @@ msgstr "" "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Ì•\Ž¦" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5976,7 +6004,7 @@ msgstr "" "ƒXƒLƒbƒv‚³‚ꂽ€–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒXƒLƒbƒv‚³‚ꂽ€–Ú‚Ì•\Ž¦" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5985,7 +6013,7 @@ msgstr "" "•\Ž¦‚Ì‚½‚߂̃tƒHƒ“ƒg‚ð‘I‘ð‚µ‚Ü‚·\n" "•\Ž¦ƒtƒHƒ“ƒg‘I‘ð" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5994,27 +6022,27 @@ msgstr "" "•\Ž¦ƒtƒHƒ“ƒg‚ðƒfƒtƒHƒ‹ƒgƒVƒXƒeƒ€ƒtƒHƒ“ƒg‚É–ß‚µ‚Ü‚·\n" "ƒfƒtƒHƒ‹ƒgƒtƒHƒ“ƒg" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "‹ó”’•¶Žš‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "DiffƒyƒCƒ“‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "ƒƒP[ƒVƒ‡ƒ“ƒyƒCƒ“‚̓tƒ@ƒCƒ‹‚Ì“à—e‘S‘Ì‚ðƒsƒNƒ`ƒƒ‚Æ‚µ‚Ä•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "ƒtƒHƒ‹ƒ_”äŠr“Œvƒ_ƒCƒAƒƒO‚ð•\Ž¦‚µ‚Ü‚·B" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -6023,7 +6051,7 @@ msgstr "" "Œ»Ý‚̃†[ƒU[ƒCƒ“ƒ^[ƒtƒF[ƒXŒ¾Œê‚ð‘I‘ð‚µ‚Ü‚·\n" "Œ¾Œê" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -6032,12 +6060,12 @@ msgstr "" "s“à‚̍·ˆÙ‚ðF‚ð•Ï‚¦‚Ä•\Ž¦‚µ‚Ü‚·\n" "s“à‚̍·ˆÙ‚ð•\Ž¦" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "2‚‚̃yƒCƒ“‚̈ʒu‚ðŒðŠ·‚µ‚Ü‚·" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -6046,7 +6074,7 @@ msgstr "" "s”ԍ†‚ð•\Ž¦‚µ‚Ü‚·\n" "s”ԍ†‚ð•\Ž¦" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -6055,7 +6083,7 @@ msgstr "" "s‚ð‰E’[‚Ő܂è•Ô‚µ‚Ü‚·B\n" "s‚ð‰E’[‚ŐܕԂ·" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6064,22 +6092,22 @@ msgstr "" "—¼‘¤‚̃yƒCƒ“‚ɃZƒŒƒNƒVƒ‡ƒ“ƒ}[ƒWƒ“‚ð•\Ž¦‚µ‚Ü‚·B\n" "ƒZƒŒƒNƒVƒ‡ƒ“ƒ}[ƒWƒ“‚Ì•\Ž¦" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "ƒeƒLƒXƒgƒTƒCƒY‚ð‘å‚«‚­‚·‚é" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "ƒeƒLƒXƒgƒTƒCƒY‚ð¬‚³‚­‚·‚é" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Šg‘債‚½ƒtƒHƒ“ƒg‚ðƒfƒtƒHƒ‹ƒgƒTƒCƒY‚ɃŠƒZƒbƒg‚µ‚Ü‚·" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6088,7 +6116,7 @@ msgstr "" "‘O‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚̍·ˆÙ (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6097,7 +6125,7 @@ msgstr "" "ŽŸ‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚̍·ˆÙ (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "" "Scroll to the previous conflict\n" @@ -6106,7 +6134,7 @@ msgstr "" "‘O‚̃Rƒ“ƒtƒŠƒNƒg‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚̃Rƒ“ƒtƒŠƒNƒg(Alt+Shift+Up)" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "" "Scroll to the next conflict\n" @@ -6115,7 +6143,7 @@ msgstr "" "ŽŸ‚̃Rƒ“ƒtƒŠƒNƒg‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚̃Rƒ“ƒtƒŠƒNƒg(Alt+Shift+Down)" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "" "Scroll to the previous difference between left and middle\n" @@ -6124,7 +6152,7 @@ msgstr "" "‘O‚̍¶‘¤‚Æ’†‰›‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚̍¶‘¤‚Æ’†‰›‚̍·ˆÙ(Alt+Shift+1)" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "" "Scroll to the next difference between left and middle\n" @@ -6133,7 +6161,7 @@ msgstr "" "ŽŸ‚̍¶‘¤‚Æ’†‰›‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚̍¶‘¤‚Æ’†‰›‚̍·ˆÙ(Alt+1)" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "" "Scroll to the previous difference between left and right\n" @@ -6142,7 +6170,7 @@ msgstr "" "‘O‚̍¶‘¤‚ƉE‘¤‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚̍¶‘¤‚ƉE‘¤‚̍·ˆÙ(Alt+Shift+2)" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "" "Scroll to the next difference between left and right\n" @@ -6151,7 +6179,7 @@ msgstr "" "ŽŸ‚̍¶‘¤‚ƉE‘¤‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚̍¶‘¤‚ƉE‘¤‚̍·ˆÙ(Alt+2)" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "" "Scroll to the previous difference between middle and right\n" @@ -6160,7 +6188,7 @@ msgstr "" "‘O‚Ì’†‰›‚ƉE‘¤‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚Ì’†‰›‚ƉE‘¤‚̍·ˆÙ(Alt+Shift+3)" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "" "Scroll to the next difference between middle and Difference\n" @@ -6169,7 +6197,7 @@ msgstr "" "ŽŸ‚Ì’†‰›‚ƉE‘¤‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚Ì’†‰›‚ƉE‘¤‚̍·ˆÙ(Alt+3)" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "" "Scroll to the previous left only difference\n" @@ -6178,7 +6206,7 @@ msgstr "" "‘O‚̍¶‘¤‚݂̂̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚̍¶‘¤‚݂̂̍·ˆÙ(Alt+Shift+7)" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "" "Scroll to the next left only difference\n" @@ -6187,7 +6215,7 @@ msgstr "" "ŽŸ‚̍¶‘¤‚݂̂̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚̍¶‘¤‚݂̂̍·ˆÙ(Alt+7)" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "" "Scroll to the previous middle only difference\n" @@ -6196,7 +6224,7 @@ msgstr "" "‘O‚Ì’†‰›‚݂̂̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚Ì’†‰›‚݂̂̍·ˆÙ(Alt+Shift+8)" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "" "Scroll to the next middle only difference\n" @@ -6205,7 +6233,7 @@ msgstr "" "ŽŸ‚Ì’†‰›‚݂̂̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚Ì’†‰›‚݂̂̍·ˆÙ(Alt+8)" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "" "Scroll to the previous right only difference\n" @@ -6214,7 +6242,7 @@ msgstr "" "‘O‚̉E‘¤‚݂̂̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚̉E‘¤‚݂̂̍·ˆÙ(Alt+Shift+9)" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "" "Scroll to the next right only difference\n" @@ -6223,7 +6251,7 @@ msgstr "" "ŽŸ‚̉E‘¤‚݂̂̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚̉E‘¤‚݂̂̍·ˆÙ(Alt+9)" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6232,7 +6260,7 @@ msgstr "" "Å‰‚̍·ˆÙ‚Ɉړ®‚µ‚Ü‚·\n" "Å‰‚̍·ˆÙ (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6241,7 +6269,7 @@ msgstr "" "Œ»Ý‚̍·ˆÙ‚Ɉړ®‚µ‚Ü‚·\n" "Œ»Ý‚̍·ˆÙ (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6250,7 +6278,7 @@ msgstr "" "ÅŒã‚̍·ˆÙ‚Ɉړ®‚µ‚Ü‚·\n" "ÅŒã‚̍·ˆÙ (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6259,7 +6287,7 @@ msgstr "" "‘I‘ð‚³‚ê‚½ƒeƒLƒXƒg‚ð‰E‚̃tƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "‰E‚ÖƒRƒs[ (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6268,7 +6296,7 @@ msgstr "" "‘I‘ð‚³‚ê‚½ƒeƒLƒXƒg‚ð¶‚Ìƒtƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "¶‚ÖƒRƒs[ (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6277,7 +6305,7 @@ msgstr "" "·ˆÙ‚ð‰E‚ɃRƒs[‚µAŽŸ‚̍·ˆÙ‚ɐi‚Ý‚Ü‚·\n" "‰E‚ɃRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6286,7 +6314,7 @@ msgstr "" "·ˆÙ‚ð¶‚ÉƒRƒs[‚µAŽŸ‚̍·ˆÙ‚ɐi‚Ý‚Ü‚·\n" "¶‚ɃRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6295,7 +6323,7 @@ msgstr "" "‚·‚ׂĂ̍·ˆÙ‚ð‰E‚̃tƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "‰E‚·‚ׂÄ" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6304,29 +6332,29 @@ msgstr "" "‚·‚ׂĂ̍·ˆÙ‚ð¶‚Ìƒtƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "¶‚·‚ׂÄ" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "—¼‘¤‚̃tƒHƒ‹ƒ_‚©‚ç‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" "‘I‘ð‚³‚ê‚½€–Ú‚ð”äŠr‚µ‚Ü‚· (•¡”‚̍€–Ú‚ª‘I‘ð‚³‚ê‚Ä‚¢‚½ê‡AÅ‰‚̍€–Ú‚ð”äŠr" "‚µ‚Ü‚·)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "ƒtƒ@ƒCƒ‹ŠÔ·ˆÙ‚𓯊ú‚³‚¹‚邽‚ß‚ÌŽè“®ƒ|ƒCƒ“ƒg‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "’ljÁ‚µ‚½·ˆÙ“¯Šúƒ|ƒCƒ“ƒg‚ð‚·‚×‚ÄƒNƒŠƒA‚µ‚Ü‚·" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "" "Automatically merge changes\n" @@ -6335,38 +6363,38 @@ msgstr "" "Ž©“®“I‚ɕύX‚ðƒ}[ƒW‚µ‚Ü‚·\n" "Ž©“®ƒ}[ƒW(Ctrl+Alt+M)" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "ƒtƒHƒ‹ƒ_”äŠr•\Ž¦‚Ì—ñ‚ð‘I‘ð‚Ü‚½‚Í•À‚בւ¦‚Ü‚·" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "ƒpƒbƒ`ƒtƒ@ƒCƒ‹¶¬‚µ‚Ü‚·" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "ƒtƒBƒ‹ƒ^‚Ì‘I‘ð‚ƕύX‚ð‚µ‚Ü‚·" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "”äŠrŒ‹‰Ê‚©‚烌ƒ|[ƒg‚𐶐¬‚µ‚Ü‚·" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "—˜—p‰Â”\‚ȃvƒ‰ƒOƒCƒ“‚̃ŠƒXƒg‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" "“WŠJƒvƒ‰ƒOƒCƒ“‚ðƒ†[ƒU[‚ª‘I‘ð‚µ‚Ü‚· (ƒtƒHƒ‹ƒ_”äŠr‚Ì‚Æ‚«‚Í“WŠJ‚µ‚Ü‚¹‚ñ)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -6375,32 +6403,32 @@ msgstr "" "Ž©“®“I‚É“WŠJƒvƒ‰ƒOƒCƒ“‚ð‘I‘ð‚µA—¼‘¤‚̃tƒ@ƒCƒ‹‚É“K—p‚µ‚Ü‚· (‚Ç‚¿‚ç‚©‚̃tƒ@ƒC" "ƒ‹‚ɂ́AŠg’£Žq‚ª•K—v‚Å‚·)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "‚±‚̃tƒ@ƒCƒ‹‚ð•ÒW‚·‚邽‚ß‚Ì“WŠJƒvƒ‰ƒOƒCƒ“‚ð‘I‘ð‚µ‚Ü‚·" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“‚ðŽg—p‚µ‚È‚¢ (•W€)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "ŠÖ˜A‚·‚éƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "‚»‚Ì‘¼‚̃vƒ‰ƒOƒCƒ“" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "‘S‚Ẵvƒ‰ƒOƒCƒ“‚ðÄ“Ǎž‚Ý‚µ‚Ü‚· (ŠJ”­ŽÒ—p)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6409,12 +6437,12 @@ msgstr "" "ŽŸ‚̃tƒ@ƒCƒ‹‚ðƒAƒNƒeƒBƒu‚É‚µ‚Ü‚·\n" "ŽŸ‚̃tƒ@ƒCƒ‹‚ð‘I‘ð" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "ŠJ‚¢‚Ä‚¢‚é‘S‚ẴEƒCƒ“ƒhƒE‚ð•Â‚¶‚Ü‚·" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6423,22 +6451,22 @@ msgstr "" "WinMergeƒwƒ‹ƒv‚ðŠJ‚­\n" "WinMergeƒwƒ‹ƒv" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Œ»Ý‚Ì WinMerge ‚̃o[ƒWƒ‡ƒ“î•ñ‚Ɛݒè‚ðƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚ɏo—Í‚µ‚Ü‚·" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "GNU General Public License‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6447,7 +6475,7 @@ msgstr "" "ƒŠƒŠ[ƒXƒm[ƒg‚ðŠJ‚­\n" "ƒŠƒŠ[ƒXƒm[ƒg" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6456,292 +6484,292 @@ msgstr "" "–|–óó‹µ WebƒTƒCƒg‚ðŠJ‚«‚Ü‚·\n" "–|–ó" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "ƒvƒ‰ƒOƒCƒ“Ý’è" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“‚ðŽg—p‚µ‚Ü‚¹‚ñ" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "‰Â”\‚È‚ç‚ΔäŠr‘Oˆ—‚ðs‚È‚¢‚Ü‚·" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ‚ª‚݂‚©‚è‚Ü‚¹‚ñ - .sct ƒXƒNƒŠƒvƒg‚Í–³Œø‰»‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<‚È‚µ>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<Ž©“®>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "“o˜^‚³‚ꂽƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚Ńtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚Ńtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "“Á’è‚̃vƒƒOƒ‰ƒ€‚ÅŠJ‚«‚Ü‚·" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "ˆÚ“®ƒuƒƒbƒN‚ð•\Ž¦‚µ‚Ü‚¹‚ñ" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "‘S‚Ă̈ړ®ƒuƒƒbƒN‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Œ»Ý‚̍·ˆÙ‚ɑΉž‚·‚éˆÚ“®ƒuƒƒbƒN‚Ì‚Ý‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "ƒJ[ƒ\ƒ‹’¼‰º‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "s%1‚Ɉړ®(&O)" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "–³Œø" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Å‹ßŽg‚Á‚½ƒŠƒXƒg" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "ƒnƒCƒ‰ƒCƒg‚È‚µ" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object(.po)" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "ƒc[ƒ‹ƒo[‚ð”ñ•\Ž¦‚É‚µ‚Ü‚·" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "¬‚³‚¢ƒAƒCƒRƒ“‚̃c[ƒ‹ƒo[‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "‘å‚«‚¢ƒAƒCƒRƒ“‚̃c[ƒ‹ƒo[‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "¶‘¤‚̃^ƒu‚ð‘S‚ĕ‚¶‚é(&L)" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "‰E‘¤‚̃^ƒu‚ð‘S‚ĕ‚¶‚é(&I)" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "‘¼‚Ì‘S‚Ẵ^ƒu‚ð•Â‚¶‚é(&O)" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "ƒ^ƒu•‚ÌŽ©“®’²®‚ð—LŒø‚É‚·‚é(&A)" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "‰æ‘œ(&I)" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 60e543fa7..81771a447 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -329,7 +329,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< ºñ¾î ÀÖÀ½ >" @@ -471,7 +471,7 @@ msgstr " #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -535,7 +535,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "µµ¿ò¸»(&H)" @@ -863,7 +863,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "ÆÄÀÏ ÀÎÄÚµù(&F)..." @@ -1467,37 +1467,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Àüü ³»¿ë ºñ±³" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "ºü¸¥ ³»¿ë ºñ±³" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "º¯°æµÈ ³¯Â¥" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "º¯°æµÈ ³¯Â¥ ¹× ÆÄÀÏ Å©±â" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "ÆÄÀÏ Å©±â" @@ -1529,7 +1529,7 @@ msgstr "WinMerge Ȩ #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "È®ÀÎ" @@ -1701,14 +1701,14 @@ msgid "&Versioning System:" msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ(&V) :" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe °æ·Î(&P) :" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "ÀϹÝ" @@ -1851,7 +1851,7 @@ msgid "&Find Next" msgstr "´ÙÀ½ ã±â(&F)" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "È®ÀÎ(&O)" @@ -1897,7 +1897,7 @@ msgid "Replace &All" msgstr "¸ðµÎ ¹Ù²Ù±â(&A)" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1949,7 +1949,7 @@ msgid "Remove" msgstr "Á¦°Å" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "»ö»ó" @@ -1978,7 +1978,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "ÅؽºÆ®" @@ -2029,13 +2029,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "±âº»°ª" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "½Ã½ºÅÛ" @@ -2176,7 +2177,7 @@ msgid "Description:" msgstr "¼³¸í:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "ÁßÁö" @@ -2238,7 +2239,7 @@ msgid "&Go To" msgstr "À̵¿(&G)" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "ºñ±³" @@ -2289,7 +2290,7 @@ msgid "Filter Comments" msgstr "ÁÖ¼® ÇÊÅ͸µ" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "ÆíÁý±â" @@ -2441,7 +2442,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "ÄÚµåÆäÀÌÁö" @@ -2725,7 +2726,7 @@ msgid "Private Filter (only for current user)" msgstr "°³ÀÎ ÇÊÅÍ (ÇöÀç »ç¿ëÀÚ)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "¾ÐÃà ÆÄÀÏ Áö¿ø" @@ -2776,7 +2777,7 @@ msgid "Files:" msgstr "ÆÄÀÏ:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "´Ù¸§" @@ -2813,7 +2814,7 @@ msgid "Right:" msgstr "¿À¸¥ÂÊ:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "µ¿ÀÏ" @@ -2866,7 +2867,7 @@ msgid "&Apply" msgstr "Àû¿ë(&A)" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "Ãë¼Ò(&C)" @@ -2972,7 +2973,7 @@ msgid "Save..." msgstr "ÀúÀå..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "ÆÄÀÏ ¹é¾÷" @@ -3013,7 +3014,7 @@ msgid "A&ppend timestamp" msgstr "ÆÄÀÏ ½Ã°£ Ãß°¡(&P)" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "º¹»ç È®ÀÎ" @@ -3054,7 +3055,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3090,8 +3091,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "µð·ºÅ丮" @@ -3127,69 +3128,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "¹ÙÀ̳ʸ®" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041203b5" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x412, 949" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Áغñ" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3198,12 +3232,12 @@ msgstr "" "ºó ¹®¼­¸¦ »ý¼ºÇÕ´Ï´Ù\n" "»õ¹®¼­ (Ctrl-N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3212,7 +3246,7 @@ msgstr "" "±âÁ¸¿¡ ¸¸µé¾îÁø ¹®¼­¸¦ ¿±´Ï´Ù.\n" "¿­±â (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3221,7 +3255,7 @@ msgstr "" "ÇöÀç ¹®¼­¸¦ ´Ý½À´Ï´Ù.\n" "´Ý±â" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3230,7 +3264,7 @@ msgstr "" "ÇöÀç ¹®¼­¸¦ ÀúÀåÇÕ´Ï´Ù.\n" "ÀúÀå (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3239,7 +3273,7 @@ msgstr "" "»õ À̸§À¸·Î ¹®¼­¸¦ ÀúÀåÇÕ´Ï´Ù.\n" "´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3248,7 +3282,7 @@ msgstr "" "Àμ⠼³Á¤À» ¼öÁ¤ÇÕ´Ï´Ù.\n" "ÆäÀÌÁö ¼³Á¤" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3257,7 +3291,7 @@ msgstr "" "ÇÁ¸°Å͸¦ ¹Ù²Ù°Å³ª Àμ⠼³Á¤À» ¼öÁ¤ÇÕ´Ï´Ù.\n" "Àμ⠼³Á¤" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3266,7 +3300,7 @@ msgstr "" "ÇöÀç ¹®¼­¸¦ ÀμâÇÕ´Ï´Ù.\n" "Àμâ" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3275,27 +3309,27 @@ msgstr "" "¹Ì¸® º¸±â\n" "¹Ì¸® º¸±â" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "¸ðµç ¼û±è ÆÄÀÏÀ» ´Ù½Ã º¸À̱â" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3304,32 +3338,32 @@ msgstr "" "ÇÁ·ÎÁ§Æ® ¿­±â\n" "ÇÁ·ÎÁ§Æ® ÆÄÀÏ (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "ÇÁ·ÎÁ§Æ®¸¦ ¿©´Â Áß ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "ÇÁ·ÎÁ§Æ®¸¦ ÀúÀåÇÏ´Â Áß ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "ÇÁ·ÎÁ§Æ® ÆÄÀÏ" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ¿­·È½À´Ï´Ù." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ÀúÀåµÇ¾ú½À´Ï´Ù." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3338,7 +3372,7 @@ msgstr "" "ÇöÀç °æ·Î¿Í ¼³Á¤À» ÇÁ·ÎÁ§Æ® ÆÄÀÏ¿¡ ÀúÀåÇÕ´Ï´Ù\n" "ÇÁ·ÎÁ§Æ® ÀúÀå" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3347,7 +3381,7 @@ msgstr "" "ÇÁ·Î±×·¥ Á¤º¸, ¹öÀü, ÀúÀÛ±ÇÀ» º¾´Ï´Ù.\n" "Á¤º¸" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3356,27 +3390,27 @@ msgstr "" "ÇÁ·Î±×·¥À» Á¾·áÇÕ´Ï´Ù.\n" "Á¾·á" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "¼±Åà ¹®¼­ ¿­±â" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3385,7 +3419,7 @@ msgstr "" "´ÙÀ½ âÀ¸·Î À̵¿ÇÕ´Ï´Ù.\n" "´ÙÀ½ â" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3394,7 +3428,7 @@ msgstr "" "ÀÌÀü âÀ¸·Î À̵¿ÇÕ´Ï´Ù.\n" "ÀÌÀü â" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3403,7 +3437,7 @@ msgstr "" "âÀ» °è´Ü½ÄÀ¸·Î ¹è¿­ÇÕ´Ï´Ù.\n" "°è´Ü½Ä ¹è¿­" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3412,7 +3446,7 @@ msgstr "" "âÀ» ¼öÆòÀ¸·Î ¹è¿­ÇÕ´Ï´Ù.\n" "¼öÆò ¹è¿­" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3421,7 +3455,7 @@ msgstr "" "âÀ» ¼öÁ÷À¸·Î ¹è¿­ÇÕ´Ï´Ù.\n" "¼öÁ÷ ¹è¿­" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3430,7 +3464,7 @@ msgstr "" "¼±Åà ºÎºÐÀ» Ŭ¸³º¸µå·Î º¹»çÇÕ´Ï´Ù.\n" "º¹»ç" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3439,7 +3473,7 @@ msgstr "" "¼±Åà ºÎºÐÀ» À߶󳻾î Ŭ¸³º¸µå·Î À̵¿ÇÕ´Ï´Ù.\n" "À߶󳻱â" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3448,7 +3482,7 @@ msgstr "" "ƯÁ¤ ³»¿ëÀ» °Ë»öÇÕ´Ï´Ù.\n" "ã±â" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3457,7 +3491,7 @@ msgstr "" "Ŭ¸³º¸µåÀÇ ³»¿ëÀ» ºÙÀÔ´Ï´Ù.\n" "ºÙÀ̱â" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3466,7 +3500,7 @@ msgstr "" "¸¶Áö¸· ÀÛ¾÷À» ¹Ýº¹ÇÕ´Ï´Ù.\n" "¹Ýº¹" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3475,7 +3509,7 @@ msgstr "" "ƯÁ¤ ³»¿ëÀ» ´Ù¸¥ ³»¿ëÀ¸·Î ¹Ù²ß´Ï´Ù.\n" "¹Ù²Ù±â" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3484,7 +3518,7 @@ msgstr "" "¹®¼­ÀÇ ¸ðµç ¿µ¿ªÀ» ¼±ÅÃÇÕ´Ï´Ù.\n" "¸ðµÎ ¼±ÅÃ" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3493,7 +3527,7 @@ msgstr "" "½ÇÇàÀ» Ãë¼ÒÇÕ´Ï´Ù.\n" "½ÇÇà Ãë¼Ò" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3502,7 +3536,7 @@ msgstr "" "´Ù½Ã ½ÇÇàÇÕ´Ï´Ù.\n" "´Ù½Ã ½ÇÇà" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3511,7 +3545,7 @@ msgstr "" "µµ±¸ ¸ðÀ½À» º¸°Å³ª ¼û±é´Ï´Ù.\n" "µµ±¸ ¸ðÀ½ º¸±â" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3520,7 +3554,7 @@ msgstr "" "»óÅ ǥ½ÃÁÙÀ» º¸°Å³ª ¼û±é´Ï´Ù.\n" "»óÅ ǥ½ÃÁÙ º¸±â" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3529,7 +3563,7 @@ msgstr "" "ÅÇ µµ±¸ ¸ðÀ½ º¸À̱â/¼û±â±â\n" "ÅÇ µµ±¸ ¸ðÀ½ Åä±Û" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3538,57 +3572,57 @@ msgstr "" "â Å©±â ÀÚµ¿ Á¶Á¤\n" "â Àá±Ý" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "âÀÇ Å©±â¸¦ Á¶Á¤ÇÕ´Ï´Ù." -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "âÀÇ À§Ä¡¸¦ À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "â Å©±â¸¦ ÃÖ¼ÒÈ­ÇÕ´Ï´Ù." -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "â Å©±â¸¦ ÃÖ´ëÈ­ÇÕ´Ï´Ù." -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "´ÙÀ½ âÀ¸·Î À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "ÀÌÀü âÀ¸·Î À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "ÇöÀç âÀ» ´Ý½À´Ï´Ù." -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "âÀ» ÀÌÀü Å©±â·Î µÇµ¹¸³´Ï´Ù." -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "ÀÛ¾÷ ¸ñ·Ï¸¦ È°¼ºÈ­ÇÕ´Ï´Ù." -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "ÀÌ Ã¢À» È°¼ºÈ­ÇÕ´Ï´Ù." -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3597,7 +3631,7 @@ msgstr "" "¹Ì¸® º¸±â¸¦ Á¾·áÇÕ´Ï´Ù.\n" "¹Ì¸® º¸±â Á¾·á" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3616,7 +3650,7 @@ msgstr "" "WinMerge.ÆÄÀÏ ºñ±³\n" "WinMerge ÆÄÀÏ ºñ±³" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3635,19 +3669,19 @@ msgstr "" "WinMerge.Æú´õ ºñ±³\n" "WinMerge Æú´õ ºñ±³" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "¿øº» ÆÄÀÏÀÇ EOL À¯Áö" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "º¹»çÇÒ °æ·Î¿¡ ¿À¸¥ÂÊ ¹öÆ°À» ´©¸£½Ê½Ã¿À" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3656,143 +3690,143 @@ msgstr "" "°³¹ßÀÚ:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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´Â Àý´ëÀûÀ¸·Î º¸ÁõµÇÁö ¾Ê½À´Ï´Ù. ÀÌ ¼ÒÇÁÆ®¿þ¾î´Â ¹«·áÀ̸ç, ÀûÀýÇÑ È¯°æ ÇÏ¿¡¼­ÀÇ ¹èÆ÷´Â ȯ¿µÇÕ´Ï´Ù; ÀÚ¼¼ÇÑ ³»¿ëÀº µµ¿ò¸» ¸Þ´º¿¡¼­ GNU ¶óÀ̼¾½º¸¦ ÂüÁ¶ÇϽʽÿÀ." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "ÁßÁö(&A)" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "Àç½Ãµµ(&)" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "¹«½Ã(&I)" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "¸ðµÎ ¹«½Ã(&A)" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "¿¹(&Y)" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "¸ðµÎ Àû¿ë(&A)" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "¾Æ´Ï¿À(&N)" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "¸ðµÎ ¾Æ´Ï¿À(&L)" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "°è¼Ó(&C)" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "¹«½Ã(&S)" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "¸ðµÎ ¹«½Ã(&A)" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "ÀÌ ¸Þ½ÃÁö¸¦ ´Ù½Ã Ç¥½ÃÇÏÁö ¾ÊÀ½(&M)" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "´Ù½Ã ¹¯Áö ¾ÊÀ½(&Q)" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Çü»ó °ü¸®" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Â÷ÀÌÁ¡" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "->" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "¿ÞÂÊÀ¸·ÎºÎÅÍ:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "¿ÞÂÊÀ¸·Î:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "¿À¸¥ÂÊÀ¸·ÎºÎÅÍ:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "¿À¸¥ÂÊÀ¸·Î:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "¹öÀü %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "À¯´ÏÄÚµå" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "¼³Á¤ (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "ÀÌÁ¦ ¸ðµç ¸Þ½ÃÁö ¹Ú½º°¡ È°¼ºÈ­µË´Ï´Ù." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3803,84 +3837,84 @@ msgstr "" "\n" "°¡´É ¹üÀ§: 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "¿­±â" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÇÁ·Î±×·¥|*.exe;*.bat;*.cmd|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ÇÁ·ÎÁ§Æ® ÆÄÀÏ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "¼³Á¤ ÆÄÀÏ (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text ÆÄÀÏ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÆÄÀÏ (*.htm,*.html)|*.htm;*.html|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÆÄÀÏ (*.xml)|*.xml|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "À̸§" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "°æ·Î" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "ÇÊÅÍ" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "¼³¸í" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "»ý¼ºÇÒ ÇÊÅÍÀÇ ÆÄÀϸíÀ» ÀÔ·ÂÇϽʽÿÀ." -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "ÆÄÀÏ ÇÊÅÍ (*.flt)|*.flt|¸ðµç ÇÊÅÍ (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3892,7 +3926,7 @@ msgstr "" "\n" "%1 ÆÄÀÏÀ» WinMerge/Filters -Æú´õ·Î º¹»çÇϽʽÿÀ." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3905,7 +3939,7 @@ msgstr "" "\n" "Æú´õ°¡ Á¸ÀçÇÏ°í ¾²±â °¡´ÉÀÎÁö È®ÀÎÇϽʽÿÀ." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3916,7 +3950,7 @@ msgstr "" "\n" "¼³Á¤/½Ã½ºÅÛ ¸Þ´º¿¡¼­ ÇÊÅÍ Æú´õ¸¦ ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3929,12 +3963,12 @@ msgstr "" "\n" "Ȥ½Ã Àбâ Àü¿ë ÆÄÀÏÀÌ ¾Æ´Ñ°¡¿ä?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "¼³Ä¡ÇÒ ÇÊÅÍ ÆÄÀÏ À§Ä¡" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3945,273 +3979,273 @@ msgstr "" "\n" "»õ ÇÊÅÍ ÆÄÀÏÀ» ÇÊÅÍ Æú´õ·Î º¹»çÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "ÇÊÅÍ ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾²±â ÇϽðڽÀ´Ï±î?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Á¤±Ô Ç¥Çö½Ä" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "µð·ºÅ丮 ºñ±³ °á°ú" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "ÆÄÀÏ ºñ±³" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "À̸§¾ø´Â ¹®¼­" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "À̸§¾ø´Â ¹®¼­" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "±× ÆÄÀÏ" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "¸¶ÀÎ ÆÄÀÏ" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "´Ù½Ã ½ºÄµ ÁßÀÔ´Ï´Ù..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "¼±Åà ÆÄÀÏ ¿­±â" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î º¹»ç" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î º¹»ç" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "¿ÞÂÊÀ¸·Î ¸ðµÎ º¹»ç" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "¿À¸¥ÂÊÀ¸·Î ¸ðµÎ º¹»ç" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "ÆÄÀÏ º¹»ç Áß..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "ÆÄÀÏ »èÁ¦ Áß..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "ÆÄÀÏ À̵¿ Áß..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "º¸°í¼­ »ý¼º Áß..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "¶óÀÎ: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "º´ÇÕ" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "´Ù¸¥ ÆÄÀÏ(%1 of %2)" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Ç׸ñ %1 / %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Ç׸ñ: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "ºñ±³ÇÒ µð·ºÅ丮 ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "µð·ºÅ丮 ¼±ÅÃ" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "¿ÞÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "¿À¸¥ÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "¾çÂÊ ¸ðµÎ À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¾ðÆÑÄ¿ ¼±Åà Ȱ¼ºÈ­¸¦ À§ÇØ µÎ ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "µð·ºÅ丮/ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "ÇØ´çÇÏ´Â ÆÄÀÏÀÌ ¾ø½À´Ï´Ù : %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "unpack µÈ ÆÄÀÏ: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4224,12 +4258,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ÆÄ½Ì ½ÇÆÐ." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4240,27 +4274,27 @@ msgstr "" "%1 ÆÄÀÏÀº\n" "ºÒÀÏÄ¡ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇÒ±î¿ä?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 (Àº)´Â Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î ¾µ±î¿ä? (´Ù¸¥ À̸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇϼ¼¿ä.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "ÆÄÀÏ ¹é¾÷À» ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4273,7 +4307,7 @@ msgstr "" "\n" "°è¼Ó ÁøÇàÇÒ±î¿ä?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4289,7 +4323,7 @@ msgstr "" "\t- ´Ù¸¥ À̸§À¸·Î ÀúÀå(È®ÀÎ)\n" "\t- ÀúÀå Ãë¼Ò(Ãë¼Ò)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4299,7 +4333,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4309,7 +4343,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4323,7 +4357,7 @@ msgstr "" "\n" "µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4332,32 +4366,32 @@ msgstr "" "%1\n" "Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4368,42 +4402,42 @@ msgstr "" "\n" "°è¼ÓÇϱâ Àü¿¡ »õ·Î °íħÀ» ÇØ ÁÖ¼¼¿ä." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "°è¼ÓÇÏ·Á¸é ¼Ò½º¼¼ÀÌÇÁ ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù (¿¹: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "VSS üũ¾Æ¿ô ÆÄÀÏ..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "üũ¾Æ¿ô ½ÇÇà Áß ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù. ´õ ÀÌ»ó ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "¹öÀü °ü¸®½Ã½ºÅÛ ¸í·É ½ÇÇà ½ÇÆÐ." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¿öÅ· Æú´õ¿Í ÇöÀç ÆÄÀÏÀÇ °æ·Î°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù. °è¼ÓÇÏ°Ú½À´Ï±î?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "VSS µ¥ÀÌÅͺ£À̽º°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "VSS ¿À·ù:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4411,171 +4445,171 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "»ç¿ë ¾È ÇÔ" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ÀÌÇÏ)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ÀÌ»ó)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "°ø¹é ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "°ø¹é ¶Ç´Â ±¸µÎÁ¡ ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "¼±Åà ÆÄÀÏÀ» ¿À¸¥ÂÊ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù." -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "¼±Å ÆÄÀÏÀ» ƯÁ¤ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù." -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿ÞÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿À¸¥ÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "¼±ÅÃÇÑ ÆÄÀÏÀ» ¾çÂÊ ¸ðµÎ¿¡¼­ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "¼±Åà ÆÄÀÏÀ» °¨Ãä´Ï´Ù (on the fly filter)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "¾çÂÊÀÇ ¼±Åà ÆÄÀÏ ¸ðµÎ À̸§À» ¹Ù²ß´Ï´Ù." -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "¿ÞÂÊÀ¸·Î (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "¿À¸¥ÂÊÀ¸·Î (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "¿ÞÂÊÀ¸·Î (%1 / %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¿À¸¥ÂÊÀ¸·Î (%1 / %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "¿ÞÂÊ (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "¿À¸¥ÂÊ (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "¸ðµÎ (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "¿ÞÂÊ (%1 / %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "¿À¸¥ÂÊ (%1 / %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "¸ðµÎ (%1 / %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "¿ÞÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "¿À¸¥ÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ÆÄÀÏ º¯°æµÊ)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 / %2 ÆÄÀÏ º¯°æµÊ)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4586,17 +4620,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Á¤¸» º¹»çÇϽðڽÀ´Ï±î:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Á¤¸» %d Ç׸ñÀ» º¹»çÇϽðڽÀ´Ï±î:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4608,613 +4642,607 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù." -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "¿ÜºÎ ¿¡µðÅ͸¦ ÀÌ¿ëÇؼ­ ¿ÞÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù." -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "¿ÜºÎ ¿¡µðÅ͸¦ ÀÌ¿ëÇؼ­ ¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "¿ÜºÎ ÆíÁý±â ½ÇÇà ½ÇÆÐ: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "ÆÄÀϸíÀ» Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "¿ÞÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "¿À¸¥ÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "¾çÂÊ °æ·Î¸¦ ¸ðµÎ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "¾Ë ¼ö ¾ø´Â ¾ÐÃà Çü½Ä" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "¾çÂÊ ÆÄÀÏÀ» ¸ðµÎ ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "´Ù¸¥ ÆÄÀÏ ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡ (¾çÂÊ)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "¿ÞÂÊ ¼±ÅÃÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "¿À¸¥ÂÊ ¼±ÅÃÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "À̸§" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "ºñ±³ °á°ú" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "¿ÞÂÊ ³¯Â¥" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "¿À¸¥ÂÊ ³¯Â¥" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "È®ÀåÀÚ" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "¿ÞÂÊ Å©±â" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "¿À¸¥ÂÊ Å©±â" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "¿À¸¥ÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "¿ÞÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "¿ÞÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "ÃֽŠÆÄÀÏ" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "¿ä¾à °á°ú" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "¿ÞÂÊ ¼Ó¼º" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "¿À¸¥ÂÊ ¼Ó¼º" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "¿ÞÂÊ ÀÎÄÚµù" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "¿À¸¥ÂÊ ÀÎÄÚµù" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "ºñ±³ÇÏÁö ¾ÊÀº Â÷ÀÌÁ¡" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "¹ÙÀ̳ʸ®" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "ºñ±³ ÁßÁöµÈ ÆÄÀÏ" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "ÇÊÅ͸µµÈ ÆÄÀÏ" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "ÇÊÅ͸µµÈ µð·ºÅ丮" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "¿ÞÂʸ¸: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "¿À¸¥Âʸ¸: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "µ¿ÀÏÇÑ ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "¿ÞÂʸ¸ Á¸Àç" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "¿À¸¥Âʸ¸ Á¸Àç" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "¿À·ù" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "¼Ò¿ä ½Ã°£: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "µð·ºÅ丮¸í ¶Ç´Â ÆÄÀϸí." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ÇÏÀ§ µð·ºÅ丮°¡ ÀÖÀ»¶§ ÇÏÀ§ µð·ºÅ丮 À̸§." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "ÀÚ¼¼ÇÑ ºñ±³ °á°ú." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "¿ÞÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "¿À¸¥ÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "ÆÄÀÏ È®ÀåÀÚ." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "¿ÞÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "¾î´À ÂÊÀÌ ´õ ÃÖ±Ù¿¡ ¼öÁ¤µÇ¾ú´ÂÁö ¾Ë·ÁÁÝ´Ï´Ù." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "°£·«ÇÑ ¿ä¾à °á°ú." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "¿ÞÂÊ ¼Ó¼º." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "¿À¸¥ÂÊ ¼Ó¼º." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "¿ÞÂÊ ÀÎÄÚµù." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "¿À¸¥ÂÊ ÀÎÄÚµù." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ÆÄÀÏ ³» ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö. Winmerg ¿¡¼­ ÀÌ ºÎºÐÀº ¹«½ÃµÇ¸ç, º´ÇÕµÇÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÆÄÀÏ ³» Â÷ÀÌÁ¡ÀÇ °³¼ö. ÀÌ´Â ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö¸¦ Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀ̸é * Ç¥½Ã." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "%1 & %2 ºñ±³" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "½°Ç¥·Î ºÐ¸®µÈ ¸ñ·Ï" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "ÅÇÀ¸·Î ºÐ¸®µÈ ¸ñ·Ï" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "´Ü¼ø HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "´Ü¼ø XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "º¸°í¼­ ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5223,32 +5251,32 @@ msgstr "" "º¸°í¼­ »ý¼º ½ÇÆÐ:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "º¸°í¼­ »ý¼º ¼º°ø" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "¾çÂÊ Ã¢¿¡ µ¿ÀÏÇÑ ÆÄÀÏÀÌ ¿­·Á ÀÖ½À´Ï´Ù." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "¼±ÅÃÇÑ ÆÄÀϵéÀº ³»¿ëÀÌ µ¿ÀÏÇÕ´Ï´Ù." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "ÆÄÀÏ ºñ±³ Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Àӽà ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. Àӽà ÆÄÀÏ ¼³Á¤À» È®ÀÎÇϼ¼¿ä." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5263,17 +5291,17 @@ msgstr "" "\n" "Âü°í: ¸ðµç ij¸®Áö ¸®ÅÏÀ» Ç×»ó µ¿ÀÏÇÏ°Ô ÀÛ¾÷ÇÏ·Á¸é, ºñ±³ÅÇ¿¡¼­ 'ij¸®Áö ¸®ÅÏ ¹«½Ã' ¼³Á¤À» ¼±ÅÃÇÏ¸é µË´Ï´Ù (ÆíÁý/¼³Á¤¿¡¼­ ¼±Åà °¡´É)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "¼±Åà µð·ºÅ丮 °æ·Î ¿À·ùÀÔ´Ï´Ù." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5288,7 +5316,7 @@ msgstr "" "%1\n" "?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5299,168 +5327,168 @@ msgstr "" "°¢°¢ÀÇ ÄÚµåÆäÀÌÁö¸¦ À¯ÁöÇÏ´Â °ÍÀÌ ÀÛ¾÷½Ã º¸±â´Â ÁÁÀ¸³ª À§ÇèÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" "±âÁ¸ À©µµ¿ì ÄÚµåÆäÀÌÁö¸¦ »ç¿ëÇÒ±î¿ä(Ãßõ)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸ ¼Õ½Ç: ¾çÂÊ ÆÄÀÏ" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "µ¿ÀÏÇÔ" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "¶óÀÎ ºñ±³" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "¸ðµÎ %1 °³¸¦ ¹Ù²Ù¾ú½À´Ï´Ù." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÇØ´çÇÏ´Â ¹®ÀÚ¿­À» ãÀ» ¼ö ¾ø½À´Ï´Ù : \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Àüü °æ·Î º¹»ç" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "ÆÄÀÏ À̸§ º¹»ç" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "À§Ä¡Ã¢" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "ºñ±³Ã¢" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "ÆÐÄ¡ ÆÄÀÏÀÌ ÀÛ¼ºµÇ¾ú½À´Ï´Ù." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "°°Àº À̸§ÀÇ ÆÐÄ¡°¡ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 °³ÀÇ ÆÄÀÏ ¼±ÅõÊ]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Ç¥ÁØ" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "ÄÁÅؽºÆ®" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "ÅëÀϵÊ" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "%1 ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Àý´ë °æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Ãâ·Â ÆÄÀÏ ÁöÁ¤" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏ¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "µð·ºÅ丮¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5471,12 +5499,12 @@ msgstr "" "\n" "ÀúÀå ¾È µÈ ÆÄÀÏÀÌ ÀÖÀ¸¸é ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Á¸ÀçÇÏÁö ¾Ê´Â µð·ºÅ丮ÀÔ´Ï´Ù." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5488,7 +5516,7 @@ msgstr "" "¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï´Ù. \n" "¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶Çϼ¼¿ä." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5497,7 +5525,7 @@ msgstr "" "\n" "¾Ë¸²: WinMerge ¼³Á¤¿¡¼­ 7-Zip ÅëÇÕÀÌ ÇØÁ¦µÇ¾ú½À´Ï´Ù." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5506,37 +5534,37 @@ msgstr "" "\n" "¾Ë¸²: WinMerge ¼³Á¤¿¡¼­ 7-Zip ÅëÇÕÀÌ µ¶¸³ ½ÇÇàÀ¸·Î Á¦ÇѵǾú½À´Ï´Ù." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "³»º¸³¾ ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "°¡Á®¿Ã ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "ÆÄÀϷκÎÅÍ °¡Á®¿Â ¼³Á¤." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "ÆÄÀÏ·Î ³»º¸³½ ¼³Á¤." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ °¡Á®¿À±â ½ÇÆÐÇÔ." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ ³»º¸³»±â ½ÇÆÐÇÔ." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5547,157 +5575,157 @@ msgstr "" "\n" "°è¼Ó ÇϽðڽÀ´Ï±î?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "È¥ÇÕµÊ" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "¿ÞÂÊ ÆÄÀÏ ÀúÀå" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ÀúÀå" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "EOLÀ» À©µµ¿ìÁî ¸ðµå·Î º¯È¯" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "EOLÀ» À¯´Ð½º ¸ðµå·Î º¯È¯" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "EOLÀ» ¸Æ ¸ðµå·Î º¯È¯" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "ÆíÁý ¸ðµå/º´ÇÕ ¸ðµå Àüȯ" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5706,12 +5734,12 @@ msgstr "" "ÆÄÀÏ ÀÎÄÚµù ¼Ó¼º º¸±â/Á¶Á¤\n" "ÆÄÀÏ ÀÎÄÚµù ¼Ó¼º" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ¿­±â & ºÐÇØ" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5720,7 +5748,7 @@ msgstr "" "ÇöÀç ¶óÀο¡¼­ Â÷ÀÌÁ¡À» ¼±ÅÃÇÕ´Ï´Ù\n" "ÇöÀç ¶óÀο¡¼­ Â÷ÀÌÁ¡" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5729,7 +5757,7 @@ msgstr "" "¼±Åà ¶óÀÎÀ̳ª Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù\n" "À̵¿ (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5738,7 +5766,7 @@ msgstr "" "¼³Á¤À» ¼³Á¤ÇÕ´Ï´Ù.\n" "¼³Á¤" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5747,37 +5775,37 @@ msgstr "" "»õ·Î °íħ\n" "»õ·Î °íħ (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "ÇöÀç ¶óÀÎ ¾Õ¿¡ Çà ¹øÈ£¸¦ ºÙ¿©¼­ Ŭ¸³º¸µå·Î º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "ºÏ¸¶Å© Åä±Û" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "´ÙÀ½ ºÏ¸¶Å©·Î À̵¿" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "ÀÌÀü ºÏ¸¶Å©·Î À̵¿" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "¸ðµç ºÏ¸¶Å© »èÁ¦" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5786,7 +5814,7 @@ msgstr "" "µ¿ÀÏÇÑ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "µ¿ÀÏÇÑ ÆÄÀÏ º¸À̱â" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5795,7 +5823,7 @@ msgstr "" "´Ù¸¥ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "´Ù¸¥ ÆÄÀÏ º¸À̱â" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5804,7 +5832,7 @@ msgstr "" "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5813,7 +5841,7 @@ msgstr "" "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5822,7 +5850,7 @@ msgstr "" "¹ÙÀ̳ʸ® ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "¹ÙÀ̳ʸ® ÆÄÀÏ º¸À̱â" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5831,7 +5859,7 @@ msgstr "" "ºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "ºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏ º¸À̱â" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5840,7 +5868,7 @@ msgstr "" "±Û²ÃÀ» ¼±ÅÃÇÕ´Ï´Ù\n" "±Û²Ã ¼±ÅÃ" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5849,27 +5877,27 @@ msgstr "" "½Ã½ºÅÛ ±âº» ±Û²Ã·Î ¼³Á¤ÇÕ´Ï´Ù.\n" "±âº» ±Û²Ã" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "°ø¹é ¹®ÀÚ¸¦ Ç¥½ÃÇÕ´Ï´Ù." -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "¼±Åà ºñ±³Ã¢À» º¸°Å³ª ¼û±é´Ï´Ù." -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "À§Ä¡ Ç¥½ÃâÀº Àüü ºñ±³ »óȲÀ» À̹ÌÁö·Î º¸¿©ÁÝ´Ï´Ù." -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "µð·ºÅ丮 ºñ±³ »óȲÀ» Ç¥½ÃÇÕ´Ï´Ù." -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5878,7 +5906,7 @@ msgstr "" "ÇöÀç »ç¿ëÀÚ ¾ð¾î ¹Ù²Ù±â\n" "¾ð¾î" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5887,12 +5915,12 @@ msgstr "" "³»ºÎ ¶óÀÎ Â÷ÀÌÁ¡ »ö»ó ´Ù¸£°Ô º¸À̱â\n" "¶óÀÎ Â÷ÀÌÁ¡ º¸À̱â" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "µÎ âÀÇ À§Ä¡¸¦ ¼­·Î ¹Ù²ß´Ï´Ù." -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5901,7 +5929,7 @@ msgstr "" "Çà ¹øÈ£¸¦ Ç¥½ÃÇÕ´Ï´Ù.\n" "Çà ¹øÈ£ º¸À̱â" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5910,7 +5938,7 @@ msgstr "" "ÀÚµ¿ ÁÙ¹Ù²Þ ±â´ÉÀ» »ç¿ëÇÕ´Ï´Ù.\n" "ÀÚµ¿ ÁٹٲÞ" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5919,22 +5947,22 @@ msgstr "" "¾çÂÊ Ã¢¿¡ ¼±Åà ¿©¹é º¸À̱â\n" "¼±Åà ¿©¹é º¸À̱â" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "ÅؽºÆ® Å©±â Å©°Ô" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "ÅؽºÆ® Å©±â ÀÛ°Ô" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "±âº»°ªÀ¸·Î ÅؽºÆ® Å©±â ÃʱâÈ­" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5943,7 +5971,7 @@ msgstr "" "ÀÌÀü Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n" "ÀÌÀü Â÷ÀÌÁ¡ ºÎºÐ (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5952,77 +5980,77 @@ msgstr "" "´ÙÀ½ Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n" "´ÙÀ½ Â÷ÀÌÁ¡ ºÎºÐ (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6031,7 +6059,7 @@ msgstr "" "óÀ½ Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n" "óÀ½ Â÷ÀÌÁ¡ ºÎºÐ (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6040,7 +6068,7 @@ msgstr "" "ÇöÀç Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n" "ÇöÀç Â÷ÀÌÁ¡ ºÎºÐ (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6049,7 +6077,7 @@ msgstr "" "¸¶Áö¸· Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n" "¸¶Áö¸· Â÷ÀÌÁ¡ ºÎºÐ (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6058,7 +6086,7 @@ msgstr "" "¼±Åà ºÎºÐÀ» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n" "¿À¸¥ÂÊÀ¸·Î º¹»ç (Alt Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6067,7 +6095,7 @@ msgstr "" "¼±Åà ºÎºÐÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n" "¿ÞÂÊÀ¸·Î º¹»ç (Alt Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6076,7 +6104,7 @@ msgstr "" "Â÷ÀÌÁ¡À» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù\n" "¿À¸¥ÂÊÀ¸·Î º¹»ç - °í±Þ (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6085,7 +6113,7 @@ msgstr "" "Â÷ÀÌÁ¡À» ¿ÞÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù\n" "¿ÞÂÊÀ¸·Î º¹»ç - °í±Þ (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6094,7 +6122,7 @@ msgstr "" "¸ðµç Â÷ÀÌÁ¡À» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n" "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6103,92 +6131,92 @@ msgstr "" "¸ðµç Â÷ÀÌÁ¡À» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n" "¸ðµÎ ¿ÞÂÊÀ¸·Î" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "¾çÂÊ ÆÄÀÏÀ» ¸ðµÎ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "¼±ÅÃµÈ ÆÄÀϵéÀ» ºñ±³ÇÕ´Ï´Ù (¿©·¯ °³°¡ ¼±ÅõǾî ÀÖÀ¸¸é ù¹ø° ÆÄÀÏÀ» ¸ÕÀú ºñ±³ÇÕ´Ï´Ù)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "µð·ºÅ丮 ºñ±³ ¼³Á¤ ¼±ÅÃ/¼ø¼­ º¯°æ" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "ÆÐÄ¡ ÆÄÀÏ »ý¼º" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "ÇÊÅÍ ¼±ÅÃ/¼öÁ¤" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "ºñ±³°á°ú º¸°í¼­ ¸¸µé±â" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "¾ðÆÑÄ¿¸¦ ¼±ÅÃÇÕ´Ï´Ù (µð·ºÅ丮 ºñ±³¿¡´Â ¾ðÆÑÇÏÁö ¾Ê½À´Ï´Ù)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¾çÂÊ ÆÄÀÏ ¸ðµÎ¿¡ ¾ðÆÑÄ¿°¡ Àû¿ëµË´Ï´Ù (ÇÑ ÆÄÀϸ¸ÀÌ È®ÀåÀÚ°¡ ÇÊ¿äÇÔ)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "ÀÌ ÆÄÀÏÀÇ ÆíÁýÀ» À§ÇÑ ¾ðÆÑÄ¿ ¼±ÅÃ" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "prediffer »ç¿ë ¾È ÇÔ(Ç¥ÁØ)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "±ÇÀåÇÏ´Â Ç÷¯±×ÀÎ" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "´Ù¸¥ Ç÷¯±×ÀÎ" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "¸ðµç Ç÷¯±×ÀÎÀ» ´Ý°í ´Ù½Ã ¿­±â (for °³¹ßÀÚ)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6197,12 +6225,12 @@ msgstr "" "´ÙÀ½ °¡½Ã ÆÄÀÏ È°¼ºÈ­\n" "´ÙÀ½ °¡½Ã ÆÄÀÏ" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "¸ðµç ⠴ݱâ" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6211,22 +6239,22 @@ msgstr "" "WinMerge µµ¿ò¸» ¿­±â\n" "WinMerge µµ¿ò¸»" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "WinMerge ¹öÀü Á¤º¸ ¹× ¼³Á¤À» ÅؽºÆ® ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "GNU ¶óÀ̼¾½º Ç¥½Ã" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "°³ÀÎ ºôµå: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6235,7 +6263,7 @@ msgstr "" "¸±¸®Áî ³ëÆ® ¹®¼­ ¿­±â\n" "¸±¸®Áî ³ëÆ®" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6244,292 +6272,292 @@ msgstr "" "¹ø¿ª À¥ »çÀÌÆ® ¿­±â\n" "¹ø¿ª" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Ç÷¯±×ÀÎ ¼¼ÆÃ" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "prediffer »ç¿ë ¾È ÇÔ" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "prediff »ç¿ë °¡´ÉÇÏ¸é »ç¿ëÇϱâ" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH Á¸ÀçÇÏÁö ¾ÊÀ½ - .sct ½ºÅ©¸³Æ®¸¦ »ç¿ëÇÏÁö ¾ÊÀ½" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<»ç¿ë ¾È ÇÔ>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<ÀÚµ¿>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "¼³Á¤µÈ ÇÁ·Î±×·¥À¸·Î ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "¿ÜºÎ ÆíÁý±â·Î ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "ÆÄÀÏÀ» ¿­ ƯÁ¤ ÇÁ·Î±×·¥À» ¼±ÅÃÇÕ´Ï´Ù" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "À̵¿¿µ¿ªÀ» Ç¥½ÃÇÏÁö ¾ÊÀ½" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "À̵¿¿µ¿ª ¸ðµÎ Ç¥½Ã" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "ÇöÀç ¼±ÅÃµÈ À̵¿¿µ¿ª¸¸ Ç¥½ÃÇÕ´Ï´Ù." -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ä¿¼­°¡ ÀÖ´Â Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "%1 ÁÙ·Î À̵¿" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "»ç¿ë ¾È ÇÔ" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "ÆÄÀÏ ½Ã½ºÅÛ ÀÌ¿ë" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "ÃÖ±Ù ÆÄÀÏ ¸ñ·Ï(MRU) »ç¿ë" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "±âº»" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "¹èÄ¡" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "À̵¿Çü °´Ã¼" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "ÀÚ¿ø" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "½©" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "µµ±¸ ¸ðÀ½ ¼û±â±â" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "µµ±¸ ¸ðÀ½ ÀÛ°Ô Ç¥½Ã" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "µµ±¸ ¸ðÀ½ Å©°Ô Ç¥½Ã" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index efc2648e1..b0825f786 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Tom >" @@ -470,7 +470,7 @@ msgstr "&Automatisk utpakking" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&Overlappende" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Hjelp" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Filko&ding..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Fullt innhold" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Raskt innhold" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Endringsdato" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Endringsdato og størrelse" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Størrelse" @@ -1528,7 +1528,7 @@ msgstr "Bes #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "&Versjonsstyringssystem" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Bane til cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Generelt" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "&Finn neste" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Erstatt &alle" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Fjern" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Farger" @@ -1977,7 +1977,7 @@ msgstr "Slettet" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Tekst" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Standardverdier" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "System" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Beskrivelse:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stopp" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Gå til" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Sammenlign" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Filter-kommentarer" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Redigering" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Tegnsett" @@ -2730,7 +2731,7 @@ msgid "Private Filter (only for current user)" msgstr "Privat filter (bare for aktuelle bruker)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Arkiv-støtte" @@ -2781,7 +2782,7 @@ msgid "Files:" msgstr "Filer:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Forskjellig" @@ -2818,7 +2819,7 @@ msgid "Right:" msgstr "Høyre:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identiske" @@ -2871,7 +2872,7 @@ msgid "&Apply" msgstr "&Bruk" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Avbryt" @@ -2977,7 +2978,7 @@ msgid "Save..." msgstr "Lagre..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Sikkerhetskopifiler" @@ -3018,7 +3019,7 @@ msgid "A&ppend timestamp" msgstr "L&egg til tidsstempel" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Bekreft kopiering" @@ -3059,7 +3060,7 @@ msgid "&Enable plugins" msgstr "&Aktiver programtillegg" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Skall-integrasjon" @@ -3095,8 +3096,8 @@ msgid "Add &Shell menu to context menu" msgstr "Legg til &skallmeny i høyreklikkmeny" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Mappe" @@ -3132,69 +3133,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binær" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041404e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x414, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3203,12 +3237,12 @@ msgstr "" "Opprett tomme dokumenter\n" "Nye dokumenter (Ctrl-N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3217,7 +3251,7 @@ msgstr "" "Åpne et eksisterende dokument\n" "Åpne (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3226,7 +3260,7 @@ msgstr "" "Lukk det aktive dokumentet\n" "Lukk" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3235,7 +3269,7 @@ msgstr "" "Lagre det aktive dokumentet\n" "Lagre (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3244,7 +3278,7 @@ msgstr "" "Lagre det aktive dokumentet med et nytt navn\n" "Lagre som" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3253,7 +3287,7 @@ msgstr "" "Endre skriver-innstillinger\n" "Sideoppsett" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3262,7 +3296,7 @@ msgstr "" "Endre skriver og skriver-innstillinger\n" "Skriveroppsett" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3271,7 +3305,7 @@ msgstr "" "Skriv ut det aktive dokumentet\n" "Skriv ut" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3280,27 +3314,27 @@ msgstr "" "Vis utskriftsforhåndsvisning\n" "Utskriftsforhåndsvisning" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Gjør alle skjulte objekter synlige igjen" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Vis/Skjul tremodus" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Utvid alle undermapper" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Sammentrekk alle undermapper" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3309,32 +3343,32 @@ msgstr "" "Åpne prosjektfil\n" "Prosjektfil (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ukjent feil ved forsøk på å åpne prosjektfil" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ukjent feil ved forsøk på å lagre prosjektfil" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Prosjektfil" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Prosjektfil lastet vellykket." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Prosjektfil lagret vellykket." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3343,7 +3377,7 @@ msgstr "" "Lagre aktuelle bane og innstillinger til prosjektfil\n" "Lagre prosjektfil" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3352,7 +3386,7 @@ msgstr "" "Vis programinformasjon, versjonsnummer og opphavsrett\n" "Om programmet" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3361,27 +3395,27 @@ msgstr "" "Avslutt programmet; spør om å lagre dokumenter\n" "Avslutt" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Åpne dette dokumentet" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3390,7 +3424,7 @@ msgstr "" "Skift til det neste vinduspanelet\n" "Neste panel" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3399,7 +3433,7 @@ msgstr "" "Skift tilbake til det forrige vinduspanelet\n" "Forrige panel" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3408,7 +3442,7 @@ msgstr "" "Arranger vinduer så de overlapper\n" "Overlappingsvinduer" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3417,7 +3451,7 @@ msgstr "" "Arranger vinduer som ikke-overlappende fliser horisontalt\n" "Flislegg vinduer horisontalt" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3426,7 +3460,7 @@ msgstr "" "Arranger vinduer som ikke-overlappende fliser vertikalt\n" "Flislegg vinduer vertikalt" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3435,7 +3469,7 @@ msgstr "" "Kopier det valgte og sett det på utklippstavlen\n" "Kopier" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3444,7 +3478,7 @@ msgstr "" "Klipp ut det valgte og sett på utklippstavlen\n" "Klipp ut" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3453,7 +3487,7 @@ msgstr "" "Finn den angitte teksten\n" "Finn" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3462,7 +3496,7 @@ msgstr "" "Lim inn utklippstavlens innhold\n" "Lim inn" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3471,7 +3505,7 @@ msgstr "" "Gjenta den siste handlingen\n" "Gjenta" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3480,7 +3514,7 @@ msgstr "" "Erstatt den angitte teksten med en annen tekst\n" "Erstatt" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3489,7 +3523,7 @@ msgstr "" "Merk hele dokumentet\n" "Merk alt" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3498,7 +3532,7 @@ msgstr "" "Angre den siste handlingen\n" "Angre (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3507,7 +3541,7 @@ msgstr "" "Gjør om den forrige handlingen\n" "Annuler angre (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3516,7 +3550,7 @@ msgstr "" "Vis eller skjul verktøylinjen\n" "Vis/skjul verktøylinjen" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3525,7 +3559,7 @@ msgstr "" "Vis eller skjul statuslinjen\n" "Vis/skjul statuslinjen" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3534,7 +3568,7 @@ msgstr "" "Vis eller skjul fanelinjen\n" "Vis/skjul faner" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3543,57 +3577,57 @@ msgstr "" "Endre panelstørrelse automatisk\n" "Lås paneler" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Endre vindusstørrelse" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Endre vindusposisjon" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Reduser vinduet til et ikon" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Forstørr vinduet til full størrelse" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Skift til det neste dokumentvinduet" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Skift til det forrige dokumentvinduet" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Lukk det aktive vinduet og spør om dokumenter skal lagres" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Gjenopprett vinduet til normal størrelse" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Liste med aktive vinduer" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktiver dette vinduet" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3602,7 +3636,7 @@ msgstr "" "Lukk utskriftsforhåndsvisning\n" "Avbryt forhåndsvisning" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3621,7 +3655,7 @@ msgstr "" "WinMerge.Filsammenligning\n" "WinMerge Filsammenligning" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3640,19 +3674,19 @@ msgstr "" "WinMerge.Mappesammenligning\n" "WinMerge Mappesammenligning" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Bevar originale EOL-tegn" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Høyreklikk på banen for å kopiere" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3661,143 +3695,143 @@ msgstr "" "Utviklere:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 ABSOLUTT INGEN GARANTIER. Dette er gratis programvare og du er velkommen til å videredistribuere den under visse omstendigheter; se GNU General Public License i Hjelp-menyen for detaljer." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Prøv igjen" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorer &alle" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ja til &alt" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nei" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nei til a<" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Fortsett" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Hopp over" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Hopp over &alle" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Ikke vis denne &meldingen igjen." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Ikke still dette &spørsmålet igjen." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Versjonskontroll" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Forskjeller" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Til:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Fra venstre:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Til venstre:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Fra høyre:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Til høyre:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versjon %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Innstillinger (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle meldingsbokser vises nå igjen." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3808,84 +3842,84 @@ msgstr "" "\n" "Bruk verdiene 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Åpne" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge prosjektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Innstillingsfiler (*.ini)|*.ini|Alle filer (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Tekstfiler (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle filer (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alle filer (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alle filer (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Plassering" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Beskrivelse" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Velg navn for nytt filter" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfiltere (*.flt)|*.flt|Alle filer (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3898,7 +3932,7 @@ msgstr "" "Kopier filen %1 til WinMerge/Filtermappe:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3911,7 +3945,7 @@ msgstr "" "\n" "Forsikre om at mappen eksisterer og kan skrives til." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3922,7 +3956,7 @@ msgstr "" "\n" "Velg filter-mappe i Innstillinger/System." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3935,12 +3969,12 @@ msgstr "" "\n" "Kanskje filen er skrivebeskyttet?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Velg filter-fil å installere" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3951,17 +3985,17 @@ msgstr "" "\n" "Kunne ikke kopiere ny filter-fil til filter-mappe." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter-fil eksisterer allerede. Overskrive eksisterende filter?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Regulære uttrykk" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3972,258 +4006,258 @@ msgstr "" "\n" "Om du ikke vil gjenoppfriske alle sammenligninger nå kan du velge Nei og gjenoppfriske sammenligninger senere." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Bane til SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultat av mappesammenligning" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Venstre uten tittel" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Høyre uten tittel" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Deres fil" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Skanner filer..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Åpner valgte" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopierer venstre til høyre" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopierer høyre til venstre" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopierer alt til venstre" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopierer alt til høyre" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopierer filer..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Sletter filer..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Flytter filer..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Oppretter rapporten..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Angrer den siste operasjonen..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Gjør om den forrige operasjonen..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Slå sammen" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Forskjell %1 av %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 forskjeller funnet" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 forskjell funnet" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "SB" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Objekter: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Velg to eksisterende mapper eller filer for å sammenligne" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Mappe-valg" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Velg to mapper eller filer for sammenligning." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Venstre bane er ugyldig!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Høyre bane er ugyldig!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Begge baner er ugyldig!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Velg to filer for å aktivere valg av utpakker." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne fil og mappe!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Fil ikke funnet: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke pakket ut: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4236,12 +4270,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Kunne ikke analysere konflikt-fil" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4252,27 +4286,27 @@ msgstr "" "%1\n" "er ikke en konfliktfil." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Lagre som" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Lagre endringer til %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 er merket som skrivebeskyttet. Vil du overskrive den skrivebeskyttede filen? (Nei for å lagre filen med et annet navn.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Feil under sikkerhetskopiering av filen" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4285,7 +4319,7 @@ msgstr "" "\n" "Fortsette likevel?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4302,7 +4336,7 @@ msgstr "" "\t-bruk et annet filnavn (Klikk Ok)\n" "\t-avbryt den aktuelle operasjonen (Klikk Avbryt)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4317,7 +4351,7 @@ msgstr "" "\n" "Vil du lagre den utpakkede versjonen til en annen fil?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4332,7 +4366,7 @@ msgstr "" "\n" "Vil du lagre den upakkede versjonen fil en annen fil?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4347,7 +4381,7 @@ msgstr "" "\n" "Overskrive endret fil?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4356,7 +4390,7 @@ msgstr "" "%1\n" "er markert skrivebeskyttet. Vil du overskrive det skrivebeskyttede objekt?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4371,22 +4405,22 @@ msgstr "" "\n" "Vil du laste inn igjen filen?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Lagre venstre fil som" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Lagre høyre fil som" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4397,7 +4431,7 @@ msgstr "" "%1\n" "har forsvunnet. Lagre en kopi av filen for å fortsette." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4408,42 +4442,42 @@ msgstr "" "\n" "Gjenoppfrisk dokumenter før du fortsetter." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du skal angi en SourceSafe prosjektbane for å fortsette (ie: $/MittProjekt)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Sjekkut filer fra VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versjonsstyringssystemet returnerte en feil under forsøket på å sjekke ut filen. Kan ikke fortsette..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Feil under utførelse av versjonsstyringssystem-kommando." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS Working Folder og plassering av gjeldende fil stemmer ikke overens. Fortsette?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) funnet!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Feil fra VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4454,7 +4488,7 @@ msgstr "" "Kontroller konfigurasjonsspesifikasjon på anvendt visning.\n" "Angre sjekke ut operasjon?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4463,164 +4497,164 @@ msgstr "" "Versionsstyrings-system returnerte en feil under forsøket på å angre å sjekke ut filen.\n" "Kontroller konfigurasjonsspesifikasjon på anvendt visning." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (eldre enn 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og nyere)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Bryt ved blanktegn" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Bryt ved blanktegn eller tegnsetting" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopier valgte objekt til navngitt mappe" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopier valgte objekt til tilpasset mappe" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Slett valgte objekt til venstre" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Slett valgte objekt til høyre" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Slett valgte objekt(er) på begge sider" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skjul valgte objekt(er) (i farta filter)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Endre navn på valgte objekt på begge sider" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Høyre til venstre (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til høyre (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Høyre til venstre (%1 av %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til høyre (%1 av %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Høyre til... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 av %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Høyre til... (%1 av %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Høyre (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 av %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Høyre (%1 av %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 av %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Venstre side - velg målmappe:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Høyre side - velg målmappe:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påvirket)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påvirket)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4631,17 +4665,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Er du sikker på at du vil kopiere:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Er du sikker på at du vil kopiere %d objekter:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4660,613 +4694,607 @@ msgstr "" "\n" "Gjenoppfrisk sammenligning." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Er du sikker på at du vil flytte:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Er du sikker på at du vil flytte %d objekter:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Bekreft flytting" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Åpne venstre fil" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Åpne venstre fil i ekstern editor" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Åpne venstre fil med ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Åpne høyre fil" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Åpne høyre fil i eksternt redigeringsprogram" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Åpne høyre fil med ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Feilet i å kjøre eksternt redigeringsprogram: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopier filnavn til utklippstavle " -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopier venstre sides baner til utklippstavle" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopier høyre sides baner til utklippstavle" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopier begge siders baner til utklippstavle" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Venstre skallmeny" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Høyre skallmeny" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Ukjent arkivformat" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Legg til objekter fra venstre side til arkiv" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Legg til objekter fra høyre side til arkiv" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Legg til objekter fra begge sider til arkiv" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Legg til forskjellige objekter til arkiv (begge sider)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flytt valgte filer på venstre side til egen mappe" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flytt valgte filer på høyre side til egen mappe" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultat av sammenligningen" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Høyre dato" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Filtype" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Høyre størrelse" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Høyre størrelse (kort)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Venstre opprettelsestid" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Høyre opprettelsestid" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Nyere fil" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Venstre filversjon" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Høyre filversjon" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Høyre attributter" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Venstre EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Høyre EOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Venstre koding" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Høyre koding" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ignorerte forskjeller" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binær" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Objekt avbrutt" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Fil hoppet over" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Mappe hoppet over" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Bare venstre: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Bare høyre: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskjellige" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Filer er forskjellige" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Mapper er forskjellige" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Bare venstre" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Bare høyre" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Feil" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Tekstfiler er identiske" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Tekstfiler er forskjellige" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Forløpt tid: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 objekt valgt" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 objekter valgt" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Fil eller mappe-navn." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkludert." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Sammenligningsresultat, lang form." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Venstre side endringsdato." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Høyre side endringsdato." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Filtype." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i byte." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Høyre filstørrelse i byte." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Venstre filstørrelse forkortet" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Høyre filstørrelse forkortet" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Venstre side opprettelsestid." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Høyre side opprettelsestid." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Forteller hvilken side som har en nyere endringsdato." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversjon, bare for noen filtyper." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Høyre side filversjon, bare for noen filetyper." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Kort sammenligningsresultat." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Høyre side attributter." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Venstre side fil EOL type" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Høyre side fil EOL type" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Venstre side koding." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Høyre side koding." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Antall ignorerte forskjeller i filen. Disse forskjeller ignoreres av WinMerge og kan ikke slås sammen." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Antall forskjeller i filen. Dette antall inkluderer ikke ignorerte forskjeller." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Viser asterisk (*) hvis filen er binær." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Sammenligning %1 med %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Komma-separert liste" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Tab-separarert liste" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Rapportfilen eksisterer allerede. Vil du overskrive eksisterende fil?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5275,32 +5303,32 @@ msgstr "" "Feil ved oppretting av rapporten:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Rapporten er opprettet vellykket" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Samme filen er åpen i begge paneler." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "De valgte filene er identiske." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Det skjedde en feil under sammenligning av filene." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Midlertidige filer kan ikke opprettes. Sjekk TEMP-mappebane innstillinger." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5315,17 +5343,17 @@ msgstr "" "\n" "Merknad: Hvis du alltid vil behandle linjeskifttypene likt, velg innstillingen 'Ignorer forskjell i linjeskift' i sammenligningsarket i innstillingsdialogen (tilgjengelig under Rediger/Innstillinger)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Valgte mappe er ugyldig" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan ikke åpne en binærfil til redigering" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5340,7 +5368,7 @@ msgstr "" "%1\n" "på andre siden og åpne disse mapper?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5351,168 +5379,168 @@ msgstr "" "Visning av hver fil i sitt tegnsett ser best ut, men sammenslåing/kopiering blir farlig.\n" "Vil du behandle begge filer som om de var i standard Windows tegnsett (anbefales)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informasjon tapt på grunn av kodings-feil: begge filer" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Ingen forskjell" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Linjeforskjell" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(er)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finne strengen \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopier full bane" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopier filnavn" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Lokaliseringspanel" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Forskjellspanel" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Fil med rettelser vellykket skrevet." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. objekt ikke funnet eller er mappe!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. objekt ikke funnet eller er mappe!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Rettelsesfilen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Forenet" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den spesifiserte utdata-bane er ikke en absolutt bane: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Spesifiser en utdata-fil" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke opprette en patch-fil fra binære filer." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke opprette en patch-fil fra mapper." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5523,12 +5551,12 @@ msgstr "" "\n" "Opprettelse av en patch krever at det ikke er noen ulagrede endringer i filer." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Mappe eksisterer ikke." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5539,7 +5567,7 @@ msgstr "" "Alle nødvendig komponenter (7-zip og/eller Merge7z*.dll) for arkivstøtte ble ikke funnet.\n" "Se manualen for mer informasjon om arkivstøtte og hvordan aktivere den." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5548,7 +5576,7 @@ msgstr "" "\n" "Merk: 7-Zip-integrasjon er deaktivert i WinMerge innstillinger." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5557,37 +5585,37 @@ msgstr "" "\n" "Merk: 7-Zip-integrasjon er begrenset til frittstående operasjoner i WinMerge innstillinger." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Velg fil for eksport" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Velg fil for import" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Innstillinger importert fra filen." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Innstillinger eksportert til filen." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Feilet i å importere innstillinger fra filen." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Feilet i å skrive innstillinger til filen." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5598,157 +5626,157 @@ msgstr "" "\n" "Vil du fortsette?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Blandet" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Utpakker" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Redigeringsskript" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Lagre venstre fil" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Lagre høyre fil" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Lagre venstre fil med navn..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Lagre høyre fil med navn..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konverter EOL til Windows-modus" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konverter EOL til Unix-modus" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konverter EOL til Mac-modus" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Veksle mellom redigerings- og sammenslåings-modus" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5757,12 +5785,12 @@ msgstr "" "Vis og juster filkodings-egenskaber\n" "Filkodings-egenskaber" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Åpne og fiks konfliktfil" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5771,7 +5799,7 @@ msgstr "" "Marker forskjells-område i den aktuelle linjen\n" "Forskjell i aktuelle linje" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5780,7 +5808,7 @@ msgstr "" "Gå til linje eller forskjell\n" "Gå til (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5789,7 +5817,7 @@ msgstr "" "Still inn programmet\n" "Innstillinger" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5798,37 +5826,37 @@ msgstr "" "Gjenoppfrisk visning\n" "Gjenoppfrisk (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopier valgte linjer til utklippstavle med linjenummer foran" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Vis/Skjul bokmerke" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Gå til neste bokmerke" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Gå til forrige bokmerke" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Fjern alle bokmerker" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5837,7 +5865,7 @@ msgstr "" "Viser objekter som er nøyaktig like\n" "Vis identiske objekter" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5846,7 +5874,7 @@ msgstr "" "Viser objekter som har forskjeller\n" "Vis objekter med forskjeller" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5855,7 +5883,7 @@ msgstr "" "Viser objekter som bare eksisterer på venstre side\n" "Vis objekter som kun er på venstre side" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5864,7 +5892,7 @@ msgstr "" "Viser objekter som bare eksisterer på høyre side\n" "Vis objekter som kun er på høyre side" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5873,7 +5901,7 @@ msgstr "" "Viser binærfiler\n" "Vis binærfiler" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5882,7 +5910,7 @@ msgstr "" "Viser objekter hoppet over\n" "Vis objekter hopper over" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5891,7 +5919,7 @@ msgstr "" "Velg skrifttype for visningen\n" "Velg skrifttype" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5900,27 +5928,27 @@ msgstr "" "Skift tilbake til å bruke standard system-skrifttype for visningen\n" "Standard skrifttype" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Viser blanktegn" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Vis/Skjul forskjellspanel" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Lokaliseringspanel viser oversiktbilde av filene" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Vis dialog med mappesammenlignings-statistikk" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5929,7 +5957,7 @@ msgstr "" "Velg språk for brukerflaten\n" "Språk" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5938,12 +5966,12 @@ msgstr "" "Viser forskjeller i selve linjen med ulike farger\n" "Vis linjeforskjeller" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Bytter plasseringen til de to panelene" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5952,7 +5980,7 @@ msgstr "" "Viser linjenummere\n" "Vis linjenummere" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5961,7 +5989,7 @@ msgstr "" "Aktiver tekstbrytning\n" "Bryt linjer" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5970,22 +5998,22 @@ msgstr "" "Viser marger for begge paneler\n" "Vis marger" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Forstørr tekst" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Forminsk tekst" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Tilbakestill tekst-zoom til standardstørrelse" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5994,7 +6022,7 @@ msgstr "" "Rull til forrige forskjell\n" "Forrige forskjell (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6003,77 +6031,77 @@ msgstr "" "Rull til neste forskjell\n" "Neste forskjell (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6082,7 +6110,7 @@ msgstr "" "Rull til første forskjell\n" "Første forskjell (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6091,7 +6119,7 @@ msgstr "" "Rull til aktuelle forskjell\n" "Aktuelle forskjell (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6100,7 +6128,7 @@ msgstr "" "Rull til siste forskjell\n" "Siste forskjell (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6109,7 +6137,7 @@ msgstr "" "Kopier den valgte teksten til den høyre filen\n" "Kopier til høyre (Alt Høyre)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6118,7 +6146,7 @@ msgstr "" "Kopier den valgte teksten til den venstre filen\n" "Kopier til venstre (Alt Venstre)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6127,7 +6155,7 @@ msgstr "" "Kopier forskjell til høyre og gå videre til neste\n" "Kopier til høyre og gå videre (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6136,7 +6164,7 @@ msgstr "" "Kopier forskjell til venstre og gå videre til neste\n" "Kopier til venstre og gå videre (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6145,7 +6173,7 @@ msgstr "" "Kopier alle forskjeller til den høyre filen\n" "Kopier alt til høyre" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6154,92 +6182,92 @@ msgstr "" "Kopier alle forskjeller til den venstre filen\n" "Kopier alt til venstre" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Slett valgte objekter fra begge mapper" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Sammenlign valgte objekt (sammenlign første objekt hvis flere er valgt)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Velg og endre rekkefølge for kolonner for mappesammenligning" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Generer en fil med rettelser" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Velg og endre filter" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genererer en rapport fra sammenligningsresultater" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Viser en liste med tilgjengelige programtillegg" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Brukeren velger utpakker (ingen utpakker ved sammenligning av mapper)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Den tilpassede utpakkeren brukes på begge filer (bare en fil behøver filendelsen)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Velg en utpakker for denne filen" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Foreslåtte programtillegg" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Andre programtillegg" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Last ut alle programtillegg og last dem inn på nytt (for utviklere)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6248,12 +6276,12 @@ msgstr "" "Aktiverer neste synlige fil\n" "Aktiver neste fil" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Lukker alle åpne vinduer" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6262,22 +6290,22 @@ msgstr "" "Åpner WinMerge-hjelpen\n" "WinMerge hjelp" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Lagrer gjeldende WinMerge versjonsinfo og konfigurasjon til en tekstfil" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Vis GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Privat Build: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6286,7 +6314,7 @@ msgstr "" "Åpner utgivelsesnotat-dokument\n" "Utgivelsesnotat" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6295,292 +6323,292 @@ msgstr "" "Åpner oversettelses-nettsiden\n" "Oversettelser" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Innstillinger for programtillegg" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Ingen prediffer" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediff hvis mulig" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke funnet - .sct skript ikke aktivert" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Åpne filen med registrert program" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Åpne filen med eksternt redigeringsprogram" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Åpne filen med med et bestemt program" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Ikke vis flyttede blokker" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Vis alle flyttede blokker" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Vis flyttede blokker bare fra gjeldende forskjell" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Gå til forskjell under markør" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Deaktivert" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Fra filsystem" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Fra MRU-liste" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Ingen markering" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Skjul verktøylinjen" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Vis liten verktøylinje" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Vis stor verktøylinje" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 4b12f90fc..45d531e34 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -327,7 +327,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "<ÎÇáí>" @@ -469,7 +469,7 @@ msgstr "&A #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -533,7 +533,7 @@ msgstr "&C #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&H ÑÇåäãÇ " @@ -861,7 +861,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&F ˜ÏÈäÏí ÑæäÏå ... " @@ -1465,37 +1465,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr " ãÍÊæíÇÊ ãÔÑæÍ " #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr " ãÍÊæíÇÊ ˜æÊÇå " #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr " ÊÇÑíÎ ÇÕáÇÍ ÔÏå " #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr " ÊÇÑíÎ æ ÇäÏÇÒå ÇÕáÇÍ ÔÏå " #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr " ÇäÏÇÒå " @@ -1527,7 +1527,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr " ÊÇííÏ " @@ -1699,14 +1699,14 @@ msgid "&Versioning System:" msgstr "&V äÓÎå ÐÇÑí ÓíÓÊã " #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&P cleartool.exe ãÓíÑ : " #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr " Úãæãí " @@ -1849,7 +1849,7 @@ msgid "&Find Next" msgstr "&F íÇÝÊä ÈÚÏí " #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&O ÊÇííÏ " @@ -1895,7 +1895,7 @@ msgid "Replace &All" msgstr "&A ÌÇíÒíäí åãí" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr " ÑÔäÇá ˜áјíÓ " @@ -1947,7 +1947,7 @@ msgid "Remove" msgstr " ÈÑÏÇÔÊä " #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr " ÑäåÇ " @@ -1976,7 +1976,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr " ãÊä " @@ -2027,13 +2027,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr " íÔ ÝÑÖåÇ " #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr " ÓíÓÊã / ÏÓʐÇå " @@ -2174,7 +2175,7 @@ msgid "Description:" msgstr " ÊæÕíÝ : " #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr " ÇíÓÊ " @@ -2236,7 +2237,7 @@ msgid "&Go To" msgstr "&G ÈÑæ Èå " #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr " ãÞÇíÓå ˜ÑÏä " @@ -2287,7 +2288,7 @@ msgid "Filter Comments" msgstr " ÇáÇíå ÊæÖíÍÇÊ " #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr " æíÑÇÓÊÇÑ " @@ -2439,7 +2440,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr " ÕÝÍå ˜Ï " @@ -2729,7 +2730,7 @@ msgid "Private Filter (only for current user)" msgstr " ÕÇÝí ÔÎÕí - ÝÞØ ÈÑÇí ˜ÇÑÈÑ ÝÚáí " #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr " ÔÊíÈÇäí ÇÒ ÈÇíÇäí " @@ -2780,7 +2781,7 @@ msgid "Files:" msgstr " ÑæäÏå åÇ : " #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr " ãÊãÇíÒ" @@ -2817,7 +2818,7 @@ msgid "Right:" msgstr " ÑÇÓÊ : " #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr " í˜ÓÇä " @@ -2870,7 +2871,7 @@ msgid "&Apply" msgstr "&A Èå ˜ÇÑ ÈÓÊä " #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&C áÛæ " @@ -2976,7 +2977,7 @@ msgid "Save..." msgstr " ÐÎíÑå ˜ÑÏä ... " #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "ÑæäÏå åÇí ÔÊíÈÇä " @@ -3017,7 +3018,7 @@ msgid "A&ppend timestamp" msgstr "&p íæäÏ ãåÑ ÒãÇä " #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr " ÊÇííÏ ÑæäæÔÊ ÈÑÏÇÑí " @@ -3058,7 +3059,7 @@ msgid "&Enable plugins" msgstr "&E ÝÚÇá ÓÇÒí äÕÈ ÔÏäíåÇ " #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr " 혁Çэå ÓÇÒí æÓÊå " @@ -3094,8 +3095,8 @@ msgid "Add &Shell menu to context menu" msgstr "&S ÇÝÒæÏä ÒíäÇä / ÝåÑÓÊ æÓÊå Èå ÒíäÇä / ÝåÑÓÊ ãÊä " #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr " æÔå " @@ -3131,69 +3132,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr " ÏæÇäí/ ÈÇíäÇÑí " + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "042904e8" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x429, 1256" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr " ÂãÇÏå " -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3202,12 +3236,12 @@ msgstr "" " ÇíÌÇÏ ÇÓäÇÏ ÎÇáí \n" "ÇÓäÇÏ ÌÏíÏ (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3216,7 +3250,7 @@ msgstr "" " ÈÇÒäãæÏä í˜ ÓäÏ ãæÌæÏ \n" " ÈÇÒ ˜ÑÏä (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3225,7 +3259,7 @@ msgstr "" " ÈÓÊä ÓäÏ ÝÚÇá \n" "ÈÓÊä " -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3234,7 +3268,7 @@ msgstr "" " ÐÎíÑå ˜ÑÏä ÓäÏ ÝÚÇá \n" " ÐÎíÑå ˜ÑÏä (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3243,7 +3277,7 @@ msgstr "" " ÓäÏ ÝÚÇá ÑÇ ÈÇ í˜ äÇã ÌÏíÏ ÐÎíÑå äãÇ \n" "ÐÎíÑå ÈÕæÑÊ " -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3252,7 +3286,7 @@ msgstr "" " ÊÛííÑ ÎíÇÑÇÊ Ç \n" " ÊäÙíã / ÈсÇíí ÕÝÍå " -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3261,7 +3295,7 @@ msgstr "" " ÊÛííÑ ÎíÇÑÇÊ Ç æ ÇÑ \n" " ÊäÙíã / ÈсÇíí Ç " -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3270,7 +3304,7 @@ msgstr "" " ÓäÏ ÝÚÇá ÑÇ Ç äãÇ \n" " Ç " -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3279,27 +3313,27 @@ msgstr "" " äãÇíÔ ÕÝÍå åÇí ˜Çãá \n" " íÔ äãÇíÔ Ç " -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr " ÂԘÇÑ äãæÏä ÏæÈÇÑå åãå ãæÇÑÏ äåÇä " -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr " ÊÛííÑ æÖÚíÊ ÔÇÎÓÇÑ " -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr " ÈÓØ åãå ÒíÑ æÔå åÇ " -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr " ÝÑæÇÔí åãå ÒíÑ æÔå åÇ " -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3308,32 +3342,32 @@ msgstr "" " ÈÇҘÑÏä ÑæäÏå ØÑÍ / ÑæŽå \n" " ÑæäÏå ØÑÍ / ÑæŽå (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr " ãÔÇåÏå ÎØÇí äÇãÔÎÕ åäÇã ãÈÇÏÑÊ Èå ÈÇҘÑÏä ÑæäÏå ÑæŽå / ØÑÍ " -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr " ãÔÇåÏå ÎØÇí äÇãÔÎÕ åäÇã ãÈÇÏÑÊ Èå ÐÎíÑå ˜ÑÏä ÑæäÏå ÑæŽå / ØÑÍ " -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr " ÑæäÏå (ÑæŽå) ØÑÍ" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr " ÑæäÏå ÑæŽå / ØÑÍ ÈÇãæÝÞíÊ ÈÇÑ ÔÏ " -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr " ÑæäÏå ÑæŽå / ØÑÍ ÈÇãæÝÞíÊ ÐÎíÑå ÔÏ " -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3342,7 +3376,7 @@ msgstr "" " ÐÎíÑå ãÓíÑåÇí ÌÇÑí æ ÎíÇÑÇÊ Èå ÑæäÏå ÑæŽå / ØÑÍ \n" " ÐÎíÑå ÑæäÏå ØÑÍ / ÑæŽå " -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3351,7 +3385,7 @@ msgstr "" " äãÇíÔ ÇØáÇÚÇÊ äÑã ÇÝÒÇÑ¡ ÔãÇÑå æíÑÇíÔ æ ÍÞ ÊÇáíÝ \n" " ÏÑÈÇÑå " -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3360,27 +3394,27 @@ msgstr "" " äÑã ÇÝÒÇÑ ÑÇ ÈÈäÏ. ÇÚáÇä äãÇ ÊÇ ÇÓäÇÏ ÐÎíÑå ÔæäÏ \n" " ÎÑæÌ " -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr " Çíä ÓäÏ ÑÇ ÈÇҘä " -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3389,7 +3423,7 @@ msgstr "" " ÇäÊÞÇá Èå åÇѐæÔ äÌÑå ÈÚÏí \n" " åÇѐæÔ ÈÚÏí " -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3398,7 +3432,7 @@ msgstr "" " ÈѐÔÊ Èå åÇѐæÔ äÌÑå ÞÈáí \n" " åÇѐæÔ ÞÈáí " -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3407,7 +3441,7 @@ msgstr "" " äÌÑå åÇ ÑÇ ØæÑí ȍíä ÊÇ åãæÔÇäí ÏÇÔÊå ÈÇÔäÏ \n" " äÌÑå åÇí ÂÈÔÇÑí " -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3416,7 +3450,7 @@ msgstr "" " äÌÑå åÇ ÑÇ ÈØæÑ ãæÒÇÆí˜ ÇÝÞí ȍíä ÊÇ å㠁æÔÇäí äÏÇÔÊå ÈÇÔäÏ \n" " ãæÒÇÆí˜ íäí ÇÝÞí äÌÑå åÇ " -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3425,7 +3459,7 @@ msgstr "" " äÌÑå åÇ ÑÇ ÈØæÑ ãæÒÇÆí˜ ÚãæÏí ȍíä ÊÇ å㠁æÔÇäí äÏÇÔÊå ÈÇÔäÏ \n" " ãæÒÇÆí˜ íäí ÚãæÏí äÌÑå åÇ " -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3434,7 +3468,7 @@ msgstr "" " ÑæäæÔÊ ÈÑÏÇÑí ÇäÊÎÇÈ æ ÐÇÔÊä ÏÑ ÍÇÝÙå íÇÏÏÇÔÊ / ˜áí ÈæÑÏ \n" " ÑæäæÔÊ ÈÑÏÇÑí " -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3443,7 +3477,7 @@ msgstr "" " ÈÑÔ ÒÏä ÇäÊÎÇÈ æ ÐÇÔÊä ÏÑ ÍÇÝÙå íÇÏÏÇÔÊ / ˜áí ÈæÑÏ \n" " ÈÑÔ " -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3452,14 +3486,14 @@ msgstr "" " íÇÝÊä ãÊä ãæÑÏ äÙÑ \n" " íÇÝÊä " -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" "Paste" msgstr " ÏÑÌ ãÍÊæíÇÊ ÍÇÝÙå íÇÏÏÇÔÊ / ˜áí ÈæÑÏ ÓÈÇäÏä " -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3468,7 +3502,7 @@ msgstr "" " ÂÎÑíä ÇÞÏÇã ÑÇ Ê˜ÑÇÑ ˜ä \n" " ʘÑÇÑ " -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3477,7 +3511,7 @@ msgstr "" " ÌÇíÒíäí ãÊä ãÔÎÕ ÔÏå ÈÇ ãÊä ãÊÝÇæÊ \n" "ÌÇíÒíäí " -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3486,7 +3520,7 @@ msgstr "" " ÊãÇã ÓäÏ ÇäÊÎÇÈ ÔæÏ \n" " ÇäÊÎÇÈ åãí " -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3495,7 +3529,7 @@ msgstr "" " ÂÎÑíä ÇÞÏÇã ÑÇ Èí ÇËÑ ˜ä \n" " Èí ÇËÑ ÔÏä ÂÎÑíä ÇÞÏÇã (Ctrl+Z) " -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3504,7 +3538,7 @@ msgstr "" " ʘÑÇÑ ÇÞÏÇã ÞÈáí Èí ÇËÑ ÔÏå \n" " ʘÑÇÑ ÇÞÏÇã ÞÈáí (Ctrl+Y) " -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3513,7 +3547,7 @@ msgstr "" " ÂԘÇÑ ˜ÑÏä íÇ äåÇä äãæÏä ãíáå ÇÈÒÇÑ \n" " ÊÛííÑ æÖÚíÊ ãíáå ÇÈÒÇÑ " -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3522,7 +3556,7 @@ msgstr "" " ÂԘÇÑ ˜ÑÏä íÇ äåÇä äãæÏä ãíáå æÖÚíÊ \n" " ÊÛííÑ æÖÚíÊ ãíáå æÖÚíÊ " -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3531,7 +3565,7 @@ msgstr "" " ÂԘÇÑ æ íÇ äåÇä ˜ÑÏä ãíáå ÌåÔ \n" " ÊÛííÑ æÖÚíÊ ãíáå ÌåÔ " -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3540,57 +3574,57 @@ msgstr "" " ÊÛííÑ ÇäÏÇÒå ÏæÈÇÑå ÎæϘÇÑ åÇѐæÔåÇ \n" " ÞÝá ˜ÑÏä åÇѐæÔåÇ " -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr " ÊÛííÑ ÇäÏÇÒå äÌÑå " -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr " ÊÛííÑ ã˜Çä äÌÑå " -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr " ˜ÇåÔ äÌÑå Èå Âí˜æä " -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr " ÈÓØ äÌÑå Èå ÇäÏÇÒå ˜Çãá " -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr " Èå äÌÑå ÓäÏ ÈÚÏí ÊÛííÑ äÌÑå ÈÏå " -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr " Èå äÌÑå ÓäÏ ÞÈáí ÊÛííÑ äÌÑå ÈÏå " -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr " äÌÑå ÝÚÇá ÑÇ ÈÈäÏ æ ÇÚáÇä äãÇ ÊÇ ÇÓäÇÏ ÐÎíÑå ÔæäÏ " -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr " ÈѐÑÏÇäÏä äÌÑå Èå ÇäÏÇÒå ãÚãæáí " -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr " ÝÚÇá äãæÏä ÝåÑÓÊ Ê˜áíÝ " -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr " ÝÚÇá äãæÏä Çíä äÌÑå " -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3599,7 +3633,7 @@ msgstr "" " ÈÓÊä ÓȘ íÔ äãÇíÔ Ç \n" " áÛæ ˜ÑÏä íÔ äãÇíÔ " -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3618,7 +3652,7 @@ msgstr "" " æíäãÑÌ.ãÞÇíÓå ÑæäÏå\n" " ãÞÇíÓå ÑæäÏå æíäãÑÌ" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3637,19 +3671,19 @@ msgstr "" " æíäãÑÌ.ãÞÇíÓå æÔå\n" " ãÞÇíÓå æÔå æíäãÑÌ" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr " ÇÕáí EOL äÇåÏÇÔÊ ÍÑæÝ " -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "˜áíÏ ÑÇÓÊ ãæÔæÇÑå ÑÇ Ñæí ãÓíÑ ÝÔÇÑÏåíÏ ÊÇ ÑæäæÔÊ ÈÑÏÇÑí ÑÏÏ " -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3658,143 +3692,143 @@ msgstr "" " ÊæÓÚå ÏåäÏå Çä : \n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 " æíäãÑÌ È˜áí ÈÏæä åí ÖãÇäÊí ÚÑÖå ãí ÔæÏ. Çíä í˜ äÑã ÇÝÒÇÑ ÑÇíÇä ÇÓÊ æ ÔãÇ ÊÍÊ ÈÑÎí ÔÑÇíØ ÕÇÍÈ ÇÎÊíÇÑ ÏÑ äÔÑ Âä åÓÊíÏ. ÈÑÇí ÌÒÆíÇÊ ãÌæÒ Úãæãí ˜áí Ìí Çä íæ ÑÇ ÏÑ ÒíäÇä / ÝåÑÓÊ ÑÇåäãÇ ÈÈíäíÏ " -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&A áÛæ " -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&R ˜æÔÔ ÏæÈÇÑå " -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&I Ô㠁æÔí " -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "&a Ô㠁æÔí ÇÒ åãå " -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Y Èáå " -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "&a åãí ÂÑí " -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&N ÎíÑ " -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "&l åãí ÎíÑ " -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&C ÇÏÇãå " -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&S ÑÔ " -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "&a ÑÔ ÇÒ åãí " -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "&m ÏæÈÇÑå Çíä íÇã ÑÇ äãÇíÔ äÏå " -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "&q ÏæÈÇÑå Çíä ÑÓÔ ÑÇ äÑÓ " -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr " ÈÇÒÈíäí æíÑÇíÔ " -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr " ÊÝÇæÊåÇ " -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr " Èå : " -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr " ÇÒ  : " -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr " Èå  : " -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr " ÇÒ ÑÇÓÊ : " -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr " Èå ÑÇÓÊ : " -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr " äÓÎå %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr " íæäí ˜Ï " -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "(%1) ÎíÇÑÇÊ " -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr " åã ǘäæä ÊãÇã ÌÚÈå åÇí íÇã ÏæÈÇÑå äãÇíÔ ÏÇÏå ãíÔæÏ. " -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3804,84 +3838,84 @@ msgstr "" " ÚÏÏ ãæÌæÏ ÏÑ ÈÎÔ ÇäÏÇÒå ÌåÔ ÏÑ ÓÊÑå Çí ˜å ÈÑÇí æíäãÑÌ ÞÇÈá ÞÈæá ÈÇÔÏ¡ äíÓÊ \n" " 1 - %1 áØÝÇ ãÞÇÏíÑ ÑæÈÑæ ÇÓÊÝÇÏå ÔæÏ : " -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr " ÈÇÒ " -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÈÑäÇãå åÇ |*.exe;*.bat;*.cmd|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr " åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr " ÑæäÏå åÇí ÑæŽå æíäãÑÌ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr " ÑæäÏå åÇí ÎíÇÑÇÊ (*.ini)|*.ini|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr " ÑæäÏå åÇí ãÊäí (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÑæäÏå åÇí (*.htm,*.html)|*.htm;*.html|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÑæäÏå åÇí (*.xml)|*.xml|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr " äÇã " -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr " ãÍá " -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr " ÕÇÝíåÇ " -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr " ÔÑÍ " -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr " ÇäÊÎÇÈ äÇ㠁ÑæäÏå ÈÑÇí ÕÇÝí ÌÏíÏ " -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr " ÑæäÏå ÕÇÝíåÇ (*.flt)|*.flt|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3894,7 +3928,7 @@ msgstr "" " áØÝÇ ÑæäÏå ÑæÈÑæ Èå æÔå ÕÇÝíåÇí æíäãÑÌ (ÒíÑ) ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ : %1 \n" "%2" -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3906,7 +3940,7 @@ msgstr "" "%1\n" " áØÝÇ ÇØãíäÇä ÍÇÕá ÔæÏ ˜å æÔå æÌæÏ ÏÇÑÏ æ ÞÇÈá äæÔÊä ÇÓÊ " -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3917,7 +3951,7 @@ msgstr "" "\n" " áØÝÇ ÏÑ ÎíÇÑÇÊ > ÓíÓÊ㠁æÔå ÕÇÝí ÑÇ ÇäÊÎÇÈ äãÇííÏ " -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3930,12 +3964,12 @@ msgstr "" "\n" "ãã˜ä ÇÓÊ ˜å ÑæäÏå ÝÞØ ÎæÇäÏäí ÈÇÔÏ¿ " -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr " ÊÚííä ÑæäÏå ÕÇÝí ÈÑÇí äÕÈ " -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3946,17 +3980,17 @@ msgstr "" "\n" " äãí ÊæÇä ÑæäÏå ÕÇÝí ÌÏíÏ ÑÇ Èå æÔå ÕÇÝí ÑæäæÔÊ ÈÑÏÇÑí äãæÏ " -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr " ÑæäÏå ÕÇÝí íÔ ÇÒ Çíä æÌæÏ ÏÇÑÏ. ÂíÇ ÕÇÝí ãæÌæÏ ÏæÈÇÑå äæíÓí ÔæÏ¿ " -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr " ÚÈÇÑÊ ãäÙã / ÞÇÚÏå ãäÏ " -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3967,258 +4001,258 @@ msgstr "" "\n" " ÇÑ äãí ÎæÇåíÏ ÊãÇã åãÓäÌíåÇí ÈÇÒÓÇÒí ÔæÏ¡ ãí ÊæÇäíÏ ÎíÑ ÑÇ ÇäÊÎÇÈ ˜ÑÏå æ åãÓäÌíåÇ ÑÇ ÈÚÏÇ ÈÇÒÓÇÒí äãÇííÏ " -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&P ãÓíÑ SS.EXE : " -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr " äÊÇíÌ åãÓäÌí æÔå åÇ " -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr " åãÓäÌí ÑæäÏå " -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "  ÈÏæä ÚäæÇä " -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr " ÑÇÓÊ ÈÏæä ÚäæÇä " -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr " ÑæäÏå ÏíÑÇä " -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr " ÑæäÏå ÎæÏã " -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr " æíÔ ÑæäÏå åÇ ... " -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr " ÈÇҘÑÏä Òíäå " -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr " ÑæäæÔÊ ÈÑÏÇÑí  Èå ÑÇÓÊ " -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÑÇÓÊ Èå  " -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr " ÑæäæÔÊ ÈÑÏÇÑí åãí Èå  " -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr " ÑæäæÔÊ ÈÑÏÇÑí åãí Èå ÑÇÓÊ " -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÑæäÏå åÇ ... " -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr " ÍÐÝ ÑæäÏå åÇ ... " -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr " ÌÇÈÌÇíí ÑæäÏå åÇ ... " -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr " ÇíÌÇÏ ÒÇÑÔ ... " -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr " Èí ÇËÑ ˜ÑÏä ÂÎÑíä Úãá ... " -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr " ʘÑÇÑ Úãá ÞÈáí ... " -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr " ÎØ : %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr " íæäÏ ÒÏä " -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr " ÊÝÇæÊ %1 ÇÒ %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr " ÊÝÇæÊåÇí íÏÇ ÔÏå = %1" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr " í˜ ÊÝÇæÊ íÏÇ ÔÏ " #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr " ãæÑÏ %1 ÇÒ %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr " ãæÇÑÏ : %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr " ÇäÊÎÇÈ Ïæ æÔå íÇ ÑæäÏå ãæÌæÏ ÈÑÇí ãÞÇíÓå " -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr " ÇäÊÎÇÈ æÔå " -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr " ÇäÊÎÇÈ ˜ÑÏä Ïæ æÔå íÇ Ïæ ÑæäÏå ÈÑÇí ãÞÇíÓå " -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr " ãÓíÑ  æÌæÏ äÏÇÑÏ ! " -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr " ãÓíÑ ÑÇÓÊ æÌæÏ äÏÇÑÏ ! " -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr " åÑ Ïæ ãÓíÑ æÌæÏ äÏÇÑäÏ ! " -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr " Ïæ ÑæäÏå ÑÇ ÇäÊÎÇÈ äãÇííÏ ÊÇ ÇäÊÎÇÈ ÈÇҘääÏå ÈÓÊå ÝÚÇá ÑÏÏ " -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr " äãíÊæÇä æÔå æ ÑæäÏå ÑÇ ãÞÇíÓå ˜ÑÏ ! " -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr " ÑæäÏå ÑæÈÑæ íÏÇ äÔÏ : %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr " ÈÓÊå ÑæäÏå ÑæÈÑæ ÈÇÒ äÔÏ : %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4231,12 +4265,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr " äÇãæÝÞ ÈæÏä ÊÌÒíå æ ÊÍáíá ÑæäÏå ÊÚÇÑÖ " -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4247,27 +4281,27 @@ msgstr "" "%1\n" "í˜ ÑæäÏå ÊÚÇÑÖ¡ äãí ÈÇÔÏ " -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr " ÐÎíÑå ˜ÑÏä Èå ÕæÑÊ " -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr " ÂíÇ ÊÛííÑÇÊ ÏÑ %1 ÐÎíÑå ÔæÏ¿" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "ÑæäÏå %1 ÈÕæÑÊ ÝÞØ ÎæÇäÏäí ÚáÇãÊ ÒÏå ÔÏå ÇÓÊ. ÂíÇ ãÇíá åÓÊíÏ ÑæäÏå ÝÞØ ÎæÇäÏäí ÈÇØá ÑÏÏ¿ - ÈÇ äÇã ÌÏíÏ ÐÎíÑå äÑÏÏ " -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr " ÎØÇ ÏÑ Êåíå ÑæäÏå ÔÊíÈÇä " -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4280,7 +4314,7 @@ msgstr "" "\n" " Èå åÑ ÍÇá ˜ÇÑ ÇÏÇãå íÇÈÏ¿ " -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4297,7 +4331,7 @@ msgstr "" "\t- í˜ äÇ㠁ÑæäÏå ãÊÝÇæÊ ÇÓÊÝÇÏå ˜äíÏ - ÊÇííÏ ÑÇ ÈÝÔÇÑíÏ \n" "\t- Úãá ÌÇÑí áÛæ ÔæÏ - áÛæ ÑÇ ÈÝÔÇÑíÏ ¿" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4312,7 +4346,7 @@ msgstr "" "\n" " ÂíÇ ãí ÎæÇåíÏ ˜å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ ÑæäÏå ÏíÑí ÐÎíÑå ÔæÏ¿ " -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4327,7 +4361,7 @@ msgstr "" "\n" " ÂíÇ ãí ÎæÇåíÏ ˜å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ ÑæäÏå ÏíÑí ÐÎíÑå ÔæÏ¿ " -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4342,7 +4376,7 @@ msgstr "" "\n" " ÑæäÏå ÊÛííÑ íÇÝÊå ÏæÈÇÑå äæíÓí ÔæÏ¿" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4351,7 +4385,7 @@ msgstr "" "%1\n" " ÈÕæÑÊ ÝÞØ ÎæÇäÏäí ÚáÇãÊ ÏÇÑ ÔÏå ÇÓÊ. ÂíÇ ãÇíá åÓÊíÏ ˜å ãæÑÏ ÝÞØ ÎæÇäÏäí ÈÇØá ÑÏÏ¿ " -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4366,22 +4400,22 @@ msgstr "" "\n" " ÂíÇ ãÇíá åÓÊíÏ ˜å ÑæäÏå ÏæÈÇÑå ÈÇѐíÑí ÔæÏ¿" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr " ÐÎíÑå ÑæäÏå  Èå ÕæÑÊ " -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr " ÐÎíÑå ÑæäÏå ÑÇÓÊ Èå ÕæÑÊ " -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4392,7 +4426,7 @@ msgstr "" "%1\n" " äǁÏíÏ ÔÏå ÇÓÊ. áØÝÇ í˜ ÑæäæÔÊ ÇÒ ÑæäÏå ÑÇ ÐÎíÑå äãÇííÏ ÊÇ ˜ÇÑ ÇÏÇãå íÇÈÏ " -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4403,42 +4437,42 @@ msgstr "" "\n" " ÇÓäÇÏ ÞÈá ÇÒ ÇÏÇãå ˜ÇÑ ÈÇÒÓÇÒí / ÊÇÒå ÔæäÏ " -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr " $/MyProject ÔãÇ ÈÇíÓÊí í˜ ãÓíÑ ÈÑÇí ÑæŽå ÓæÑÓ ÓíÝ ãÔÎÕ äãÇííÏ ÊÇ ˜ÇÑ ÇÏÇãå íÇÈÏ - ÈØæÑãËÇá" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr " ... VSS æÇÑÓí ÑæäÏå åÇ ÇÒ " -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr " ÏÑ ÒãÇäí ˜å ãÈÇÏÑÊ Èå æÇÑÓí ÑæäÏå ÑÏíÏ¡ äÓÎå ÐÇÑí ÓíÓÊã ÈÇ ÎØÇ ãæÇÌå ÔÏ. ÚÇÌÒ ÇÒ ÇÏÇãå ˜ÇÑ ... " -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr " ÎØÇ ÏÑ ÇÌÑÇí ÝÑãÇä äÓÎå ÐÇÑí ÓíÓÊã " -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr " æÔå ˜ÇÑí æ ã˜Çä ÑæäÏå ÌÇÑí ÊØÈíÞ äÏÇÑäÏ. ˜ÇÑ ÇÏÇãå íÇÈÏ¿ VSS " -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "VSS ÇíÇå(åÇí) ÏÇÏå íÏÇ äÔÏ ! " -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr " : VSS ÎØÇ ÇÒ " -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4449,7 +4483,7 @@ msgstr "" " áØÝÇ ãÔÎÕÇÊ í˜ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n" " ÏÓÊæÑÇáÚãá æÇÑÓí Èí ÇËÑ ÑÏÏ ¿" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4459,164 +4493,164 @@ msgstr "" " áØÝÇ ãÔÎÕÇÊ í˜ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n" " " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr " åíí˜ " -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr " æíŽæÇá ÓæÑÓ ÓíÝ - äÓÎå Çííä ÊÑ ÇÒ 5.0 " -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr " æíŽæÇá ÓæÑÓ ÓíÝ - äÓÎå 5.0 æ ÈÇáÇÊÑ " -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr " ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ íÇ äÞØå / äÔÇä ÐÇÑì " -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr " ÑæäæÔÊ ÈÑÏÇÑí ãæÑÏ ÇäÊÎÇÈ ÔÏå Èå ÝåÑÓÊ ÑÇåäãÇí äÇãÈÑÏå " -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr " ÑæäæÔÊ ÈÑÏÇÑí ãæÑÏ ÇäÊÎÇÈ ÔÏå Èå ÝåÑÓÊ ÑÇåäãÇí ÓÝÇÑÔí " -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr " ÍÐÝ ãæÑÏ ÇäÊÎÇÈ ÔÏå ÏÑ  " -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr " ÍÐÝ ãæÑÏ ÇäÊÎÇÈ ÔÏå ÏÑ ÑÇÓÊ " -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr " ÍÐÝ äãæÏä ãæÑÏ (åÇí) ÇäÊÎÇÈ ÔÏå ÏÑ åÑ Ïæ ØÑÝ " -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr " äåÇä äãæÏä ãæÑÏ (åÇí) ÇäÊÎÇÈ ÔÏå - ÈÇ ÕÇÝí ÝÚÇá " -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr " ÊÛííÑ äÇã ãæÑÏ ÇäÊÎÇÈ ÔÏå ÏÑ åÑ Ïæ ÓãÊ " -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr " ÑÇÓÊ Èå  - %1" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "  Èå ÑÇÓÊ - %1" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr " ÑÇÓÊ Èå  - %1 ÇÒ %2 " -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "  Èå ÑÇÓÊ - %1 ÇÒ %2 " -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "  Èå ... - %1" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr " ÑÇÓÊ Èå ... - %1" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "  Èå ... - %1 ÇÒ %2 " -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr " ÑÇÓÊ Èå ... - %1 ÇÒ %2 " -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "  - %1" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr " ÑÇÓÊ - %1" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr " åÑ Ïæ ÓãÊ - %1" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "  - %1 ÇÒ %2" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr " ÑÇÓÊ - %1 ÇÒ %2" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr " åÑ Ïæ ÓãÊ - %1 ÇÒ %2" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr " ØÑÝ  - ÇäÊÎÇÈ æÔå ãÞÕÏ : " -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr " ØÑÝ ÑÇÓÊ - ÇäÊÎÇÈ æÔå ãÞÕÏ : " -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "{ ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå: %1 }" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "{ ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå: %1 ÇÒ %2 }" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4627,17 +4661,17 @@ msgstr "" "\n" " ÑÇ ÍÐÝ äãÇííÏ %1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr " ÂíÇ ãØãÆä åÓÊíÏ ˜å ãíÎæÇåíÏ ÑæäæÔÊ ÈÑÏÇÑí äãÇííÏ ÇÒ : " -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " ÝÞÑå ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ¿ %d ÂíÇ ãØãÆä åÓÊíÏ ˜å ãí ÎæÇåíÏ ÇÒ " -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4655,613 +4689,607 @@ msgstr "" " íÏÇ äÔÏ \n" " áØÝÇ ãÞÇíÓå ÑÇ ÊÌÏíÏ äãÇííÏ " -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr " ÂíÇ ãØãÆä åÓÊíÏ ˜å ãíÎæÇåíÏ Çíä ÑÇ ÌÇÈÌÇ äãÇííÏ: " -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr " ãæÑÏ ÌÇÈÌÇ ÔæÏ¿ %d" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr " ÊÇííÏ ÌÇÈÌÇíí " -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr " ÈÇҘÑÏä ÑæäÏå  " -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr " ÈÇҘÑÏä ÑæäÏå í ÈÇ æíÑÇÓÊÇÑ ÎÇÑÌí " -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr " ÈÇҘÑÏä ÑæäÏå  ÈÇ ... " -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr " ÈÇҘÑÏä ÑæäÏå ÑÇÓÊ " -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr " ÈÇҘÑÏä ÑæäÏå ÑÇÓÊí ÏÑ æíÑÇÓÊÇÑ ÎÇÑÌí " -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr " ÈÇҘÑÏä ÑæäÏå ÑÇÓÊ ÈÇ ... " -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr " ÇÌÑÇí äÇãæÝÞ æíÑÇÓÊÇÑ ÎÇÑÌí : %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇ㠁ÑæäÏå åÇ Èå ˜áí ÈæÑÏ / ÍÇÝÙå íÇÏÏÇÔÊ " -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇã ãÓíÑåÇí ÓãÊ  Èå ÍÇÝÙå íÇÏÏÇÔÊ / ˜áí ÈæÑÏ " -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇã ãÓíÑåÇí ÓãÊ ÑÇÓÊ Èå ÍÇÝÙå íÇÏÏÇÔÊ / ˜áí ÈæÑÏ " -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇã ãÓíÑåÇí åÑ Ïæ ØÑÝ Èå ÍÇÝÙå íÇÏÏÇÔÊ / ˜áí ÈæÑÏ " -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr " ÒíäÇä / ÝåÑÓÊ æÓÊå  " -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr " ÒíäÇä / ÝåÑÓÊ æÓÊå ÑÇÓÊ " -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr " ÈÇíÇäí ÈÇ ÞÇáÈ ÈäÏí äÇÔäÇÓ " -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr " ÇÝÒæÏä ãæÇÑÏ ÇÒ ÓãÊ  Èå ÈÇíÇäí " -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr " ÇÝÒæÏä ãæÇÑÏ ÇÒ ÓãÊ ÑÇÓÊ Èå ÈÇíÇäí " -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr " ÇÝÒæÏä ãæÇÑÏ ÇÒ åÑ Ïæ ØÑÝ Èå ÈÇíÇäí " -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr " ÇÝÒæÏä ãæÇÑÏ ãÊÝÇæÊ Èå ÈÇíÇäí åÑ Ïæ ÓãÊ " -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr " ÑæäÏå ÇäÊÎÇÈ ÔÏå ÏÑ ÓãÊ  Èå ÝåÑÓÊ ÑÇåäãÇí ÓÝÇÑÔí ÌÇÈÌÇ ÔæÏ " -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr " ÑæäÏå ÇäÊÎÇÈ ÔÏå ÏÑ ÓãÊ ÑÇÓÊ Èå ÝåÑÓÊ ÑÇåäãÇí ÓÝÇÑÔí ÌÇÈÌÇ ÔæÏ " -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr " äÇ㠁ÑæäÏå " -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr " äÊíÌå ãÞÇíÓå " -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr " ÊÇÑíÎ  " -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr " ÊÇÑíÎ ÑÇÓÊ " -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr " ÊæÓÚå " -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr " ÇäÏÇÒå  " -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr " ÇäÏÇÒå ÑÇÓÊ " -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr " ÓãÊ ÑÇÓÊ - ãÎÊÕÑ " -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr " ÓãÊ  - ãÎÊÕÑ " -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr " ÒãÇä ÇíÌÇÏ í " -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr " ÒãÇä ÇíÌÇÏ ÑÇÓÊí " -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr " ÑæäÏå ÌÏíÏÊÑ " -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr " äÓÎå ÑæäÏå  " -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr " äÓÎå ÑæäÏå ÑÇÓÊ " -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr " äÊíÌå ˜æÊÇå " -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr " ÎÕíÕå åÇí í " -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr " ÎÕíÕå åÇí ÑÇÓÊí " -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "  EOL " -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr " ÑÇÓÊ EOL " -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr " ˜ÏÈäÏí  " -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr " ˜ÏÈäÏí ÑÇÓÊ " -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr " ÊÝÇæÊ Ô㠁æÔí ÔÏå " -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr " ÏæÇäí/ ÈÇíäÇÑí " - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr " äÇÊæÇä ÇÒ åãÓäÌí ÑæäÏå åÇÓÊ" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr " ãæÑÏ ÇäÕÑÇÝí " -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr " ÑæäÏå ÇÒ Þáã ÇÝÊÇÏå " -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr " æÔå ÇÒ Þáã ÇÝÊÇÏå " -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr " ÝÞØ  : %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr " ÝÞØ ÑÇÓÊ : %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr " ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí åãÓÇä åÓÊäÏ " -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr " ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr " ÑæäÏå åÇ ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr " æÔå åÇ ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr " ÝÞØ  " -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr " ÝÞØ ÑÇÓÊ " -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr " ÎØÇ " -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr " ÑæäÏå åÇí ãÊäí åãÓÇä åÓÊäÏ " -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr " ÑæäÏå åÇí ãÊäí ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr " ÒãÇä ӁÑí ÔÏå - ãíáí ËÇäíå : %ld" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr " í˜ ãæÑÏ ÇäÊÎÇÈ ÔÏ " -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "ãæÇÑÏ ÇäÊÎÇÈ ÔÏå = %1" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr " äÇ㠁ÑæäÏå íÇ æÔå " -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr " äÇã ÒíсæÔå ãæÞÚí ˜å ÒíсæÔå åÇ ÔÇãá åÓÊäÏ " -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr " Ԙá ãÈÓæØ äÊÇíÌ åãÓäÌí / ãÞÇíÓå " -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ í " -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ ÑÇÓÊí " -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr " ÊæÓÚå ÑæäÏå " -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr " ÇäÏÇÒå ÑæäÏå  Èå ÈÇíÊ " -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr " ÇäÏÇÒå ÑæäÏå ÑÇÓÊ Èå ÈÇíÊ " -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr " ÇäÏÇÒå ÑæäÏå ÓãÊ  ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ " -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr " ÇäÏÇÒå ÑæäÏå ÓãÊ ÑÇÓÊ ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ " -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ  " -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ ÑÇÓÊ " -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr " ãí æíÏ ˜å ÊÇÑíÎ ÊÛííÑ ˜ÏÇã ÓãÊ ÌÏíÏÊÑ ÇÓÊ " -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr " äÇÑÔ ÑæäÏå ÓãÊ ¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ ÑæäÏå åÇ " -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr " äÇÑÔ ÑæäÏå ÓãÊ ÑÇÓÊ¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ ÑæäÏå åÇ " -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr " äÊíÌå åãÓäÌí ÈØæÑ ˜æÊÇå " -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr " ÎÕíÕå åÇí ÓãÊ  " -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr " ÎÕíÕå åÇí ÓãÊ ÑÇÓÊ " -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr " ÑæäÏå ÓãÊ  EOL äæÚ " -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr " ÑæäÏå ÓãÊ ÑÇÓÊ EOL äæÚ " -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr " ˜ÏÈäÏí ÓãÊ  " -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr " ˜ÏÈäÏí ÓãÊ ÑÇÓÊ " -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr " ÔãÇÑå ÊÝÇæÊåÇí Ô㠁æÔí ÔÏå ÏÑ ÑæäÏå. Çíä ÊÝÇæÊåÇ ÊæÓØ æíäãÑÌ Ô㠁æÔí ÔÏå ÇÓÊ æ ÞÇÈá íæäÏ ÒÏä äíÓÊ " -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr " ÔãÇÑå ÊÝÇæÊåÇ ÏÑ ÑæäÏå. Çíä ÔãÇÑå ÔÇãá ÊÝÇæÊåÇí Ô㠁æÔí ÔÏå äãí ÔæÏ " -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr " äãÇíÔ í˜ ÓÊÇÑå * ÏÑ ÕæÑÊí˜å ÑæäÏå ÏæÇäí / ÈÇíäÇÑí ÈÇÔÏ " -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr " åãÓäÌí %1 ÈÇ %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr " ÝåÑÓÊí ˜å ÈÇ ˜ÇãÇ ÌÏÇ ÔÏå ÈÇÔÏ " -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr " ÝåÑÓÊ ÌÏÇÔÏå ÈÇ ˜áíÏ ÌåÔ " -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr " ÓÇÏå HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr " ÓÇÏå XML " -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " íÔ ÇÒ Çíä¡ ÑæäÏå ÒÇÑÔ æÌæÏ ÏÇÔÊå ÇÓÊ. ÂíÇ ãÇíáíÏ ˜å ÑæäÏå ÌÇíÒíä ÔæÏ ¿ " -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5270,32 +5298,32 @@ msgstr "" " ÎØÇ ÏÑ ÇíÌÇÏ ÒÇÑÔ : \n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr " ÒÇÑÔ ÈÇ ãæÝÞíÊ ÇíÌÇÏ ÔÏå ÇÓÊ " -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr " í˜ ÑæäÏå ÏÑ åÑ Ïæ ÊÇÈáæ ÈÇÒ ÔÏå ÇÓÊ" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr " ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå åãÓÇä åÓÊäÏ " -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr " Èå åäÇã åãÓäÌí ÑæäÏå åÇ ÎØÇíí ÑÎ ÏÇÏ " -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr " ÑæäÏå åÇí ãæÞÊí ÑÇ äãí ÊæÇä ÇíÌÇÏ äãæÏ. ÊäÙíãÇÊ ãÓíÑ ãæÞÊ ÈÑÑÓí ÑÏÏ " -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5310,17 +5338,17 @@ msgstr "" "\n" "ÊæÌå: ÏÑ ÕæÑÊí˜å ãí ÎæÇåíÏ ÈÑÇí åãíÔå ÊãÇã ÇäæÇÚ ÚáÇãÊåÇí ÈÇҐÔÊ Èå ÓÑ ÓØÑ í˜ÓÇä ÏÑ äÙÑ ÑÝÊå ÔæäÏ¡ ÇäÊÎÇÈ \"äÇÏíÏå ÑÝÊä ÊÝÇæÊ ÚáÇãÊåÇí ÈÇҐÔÊ Èå ÓÑ ÓØÑ ...\" ÏÑ ÈÎÔ ãÞÇíÓå / åãÓäÌí äÌÑå ãÍÇæÑå ÎíÇÑÇÊ {ãæÌæÏ ÒíÑ æíÑÇíÔ>ÎíÇÑÇÊ} ÚáÇãÊ ÒÏå ÔæÏ " -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr " æÔå ÇäÊÎÇÈ ÔÏå æÌæÏ äÏÇÑÏ " -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr " äãí ÊæÇäÏ ÝÇíá ÏæÇäí / ÈÇíäÇÑí ÑÇ ÏÑ æíÑÇÓÊÇÑ ÈÇÒ äãÇíÏ " -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5335,7 +5363,7 @@ msgstr "" "%1\n" "Èå ÓãÊ ÏíÑ æ ÈÇÒÔÏä Çíä æÔå åÇ ¿ " -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5346,168 +5374,168 @@ msgstr "" " äãÇíÔ åÑ ÑæäÏå ÏÑ ÕÝÍå ˜Ï ÎæÏÔ Ìáæå ÈåÊÑí ÏÇÑÏ ÇãÇ ÑæäæÔÊ ÈÑÏÇÑí / íæäÏ Òäí ÎØÑäǘ ÎæÇåÏ ÈæÏ \n" " ÂíÇ ãÇíá åÓÊíÏ ÊÇ ÈÇ åÑ Ïæ ÑæäÏå Èå Ԙáí ˜å ÏÑ ÕÝÍå ˜Ï íÔ ÝÑÖ æíäÏæÒ ãí ÈÇÔÏ¡ ˜ÇÑ ÔæÏ - Çíäæäå ÊæÕíå ãíÔæÏ - ¿" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr " ÇØáÇÚÇÊ Èå Ïáíá ÎØÇåÇí ˜ÏÈäÏí ÇÒ ÏÓÊ ÑÝÊ : ÏÑ ÑæäÏå åÑ Ïæ ÓãÊ " -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr " ÈÏæä ÝÑÞ" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr " ÊÝÇæÊ ÎØ Èå ÎØ " -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr " ÑÔÊå {åÇí} ÌÇíÒíä ÔÏå : %1" -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr " äãí ÊæÇä ÑÔÊå ÑæÈÑæ ÑÇ íÏÇ ˜ÑÏ : \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ ÊãÇã ãÓíÑ" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ äÇ㠁ÑæäÏå " -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr " åÇѐæÔ ã˜Çä " -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr " åÇѐæÔ ÊÝÇæÊ " -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr " ÑæäÏå æÕáå /˜Žäå ÈÇ ãæÝÞíÊ äæÔÊå ÔÏ " -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr " ãæÑÏ íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ ! -1" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr " ãæÑÏ íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ ! -2" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " ÑæäÏå æÕáå / ˜Žäå ÏÑ ÍÇá ÍÇÖÑ ãæÌæÏ ãí ÈÇÔÏ. ÂíÇ ãí ÎæÇåíÏ ÊÇ ÈÇÒäæíÓí ÔæÏ¿ " -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "{ ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå: %1 }" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr " ÚÇÏí " -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr " ãÊä " -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr " 혁Çэå ÔÏå " -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "äãí ÊæÇäÏ ÏÑ ÑæäÏå 1% ÈäæíÓÏ " -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " ãÓíÑ ÎÑæÌí ãÔÎÕ ÔÏå í˜ ãÓíÑ ãØáÞ äãí ÈÇÔÏ : %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr " í˜ ÑæäÏå ÎÑæÌí ÑÇ ãÔÎÕ äãÇííÏ " -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr " äãí ÊæÇä í˜ æÕáå / ˜Žäå ÑæäÏå ÇÒ ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí Êåíå äãæÏ " -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr " äãí ÊæÇä í˜ æÕáå / ˜Žäå ÑæäÏå ÇÒ ÝåÑÓÊåÇí ÑÇåäãÇ ÇíÌÇÏ äãæÏ " -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5518,12 +5546,12 @@ msgstr "" "\n" "ÇíÌÇÏ í˜ æÕáå / ˜Žäå äíÇÒãäÏ ÇíäÓÊ ˜å åí ÊÛííÑ ÐÎíÑå äÔÏå Çí ÏÑ ÑæäÏå åÇ æÌæÏ äÏÇÔÊå ÈÇÔÏ " -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr " æÔå æÌæÏ äÏÇÑÏ " -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5534,7 +5562,7 @@ msgstr "" " ÊãÇã ÇÌÒÇÁ ãæÑÏ äíÇÒ ÈÑÇí ÔÊíÈÇäí ÇÒ ÈÇíÇäí ÑÇ äãí ÊæÇä íÇÝÊ - Merge7z*.dll &/ 7-zip - \n" " ÈÑÇí ÇØáÇÚ ÈíÔÊÑ ÇÒ ÔÊíÈÇäí ÈÇíÇäí æ æäí ÝÚÇáÓÇÒí Âä¡ ˜ÊÇȍå ÑÇåäãÇ ÑÇ ÈÈíäíÏ" -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5543,7 +5571,7 @@ msgstr "" "\n" " ÊæÌå: 혁Çэì Óæä Òí ÏÑ ÊäÙíãÇÊ æíäãÑÌ ÛíÑÝÚÇá ÔÏå ÇÓÊ " -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5552,37 +5580,37 @@ msgstr "" "\n" " ÊæÌå: 혁Çэì Óæä Òí ãäÍÕÑ Èå Úãá˜ÑÏ ãÓÊÞá ÏÑ ÊäÙíãÇÊ æíäãÑÌ ãí ÈÇÔÏ " -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr " ÇäÊÎÇÈ ÑæäÏå ÈÑÇí ÕÏæÑ " -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr " ÇäÊÎÇÈ ÑæäÏå ÈÑÇí æÑæÏ " -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr " ÎíÇÑÇÊ ÇÒ ÑæäÏå æÇÑÏ ÔÏ " -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr " ÎíÇÑÇÊ Èå ÑæäÏå ÕÇÏÑ ÔÏ " -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr " æÑæÏ ÎíÇÑÇÊ ÇÒ ÑæäÏå äÇãæÝÞ ÈæÏ " -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr " äÇÑÔ ÎíÇÑÇÊ ÏÑ ÑæäÏå äÇãæÝÞ ÈæÏ " -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5593,157 +5621,157 @@ msgstr "" "\n" "ÂíÇ ãÇíá Èå ÇÏÇãå åÓÊíÏ ¿ " -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr " íæäí˜Ó " -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr " ãÎáæØ " -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr " äæÚ " -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr " ÈÇÒ ˜ääÏå ÈÓÊå " -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr " íÔ ÝÑÞ ÐÇÑ " -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "ÏÓÊ äæÔÊå ÈÑÇí æíÑÇÓÊÇÑ " -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr " ÐÎíÑå ÑæäÏå ØÑÝ  " -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr " ÐÎíÑå ÑæäÏå ØÑÝ ÑÇÓÊ " -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr " ÐÎíÑå ÑæäÏå ÓãÊ  ÈÇ äÇã ... " -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr " ÐÎíÑå ÑæäÏå ÓãÊ ÑÇÓÊ ÈÇ äÇã ... " -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr " Windows Èå EOL ÊÈÏíá ÓȘ" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr " Unix Èå EOL ÊÈÏíá ÓȘ" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr " Mac Èå EOL ÊÈÏíá ÓȘ" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr " ÊÚæíÖ Èíä ÓȘåÇí æíÑÇíÔ æ íæäÏ " -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5752,12 +5780,12 @@ msgstr "" " äãÇíÔ æ ÊäÙíã æ펐íåÇí ˜ÏÈäÏí ÑæäÏå \n" " æ펐íåÇí ˜ÏÈäÏí ÑæäÏå " -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr " ÈÇÒ ˜ÑÏä æ ÊÌÒíå æ ÊÍáíá äãæÏä ÑæäÏå ÊÚÇÑÖ " -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5766,7 +5794,7 @@ msgstr "" " ÇäÊÎÇÈ äÇÍíå ãÊÝÇæÊ ÏÑ ÎØ ÌÇÑí \n" " ÊÝÇæÊ ÏÑ ÎØ ÌÇÑí " -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5775,7 +5803,7 @@ msgstr "" " ÈÑæ Èå ÎØ íÇ ÊÝÇæÊ \n" " ÈÑæ Èå (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5784,7 +5812,7 @@ msgstr "" " ÊäÙíã ÎíÇÑÇÊ ÈÑäÇãå \n" " ÎíÇÑÇÊ " -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5793,37 +5821,37 @@ msgstr "" " ÈÇÒÓÇÒí ÕÝÍå äãÇíÔ \n" " ÈÇÒÓÇÒí F5" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÎØæØ ÇäÊÎÇÈ ÔÏå Èå ˜áí ÈæÑÏ / ÍÇÝÙå íÇÏÏÇÔÊ ÈÇ ÇÖÇÝå ˜ÑÏä ÔãÇÑå ÎØæØ Èå ÎØ ÂÛÇÒíä" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr " ÊÛííÑ æÖÚíÊ äÔÇä " -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr " ÈÑæ Èå äÔÇä ÈÚÏí " -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr " ÈÑæ Èå äÔÇä ÞÈáí " -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr " Ç˜ ˜ÑÏä åãå äÔÇäåÇ " -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5832,7 +5860,7 @@ msgstr "" " äãÇíÔ ãæÇÑÏí ˜å ÈØæÑ ÏÞíÞ í˜ÓÇääÏ \n" "äãÇíÔ ãæÇÑÏ í˜ÓÇä " -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5841,7 +5869,7 @@ msgstr "" " äãÇíÔ ãæÇÑÏí ˜å ÊÝÇæÊ ÏÇÑäÏ \n" "äãÇíÔ ãæÇÑÏ ãÊÝÇæÊ " -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5850,7 +5878,7 @@ msgstr "" " äãÇíÔ ãæÇÑÏí ˜å ÝÞØ ÏÑ ÓãÊ  æÌæÏ ÏÇÑÏ \n" "äãÇíÔ ãæÇÑÏ ÈíãÇääÏ  " -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5859,7 +5887,7 @@ msgstr "" " äãÇíÔ ãæÇÑÏí ˜å ÝÞØ ÏÑ ÓãÊ ÑÇÓÊ æÌæÏ ÏÇÑÏ \n" "äãÇíÔ ãæÇÑÏ ÈíãÇääÏ ÑÇÓÊ " -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5868,7 +5896,7 @@ msgstr "" " äãÇíÔ ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí \n" " äãÇíÔ ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí " -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5877,7 +5905,7 @@ msgstr "" " äãÇíÔ ãæÇÑÏ ÌÇÇÝÊÇÏå \n" "äãÇíÔ ãæÇÑÏ ÌÇÇÝÊÇÏå " -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5886,7 +5914,7 @@ msgstr "" " ÇäÊÎÇÈ Þáã ÈÑÇí äãÇíÔ \n" " ÇäÊÎÇÈ Þáã äãÇíÔ " -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5895,27 +5923,27 @@ msgstr "" " ÈѐÔÊ Èå ÇÓÊÝÇÏå ÇÒ Þá㠁íÔ ÝÑÖ ÓíÓÊã / ãÌãæÚå ÈÑÇí äãÇíÔ \n" " Þá㠁íÔ ÝÑÖ " -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr " ÏÎÔå / ˜ÇјÊÑ ÝÇÕáå ÓÝíÏ ÑÇ äãÇíÔ ÈÏå " -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr " ÊÛííÑ æÖÚíÊ åÇѐæÔ ÊÝÇæÊ " -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr " ã˜Çä åÇѐæÔ ÊÕæíÑ ˜áí ÇÒ ÑæäÏå åÇ ÑÇ äãÇíÔ ãí ÏåÏ " -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr " äÌÑå ãÍÇæÑå ÂãÇÑ ãÞÇíÓå / åãÓäÌí æÔå ÑÇ äãÇíÔ ÈÏå " -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5924,7 +5952,7 @@ msgstr "" " ÇäÊÎÇÈ ÒÈÇä ÑÇÈØ ˜ÇÑÈÑ ÝÚáí \n" " ÒÈÇä " -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5933,12 +5961,12 @@ msgstr "" " äãÇíÔ ÊÝÇæÊåÇí ÏÇÎá ÎØæØ ÈÇ ÑäåÇí ãÊÝÇæÊ \n" " äãÇíÔ ÊÝÇæÊ ÎØ " -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr " ã˜Çä Ïæ åÇѐæÔ ãÚÇæÖå ÔæÏ " -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5947,7 +5975,7 @@ msgstr "" " äãÇíÔ ÔãÇÑå ÎØæØ \n" " äãÇíÔ ÔãÇÑå ÎØæØ " -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5956,7 +5984,7 @@ msgstr "" " ÝÚÇá ÓÇÒí ÓØÑÈäÏí ÍÑÝí \n" " ÓØÑÈäÏí ÎØæØ " -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5965,22 +5993,22 @@ msgstr "" " ÍÇÔíå åÇí ÇäÊÎÇÈ ÑÇ ÈÑÇí åÑ Ïæ åÇѐæÔ äãÇíÔ ÈÏå \n" " äãÇíÔ ÍÇÔíå åÇí ÇäÊÎÇÈ " -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr " ÇÝÒÇíÔ ÇäÏÇÒå ãÊä " -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr " ˜ÇåÔ ÇäÏÇÒå ãÊä " -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr " ÈÇҐÑÏÇäÏä ÈÒѐäãÇíí ãÊä Èå ÍÇáÊ íÔ ÝÑÖ " -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5989,7 +6017,7 @@ msgstr "" " ÇäÊÞÇá Èå ÊÝÇæÊ ÞÈáí \n" " ÊÝÇæÊ ÞÈáí (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5998,77 +6026,77 @@ msgstr "" " ÇäÊÞÇá Èå ÊÝÇæÊ ÈÚÏí \n" " ÊÝÇæÊ ÈÚÏí (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6077,7 +6105,7 @@ msgstr "" " ÇäÊÞÇá Èå äÎÓÊíä ÊÝÇæÊ \n" " äÎÓÊíä ÊÝÇæÊ (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6086,7 +6114,7 @@ msgstr "" " ÇäÊÞÇá Èå ÊÝÇæÊ ÌÇÑí \n" "ÊÝÇæÊ ÌÇÑí (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6095,7 +6123,7 @@ msgstr "" " ÇäÊÞÇá Èå ÊÝÇæÊ ÂÎÑ \n" " ÂÎÑíä ÊÝÇæÊ (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6104,7 +6132,7 @@ msgstr "" " ÑæäæÔÊ ÈÑÏÇÑí ãÊä ÇäÊÎÇÈ ÔÏå Èå ÑæäÏå ÓãÊ ÑÇÓÊ \n" " ÑæäæÔÊ ÈÑÏÇÑí Èå ÑÇÓÊ (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6113,7 +6141,7 @@ msgstr "" " ÑæäæÔÊ ÈÑÏÇÑí ãÊä ÇäÊÎÇÈ ÔÏå Èå ÑæäÏå ÓãÊ  \n" " ÑæäæÔÊ ÈÑÏÇÑí  (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6122,7 +6150,7 @@ msgstr "" " ÑæäæÔÊ ÈÑÏÇÑí ÊÝÇæÊ Èå ÑÇÓÊ æ íÔÑæí Èå ÊÝÇæÊ ÈÚÏí \n" " ÑæäæÔÊ ÈÑÏÇÑí ÑÇÓÊ æ íÔÑæí (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6131,7 +6159,7 @@ msgstr "" " ÑæäæÔÊ ÈÑÏÇÑí ÊÝÇæÊ Èå  æ íÔÑæí Èå ÊÝÇæÊ ÈÚÏí \n" "ÑæäæÔÊ ÈÑÏÇÑí  æ íÔÑæí (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6140,7 +6168,7 @@ msgstr "" " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ åãå ÊÝÇæÊåÇ Ñæí ÑæäÏå ÓãÊ ÑÇÓÊ \n" " ÊãÇã ÑÇÓÊ" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6149,92 +6177,92 @@ msgstr "" " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ åãå ÊÝÇæÊåÇ Ñæí ÑæäÏå ÓãÊ  \n" " ÊãÇ㠍 " -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr " ÍÐÝ ãæÇÑÏ ÇäÊÎÇÈ ÔÏå ÇÒ åÑ Ïæ ÝåÑÓÊ ÑÇåäãÇ / ÏÇíјÊæÑí " -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr " åãÓäÌí / ãÞÇíÓå ãæÑÏ ÇäÊÎÇÈ ÔÏå - åãÓäÌí äÎÓÊíä ãæÑÏ ÏÑÕæÑÊí˜å äÏ ãæÑÏ ÇäÊÎÇÈ ÔÏå ÈÇÔÏ " -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr " ÇäÊÎÇÈ æ ãÑÊÈ ˜ÑÏä ÏæÈÇÑå ÓÊæäåÇí åãÓäÌí ÝåÑÓÊ ÑÇåäãÇ / ÏÇíјÊæÑí " -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr " ÊæáíÏ í˜ æÕáå / ˜Žäå ÑæäÏå " -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr " ÇäÊÎÇÈ æ ÇÕáÇÍ ÕÇÝíåÇ " -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr " ÊæáíÏ í˜ ÒÇÑÔ ÇÒ äÊÇíÌ åãÓäÌí " -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr " äãÇíÔ ÝåÑÓÊí ÇÒ æÕá ÔÏäíåÇí ãæÌæÏ " -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr " ˜ÇÑÈÑ ÈÇҘääÏå ÈÓÊå ÑÇ ÇäÊÎÇÈ ãí ˜äÏ - Èå åäÇã åãÓäÌí ÝåÑÓÊ ÈÓÊå Çí ÈÇÒ äãí ÔæÏ " -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ÈÇҘääÏå ÈÓÊå ÊØÈíÞ ÏÇÏå ÔÏå Ñæí åÑ Ïæ ÑæäÏå åÇ È˜ÇÑ ÈÓÊå ãí ÔæÏ " -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr " ÇäÊÎÇÈ í˜ ÈÇҘääÏå ÈÓÊå ÈÑÇí æíÑÇíÔ Çíä ÑæäÏå " -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr " ÈÏæä íÔ ÝÑÞ ÐÇÑ - ÚÇÏí " -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr " æÕá ÔÏäíåÇí íÔäåÇÏí " -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr " ÓÇíÑ æÕá ÔÏäíåÇ " -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr " ÊÎáíå åãå æÕá ÔÏäíåÇ æ äÕÈ ãÌÏÏ ÂäåÇ - ÈÑÇí ˜ÇÑÈÑÇä íÔÑÝÊå / ÊæÓÚå ÏåäÏå " -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6243,12 +6271,12 @@ msgstr "" " ÝÚÇá ˜ÑÏä ÑæäÏå ÞÇÈá ÑæÆíÊ ÈÚÏí \n" " ÝÚÇá ˜ÑÏä ÑæäÏå ÈÚÏí " -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr " ÈÓÊä åãå äÌÑå åÇí ÈÇÒ " -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6257,22 +6285,22 @@ msgstr "" " ÈÇҘÑÏä ÑÇåäãÇí æíäãÑÌ \n" " ÑÇåäãÇí æíäãÑÌ " -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr " ÇÓÊÎÑÇÌ ÇØáÇÚÇÊ æíÑÇíÔ æ í˜ÑÈäÏí æíäãÑÌ ÝÚáí Èå ÑæäÏå ãÊäí " -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr " äãÇíÔ ãÌæÒ Úãæãí ˜áí Ìí Çä íæ " -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr " ÓÇÎÊ ÔÎÕí : %1 " -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6281,7 +6309,7 @@ msgstr "" " ÈÇҘÑÏä íÇÏÏÇÔÊåÇí äÔÑ \n" " íÇÏÏÇÔÊåÇí äÔÑ" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6290,292 +6318,292 @@ msgstr "" " ÈÇҘÑÏä æÈ ÓÇíÊ ÊÑÌãå åÇ \n" " ÊÑÌãå åÇ " -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr " ÞÑÇѐÇååÇí æÕá ÔÏäí åÇ" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr " ÈÏæä íÔ ÝÑÞ ÐÇÑ " -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr " íÔ ÝÑÞ ÏÑ ÕæÑÊ Çã˜Çä " -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr " .sct íÏÇ äÔÏ - ÏÓÊ äæÔÊå åÇ ÛíÑ ÝÚÇá ÔÏ WSH " -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<å퍘ÏÇã>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<ÎæϘÇÑ>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr " ÈÇҘÑÏä ÑæäÏå ÈÇ ÈÑäÇãå ˜ÇÑÈÑÏí ÑÓãí " -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr " ÈÇҘÑÏä ÑæäÏå ÈÇ æíÑÇÓÊÇÑ ÈíÑæäí " -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr " ÈÇҘÑÏä ÑæäÏå ÈÇ ÈÑäÇãå æíŽå " -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr " äãÇíÔ äÏÇÏä ˜äÏå åÇí (Èáæ˜åÇí) ÌÇÈÌÇ ÔÏå " -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr " äãÇíÔ åãå ˜äÏå åÇí (Èáæ˜åÇí) ÌÇÈÌÇ ÔÏå " -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr " äãÇíÔ ˜äÏå åÇí (Èáæ˜åÇí) ÌÇÈÌÇ ÔÏå ÇÒ ãÍá ÊÝÇæÊ ÌÇÑí " -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr " ÈÑæ Èå ãÍá ÊÝÇæÊ ÏÑ ãæÞÚíÊ ã˜Çä äãÇ " -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "&G ÈÑæ Èå ÎØ %1 " -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr " ÛíÑ ÝÚÇá " -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr " ÇÒ ÏÓʐÇå (ÓíÓÊã) ÑæäÏå åÇ " -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr " ÇÒ ÝåÑÓÊ ÂÎÑíä ÑæäÏå åÇ " -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr " ãÔÎÕ ä˜ÑÏä " -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr " ÈíÓí˜ " -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr " ÏÓÊå " -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr " ÝæÑÊÑä " -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr " Çíääæ ÓÊǁ " -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr " ÇíäÓÊÇá ÔíáÏ " -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr " ÌÇæÇ " -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr " ÇæÊæáíӁ " -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr " ÇӘÇá " -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr " Ñá " -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr " ÔíÆ Íãá ÔÏäí " -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr " ÇæÑÔá " -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr " íÊæä " -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr " ãäÇÈÚ " -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr " ÑÇÈí " -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr " æÓÊå " -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr " æÑíáæ " -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr " äåÇä ˜ÑÏä ãíáå ÇÈÒÇÑ " -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr " äãÇíÔ ãíáå ÇÈÒÇÑ ˜æ˜ " -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr " äãÇíÔ ãíáå ÇÈÒÇÑ ÈÒѐ " -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 0443aecfb..332d05c11 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -329,7 +329,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< pusty >" @@ -471,7 +471,7 @@ msgstr "Rozpakowywanie &automatycznie" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -535,7 +535,7 @@ msgstr "&Kaskadowo" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Pomoc" @@ -863,7 +863,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Kodowanie pliku" @@ -1467,37 +1467,37 @@ msgid "&Compare method:" msgstr "Metoda &porównania:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Pe³na zawartoœæ" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Skrócona zawartoœæ" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Data modyfikacji" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Data modyfikacji i wielkoœæ" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Wielkoœæ" @@ -1529,7 +1529,7 @@ msgstr "Odwied #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1701,14 +1701,14 @@ msgid "&Versioning System:" msgstr "Œledzenie &wersji:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "S&cie¿ka do cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Ogólne" @@ -1851,7 +1851,7 @@ msgid "&Find Next" msgstr "&Nastêpny" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1897,7 +1897,7 @@ msgid "Replace &All" msgstr "&Wszystkie" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Racjonalne dopasowanie wielkoœci" @@ -1949,7 +1949,7 @@ msgid "Remove" msgstr "Usuñ" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Kolory" @@ -1978,7 +1978,7 @@ msgstr "Usuni #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Tekst" @@ -2029,13 +2029,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Domyœlne" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "System" @@ -2176,7 +2177,7 @@ msgid "Description:" msgstr "Opis:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Zatrzymaj" @@ -2238,7 +2239,7 @@ msgid "&Go To" msgstr "&IdŸ do" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Porównaj" @@ -2289,7 +2290,7 @@ msgid "Filter Comments" msgstr "Komentarze filtra" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Edytor" @@ -2441,7 +2442,7 @@ msgstr "Odrzu #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Strona kodowa" @@ -2731,7 +2732,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtr prywatny (tylko dla bie¿¹cego u¿ytkownika)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Wsparcie dla archiwów" @@ -2782,7 +2783,7 @@ msgid "Files:" msgstr "Pliki:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "ró¿nych" @@ -2819,7 +2820,7 @@ msgid "Right:" msgstr "Prawa:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identyczne" @@ -2872,7 +2873,7 @@ msgid "&Apply" msgstr "Z&astosuj" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "A&nuluj" @@ -2978,7 +2979,7 @@ msgid "Save..." msgstr "Zapisz..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Pliki kopii" @@ -3019,7 +3020,7 @@ msgid "A&ppend timestamp" msgstr "Dodaj czas utworzenia kopii" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "PotwierdŸ kopiowanie" @@ -3060,7 +3061,7 @@ msgid "&Enable plugins" msgstr "W³¹cz wtyczki" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Integracja z systemem" @@ -3096,8 +3097,8 @@ msgid "Add &Shell menu to context menu" msgstr "Dodaj menu &pow³oki plików do menu kontekstowego" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Folder" @@ -3133,69 +3134,102 @@ msgid "&Quick compare limit (MB):" msgstr "Limit sz&ybkiego porównania (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binarne" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041504e2" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x415, 1250" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Gotowy" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3204,12 +3238,12 @@ msgstr "" "Tworzy puste dokumenty\n" "Nowe dokumenty (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3218,7 +3252,7 @@ msgstr "" "Otwórz istniej¹cy dokument\n" "Otwórz (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3227,7 +3261,7 @@ msgstr "" "Zamknij aktywny dokument\n" "Zamknij" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3236,7 +3270,7 @@ msgstr "" "Zapisz aktywny dokument\n" "Zapisz (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3245,7 +3279,7 @@ msgstr "" "Zapisz aktywny dokument pod inn¹ nazw¹\n" "Zapisz jako" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3254,7 +3288,7 @@ msgstr "" "Zmieñ opcje wydruku\n" "Ustawienia strony" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3263,7 +3297,7 @@ msgstr "" "Zmieñ opcje drukarki i wydruku\n" "Ustawienia wydruku" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3272,7 +3306,7 @@ msgstr "" "Wydrukuj bie¿¹cy dokument\n" "Drukuj" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3281,27 +3315,27 @@ msgstr "" "Wyœwietl cale strony\n" "Podgl¹d wydruku" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Poka¿ wszystkie ukryte elementy" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "W³¹cz tryb drzewa" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Rozwiñ wszystkie podfoldery" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Zwiñ wszystkie podfoldery" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3310,32 +3344,32 @@ msgstr "" "Otwórz plik projektu\n" "Plik projektu (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nieznany b³¹d podczas otwierania projektu" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nieznany b³¹d podczas zapisu projektu" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Plik projektu" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Plik projektu za³adowano pomyœlnie." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Plik projektu zapisano pomyœlnie." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3344,7 +3378,7 @@ msgstr "" "Zapisz aktualne œcie¿ki i opcje do pliku projektu\n" "Zapisz plik projektu" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3353,7 +3387,7 @@ msgstr "" "Wyœwietl informacje o programie, numer wersji i info o prawach autorskich\n" "O programie" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3362,27 +3396,27 @@ msgstr "" "WyjdŸ z programu; program pyta, czy zachowaæ dokumenty\n" "WyjdŸ" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Otwórz ten dokument" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3391,7 +3425,7 @@ msgstr "" "PrzejdŸ do nastêpnego panelu\n" "Nastêpny panel" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3400,7 +3434,7 @@ msgstr "" "Wróæ do poprzedniego panelu\n" "Poprzedni panel" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3409,7 +3443,7 @@ msgstr "" "Ustaw okna w nak³adaj¹c¹ siê kaskadê\n" "Kaskadowo" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3418,7 +3452,7 @@ msgstr "" "Ustaw okna obok siebie poziomo\n" "Okna poziomo" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3427,7 +3461,7 @@ msgstr "" "Ustaw okna obok siebie pionowo\n" "Okna pionowo" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3436,7 +3470,7 @@ msgstr "" "Kopiuj zaznaczenie i wstaw do schowka\n" "Kopiuj" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3445,7 +3479,7 @@ msgstr "" "Wytnij zaznaczenie i wstaw do schowka\n" "Wytnij" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3454,7 +3488,7 @@ msgstr "" "ZnajdŸ wskazany tekst\n" "Wyszukaj" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3463,7 +3497,7 @@ msgstr "" "Wstaw zawartoœæ schowka\n" "Wklej" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3472,7 +3506,7 @@ msgstr "" "Powtórz ostatni¹ czynnoœæ\n" "Powtórz" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3481,7 +3515,7 @@ msgstr "" "Zast¹p dany tekst innym\n" "Zast¹p" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3490,7 +3524,7 @@ msgstr "" "Zaznacz ca³y dokument\n" "Zaznacz wszystko" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3499,7 +3533,7 @@ msgstr "" "Cofnij ostatni¹ czynnoœæ\n" "Cofnij" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3508,7 +3542,7 @@ msgstr "" "Powtórz cofniêt¹ czynnoœæ\n" "Powtórz" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3517,7 +3551,7 @@ msgstr "" "Poka¿ lub ukryj pasek narzêdzi\n" "Prze³¹cz pasek narzêdzi" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3526,7 +3560,7 @@ msgstr "" "Poka¿ lub ukryj pasek stanu\n" "Prze³¹cz pasek stanu" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3535,7 +3569,7 @@ msgstr "" "Poka¿ lub ukryj pasek kart\n" "W³¹cz pasek kart" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3544,57 +3578,57 @@ msgstr "" "Zmieniaj rozmiar paneli automatycznie\n" "Zablokuj panele" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Zmieñ rozmiar okna" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Zmieñ pozycjê okna" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Zredukuj okno do ikony" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Maksymalnie powiêksz okno" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Prze³¹cz na okno nastêpnego dokumentu" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Prze³¹cz na okno poprzedniego dokumentu" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zamknij aktywne okno; program pyta, czy zachowaæ dokumenty" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Przywróc normalny rozmiar okna" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "W³¹cz listê zadañ" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktywuj to okno" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3603,7 +3637,7 @@ msgstr "" "Zamknij podgl¹d wydruku\n" "Anuluj podgl¹d" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3622,7 +3656,7 @@ msgstr "" "WinMerge.FileCompare\n" "Porównanie plików WinMerge " -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3641,19 +3675,19 @@ msgstr "" "WinMerge.FolderCompare\n" "Porównanie folderów WinMerge" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Zapisz oryginalne znaki koñca linii" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Kliknij prawym klawiszem na œcie¿kê do skopiowania" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3662,143 +3696,143 @@ msgstr "" "Twórcy:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 jest rozprowadzany BEZ JAKIEJKOLWIEK GWARANCJI. To jest darmowe oprogramowanie i mo¿na je redystrybuowaæ pod szczególnymi warunkami; w celu uzyskania szczegó³owych informacji zobacz Licencjê GNU General Public License w menu Pomoc." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Przerwij" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "P&onów" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignoruj" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignoruj &wszystkie" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Tak" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Tak na &wszystkie" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nie na w&szystkie" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Kontynuuj" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Pom&iñ" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Pomiñ ws&zystkie" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Nie wyœwietlaj ponownie tego komunikatu." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Nie &pytaj ponownie." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Sk³adnia" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Kontrola wersji" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Ró¿nice" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Z lewej:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "na lew¹:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Z prawej:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Na praw¹" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Wersja %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opcje (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Wszystkie komunikaty zostan¹ ponownie wyœwietlone." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3809,84 +3843,84 @@ msgstr "" "\n" "Proszê u¿yæ wartoœci 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Otwórz" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Pliki projektów WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Pliki ustawieñ (*.ini)|*.ini|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Pliki Text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Pliki HTML (*.htm,*.html)|*.htm;*.html|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nazwa" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "lokalizacja" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Wybierz nazwê dla nowego filtru" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry plików(*.flt)|*.flt|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3899,7 +3933,7 @@ msgstr "" "Proszê skopiowaæ plik %1 do folderu WinMerge/Filters:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3912,7 +3946,7 @@ msgstr "" "\n" "Upewnij siê, ¿e folder taki istnieje i jest zapisywalny." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3923,7 +3957,7 @@ msgstr "" "\n" "Proszê wybraæ folder filtrów w opcje/System." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3936,12 +3970,12 @@ msgstr "" "\n" "Byæ mo¿e plik ten jest tylko do odczytu?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Lokalizuj plik fitra do instalacji" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3952,17 +3986,17 @@ msgstr "" "\n" "Nie mo¿na skopiowaæ pliku do foldera filtrów." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Plik filtra ju¿ istnieje. Czy nadpisaæ istniej¹cy plik?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Wyra¿enia regularne" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3973,258 +4007,258 @@ msgstr "" "\n" "Je¿eli nie chcesz odœwierzaæ okien porównañ teraz, wybierz Nie i odœwie¿ okna póŸniej." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "Œcie¿ka do SS.EXE" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Wyniki porównania folderów" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Porównywanie plików" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Lewy bez tytu³u" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Prawy bez tytu³u" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Ich plik" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Mój plik" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Skanowanie plików..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Otwieranie wybranych" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopiowanie lewej na praw¹" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopiowanie prawej na lew¹" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopiowanie wszystkich na lew¹" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopiowanie wszystkich na praw¹" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopiowanie plików..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Usuwanie plików..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Przenoszenie plików..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Tworzenie raportu..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Cofanie ostatniej operacji..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Przywracanie ostatniej operacji..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Linia: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Scal" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Ró¿nica %1 z %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "Znaleziono ró¿nic: %1" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "Znaleziono 1 ró¿nicê" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "Tylko odczyt" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Element %1 z %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Elementy: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wybierz dwa istniej¹ce foldery lub pliki do porównania" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Wybór katalogu" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Wybierz dwa foldery lub pliki do porównania." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Lewa œcie¿ka nieprawid³owa!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Prawa œcie¿ka nieprawid³owa!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Obie œcie¿ki nieprawid³owe!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Wybierz dwa pliki, aby umo¿liwiæ wybór programu rozpakowuj¹cego." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Nie mo¿na porównaæ pliku i folderu!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Nie znaleziono pliku: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Plik nie rozpakowany: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4237,12 +4271,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "B³¹d parsowania pliku konflitku" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4253,27 +4287,27 @@ msgstr "" "%1\n" "nie jest plikiem konfliktu" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Zapisz jako" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Zapisaæ zmiany w %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 tylko do odczytu. Czy chcesz zachowaæ plik pod inn¹ nazw¹?" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "B³¹d przy tworzeniu kopii zapasowej pliku" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4286,7 +4320,7 @@ msgstr "" "\n" "Kontynuowaæ ?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4303,7 +4337,7 @@ msgstr "" "\t-u¿yæ innej nazwy pliku (wybierz Ok)\n" "\t-anulowaæ operacjê (wybierz Anuluj)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4318,7 +4352,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4333,7 +4367,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4348,7 +4382,7 @@ msgstr "" "\n" "Nadpisaæ zmieniony plik?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4357,7 +4391,7 @@ msgstr "" "%1\n" "jest oznaczony jako tylko do odczytu. Czy zignorowaæ status tylko do odczytu?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4372,22 +4406,22 @@ msgstr "" "\n" "Czy prze³adowaæ plik?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Zapisz lewy plik jako" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Zapisz prawy plik jako" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4398,7 +4432,7 @@ msgstr "" "%1\n" "zosta³ usuniêty. Aby kontynuowaæ proszê zapisaæ jego kopiê" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4409,42 +4443,42 @@ msgstr "" "\n" "Przed kontynuacj¹ odœwie¿ dokumenty." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Musisz wskazaæ scie¿kê projektu SourceSafe aby kontynuowaæ (tj.: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Pobie¿ pliki z VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "System œledzenia wersji zwróci³ b³¹d podczas próby pobrania pliku. Nie mo¿na kontynuowaæ..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "B³¹d wykonania polecenia systemu wersjonowania." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Katalog roboczy VSS oraz lokalizacja bie¿acego pliku nie zgadzaj¹ siê. Kontynuowaæ?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Nie znaleziono bazy VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "B³¹d VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4455,7 +4489,7 @@ msgstr "" " Proszê sprawdziæ config_spec u¿ywanego widoku.\n" " Cofn¹æ operacjê checkout?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4464,164 +4498,164 @@ msgstr "" "System œledzenia wersji zwróci³ b³¹d podczas operacji uncheckout.\n" " Proszê sprawdziæ config_spec u¿ywanego widoku." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Brak" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "(Visual SourceSafe (poni¿ej 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i wy¿ej)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Zatrzymaj na przerwie" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Zatrzymaj na przerwie lub punktorze" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiuj wybrany plik do wskazanego katalogu" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiuj wybrany plik do katalogu" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Usuñ wybran¹ pozycjê z lewej" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Usuñ wybran¹ pozycjê z prawej" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Usuñ wybrane pozycje po obu stronach" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ukryj wybrane elementy (filtr roboczy)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Zmieñ nazwê wybranej pozycji na obu stronach" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Prawa na lew¹ (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Lewa na praw¹ (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Prawa na lew¹ (%1 z %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lewa na praw¹ (%1 z %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Lewa na... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Prawa na... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lewa na... (%1 z %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Prawa na... (%1 z %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Lewa (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Prawa (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Obie (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Lewa (%1 z %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Prawa (%1 z %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Obie (%1 z %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Lewa strona - wybierz folder docelowy:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Prawa strona - wybierz folder docelowy:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 objêtych plików)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 z %2 objêtych plików)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4632,17 +4666,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Czy na pewno skopiowaæ:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Czy na pewno skopiowaæ %d elementów:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4661,613 +4695,607 @@ msgstr "" "\n" "Proszê odœwie¿yæ porównanie." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Czy na pewno przenieœæ:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Czy na pewno przenieœæ %d elementów:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Potwierdzenie przenoszenia" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Otwórz lewy plik" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Otwórz lewy plik w zewnêtrznym edytorze" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Otwórz lewy plik w..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Otwórz prawy plik" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Otwórz prawy plik w zewnêtrznym edytorze" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Otwórz prawy plik w..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nie mo¿na uruchomiæ zewnêtrznego edytora: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiuj nazwy plików do schowka" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiuj œcie¿ki z lewej do schowka" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiuj œcie¿ki z prawej do schowka" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiuj œcie¿ki z obu stron do schowka" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Menu pow³oki pliku po lewej" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Menu pow³oki pliku po prawej" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Nieznany format archiwum" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj elementy z lewej do archiwum" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj elementy z prawej do archiwum" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj elementy z obu stron do archiwum" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj ró¿ne elementy do archiwum (z obu stron)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Kopiuj wybrany plik z lewej do katalogu" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Kopiuj wybrany plik z prawej do katalogu" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Plik" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Wynik porównania" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Data pliku po lewej" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Data pliku po prawej" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Rozszerzenie" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Rozmiar w lewym panelu" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Rozmiar w prawym panelu" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Rozmiar po prawej (krótki)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Rozmiar po lewej (krótki)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Czas utworzenia po lewej" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Czas utworzenia po prawej" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Nowszy plik" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Wersja pliku po lewej" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Wersja pliku po prawej" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Skrócony wynik" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atrybuty po lewej" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atrybuty pliku po prawej" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Lewe ZKL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Prawe ZKL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Lewe kodowanie" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Prawe kodowanie" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ignorowane ró¿n." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binarne" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Nie mo¿na porównaæ plików" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Anulowany" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Plik pominiêty" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Folder pominiêty" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Tylko po lewej: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Tylko po prawej: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Pliki binarne s¹ identyczne" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Pliki binarne s¹ ró¿ne" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Pliki s¹ ró¿ne" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Foldery different" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Tylko po lewej" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Tylko po prawej" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "B³¹d" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Pliki tekstowe s¹ identyczne" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Pliki tekstowe s¹ ró¿ne" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Up³ynê³o: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "wybrano 1 element" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "wybrano %1 elementów" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Plik lub katalog." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazwa podkatalogu, gdy podkatalogi s¹ przetwarzane." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Wynik porównania – wersja pe³na." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Data modyfikacji lewej strony." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Data modyfikacji prawej strony." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Rozszerzenie pliku." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Rozmiar lewego pliku w bajtach." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Rozmiar prawego pliku w bajtach." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Lewa wielkoœæ pliku skrócona." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Prawa wielkoœæ pliku skrócona." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Czas utworzenia lewej strony." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Czas utworzenia prawej strony." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Pokazuje, która strona zosta³a póŸniej zmodyfikowana." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Wersja pliku z lewej - tylko dla niektórych typów." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Wersja pliku z prawej - tylko dla niektórych typów." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Skrócony wynik porównania." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atrybuty lewej strony." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atrybuty prawej strony." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Typ znaków koñca linii z lewej" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Typ znaków koñca linii z prawej" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Kodowanie lewej strony." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Kodowanie prawej strony." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Liczba ró¿nic zignorowanych w pliku. Ró¿nice te zosta³y zignorowane przez WinMerge i nie mog¹ zostaæ po³¹czone." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Liczba ró¿nic w pliku. Liczba ta nie zawiera zignorowanych ró¿nic." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Pokazuje gwiazdkê (*) jeœli plik binarny." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Porównaj %1 z %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Lista z przecinkami" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Lista z tabulatorami" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Prosty HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Prosty XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Plik raportu ju¿ istnieje. Czy chcesz nadpisaæ istniej¹cy plik ?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5276,32 +5304,32 @@ msgstr "" "B³¹d przy tworzeniu raportu:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Raport zosta³ pomyœlnie utworzony." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Ten sam plik otwierany w obu panelach." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Wybrane pliki s¹ identyczne." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "B³¹d podczas porównywania plików." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nie mo¿na utworzyæ plików tymczasowych. SprawdŸ ustawienie œcie¿ki tymczasowej." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5316,17 +5344,17 @@ msgstr "" "\n" "Uwaga: Jeœli odmienne znaki koñca linii maj¹ zawsze byæ traktowane jako równowa¿ne, ustaw opcjê 'Ignoruj ró¿nice koñca linii...' na zak³adce porównania w oknie opcji (dostêpne w Edycja/Opcje)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Wybrany folder jest nieprawid³owy." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nie mo¿na otworzyæ w edytorze pliku binarnego." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5341,7 +5369,7 @@ msgstr "" "%1\n" "na drugiej stronie i otworzyæ te foldery?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5352,168 +5380,168 @@ msgstr "" "Wyœwietlanie ka¿dego pliku w odpowiedniej stronie kodowej da lepsze wyniki, ale scalenie/skopiowanie bêdzie niebezpieczne.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Utrata informacji z powodu b³êdów kodowania: oba pliki" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Brak ró¿nic" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Ró¿nice wierszy" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Zast¹piono %1 sekwencji znaków." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nie mo¿na znaleŸæ sekwencji znaków \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopiuj pe³n¹ œcie¿kê" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopiuj nazwê pliku" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Okno lokacji" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Okno Diff" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Utworzono ³atkê.." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Plik patch ju¿ istnieje. Czy napisaæ plik?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[wybrano %1 plików]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normalny" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Zunifikowany" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Nie mo¿na zapisaæ do pliku %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Wybrana œcie¿ka docelowa nie jest absolutna: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Wybierz plik docelowy" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nie mo¿na utworzyæ patcha z plików binarnych." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nie mo¿na utworzyæ patcha z katalogów." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5524,12 +5552,12 @@ msgstr "" "\n" "Tworzenie patcha wymaga zapisania wszystkich zmian w plikach." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Folder nie istnieje." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5540,7 +5568,7 @@ msgstr "" "Nie znaleziono komponentów (7-zip i/lub Merge7z*.dll) wymaganych do obs³ugi archiwów.\n" "Informacje o obs³udze archiwów zawiera podrêcznik." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5549,7 +5577,7 @@ msgstr "" "\n" "Uwaga: Integracja 7-Zip jest wy³¹czona w ustawieniach programu." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5558,37 +5586,37 @@ msgstr "" "\n" "Uwaga: Integracja 7-Zip ograniczona jest do podstawowych operacji w ustawieniach programu." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Wybierz plik do eksportu" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Wybierz plik do importu" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Zaimportowano opcje z pliku." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Wyeksportowano opcje do pliku." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "B³¹d podczas importu opcji z pliku." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "B³¹d podczas eksportu opcji do pliku." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5599,157 +5627,157 @@ msgstr "" "\n" "Czy na pewno kontynuowaæ?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "£¹czone" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Program rozpakowuj¹cy" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Ró¿nicowanie wstêpne" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Skrypt edytora" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Zapisz lewy plik" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Zapisz prawy plik" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Zapisz lewy plik pod nazw¹..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Zapisz prawy plik pod nazw¹..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konwertuj ZKL na Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konwertuj ZKL na Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konwertuj ZKL na Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Prze³¹cz miêdzy trybami edycji i scalania" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5758,12 +5786,12 @@ msgstr "" "Poka¿ i dostosuj w³aœciwoœci kodowania pliku\n" "W³aœciwoœci kodowania pliku" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Otwórz i rozwi¹¿ plik konfliktu" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5772,7 +5800,7 @@ msgstr "" "Zaznacz obszar ró¿nicy w bie¿¹cej linii\n" "Ró¿nica w bie¿¹cej linii" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5781,7 +5809,7 @@ msgstr "" "PrzejdŸ do linii lub ró¿nicy\n" "IdŸ do (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5790,7 +5818,7 @@ msgstr "" "Ustaw opcje programu\n" "Opcje" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5799,79 +5827,79 @@ msgstr "" "Odœwie¿ podgl¹d\n" "Odœwie¿ (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiuj wybrane linie do schowka dodaj¹c numeracjê wierszy" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Dodaj zak³adkê" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "IdŸ do nastêpnej zak³adki" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "IdŸ do poprzedniej zak³adki" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Wyczyœæ wszystkie zak³adki" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "Wyœwietla pliki, które s¹ dok³adnie identyczne" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "Wyswietla pliki z ró¿nicami" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "Wyswietla pliki istniej¹ce tylko po lewej" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "Wyswietla pliki istniej¹ce tylko po prawej" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "Wyœwietla pliki binarne" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "Wyœwietla pominiête pliki" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5880,7 +5908,7 @@ msgstr "" "Wybierz czcionkê podgl¹du\n" "Wybierz czcionkê podgl¹du" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5889,27 +5917,27 @@ msgstr "" "Przywróæ domyœln¹ czcionkê systemow¹ podgl¹du\n" "Czcionka domyœlna" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Pokazuje bia³e znaki" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Prze³¹cz panel ró¿nic" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panel pokazuje ogólny obraz z plików" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Poka¿ okno statystyk porównania folderu" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5918,7 +5946,7 @@ msgstr "" "Wybierz jêzyk interfejsu u¿ytkownika\n" "Jêzyk" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5927,12 +5955,12 @@ msgstr "" "Pokazuj ró¿nice wewn¹trz linii ró¿nymi kolorami\n" "Pokazuj ró¿nicê linii" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Zamieñ pozycje dwóch okien" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5941,7 +5969,7 @@ msgstr "" "Poka¿ numery linii\n" "Poka¿ numery linii" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5950,7 +5978,7 @@ msgstr "" "W³¹cz zawijanie s³ów\n" "Zawijaj linie" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5959,22 +5987,22 @@ msgstr "" "Pokazuje marginesy zaznaczenie dla obu paneli\n" "Poka¿ marginesy zaznaczenia" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Zwiêksz rozmiar tekstu" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Zmniejsz rozmiar tekstu" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Resetuj powiêkszenie" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5983,7 +6011,7 @@ msgstr "" "IdŸ do poprzedniej ró¿nicy\n" "Poprzednia ró¿nica (Alt+Góra)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5992,77 +6020,77 @@ msgstr "" "IdŸ do nastêpnej ró¿nicy\n" "Nastêpna ró¿nica (Alt+Dó³)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6071,7 +6099,7 @@ msgstr "" "IdŸ do pierwszej ró¿nicy\n" "Pierwsza ró¿nica (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6080,7 +6108,7 @@ msgstr "" "IdŸ do bie¿¹cej ró¿nicy\n" "Bie¿¹ca ró¿nica (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6089,7 +6117,7 @@ msgstr "" "IdŸ do ostatnej ró¿nicy\n" "Ostatnia ró¿nica (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6098,7 +6126,7 @@ msgstr "" "Kopiuj wybrany tekst do prawego pliku\n" "Kopiuj na prawo (Alt+Prawo)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6107,7 +6135,7 @@ msgstr "" "Kopiuj wybrany tekst do lewego pliku\n" "Kopiuj na lewo (Alt+Lewo)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6116,7 +6144,7 @@ msgstr "" "Kopiuj ró¿nicê na prawo i przejdŸ do nastêpnej\n" "Kopiuj na prawo i nastêpna (Ctrl+Alt+Prawo)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6125,7 +6153,7 @@ msgstr "" "Kopiuj ró¿nicê na lewo i przejdŸ do nastêpnej\n" "Kopiuj na lewo i nastêpna (Ctrl+Alt+Lewo)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6134,7 +6162,7 @@ msgstr "" "Kopiuj wszystkie ró¿nice do prawego pliku\n" "Wszystkie na prawo" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6143,92 +6171,92 @@ msgstr "" "Kopiuj wszystkie ró¿nice do lewego pliku\n" "Wszystkie na lewo" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Usuñ zaznaczone elementy z obu folderów" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porównaj zaznaczony element (porównaj pierwszy element jeœli zaznaczono wiele elementów)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Wybierz i ponownie uporz¹dkuj kolumny porównania katalogów" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Generuj ³atkê" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Wybierz i modyfikuj filtry" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Generuje raport z wyników porównania" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Pokazuje listê dostêpnych wtyczek" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "U¿ytkownik wybiera program rozpakowuj¹cy (bez rozpakowywania podczas porównania katalogów)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Program rozpakowuj¹cy zostanie uruchomiony dla obu plików (jeden plik wymaga rozszerzenia)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Wybierz program rozpakowuj¹cy, by edytowaæ plik" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Bez ró¿nicowania wstêpnego (normalne)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Sugerowane wtyczki" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Inne wtyczki" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Od³¹cz i ponownie pod³¹cz wszystkie wtyczki (dla programistów)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6237,12 +6265,12 @@ msgstr "" "Aktywuje nastêpny widoczny plik\n" "Aktywuj nastêpny plik" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Zamyka wszystkie otwarte okna" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6251,22 +6279,22 @@ msgstr "" "Otwiera pomoc WinMerge\n" "Pomoc WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Wyœwietla bie¿¹c¹ wersjê WinMerge oraz tekstowy plik konfiguracji" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Wyœwietla licencjê GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Kompilacja prywatna: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6275,7 +6303,7 @@ msgstr "" "Otwiera dokument z informacjami o wydaniu\n" "Informacje o wydaniu" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6284,292 +6312,292 @@ msgstr "" "Otwiera witrynê t³umaczeñ\n" "T³umacznia" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Ustawienia wtyczki" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Bez ró¿nicowania wstêpnego" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Ró¿nicuj wstêpnie, jeœli mo¿na" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nie znaleziono WSH – skrypty .sct wy³¹czone" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Otwórz plik w zarejestrowanej aplikacji" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Otwórz plik w zewnêtrznym edytorze" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Otwórz plik w wybranym programie" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Nie wyœwietlaj przenoszonych bloków" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Wyœwietl wszystkie przeniesione bloki" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Wyœwietl przeniesione bloki tylko od bie¿¹cej ró¿nicy" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "IdŸ do ró¿nicy pod kursorem" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "&IdŸ do linii %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Wy³¹czone" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Z systemu plików" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Z listy MRU" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Bez podœwietlenia" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Zasoby" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ukryj pasek narzêdzi" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Poka¿ ma³y pasek narzêdzi" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Poka¿ du¿y pasek narzêdzi" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index d479be3cb..36edef05c 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -327,7 +327,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -469,7 +469,7 @@ msgstr "Extrac #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -533,7 +533,7 @@ msgstr "Cascata" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "A&juda" @@ -861,7 +861,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "" @@ -1465,37 +1465,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Conteúdo essencial" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Data de modificação" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Data de modificação e tamanho" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Tamanho" @@ -1527,7 +1527,7 @@ msgstr "Visite o site de WinMerge!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "" @@ -1699,14 +1699,14 @@ msgid "&Versioning System:" msgstr "Sistema de versão:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "Destino de cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Geral" @@ -1849,7 +1849,7 @@ msgid "&Find Next" msgstr "Localizar próximo" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "OK" @@ -1895,7 +1895,7 @@ msgid "Replace &All" msgstr "Substituir todos" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Alteração lógica de maiúsculas/minúsculas" @@ -1947,7 +1947,7 @@ msgid "Remove" msgstr "" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Cores" @@ -1976,7 +1976,7 @@ msgstr "Eliminado" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Texto" @@ -2027,13 +2027,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Predefinição" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistema" @@ -2174,7 +2175,7 @@ msgid "Description:" msgstr "Descrição:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Parar" @@ -2236,7 +2237,7 @@ msgid "&Go To" msgstr "Ir para" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Comparar" @@ -2287,7 +2288,7 @@ msgid "Filter Comments" msgstr "Filtrar comentários" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "" @@ -2439,7 +2440,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Página de código" @@ -2709,7 +2710,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtro privado (apenas para o utilizador actual)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Suporte de arquivo" @@ -2760,7 +2761,7 @@ msgid "Files:" msgstr "Ficheiros:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Diferente" @@ -2797,7 +2798,7 @@ msgid "Right:" msgstr "Direita:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Idêntico" @@ -2850,7 +2851,7 @@ msgid "&Apply" msgstr "Aplicar" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "Cancelar" @@ -2956,7 +2957,7 @@ msgid "Save..." msgstr "Guardar..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "" @@ -2997,7 +2998,7 @@ msgid "A&ppend timestamp" msgstr "" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "" @@ -3038,7 +3039,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3074,8 +3075,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Pasta" @@ -3111,2939 +3112,2966 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binário" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "081604e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x816, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "Criar documentos\nNovos documentos (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "Abrir um documento existente\nAbrir (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "Close the active document\nClose" msgstr "Fechar o documento activo\nFechar" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "Guardar o documento actual\nGuardar (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "Guardar o documento actual com novo nome\nGuardar como" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "Change the printing options\nPage Setup" msgstr "Modificar as opções de impressão\nConfiguração de página" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "Alterar a impressora e as opções de impressão\nConfiguração de impressão" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "Print the active document\nPrint" msgstr "Imprimir o documento actual\nImprimir" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "Display full pages\nPrint Preview" msgstr "Exibir páginas inteiras\nPré-visualização" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Mostrar todos os itens ocultados" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "Abrir projecto\nProject file (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao abrir projecto" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao guardar projecto" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Projecto:" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Projecto carregado com sucesso." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Projecto guardado com sucesso." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "Guardar localização e opções do projecto\nSave Project File" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "Mostrar informação do programa, número da versão e direitos de autor\nAbout" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "Sair da aplicação; confirmar guardar documentos\nExit" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Abre este documento" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "Mudar para a próxima janela\nNext Pane" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "Voltar à janela anterior\nPrevious Pane" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "Ordenar janelas em cascata\nCascade Windows" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "Ordenar janelas sem sobreposição\nTile Windows" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "Ordenar janelas sem sobreposição\nTile Windows" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "Copiar a selecção e colocá-la na Área de Transferência\nCopy" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "Cortar a selecção e colocá-la na Área de Transferência\nCut" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "Find the specified text\nFind" msgstr "Localizar texto especificado\nFind" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "Inserir conteúdo da Área de Transferência\nPaste" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "Repeat the last action\nRepeat" msgstr "Repetir a última acção\nRepeat" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "Substituir texto especificado por texto diferente\nReplace" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "Select the entire document\nSelect All" msgstr "Seleccionar todo o documento\nSelect All" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "Anular a última acção\nUndo (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "Refazer a anterior acção anulada\nRedo (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "Mostrar/Ocultar a barra de ferramentas\nToggle ToolBar" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "Mostrar/Ocultar a barra de estado\nToggle StatusBar" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Alterar o tamanho da janela" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Alterar a posição da janela" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um ícone" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho máximo" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Mudar para a janela do próximo documento" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Mudar para a janela do documento anterior" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fechar a janela activa e confirmar guardar documentos" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Aumentar a janela para o tamanho normal" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Activar lista de tarefas" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Activar esta janela" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "Fechar pré-visualização\nCancel Preview" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Manter caracteres EOL originais" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o botão direito do rato no destino a copiar" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 "" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "Abortar" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "Tentar novamente" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "Ignorar" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorar todos" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "Sim" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Sim para todos" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "Não" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Não para todos" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "Continuar" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Avançar" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Avançar todos" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Não voltar a exibir esta mensagem." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Não voltar a perguntar." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Controlo de versão" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Diferenças" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versão %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opções (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as mensagens estão novamente disponíveis." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projectos WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Localização" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Descrição" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Seleccionar nome de ficheiro para novo filtro" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ficheiros de filtros (*.ini)|*.ini|Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Localizar filtro a instalar" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Relatório de comparação de arquivos" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Comparação de ficheiros" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Sem título esquerda" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Sem título direita" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Analisando ficheiros..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "A abrir selecção" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "A copiar da esquerda para a direita" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "A copiar da direita para a esquerda" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "A copiar tudo para a esquerda" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "A copiar tudo para a direita" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "A copiar ficheiros..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "A eliminar ficheiros..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "A mover ficheiros..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "A criar relatório..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenças encontradas" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 diferença encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Item %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dois arquivos ou ficheiros existentes para comparar" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Selecção de pasta" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dois arquivos ou ficheiros para comparar." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "A pasta de destino da esquerda é inválido!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "A pasta de destino da direita é inválida!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Ambas as pastas de destino são inválidas!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleccione dois ficheiros para activar a selecção de extractor." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossível comparar ficheiro ou arquivo!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Ficheiro não encontrado: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Ficheiro não extraído: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "Impossível abrir ficheiro\n%1\n\n%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Guardar como" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Guardar alterações em %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 é apenas de leitura. Deseja substituir o ficheiro apenas de leitra ? (Não, para guardar com novo nome.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Erro ao criar cópia de segurança" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" msgstr "Erro ao guardar ficheiro.\n%1\n%2\nDeseja:\n\t-usar um nome diferente para o ficheiro (Prima Ok)\n\t-abortar a acção actual (Prima Cancelar)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "Plugin '%2' impossível comprimir as suas alterações no ficheiro esquerdo em '%1'.\n\nO ficheiro original não será alterado.\n\nDeseja guardar a versão não comprimida em outro ficheiro?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "Plugin '%2' impossível comprimir as suas alterações no ficheiro direito em '%1'.\n\nO ficheiro original não será alterado.\n\nDeseja guardar a versão não comprimida em outro ficheiro?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "Outra aplicação actualizou o ficheiro\n%1\ndesde a incialização de WinMerge.\n\nSubstituir ficheiro modificado?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "%1\né apenas de leitura. Deseja substituir o item apenas de leitura?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Guardar ficheiro esquerdo como..." -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Guardar ficheiro direito como..." -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "Impossível combinar diferenças quando os documentos não estão sincronizados.\n\nActualizar documentos antes de continuar." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Tem de especificar o destino de um projecto SourceSafe para continuar (ex: $/OMeuProjecto)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger ficheiros de VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistema de versões apresentou erro ao tentar desproteger ficheiro. Impossível contiuar..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar comando do sistema de versões." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "O ficheiro de trabalho de VSS e o destino do ficheiro actual não coincidem. Continuar?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Base(s) de dados VSS não encontrada(s)!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Erro no VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?" msgstr "O sistema de versões apresentou um erro ao tentar desproteger o ficheiro.\n Verifique a configuração da visualização utilizada.\n Anular a operação de desprotecção?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "O sistema de versões apresentou um erro ao tentar anular a desprotecção do ficheiro.\n Verifique a configuração da visualização utilizada." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior a 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superior)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Quebra de linha nos espaços" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebra de linha nos espaços ou pontuação" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar o item seleccionado para a directoria nomeada" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar o item seleccionado para a directoria personalizada" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Eliminar item seleccionado à esquerda" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Eliminar item seleccionado à direita" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Eliminar item(s) seleccionado(s) em ambos os lados" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ocultar item(s) seleccionado(s) (no filtro)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Renomear o item seleccionado em ambos os lados" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Da direita para a esquerda (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Da esquerda para a direita (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da direita para a esquerda (%1 de %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da esquerda para a direita (%1 de %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Da esquerda para... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Da direita para... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Da esquerda para... (%1 de %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Da direita para... (%1 de %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de 2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Direita (%1 de 2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - seleccione pasta de destino:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - seleccione pasta de destino:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ficheiros afectados)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 ficheiros afectados)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "Tem certeza que deseja eliminar\n\n%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Abrir ficheiro esquerdo" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Abrir ficheiro esquerdo no editor externo" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Abrir ficheiro esquerdo com..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Abrir ficheiro direito" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Abrir ficheiro direito no editor externo" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Abrir ficheiro direito com..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Erro ao executar editor externo: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar nomes dos ficheiros para a Área de Transferência" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar destino do lado esquerdo para a Área de Transferência" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar destino do lado direito para a Área de Transferência" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar destino de ambos os lados para a Área de Transferência" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo desconhecido" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Adicionar itens do lado esquerdo ao arquivo" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Adicionar itens do lado direito ao arquivo" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Adicionar itens de ambos os lados ao arquivo" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Adicionar outros itens ao arquivo (ambos os lados)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nome do ficheiro" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultado da comparação" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Data da esquerda" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Data da direita" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Lado esquerdo" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Lado direito" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Lado direito (Curto)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Lado esquerdo (Curto)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Data de criação - Esq" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Data de criação - Dta" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Ficheiro mais recente" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Versão do ficheiro esquerdo" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Versão do ficheiro direito" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Resultado resumido" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atributos esq" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atributos dta" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "EOL esq" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "EOL dta" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Codificação esq" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Codificação dta" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Diferença ignorada." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binário" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Impossível comparar ficheiros" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Ficheiro omitido" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Arquivo omitido" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Os ficheiros binários são idênticos" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Os ficheiros binários são diferentes" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Os ficheiros são diferentes" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Apenas esquerda" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Apenas direita" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %Id ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 item seleccionado" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 itens seleccionado" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nome do ficheiro ou pasta." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome de sub-ficheiro quando sub-ficheiros incluídos." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparação, forma extensa." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Data de modificação do lado esquerdo." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Data de modificação do lado direito." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Extensão do ficheiro." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do ficheiro em bytes." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do ficheiro direito em bytes." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do ficheiro esquerdo abreviado." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do ficheiro direito abreviado." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Data de criação do lado esquerdo." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Data de criação do lado direito." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica o lado com a data de modificação mais recente." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versão do ficheiro do lado esquerdo, apenas para alguns tipos de ficheiros." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versão do ficheiro do lado direito, apenas para alguns tipos de ficheiros." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Resultado resumido da comparação." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tipo de ficheiro EOL do lado esquerdo" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tipo de ficheiro EOL do lado direito" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Codificação do lado esquerdo." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Codificação do lado direito." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferenças ignoradas no ficheiro. Estas diferenças são ignoradas pelo WinMerge e não podem ser combinadas." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferenças no ficheiro. Este número não inclui diferenças ignoradas." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Apresenta um asterisco (*) se ficheiro for binário." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 com %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vírgulas" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabulações" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML simples" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "HTML simples" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "Error creating the report:\n%1" msgstr "Erro ao criar relatório:\n%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "O relatório foi criado com sucesso." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo ficheiro está aberto em ambas as janelas." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Os ficheiros seleccionados são idênticos." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocorreu um ero ao comparar os ficheiros." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Impossível criar ficheiros temporários. Verifique as suas definições de ficheiros temporários." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "O arquivo seleccionado é inválido." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossível abrir ficheiro binário no editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "Encontrados páginas de código diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \nApresentar cada ficheiro na sua página de código terá melhor visualização, mas combinar/copiar poderá ser arriscado.\Deseja tratar os dois ficheiros como tendo as páginas de código predefinidas para as janelas?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informações perdidas devido a erros de codificação: ambos os ficheiros" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Sem diferenças" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Diferença de linha" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituída(s) %1 string(s)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposível localizar string \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copiar localização completa" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copiar nome de ficheiro" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Janela de localização" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Janela de diferenças" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Ficheiro patch escrito com sucesso." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. item não encontrado ou é uma directoria!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. item não encontrado ou é uma directoria!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O ficheiro patch já existe. Deseja substituí-lo?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 itens seleccionados]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Impossível escrever no ficheiro %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "A localização de destino não é uma localização absoluta: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Especifique o ficheiro de destino" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossível criar ficheiro patch a partir de ficheiros binários." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossível criar ficheiro patch a partir de directorias." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "Por favor, guarde todos os ficheiros antes.\n\nCiar um ficheiro patch requer a inexistência de alterações por guardar nos ficheiros." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "O arquivo não existe." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "\nNota: integração 7-Zip desactivada nas definições do WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "\nNota: integração 7-Zip está restricta a operação autónoma nas definições do WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Seleccione ficheiro a exportar" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Seleccione ficheiro a importar" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Opções importadas do ficheiro." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Opções exportadas para o ficheiro." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Importação de opções do ficheiro falhou." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Escrita de opções para o ficheiro falhou." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Guardar ficheiro esquerdo" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Guardar ficheiro direito" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Guardar ficheiro com o nome..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Guardar ficheiro direito com o nome..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Alternar entre modos de edição e combinação" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "Ver e ajustar propriedades de codificação\nPropriedades de codificação do ficheiro" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "Seleccionar área de diferenças na linha actual\nDiferença na linha actual" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "Ir para linha ou diferença\nIr para (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "Set program options\nOptions" msgstr "Definir opções do programa\nOpções" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "Actualizar visualização\nActualizar (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar linhas seleccionadas para a Área de Transferência adicionando nºs de linha ao início de linha" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Alternar marcações" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ir para a próxima marcação" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ir para a marcação anterior" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Eliminar todos os marcadores" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "Mostrar itens exactamente iguais\nMostrar itens idênticos" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "Mostra itens com diferenças\nMostra itens diferentes" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "Mostra itens exstentes apenas no lado esquerdo\nMostra itens únicos da esquerda" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "Mostra itens exstentes apenas no lado direito\nMostra itens únicos da direita" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "Mostra ficheiros binários\nMostra ficheiros binários" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "Mostra itens omitidos\nMostra itens omitidos" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "Selecciona a fonte de visualização\nSelecciona fonte de visualização" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "Repor fonte do sistema predefinida de visualização\nFonte predefinida" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Mostra espaços em branco" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Mostrar/Ocultar janela de diferenças" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Janela de localização mostra visão geral dosficheiros" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra estatísticas da comparação de arquivos" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Troca a posição das duas janelas" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "Mostra os números de linha\nMostra números de linha" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "Ajustar comprimento de linhas à largura da janela\nAjustar linhas" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "Copiar o texto seleccionado para oficheiro esquerdo\nCopiar à direita (Alt+Direita)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "Copiar o texto seleccionado para o ficheiro esquerdo\nCopiar à esquerda (Alt+Esquerda)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "Copiar diferença para a direita e avançar para a próxima\nCopiar à direita e avançar (Ctrl+Alt+Direita)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "Copiar diferença para a esquerda e avançar para a próxima\nCopiar à esquerda e avançar (Ctrl+Alt+Esquerda)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "Copiar todas as diferenças para o ficheiro da direita\nTodas à direita" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "Copiar todas as diferenças para o ficheiro da esquerda\nTodas à esquerda" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Eliminar itens seleccionados de ambas as directorias" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar o item seleccionado (comparar primeiro item, se vários itens seleccionados)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleccionar e reordenar colunas de comparação da directoria" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Gerar ficheiro patch" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Seleccionar e modificar filtros" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Gera um relatório dos resultados de comparação" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O utilizador selecciona o extractor (sem extracção quando comparando dir)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O extractor adoptado aplica-se a ambos ficheiros (apenas um ficheiro necessita de extensão)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleccione um extractor para editar este ficheiro" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Não pré-diferenciar (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarregar todos os plugins e recarregá-los (para developers)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Fecha todas as janelas abertas" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Exporta a versão actual de WinMerge e a configuração para um ficheiro de texto" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Compilação privada: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Definições de plugin" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Não pré-diferenciar" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Pré-diferenciar, se possível" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH não encontrado - scripts .sct desactivados" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Abrir ficheiro com a aplicação registada" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Abrir ficheiro com editor externo" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Abrir ficheiro com programa específico" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Não mostrar blocos movidos" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostrar blocos movidos apenas da diferença actual" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ir para a diferença sob o cursor" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Ir para linha %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Do sistema de ficheiros" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Da lista MRU" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 3a2697475..24c9cfe00 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Gol >" @@ -470,7 +470,7 @@ msgstr "Dezarhivare &automat #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&Cascad #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "A&jutor" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Codar&e caractere fiºiere..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Conþinut întreg" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Conþinut rapid" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Datã modificare" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Datã modificare ºi mãrime" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Mãrime" @@ -1528,7 +1528,7 @@ msgstr "Viziteaz #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "Sistem de &versionare:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "Ca&lea cãtre cleartool.exe" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "General" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "&Gãseºte" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Înlocuieºte t&ot" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Înlãturã" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Culori" @@ -1977,7 +1977,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Text" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Implicite" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistem" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Descriere:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stop" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Mergi la" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Comparare" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Comentarii filtre" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Codare caractere" @@ -2727,7 +2728,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtru privat (doar pentru utilizatorul curent)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Suport arhivare" @@ -2778,7 +2779,7 @@ msgid "Files:" msgstr "Fiºiere:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Diferite" @@ -2815,7 +2816,7 @@ msgid "Right:" msgstr "Dreapta:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identice" @@ -2868,7 +2869,7 @@ msgid "&Apply" msgstr "&Aplicã" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Renunþã" @@ -2974,7 +2975,7 @@ msgid "Save..." msgstr "Salveazã..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Copii de siguranþã" @@ -3015,7 +3016,7 @@ msgid "A&ppend timestamp" msgstr "Adaugã timp" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Confirmã copierea" @@ -3056,7 +3057,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3092,8 +3093,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Director" @@ -3129,69 +3130,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binar" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, fuzzy, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, fuzzy, c-format msgid "0x409, 1252" msgstr "0x409, 1250" -#: Merge.rc:2026 +#: Merge.rc:2040 #, fuzzy, c-format msgid "Ready" msgstr "Gata" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3200,12 +3234,12 @@ msgstr "" "Creazã documente goale\n" "Documente noi (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3214,7 +3248,7 @@ msgstr "" "Deschide un document existent\n" "Deschide (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3223,7 +3257,7 @@ msgstr "" "Închide documentul activ\n" "Închide" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3232,7 +3266,7 @@ msgstr "" "Salveazã documentul activ\n" "Salveazã (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3241,7 +3275,7 @@ msgstr "" "Salveazã documentul activ cu un nou nume\n" "Salveazã ca" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3250,7 +3284,7 @@ msgstr "" "Schimbã setãrile de tipãrire ale paginii\n" "Setãri paginã" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3259,7 +3293,7 @@ msgstr "" "Schimbã imprimanta ºi opþiunile de tipãrire\n" "Setãri tipãrire" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3268,7 +3302,7 @@ msgstr "" "Tipãreºte documentul curent\n" "Tipãreºte" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3277,27 +3311,27 @@ msgstr "" "Afiºeazã pagini întregi \n" "Previzualizare tipãrire" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Marcheazã din nou ca vizibile toate elementele ascunse" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3306,32 +3340,32 @@ msgstr "" "Deschide un fiºier proiect\n" "Fiºier proiect (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Eroare necunoscutã la încercarea de deschidere a fiºierului proiect" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Eroare necunoscutã la încercarea de salvare a fiºierului proiect" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Fiºier proiect" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Fiºierul proiect a fost încãrcat cu succes" -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Fiºierul proiect a fost salvat cu succes" -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3340,7 +3374,7 @@ msgstr "" "Salveazã cãile curente si opþiunile în fiºierul proiect\n" "Salveazã fiºierul proiect" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3349,7 +3383,7 @@ msgstr "" "Afiºeazã informaþii despre program, numãrul versiunii ºi drepturile de copiere\n" "Despre" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3358,27 +3392,27 @@ msgstr "" "Închide aplicaþia; solicitã salvarea documentelor\n" "Ieºire" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Deschide acest document" -#: Merge.rc:2104 +#: Merge.rc:2118 #, fuzzy, c-format msgid "" "Switch to the next window pane\n" @@ -3387,7 +3421,7 @@ msgstr "" "Comutã la urmãtorul panou\n" "Urmãtorul panou" -#: Merge.rc:2105 +#: Merge.rc:2119 #, fuzzy, c-format msgid "" "Switch back to the previous window pane\n" @@ -3396,7 +3430,7 @@ msgstr "" "Comutã înapoi la precedentul panou\n" "Precedentul panou" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3405,7 +3439,7 @@ msgstr "" "Aranjeazã ferestrele astfel încât sã se suprapunã\n" "Cascadeazã ferestrele" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3414,7 +3448,7 @@ msgstr "" "Aranjeazã ferestrele adiacent orizontal fãrã sã se suprapunã\n" "Adiacent orizontal" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3423,7 +3457,7 @@ msgstr "" "Aranjeazã ferestrele adiacent vertical fãrã sã se suprapunã\n" "Adiacent vertical" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3432,7 +3466,7 @@ msgstr "" "Copie selecþia în memorie\n" "Copie" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3441,7 +3475,7 @@ msgstr "" "Taie selecþia ºi mutã în memorie\n" "Taie" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3450,7 +3484,7 @@ msgstr "" "Gãseºte textul specificat\n" "Gãseºte" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3459,7 +3493,7 @@ msgstr "" "Insereazã conþinutul memoriei\n" "Lipeºte" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3468,7 +3502,7 @@ msgstr "" "Repetã ultima acþiune\n" "Repetã" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3477,7 +3511,7 @@ msgstr "" "Înlocuieºte textul specificat cu un alt text\n" "Înlocuieºte" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3486,7 +3520,7 @@ msgstr "" "Selecteazã întregul document\n" "Selecteazã tot" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3495,7 +3529,7 @@ msgstr "" "Anuleazã ultima acþiune\n" "Anuleazã (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3504,7 +3538,7 @@ msgstr "" "Refã precedenta acþiune anulatã\n" "Refã (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3513,7 +3547,7 @@ msgstr "" "Aratã sau ascunde bara de unelte\n" "Basculeazã bara de unelte" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3522,7 +3556,7 @@ msgstr "" "Aratã sau ascunde bara de stare\n" "Basculeazã bara de stare" -#: Merge.rc:2135 +#: Merge.rc:2149 #, fuzzy, c-format msgid "" "Show or hide the tab bar\n" @@ -3531,7 +3565,7 @@ msgstr "" "Aratã sau ascunde bara cu file\n" "Basculeazã bara cu file" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3540,57 +3574,57 @@ msgstr "" "Redimensioneazã automat panourile\n" "Îngheaþã panouri" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Schimbã mãrimea ferestrei" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Schimbã poziþia ferestrei" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Redu fereastra la o icoanã" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Lãrgeºte fereastra la mãrimea întreagã" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Comutã la urmãtoarea fereastrã document" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Comutã la precedenta fereastrã document" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Închide fereastra activã ºi solicitã salvarea documentelor" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Restaureazã fereastra la mãrimea normalã" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Activeazã lista de sarcini" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Activeazã aceastã fereastrã" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3599,7 +3633,7 @@ msgstr "" "Închide modul previzualizare\n" "Închide previzualizare" -#: Merge.rc:2168 +#: Merge.rc:2182 #, fuzzy, c-format msgid "" "\n" @@ -3618,7 +3652,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Comparare fiºiere" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3637,19 +3671,19 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Comparare directoare" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Pãstreazã caracterele de SDL originale" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Clic-dreapta pe cale pentru a o copia" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3658,143 +3692,143 @@ msgstr "" "Dezvoltatori:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 vine fãrã ABSOLUT NICIO GARANÞIE. Acesta este software liber ºi sunteþi invitaþi sã-l redistribuiþi sub anumite circumstanþe; vedeþi Licenþa Publicã Generalã GNU în meniul Ajutor pentru detalii." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "Re&nunþã" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Reîncearcã" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorã" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorã to&ate" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "D&a la toate" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nu" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nu la to&ate" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Continuã" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "O&mite" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Omite to&ate" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Nu afiºa acest &mesaj din nou." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Nu î&ntreba aceasta din nou." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Control versiuni" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Diferenþe" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Cãtre:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "De la stânga:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Cãtre stânga:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "De la dreapta:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Cãtre dreapta:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versiune %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Opþiuni (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Toate casetele de mesaj vor fi de acum afiºate din nou." -#: Merge.rc:2272 +#: Merge.rc:2287 #, fuzzy, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3805,84 +3839,84 @@ msgstr "" "\n" "Vã rugãm folosiþi valorile 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Deschide" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programe|*.exe;*.bat;*.cmd|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fiºiere proiect WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fiºiere opþiuni (*.ini)|*.ini|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fiºiere text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fiºiere HTML (*.htm,*.html)|*.htm;*.html|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fiºiere XML (*.xml)|*.xml|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nume" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Locaþie" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Descriere" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Selecteazã numele fiºierului pentru noul filtru" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fiºiere filtru (*.flt)|*.flt|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3895,7 +3929,7 @@ msgstr "" "Vã rugãm copiaþi fiºierul %1 în directorul WinMerge/Filters :\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3908,7 +3942,7 @@ msgstr "" "\n" "Vã rugãm verificaþi cã fiºierul existã ºi este editabil." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3919,7 +3953,7 @@ msgstr "" "\n" "Vã rugãm selectaþi directorul filtru în Opþiuni.../Sistem." -#: Merge.rc:2322 +#: Merge.rc:2337 #, fuzzy, c-format msgid "" "Failed to delete the filter file:\n" @@ -3932,12 +3966,12 @@ msgstr "" "\n" "Este posibil ca fiºierul sã nu poatã fi editat (numai-citire)?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Selectaþi fiºierul filtru pentru instalare" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3948,273 +3982,273 @@ msgstr "" "\n" "Nu s-a putut copia noul fiºier filtru în directorul filtru." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Fiºierul filtru deja existã. Suprascrie?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Expresie regulatã" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Rezultate comparare directoare" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Comparare fiºiere" -#: Merge.rc:2354 +#: Merge.rc:2369 #, fuzzy, c-format msgid "Untitled left" msgstr "Nedenumit stânga" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, fuzzy, c-format msgid "Untitled right" msgstr "Nedenumit dreapta" -#: Merge.rc:2357 +#: Merge.rc:2372 #, fuzzy, c-format msgid "Theirs File" msgstr "Fiºierul lor" -#: Merge.rc:2358 +#: Merge.rc:2373 #, fuzzy, c-format msgid "Mine File" msgstr "Fiºierul meu" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Scanare fiºiere..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Deschidere selecþie" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Copiere stânga cãtre dreapta" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Copiere dreapta cãtre stânga" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Copiere toate la stânga" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Copiere toate la dreapta" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Copiere fiºiere..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "ªtergere fiºiere..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Mutare fiºiere..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Creare raport..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Linie: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Fuziune" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Deferenþa %1 din %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenþe gãsite" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "O diferenþã gãsitã" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, fuzzy, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Element %1 din %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Elemente: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selectaþi douã directoare sau fiºiere existente pentru comparare" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Selectare directoare" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Selectaþi douã directoare sau douã fiºiere pentru comparare." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Calea din stânga este nevalidã!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Calea din dreapta este nevalidã!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Ambele cãi sunt nevalide!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, fuzzy, c-format msgid "Choose two files to enable unpacker selection." msgstr "Alegeþi douã fiºiere pentru a activa selecþia cu dezarhivatorul." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Nu se poate compara un fiºier cu un director!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Fiºier negãsit: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Fiºier nedezarhivat: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4227,12 +4261,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Analizarea fiºierului de conflicte a eºuat." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4243,27 +4277,27 @@ msgstr "" "%1\n" "nu e un fiºier de conflicte." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Salveazã ca" -#: Merge.rc:2435 +#: Merge.rc:2450 #, fuzzy, c-format msgid "Save changes to %1?" msgstr "Salveazã schimbãrile în %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, fuzzy, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 este marcat ca numai-citire. Doriþi suprascrierea fiºierului numai-citire? (Apãsaþi nu ca sã forþaþi redenumirea.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, fuzzy, c-format msgid "Error backing up file" msgstr "Eroare la salvarea copiei de siguranþã a fiºierului" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4276,7 +4310,7 @@ msgstr "" "\n" "Continuaþi oricum?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4293,7 +4327,7 @@ msgstr "" "\t- folosiþi un alt nume de fiºier (apãsaþi Ok)\n" "\t- renunþaþi la operaþia curentã (apãsaþi Renunþã)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4308,7 +4342,7 @@ msgstr "" "\n" "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4323,7 +4357,7 @@ msgstr "" "\n" "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4338,7 +4372,7 @@ msgstr "" "\n" "Suprascrieþi fiºierul modificat?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, fuzzy, c-format msgid "" "%1\n" @@ -4347,32 +4381,32 @@ msgstr "" "%1\n" "este marcat ca numai-citire. Doriþi sã suprascrieþi elementul numai-citire?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Salveazã fiºierul din stânga ca" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Salveazã fiºierul din dreapta ca" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, fuzzy, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4383,42 +4417,42 @@ msgstr "" "\n" "Reîmprospãtaþi documentele înainte de a continua." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Trebuie sã specificaþi calea unui proiect SourceSafe pentru a continua (ex.: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Extrage fiºierele din VSS.." -#: Merge.rc:2463 +#: Merge.rc:2478 #, fuzzy, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistemul de versionare a returnat o eroare încercând sã extragã fiºierul. Imposibil de continuat..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Eroare la execuþia comenzii sistemului de versionare." -#: Merge.rc:2465 +#: Merge.rc:2480 #, fuzzy, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Directorul de lucru VSS ºi locaþia fiºierului curent nu se potrivesc. Continuaþi?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Nu s-a gãsit nicio bazã de date VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Eroare de la VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4429,7 +4463,7 @@ msgstr "" " Vã rugãm, verificaþi specificaþiile scopului folosit.\n" " Anuleazã operaþia de extragere?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4438,164 +4472,164 @@ msgstr "" "Sistemul de versionare a returnat o eroare încercând sã anuleze extragerea fiºierului.\n" " Vã rugãm, verificaþi specificaþiile scopului folosit." -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Nici unul" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mai vechi de 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 sau mai nou)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, fuzzy, c-format msgid "Break at whitespace" msgstr "Întrerupe la blanc" -#: Merge.rc:2480 +#: Merge.rc:2495 #, fuzzy, c-format msgid "Break at whitespace or punctuation" msgstr "Întrerupe la blanc sau semn de punctuaþie" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copie elementul selectat în directorul specificat" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copie elementul selectat în directorul preferinþã" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "ªterge elementul selectat din stânga" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "ªterge elementul selectat din dreapta" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "ªterge elementul(ele) selectat(e) din ambele pãrþi" -#: Merge.rc:2493 +#: Merge.rc:2508 #, fuzzy, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ascunde elementul(ele) selectat(e) (filtru din-zbor)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Redenumeºte elementele selectate în ambele pãrþi" -#: Merge.rc:2495 +#: Merge.rc:2510 #, fuzzy, c-format msgid "Right to Left (%1)" msgstr "De la dreapta la stânga (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, fuzzy, c-format msgid "Left to Right (%1)" msgstr "De la stânga la dreapta (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "De la dreapta la stânga (%1 din %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "De la stânga la dreapta (%1 din %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Stânga la... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Dreapta la... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Stânga la... (%1 din %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Dreapta la... (%1 din %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Stânga (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Dreapta (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Ambele (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Stânga (%1 din %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Dreapta (%1 din %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Ambele (%1 din %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Partea stângã - selectare director destinaþie:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Partea dreaptã - selectare director destinaþie:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fiºiere afectate)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 din %2 fiºiere afectate)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4606,17 +4640,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Sunteþi sigur cã vreþi sã copiaþi:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Sunteþi sigur cã vreþi sã copiaþi %d elemente:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, fuzzy, c-format msgid "" "Operation aborted!\n" @@ -4635,613 +4669,607 @@ msgstr "" "\n" "Vã rugãm reîmprospãtaþi compararea." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Deschide fiºier stânga" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Deschide fiºierul stânga în editor extern" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Deschide fiºier stânga cu..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Deschide fiºier dreapta" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Deschide fiºierul dreapta cu editor extern" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Deschide fiºier dreapta cu..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Execuþia editorului extern a eºuat: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copie numele fiºierelor în memorie" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copie cãile din partea stângã în memorie" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copie cãile din partea dreaptã în memorie" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copie cãile din ambele pãrþi în memorie" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Format arhivã necunoscut" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Adaugã elementele din partea stângã la arhivã" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Adaugã elementele din partea dreaptã la arhivã" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Adaugã elementele din ambele pãrþi la arhivã" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Adaugã elementele diferite la arhivã (ambele pãrþi)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mutã fiºierul selectat din stânga cãtre director specificat" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mutã fiºierul selectat din dreapta cãtre director specificat" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nume fiºier" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Rezultat comparare" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Datã stânga" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Datã dreapta" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Mãrime stânga" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Mãrime dreapta" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Mãrime dreapta (scurt)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Mãrime stânga (scurt)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, fuzzy, c-format msgid "Left Creation Time" msgstr "Timp creare stânga" -#: Merge.rc:2600 +#: Merge.rc:2615 #, fuzzy, c-format msgid "Right Creation Time" msgstr "Timp creare dreapta" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Fiºier mai nou" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Versiune fiºier stânga" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Versiune fiºier dreapta" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, fuzzy, c-format msgid "Short Result" msgstr "Rezultat scurt" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atribute stânga" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atribute dreapta" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, fuzzy, c-format msgid "Left EOL" msgstr "SDL stânga" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, fuzzy, c-format msgid "Right EOL" msgstr "SDL dreapta" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Set de caractere stânga" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Set de caractere dreapta" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, fuzzy, c-format msgid "Ignored Diff." msgstr "Diferenþe ignorate" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binar" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Imposibil de comparat fiºierele" -#: Merge.rc:2630 +#: Merge.rc:2645 #, fuzzy, c-format msgid "Item aborted" msgstr "Element întrerupt" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Fiºier omis" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Director omis" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Numai stânga: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Numai dreapta: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Fiºierele binare sunt identice" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Fiºierele binare sunt diferite" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Fiºierele sunt diferite" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Numai stânga" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Numai dreapta" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Eroare" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Timp scurs: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "Un element selectat" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 elemente selectate" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nume de fiºier sau director." -#: Merge.rc:2670 +#: Merge.rc:2685 #, fuzzy, c-format msgid "Subfolder name when subfolders are included." msgstr "Nume de sub-director pentru când sub-directoarele sunt incluse." -#: Merge.rc:2671 +#: Merge.rc:2686 #, fuzzy, c-format msgid "Comparison result, long form." msgstr "Rezultate comparare, forma lungã." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Data modificãrii pãrþii stângi." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Data modificãrii pãrþii drepte." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Extensia fiºierului." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Dimensiune fiºier stânga în octeþi." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Dimensiune fiºier dreapta în octeþi." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Dimensiune fiºier stânga prescurtatã." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Dimensiune fiºier dreapta prescurtatã." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Timp creare stânga." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Timp creare dreapta." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Spune care parte are o datã a modificãrii mai recentã." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versiune fiºier stânga, numai pentru unele tipuri de fiºiere." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versiune fiºier dreapta, numai pentru unele tipuri de fiºiere." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, fuzzy, c-format msgid "Short comparison result." msgstr "Rezultat comparare pe scurt." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atribute partea stângã." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atribute partea dreaptã." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tip SDL fiºier partea stângã." -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tip SDL fiºier partea dreaptã." -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Set de caractere partea stângã." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Set de caractere partea dreaptã." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Numãr de diferenþe ignorate în fiºier. Aceste diferenþe sunt ignorate de WinMerge ºi nu pot fi fuzionate." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Numãr de diferenþe în fiºier. Acest numãr nu include diferenþele ignorate." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Aratã un asterisc (*) dacã fiºierul este binar." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Comparã %1 cu %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, fuzzy, c-format msgid "Comma-separated list" msgstr "Listã separatã-de-virgule" -#: Merge.rc:2719 +#: Merge.rc:2734 #, fuzzy, c-format msgid "Tab-separated list" msgstr "Listã separatã-de-tab-uri" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML simplu" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "XML simplu" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Fiºierul raport existã deja. Doriþi sã suprascrieþi fiºierul existent?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5250,32 +5278,32 @@ msgstr "" "Eroare la creare raport:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Raportul a fost creat cu succes." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Acelaºi fiºier este deschis în ambele panouri." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Fiºierele selectate sunt identice." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "A fost întâlnitã o eroare în timpul comparãrii fiºierelor." -#: Merge.rc:2734 +#: Merge.rc:2749 #, fuzzy, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Fiºierele temporare nu au putut fi create. Verificaþi setarea cãii cãtre locaþia temporarã." -#: Merge.rc:2735 +#: Merge.rc:2750 #, fuzzy, c-format msgid "" "These files use different carriage return types.\n" @@ -5290,17 +5318,17 @@ msgstr "" "\n" "Notã: Dacã întotdeauna doriþi tratarea ca ºi echivalentã a tuturor caracterelor de sfârºit de linie (SDL), setaþi opþiunea 'Ignorã diferenþele de sfârºit de linie..' în fila Comparare a dialogului de opþiuni (disponibilã sub meniul Editare/Opþiuni)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Directorul selectat este invalid." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nu se poate deschide în editor un fiºier binar." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5315,7 +5343,7 @@ msgstr "" "%1\n" "în partea cealaltã ºi sã deschideþi ambele directoare?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5326,168 +5354,168 @@ msgstr "" "Afiºarea în setul de caractere propriu este mai potrivitã dar fuziunea/copierea este periculoasã.\n" "Doriþi tratarea ambelor fiºiere ca ºi cum ar fi în setul de caractere implicit din Windows (recomandat)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Pierdere de informaþie datoritã incompatibilitãþii seturilor de caractere: ambele fiºiere" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Nicio diferenþã" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Diferenþã pe linie" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "S-a(u) înlocuit %1 ºir(uri)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nu s-a gãsit ºirul \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copie calea întreagã" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copie numele fiºierului" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, fuzzy, c-format msgid "Location Pane" msgstr "Panou locaþie" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Panou diferenþe" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Fiºierul petic a fost scris cu succes." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. elementul nu a fost gãsit sau este un director!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. elementul nu a fost gãsit sau este un director!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Fiºierul petic deja existã. Doriþi suprascrierea lui?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, fuzzy, c-format msgid "[%1 files selected]" msgstr "[%1 fiºier(e) selectat(e)]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Nu s-a reuºit scrierea în fiºierul %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, fuzzy, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Locaþia destinaþie nu este o cale absolutã: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Specificaþi un fiºier destinaþie" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nu s-a reuºit crearea unui fiºier petic din fiºiere binare." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nu s-a reuºit crearea unui fiºier petic din directoare." -#: Merge.rc:2813 +#: Merge.rc:2828 #, fuzzy, c-format msgid "" "Please save all files first.\n" @@ -5498,12 +5526,12 @@ msgstr "" "\n" "Crearea unui petic necesitã ca fiºierele sã nu aibã conþinut nesalvat." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Directorul nu existã." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5514,7 +5542,7 @@ msgstr "" "Componentele necesare (7-zip ºi/sau Merge7z*.dll) pentru dezarhivare nu au fost gãsite.\n" "Vedeþi manualul pentru mai multe informaþii despre suportul de dezarhivare ºi despre cum sã-l activaþi." -#: Merge.rc:2820 +#: Merge.rc:2835 #, fuzzy, c-format msgid "" "\n" @@ -5523,7 +5551,7 @@ msgstr "" "\n" "Notã: integrarea 7-Zip este dezactivatã în setãrile WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, fuzzy, c-format msgid "" "\n" @@ -5532,37 +5560,37 @@ msgstr "" "\n" "Notã: integrarea 7-Zip este restricþionatã la operare de sine stãtãtoare în setãrile WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Selectaþi fiºierul pentru export" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Selectaþi fiºierul pentru import" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Opþiuni importate din fiºier." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Opþiuni exportate cãtre fiºier." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "A eºuat importul opþiunilor din fiºier." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "A eºuat scrierea opþiunilor cãtre fiºier." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5573,157 +5601,157 @@ msgstr "" "\n" "Doriþi sã continuaþi?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Amestecat" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " O" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KO" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MO" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GO" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TO" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PO" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Salveazã fiºierul stâng" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Salveazã fiºierul drept" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Salveazã fiºierul stâng cu numele..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Salveazã fiºierul drept cu numele..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Converteºte SDL cãtre modul Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converteºte SDL cãtre modul Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converteºte SDL cãtre modul Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Interschimbã între modurile editare ºi fuziune" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5732,12 +5760,12 @@ msgstr "" "Verificã ºi ajusteazã proprietãþile de codare ale fiºierelor.\n" "Proprietãþile de codare ale fiºierelor" -#: Merge.rc:2884 +#: Merge.rc:2899 #, fuzzy, c-format msgid "Open and resolve conflict file" msgstr "Deschide ºi rezolvã fiºierul conflict" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5746,7 +5774,7 @@ msgstr "" "Selecteazã zona diferenþã de pe linia curentã\n" "Diferenþa de pe linia curentã" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5755,7 +5783,7 @@ msgstr "" "Mergi la linie sau la diferenþã\n" "Mergi la (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5764,7 +5792,7 @@ msgstr "" "Seteazã opþiunile programului\n" "Opþiuni" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5773,37 +5801,37 @@ msgstr "" "Reîmprospãteazã afiºarea\n" "Reîmprospãteazã (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copie liniile selectate în memorie adãugând numerele de linie la începutul fiecãrei linii" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Basculeazã semnul de carte" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Mergi la urmãtorul semn de carte" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Mergi la precedentul semn de carte" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Curãþã toate semnele de carte" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5812,7 +5840,7 @@ msgstr "" "Afiºeazã elementele care sunt identice\n" "Aratã elementele identice" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5821,7 +5849,7 @@ msgstr "" "Afiºeazã elementele care conþin diferenþe\n" "Aratã elementele cu diferenþe" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5830,7 +5858,7 @@ msgstr "" "Afiºeazã elementele care existã numai în partea stângã\n" "Aratã elementele care sunt numai în stânga" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5839,7 +5867,7 @@ msgstr "" "Afiºeazã elementele care existã numai în partea dreaptã\n" "Aratã elementele care sunt numai în dreapta" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5848,7 +5876,7 @@ msgstr "" "Afiºeazã fiºierele binare\n" "Aratã fiºierele binare" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5857,7 +5885,7 @@ msgstr "" "Afiºeazã fiºierele omise\n" "Aratã fiºierele omise" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5866,7 +5894,7 @@ msgstr "" "Selecteazã fontul pentru vizualizare\n" "Selecteazã fontul vizualizare" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5875,27 +5903,27 @@ msgstr "" "Revinã la folosirea fontului implicit de sistem pentru vizualizare\n" "Font implicit" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Aratã blancurile" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Basculeazã panoul de diferenþe" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panoul locaþie aratã o imagine cu locaþia curentã în contextul fiºierelor" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Aratã dialogul cu statisticile de comparare a directoarelor" -#: Merge.rc:2922 +#: Merge.rc:2937 #, fuzzy, c-format msgid "" "Select the current user interface language\n" @@ -5904,7 +5932,7 @@ msgstr "" "Selecteazã limba curentã pentru interfaþã\n" "Limbã" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5913,12 +5941,12 @@ msgstr "" "Aratã diferenþele în interiorul liniei utilizând culori diferite\n" "Aratã diferenþele pe linie" -#: Merge.rc:2924 +#: Merge.rc:2939 #, fuzzy, c-format msgid "Swap the positions of the two panes" msgstr "Interschimbã poziþiile celor douã panouri" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5927,7 +5955,7 @@ msgstr "" "Aratã numerele de linie\n" "Aratã numerele de linie" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5936,7 +5964,7 @@ msgstr "" "Activeazã înfãºurarea liniilor lungi\n" "Înfãºoarã liniile" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5945,22 +5973,22 @@ msgstr "" "Aratã marginile de selecþie pentru ambele panouri\n" "Aratã marginile de selecþie" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Mãreºte dimensiunea textului" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Micºoreazã dimensiunea textului" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Reseteazã dimensiunea textului la valoarea implicitã" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5969,7 +5997,7 @@ msgstr "" "Desfãºoarã la diferenþa anterioarã\n" "Diferenþa anterioarã (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5978,77 +6006,77 @@ msgstr "" "Desfãºoarã la diferenþa urmãtoare\n" "Diferenþa urmãtoare (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6057,7 +6085,7 @@ msgstr "" "Desfãºoarã la prima diferenþã\n" "Prima diferenþã (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6066,7 +6094,7 @@ msgstr "" "Desfãºoarã la diferenþa curentã\n" "Diferenþa curentã (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6075,7 +6103,7 @@ msgstr "" "Desfãºoarã la ultima diferenþã\n" "Ultima diferenþã (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6084,7 +6112,7 @@ msgstr "" "Copie textul selectat cãtre fiºierul din dreapta\n" "Copie la dreapta (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6093,7 +6121,7 @@ msgstr "" "Copie textul selectat cãtre fiºierul din stânga\n" "Copie la stânga (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6102,7 +6130,7 @@ msgstr "" "Copie diferenþa cãtre dreapta ºi avanseazã la urmãtoarea\n" "Copie la dreapta ºi avanseazã (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6111,7 +6139,7 @@ msgstr "" "Copie diferenþa cãtre stânga ºi avanseazã la urmãtoarea\n" "Copie la stânga ºi avanseazã (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6120,7 +6148,7 @@ msgstr "" "Copie toate diferenþele cãtre fiºierul din dreapta\n" "Toate la dreapta" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6129,92 +6157,92 @@ msgstr "" "Copie toate diferenþele cãtre fiºierul din stânga\n" "Toate la stânga" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "ªterge elementele selectate din ambele directoare" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparã elementele selectate (comparã doar primul element dacã mai multe elemente sunt selectate)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selecteazã ºi reordoneazã coloanele pentru compararea de directoare" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Genereazã un fiºier petic" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Selecteazã ºi modificã filtre" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genereazã un raport din rezultatele comparãrii" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, fuzzy, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Utilizatorul selecteazã dezarhivatorul (nu este suportatã dezarhivarea la compararea de directoare)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Dezarhivatorul potrivit este aplicat la ambele fiºiere (este suficient ca doar un fiºier sã conþinã extensie)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selectaþi un dezarhivator pentru a edita acest fiºier" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Nu folosi prediferenþiatorul (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Plug-in-uri recomandate" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Alte plug-in-uri" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarcã toate plug-in-urile ºi le reîncarcã (pentru dezvoltatori)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6223,12 +6251,12 @@ msgstr "" "Activeazã urmãtorul fiºier vizibil\n" "Activeazã urmãtorul fiºier" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Închide toate ferestrele deschise" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6237,22 +6265,22 @@ msgstr "" "Deschide documentaþia WinMerge\n" "Documentaþia WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Extrage versiunea curentã ºi configuraþia WinMerge într-un fiºier text" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Afiºeazã Licenþa Publicã Generalã GNU" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Numãr de asamblare privat: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6261,7 +6289,7 @@ msgstr "" "Deschide documentul cu notele versiunii\n" "Notele Versiunii" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6270,292 +6298,292 @@ msgstr "" "Deschide saitul cu traduceri\n" "Traduceri" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Setãri pentru plug-in-uri" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Nu folosi prediferenþiator" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Foloseºte prediferenþiator dacã este posibil" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nu s-a gãsit WSH - scripurile .sct sunt dezactivate" -#: Merge.rc:3016 +#: Merge.rc:3031 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Deschide fiºierul cu aplicaþia înregistratã" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Deschide fiºierul cu un editor extern" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Deschide fiºierul cu un anume program" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Nu afiºa blocurile mutate" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Aratã toate blocurile mutate" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Aratã doar blocurile mutate din diferenþa curentã" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Mergi la diferenþa din dreptul cursorului" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "&Mergi la linia %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Inactiv" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Din sistemul de fiºiere" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Din lista de recent utilizate" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resurse" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ascunde bara de unelte" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Aratã bara de unelte format mic" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Aratã bara de unelte format mare" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 641deae67..9083297ba 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -330,7 +330,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Íåò >" @@ -472,7 +472,7 @@ msgstr " #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -536,7 +536,7 @@ msgstr "& #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Ïîìîùü" @@ -864,7 +864,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Êîäèðîâàíèå ôàéëà..." @@ -1468,37 +1468,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Ïîëíûé ïîèñê ïî ñîäåðæèìîìó" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Áûñòðûé ïîèñê ïî ñîäåðæèìîìó" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Ïî ðàçëè÷èÿì â äàòå" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Ïî äàòå èçìåíåíèÿ è ðàçìåðó" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Ïî ðàçìåðó" @@ -1530,7 +1530,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "ÎÊ" @@ -1702,14 +1702,14 @@ msgid "&Versioning System:" msgstr "&Ñèñòåìà êîíòðîëÿ âåðñèé:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïóòü ê cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Îñíîâíûå" @@ -1852,7 +1852,7 @@ msgid "&Find Next" msgstr "&Äàëåå" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ok" @@ -1898,7 +1898,7 @@ msgid "Replace &All" msgstr "Ç&àìåíèòü âñå" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1950,7 +1950,7 @@ msgid "Remove" msgstr "Óäàëèòü" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Öâåòà" @@ -1979,7 +1979,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Òåêñò" @@ -2030,13 +2030,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Ïî óìîë÷àíèþ" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Ñèñòåìà" @@ -2177,7 +2178,7 @@ msgid "Description:" msgstr "Îïèñàíèå:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Îñòàíîâèòü" @@ -2239,7 +2240,7 @@ msgid "&Go To" msgstr "Ïåðåéò&è" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Ñðàâíåíèå" @@ -2290,7 +2291,7 @@ msgid "Filter Comments" msgstr "Ôèëüòð êîììåíòàðèåâ" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" @@ -2442,7 +2443,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Êîäîâàÿ ñòðàíèöà" @@ -2728,7 +2729,7 @@ msgid "Private Filter (only for current user)" msgstr "Ëè÷íûé ôèëüòð (òîëüêî äëÿ òåêóùåãî ïîëüçîâàòåëÿ)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Ïîääåðæêà àðõèâîâ" @@ -2779,7 +2780,7 @@ msgid "Files:" msgstr "Ôàéëû:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Îòëè÷àþòñÿ" @@ -2816,7 +2817,7 @@ msgid "Right:" msgstr "Ñïðàâà:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Îäèíàêîâûå" @@ -2869,7 +2870,7 @@ msgid "&Apply" msgstr "&Ïðèìåíèòü" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Îòìåíà" @@ -2975,7 +2976,7 @@ msgid "Save..." msgstr "Ñîõðàíèòü..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Ðåçåðâíûå êîïèè" @@ -3016,7 +3017,7 @@ msgid "A&ppend timestamp" msgstr "Äîáàâèòü äàòó" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Ïîäòâåðæäåíèÿ" @@ -3057,7 +3058,7 @@ msgid "&Enable plugins" msgstr "&Âêëþ÷èòü äîïîëíåíèÿ" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Èíòåãðàöèÿ â îáîëî÷êó" @@ -3093,8 +3094,8 @@ msgid "Add &Shell menu to context menu" msgstr "Äîáàâèòü &ìåíþ îáîëî÷êè â êîíòåêñòíîå ìåíþ" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Êàòàëîã" @@ -3130,69 +3131,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Äâîè÷íûé" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041904e3" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x419, 1251" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Ãîòîâî" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3201,12 +3235,12 @@ msgstr "" "Ñîçäàòü ïóñòûå äîêóìåíòû\n" "New Documents (Ctrl-N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3215,7 +3249,7 @@ msgstr "" "Îòêðûòü ñóùåñòâóþùèé äîêóìåíò\n" "Open (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3224,7 +3258,7 @@ msgstr "" "Çàêðûòü àêòèâíûé äîêóìåíò\n" "Close" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3233,7 +3267,7 @@ msgstr "" "Ñîõðàíèòü àêòèâíûé äîêóìåíò\n" "Save (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3242,7 +3276,7 @@ msgstr "" "Ñîõðàíèòü àêòèâíûé äîêóìåíò ïîä íîâûì èìåíåì\n" "Save As" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3251,7 +3285,7 @@ msgstr "" "Èçìåíèòü íàñòðîéêè ïå÷àòè\n" "Page Setup" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3260,7 +3294,7 @@ msgstr "" "Èçìåíèòü íàñòðîéêè ïðèíòåðà è ïå÷àòè\n" "Print Setup" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3269,7 +3303,7 @@ msgstr "" "Ïå÷àòàòü àêòèâíûé äîêóìåíò\n" "Print" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3278,27 +3312,27 @@ msgstr "" "Ïîêàçûâàòü ïîëíûå ñòðàíèöû\n" "Print Preview" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Ïîêàçàòü âñå ñêðûòûå" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Ïåðåêëþ÷èòü â ðåæèì äåðåâà" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Ðàçâåðíóòü âñå ïîäïàïêè" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Ñâåðíóòü âñå ïîäïàïêè" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3307,32 +3341,32 @@ msgstr "" "Îòêðûòü ôàéë ïðîåêòà\n" "Ôàéë ïðîåêòà (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåèçâåñòíàÿ îøèáêà ïðè îòêðûòèè ôàéëà ïðîåêòà" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåèçâåñòíàÿ îøèáêà ïðè ñîõðàíåíèè ôàéëà ïðîåêòà" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Ôàéë ïðîåêòà" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Ôàéë ïðîåêòà óñïåøíî çàãðóæåí." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Ôàéë ïðîåêòà óñïåøíî ñîõðàíåí." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3341,7 +3375,7 @@ msgstr "" "Ñîõðàíèòü òåêóùèå ïóòè è íàñòðîéêè â ôàéë ïðîåêòà\n" "Ñîõðàíèòü ôàéë ïðîåêòà" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3350,7 +3384,7 @@ msgstr "" "Ïîêàçàòü èíôîðìàöèþ î ïðîãðàììå, íîìåð âåðñèè è êîïèðàéò\n" "About" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3359,27 +3393,27 @@ msgstr "" "Âûéòè èç ïðîãðàììû; Ñïðîñèòü î ñîõðàíåíèè äîêóìåíòîâ\n" "Exit" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Îòêðûòü ýòîò äîêóìåíò" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3388,7 +3422,7 @@ msgstr "" "Ïåðåêëþ÷èòüñÿ íà ñëåäóþùþþ îêîííóþ ïàíåëü\n" "Next Pane" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3397,7 +3431,7 @@ msgstr "" "Ïåðåêëþ÷èòüñÿ íà ïðåäûäóùþþ îêîííóþ ïàíåëü\n" "Previous Pane" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3406,7 +3440,7 @@ msgstr "" "Ðàñïîëîæèòü îêíà êàñêàäîì ñ íàëîæåíèåì\n" "Cascade Windows" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3415,7 +3449,7 @@ msgstr "" "Ðàñïîëîæèòü îêíà íåïåðåêðûâàþùåéñÿ ãîðèçîíòàëüíîé ÷åðåïèöåé\n" "Îêíà ÷åðåïèöåé ãîðèçîíòàëüíî" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3424,7 +3458,7 @@ msgstr "" "Ðàñïîëîæèòü îêíà íåïåðåêðûâàþùåéñÿ âåðòèêàëüíîé ÷åðåïèöåé\n" "Îêíà ÷åðåïèöåé âåðòèêàëüíî" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3433,7 +3467,7 @@ msgstr "" "Ñêîïèðîâàòü â áóôåð îáìåíà\n" "Copy" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3442,7 +3476,7 @@ msgstr "" "Âûðåçàòü è ïîìåñòèòü â áóôåð îáìåíà\n" "Cut" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3451,7 +3485,7 @@ msgstr "" "Íàéòè óêàçàííûé òåêñò\n" "Find" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3460,7 +3494,7 @@ msgstr "" "Âñòàâèòü ñîäåðæèìîå áóôåðà îáìåíà\n" "Paste" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3469,7 +3503,7 @@ msgstr "" "Ïîâòîðèòü ïîñëåäíåå äåéñòâèå\n" "Repeat" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3478,7 +3512,7 @@ msgstr "" "Çàìåíèòü óêàçàííûé òåêñò íà äðóãîé\n" "Replace" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3487,7 +3521,7 @@ msgstr "" "Âûáðàòü âåñü äîêóìåíò\n" "Select All" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3496,7 +3530,7 @@ msgstr "" "Îòìåíèòü ïîñëåäíåå äåéñòâèå\n" "Undo" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3505,7 +3539,7 @@ msgstr "" "Âåðíóòü îòìåíåííîå äåéñòâèå\n" "Redo" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3514,7 +3548,7 @@ msgstr "" "Ïîêàçàòü èëè ñêðûòü ïàíåëü èíñòðóìåíòîâ\n" "Toggle ToolBar" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3523,7 +3557,7 @@ msgstr "" "Ïîêàçàòü èëè ñêðûòü ñòðîêó ñîñòîÿíèé\n" "Toggle StatusBar" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3532,7 +3566,7 @@ msgstr "" "Ïîêàçàòü èëè ñêðûòü ïàíåëü òàáîâ\n" "Toggle TabBar" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3541,57 +3575,57 @@ msgstr "" "Àâòîìàòè÷åñêè èçìåíÿòü ðàçìåð ïàíåëåé\n" "Çàáëîêèðîâàòü ïàíåëè" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Èçìåíèòü ðàçìåð îêíà" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Èçìåíèòü ïîëîæåíèå îêíà" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Ñâåðíóòü îêíî â çíà÷îê" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Ðàñêðûòü îêíî äî ìàêñèìóìà" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Ïåðåêëþ÷èòüñÿ íà ñëåäóþùèé äîêóìåíò" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Ïåðåêëþ÷èòüñÿ íà ïðåäûäóùèé äîêóìåíò" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Çàêðûòü àêòèâíîå îêíî è ñïðîñèòü î ñîõðàíåíèè äîêóìåíòîâ" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Âîññòàíîâèòü íîðìàëüíûå ðàçìåðû îêíà" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Àêòèâèðîâàòü ñïèñîê çàäà÷" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Àêòèâèðîâàòü ýòî îêíî" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3600,7 +3634,7 @@ msgstr "" "Çàêðûòü îêíî ïðåäâàðèòåëüíîãî ïðîñìîòðà\n" "Cancel Preview" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3619,7 +3653,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Ñðàâíåíèå Ôàéëîâ" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3638,19 +3672,19 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Ñðàâíåíèå Ïàïîê" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Ñîõðàíÿòü îðèãèíàëüíûå ñèìâîëû EOL" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Ïðàâûé êëèê íà ïóòè, ÷òîáû ñêîïèðîâàòü" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3659,143 +3693,143 @@ msgstr "" "Ðàçðàáîò÷èêè:\n" "Äèí Ãðèìì (Dean Grimm), Êðèñòèàí Ëèñò (Christian List), Êèììî Âàðèñ (Kimmo Varis), Éîõåí Òóõò (Jochen Tucht), Òèì Ãåðóíäò (Tim Gerundt), Òàêàøè Ñàâàíàêè (Takashi Sawanaki), Ãýë Õàììåð (Gal Hammer), Àëåêñàíäð Ñêèííåð (Alexander Skinner)" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 ïîñòàâëÿåòñÿ ÁÅÇ ÊÀÊÎÉ-ËÈÁÎ ÃÀÐÀÍÒÈÈ. Ýòî ñâîáîäíîå ÏÎ è ìû ïðèâåòñòâóåì åãî ðàñïðîñòðàíåíèå ñîãëàñíî íåêîòîðûõ óñëîâèé; îçíàêîìüòåñü ñ GNU General Public License â ìåíþ Ïîìîùü äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Ïðåðâàòü" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "Ïîâ&òîðèòü" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Èãíîðèðîâàòü" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Èãíîðèðîâàòü &âñå" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ä&à äëÿ âñåõ" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Íåò" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Íåò ä&ëÿ âñåõ" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "Ïðî&äîëæèòü" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Ï&ðîïóñòèòü" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Ïðîï&óñòèòü âñå" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçûâàòü &áîëüøå ýòî ñîîáùåíèå" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Íå çàäàâàòü &áîëüøå ýòîò âîïðîñ" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Êîíòðîëü âåðñèé" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Îòëè÷èÿ" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Íà:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Ñëåâà:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Íàëåâî:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Ñïðàâà:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Íàïðàâî:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Âåðñèÿ %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Þíèêîä" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Íàñòðîéêè (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Òåïåðü âñå ñîîáùåíèÿ ñíîâà áóäóò îòîáðàæàòüñÿ" -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3806,84 +3840,84 @@ msgstr "" "\n" "Èñïîëüçóéòå çíà÷åíèÿ 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Îòêðûòü" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàììû|*.exe;*.bat;*.cmd|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Ôàéëû ïðîåêòîâ WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëû êîíôèãóðàöèè (*.ini)|*.ini|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Òåêñòîâûå ôàéëû (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Ôàéëû HTML (*.htm,*.html)|*.htm;*.html|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Ôàéëû XML (*.xml)|*.xml|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Èìÿ" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Ìåñòîïîëîæåíèå" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Ôèëüòðû" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Îïèñàíèå" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Óêàæèòå èìÿ ôàéëà äëÿ íîâîãî ôèëüòðà" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëû ôèëüòðîâ (*.flt)|*.flt|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3896,7 +3930,7 @@ msgstr "" "Ñêîïèðóéòå ôàéë %1 â ïàïêó ñ ôèëüòðàìè:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3909,7 +3943,7 @@ msgstr "" "\n" "Óáåäèòåñü, ÷òî ïàïêà ñóùåñòâóåò è äîñòóïíà äëÿ çàïèñè." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3920,7 +3954,7 @@ msgstr "" "\n" "Óêàæèòå ïàïêó ñ ôèëüòðàìè íà âêëàäêå Ñèñòåìà â Íàñòðîéêàõ." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3933,12 +3967,12 @@ msgstr "" "\n" "Âîçìîæíî ôàéë èñïîëüçóåòñÿ." -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Óêàçàòü ôàéë ôèëüòðà" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3949,17 +3983,17 @@ msgstr "" "\n" "Íåâîçìîæíî ñêîïèðîâàòü ôàéë ôèëüòðà â ïàïêó ñ ôèëüòðàìè." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëüòð óæå ñóùåñòâóåò. Ïåðåçàïèñàòü?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Ðåãóëÿðíîå âûðàæåíèå" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3969,258 +4003,258 @@ msgstr "" "Ôèëüòðû áûëè îáíîâëåíû. Õîòèòå îáíîâèòü âñå îòêðûòûå ñðàâíèâàåìûå ïàïêè?\n" "Åñëè íå õîòèòå îáíîâëÿòü ñåé÷àñ, òî ìîæåòå íàæàòü \"Íåò\" è îáíîâèòü ïîçæå." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Ïóòü ê SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëüòàòû ñðàâíåíèÿ êàòàëîãîâ" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Ñðàâíåíèå ôàéëîâ" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Áåçûìÿííûé ñëåâà" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Áåçûìÿííûé ñïðàâà" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Èõ ôàéë" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Ìîé ôàéë" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Ñêàíèðîâàíèå ôàéëîâ..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Îòêðûâàþ âûáðàííîå" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Êîïèðîâàíèå Ñëåâà Íàïðàâî" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Êîïèðîâàíèå Ñïðàâà Íàëåâî" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàëåâî" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàïðàâî" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Êîïèðîâàíèå ôàéëîâ..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Óäàëåíèå ôàéëîâ..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Ïåðåìåùåíèå ôàéëîâ..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Ñîçäàåòñÿ îò÷åò..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Îòìåíà ïîñëåäíåé îïåðàöèè" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Ïîâòîðåíèå ïðåäûäóùåé îïåðàöèè" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Ñòðîêà: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Îáúåäèíåíèå" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Îòëè÷èå %1 èç %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 îòëè÷èé íàéäåíî" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "Íàéäåíî âñåãî îäíî îòëè÷èå" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Ýëåìåíò %1 èç %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Ýëåìåíòîâ: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Âûáåðèòå äâà ÑÓÙÅÑÒÂÓÞÙÈÕ êàòàëîãà èëè ôàéëà äëÿ ñðàâíåíèÿ" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Âûáîð êàòàëîãà" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Âûáåðèòå äëÿ ñðàâíåíèÿ äâà êàòàëîãà èëè ôàéëà" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Ïóòü ñëåâà óêàçàí íåâåðíî" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Ïóòü ñïðàâà óêàçàí íåâåðíî" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Îáà ïóòè óêàçàíû íåâåðíî" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Âûáåðèòå äâà ôàéëà, ÷òîáû âêëþ÷èòü âûáîð ðàñïàêîâùèêà" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Íåâîçìîæíî ñðàâíåíèå ôàéëà è êàòàëîãà!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Ôàéë íå íàéäåí: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Ôàéë íå ðàñïàêîâàí: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4233,12 +4267,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Îøèáêà ðàçáîðà ôàéëà êîíôëèêòîâ" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4249,27 +4283,27 @@ msgstr "" "%1\n" "íå ÿâëÿåòñÿ ôàéëîì êîíôëèêòîâ" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Ñîõðàíèòü êàê..." -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Ñîõðàíèòü èçìåíåíèÿ â %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë ? (Íåò ïîçâîëÿåò çàäàòü íîâîå èìÿ ôàéëà)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Îøèáêà ñîçäàíèÿ ðåçåðâíîé êîïèè" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4282,7 +4316,7 @@ msgstr "" "\n" "Ïðîäîëæèòü â ëþáîì ñëó÷àå?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4299,7 +4333,7 @@ msgstr "" "\t-èñïîëüçîâàòü äðóãîå èìÿ ôàéëà (Íàæìèòå Ok)\n" "\t-îòìåíèòü òåêóùóþ îïåðàöèþ (Íàæìèòå Îòìåíà)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4314,7 +4348,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4329,7 +4363,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4344,14 +4378,14 @@ msgstr "" "\n" "Ïåðåçàïèñàòü èçìåíåííûé ôàéë?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4366,22 +4400,22 @@ msgstr "" "\n" "Âû õîòèòå ïåðåçàãðóçèòü ôàéë?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..." -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..." -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4392,7 +4426,7 @@ msgstr "" "%1\n" "óòðà÷åí. Ïîæàëóéñòà, ñîõðàíèòå êîïèþ ôàéëà, ÷òîáû ïðîäîëæèòü." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4403,42 +4437,42 @@ msgstr "" "\n" "Îáíîâèòå äîêóìåíòû ïåðåä ïðîäîëæåíèåì." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "×òîáû ïðîäîëæèòü, Âû äîëæíû óêàçàòü ïóòü ê ïðîåêòó SourceSafe (íàïðèìåð: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Ïîëó÷àåì ôàéëû èç VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé âåðíóëà îøèáêó ïðè ïîïûòêå âçÿòü ôàéë ïîä êîíòðîëü. Íåò âîçìîæíîñòè ïðîäîëæàòü..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Îøèáêà âûïîëíåíèÿ ñèñòåìíîé êîìàíäû Ñèñòåìû êîíòðîëÿ âåðñèé." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ðàáî÷àÿ ïàïêà VSS è ìåñòîïîëîæåíèå òåêóùåãî ôàéëà íå ñîâïàäàþò. Ïðîäîëæèòü ?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Íå íàéäåíà áàçà äàííûõ VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Îøèáêà VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4449,7 +4483,7 @@ msgstr "" " Ïðîâåðüòå êîíôèãóðàöèþ.\n" " Ñäåëàòü îòêàò?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4458,164 +4492,164 @@ msgstr "" "VSS âåðíóëà îøèáêó ïðè ïîïûòêå îòêàòà èçìåíåíèé.\n" " Ïðîâåðüòå êîíôèãóðàöèþ. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Íåò" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìëàäøå, ÷åì 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 è âûøå)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Ðàçáèâàòü ïî íåâèäèìûì" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ðàçáèâàòü ïî íåâèäèìûì è çíàêàì ïóíêòóàöèè" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñëåâà" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñïðàâà" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû ñ îáîèõ ñòîðîí" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ñêðûòü âûáðàííûå ýëåìåíòû (áûñòðûé ôèëüòð)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Ïåðåèìåíîâàòü âûáðàííûå ýëåìåíòû íà îáîèõ ñòîðîíàõ" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Ñêîïèðîâàòü íà ëåâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Ñêîïèðîâàòü íà ïðàâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Ñïðàâà íàëåâî (%1 èç %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ñëåâà íàïðàâî (%1 èç %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Ñëåâà íà... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Ñïðàâà íà... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ñëåâà íà... (%1 èç %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Ñïðàâà íà... (%1 èç %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Ñëåâà (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Óäàëèòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ ñ ïðàâîé ñòîðîíû" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Óäàëèòü ñ îáåèõ ñòîðîí %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Ñëåâà (%1 èç %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Ñïðàâà (%1 èç %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Âìåñòå (%1 èç %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Ëåâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Ïðàâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 èç %2 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4626,17 +4660,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü %d ýëåìåíòîâ:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4655,613 +4689,607 @@ msgstr "" "\n" "Îáíîâèòå ñðàâíåíèå." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü %d ýëåìåíòîâ:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Ïîäòâåðäèòå ïåðåìåùåíèå" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Îòêðûòü ôàéë ñëåâà" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Îòêðûòü ôàéë ñëåâà âî âíåøíåì ðåäàêòîðå" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Îòêðûòü ôàéë ñëåâà ñ ïîìîùüþ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Îòêðûòü ôàéë ñïðàâà" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Îòêðûòü ôàéë ñïðàâà âî âíåøíåì ðåäàêòîðå" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Îòêðûòü ôàéë ñïðàâà ñ ïîìîùüþ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íåâîçìîæíî âûïîëíèòü %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ â áóôåð îáìåíà" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ëåâîé ÷àñòè â áóôåð îáìåíà" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ïðàâîé ÷àñòè â áóôåð îáìåíà" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ ñ îáîèõ ïàíåëåé â áóôåð îáìåíà" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Ëåâîå ìåíþ îáîëî÷êè" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Ïðàâîå ìåíþ îáîëî÷êè" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Íåèçâåñòíûé ôîðìàò àðõèâà" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ëåâîé ñòîðîíû" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ïðàâîé ñòîðîíû" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ îáîèõ ñòîðîí" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Çààðõèâèðîâàòü ïðîèçâîëüíûå ýëåìåíòû ñ îáîèõ ñòîðîí" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Ïåðåìåñòèòü âûáðàííûå ñëåâà ôàéëû â äðóãóþ ïàïêó" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ïåðåìåñòèòü âûáðàííûå ñïðàâà ôàéëû â äðóãóþ ïàïêó" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Èìÿ ôàéëà" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Ðåçóëüòàò ñðàâíåíèÿ" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Äàòà Ñëåâà" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Äàòà Ñïðàâà" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Ðàñøèðåíèå" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Ðàçìåð ñëåâà" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Ðàçìåð ñïðàâà" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð ñïðàâà (ñîêð.)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð ñëåâà (ñîêð.)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Áîëåå íîâûé ôàéë" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ ôàéëà ñëåâà" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ ôàéëà ñïðàâà" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Óïðîùåííûé ðåçóëüòàò" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Ëåâûé EOL" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Ïðàâûé EOL" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Èãíîð. îòëè÷èÿ" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Äâîè÷íûé" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Íåâîçìîæíî ñðàâíèòü ôàéëû" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Ñðàâíåíèå ïðåðâàíî" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Ôàéë ïðîïóùåí" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Êàòàëîã ïðîïóùåí" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Òîëüêî ñëåâà: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Òîëüêî ñïðàâà: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Áèíàðíûå ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Ïàïêè ðàçëè÷íû" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Òîëüêî ñëåâà" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Òîëüêî ñïðàâà" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Îøèáêà" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâûå ôàéëû èäåíòè÷íû" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Òåêñòîâûå ôàéëû ðàçëè÷íû" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîøëî âðåìåíè: %ld ìñ" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "Âûáðàí 1 ýëåìåíò" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "Âûáðàíî ýëåìåíòîâ: %1" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Èìÿ ôàéëà èëè êàòàëîãà" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìåíà ïîäïàïîê, åñëè ïîäïàïêè âêëþ÷åíû" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëüòàò ñðàâíåíèÿ, äëèííàÿ ôîðìà." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñëåâà" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Ðàñøèðåíèå ôàéëà" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð ôàéëà ñëåâà â áàéòàõ" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð ôàéëà ñïðàâà â áàéòàõ" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Ðàçìåð ëåâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Ðàçìåð ïðàâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçàòü ñ êàêîé èç ñòîðîí äàòà èçìåíåíèÿ ôàéëà íîâåå" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñëåâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñïðàâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Ðåçóëüòàò áûñòðîãî ñðàâíåíèÿ" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ëåâîãî ôàéëà" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ïðàâîãî ôàéëà" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Êîëè÷åñòâî èãíîðèðîâàííûõ îòëè÷èé â ôàéëå. Ýòè îòëè÷èÿ áûëè èãíîðèðîâàííû WinMerge è íå ìîãóò áûòü îáðàáîòàíû." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Êîëè÷åñòâî îòëè÷èé â ôàéëå. Ýòî ÷èñëî íå âêëþ÷àåò â ñåáÿ èãíîðèðîâàííûå îòëè÷èÿ." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàçàòü çâåçäî÷êó (*) åñëè ôàéë áèíàðíûé." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíèâàíèå %1 ñ %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè çàïÿòûìè" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè òàáóëÿòîðàìè" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Ïðîñòîé HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Ïðîñòîé XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéë îò÷åòà óæå ñóùåñòâóåò. Ïåðåçàïèñàòü??" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5270,32 +5298,32 @@ msgstr "" "Îøèáêà ïðè ñîçäàíèè îò÷åòà:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åò óñïåøíî ñîçäàí" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Íà îáîèõ ïàíåëÿõ îòêðûò îäèí è òîò æå ôàéë" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Âûáðàííûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïðè ñðàâíåíèè ôàéëîâ ïðîèçîøëà îøèáêà." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Âðåìåííûå ôàéëû íå ìîãóò áûòü ñîçäàíû. Ïðîâåðüòå íàñòðîéêè ïóòåé äëÿ âðåìåííûõ ôàéëîâ" -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5310,17 +5338,17 @@ msgstr "" "\n" "Âíèìàíèå: Åñëè âàñ íå èíòåðåñóþò ðàçëè÷èÿ â EOL, óñòàíîâèòå îïöèþ 'Èãíîðèðîâàòü ðàçëè÷èÿ â EOL' íà âêëàäêå Ñðàâíåíèå â Íàñòðîéêàõ." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Íåâîçìîæíî îòêðûòü âûáðàííóþ ïàïêó." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íåâîçìîæíî îòîáðàçèòü áèíàðíûé ôàéë â ðåäàêòîðå." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5335,7 +5363,7 @@ msgstr "" "%1\n" "íà äðóãîé ñòîðîíå è îáå îòêðûòü èõ?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5346,168 +5374,168 @@ msgstr "" "Êàæäûé èç ôàéëîâ ìîæåò áûòü îòîáðàæåí â ñâîåé êîäèðîâêå, íî èõ ñëèÿíèå èëè êîïèðîâàíèå ìîæåò ïîâðåäèòü èíôîðìàöèþ.\n" "Îòîáðàçèòü îáà ôàéëà â ñèñòåìíîé êîäèðîâêå (ðåêîìåíäóåòñÿ)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: îáà ôàéëà" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Íåò îòëè÷èé" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Ñòðîêà îòëè÷èé" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíî %1 ñòðîê." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íåâîçìîæíî íàéòè ñòðîêó \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Ñêîïèðîâàòü ïîëíûé ïóòü" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Ñêîïèðîâàòü èìÿ ôàéëà" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèÿ" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Îòëè÷èÿ" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Ïàò÷ óñïåøíî çàïèñàí." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïàò÷ óæå ñóùåñòâóåò. Õîòèòå ïåðåçàïèñàòü åãî ?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 ôàéëîâ âûáðàíî]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Íîðìàëüíûé" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Óíèôèöèðîâàííûé" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Íåò âîçìîæíîñòè çàïèñàòü â ôàéë %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Óêàçàííûé ïóòü äëÿ âûâîäà íå ÿâëÿåòñÿ àáñîëþòíûì: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Óêàçàòü âûõîäíîé ôàéë" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç áèíàðíûõ ôàéëîâ" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç êàòàëîãîâ" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5518,12 +5546,12 @@ msgstr "" "\n" "Ñîçäàíèå ïàò÷à òðåáóåò ÷òîáû â ôàéëàõ íå áûëî íåñîõðàíåííûõ èçìåíåíèé" -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Ïàïêà íå ñóùåñòâóåò" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5535,7 +5563,7 @@ msgstr "" "Íå íàéäåíû âñå íåîáõîäèìûå êîìïîíåíòû (7-zip è/èëè Merge7z*.dll) . \n" "Ïîñìîòðèòå èíñòðóêöèþ, ÷òî áû óçíàòü áîëüøå ïðî ïîääåðæêó àðõèâîâ è êàê åå âêëþ÷èòü." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5544,7 +5572,7 @@ msgstr "" "\n" "Âíèìàíèå: Èíòåãðàöèÿ ñ 7-Zip îòêëþ÷åíà â íàñòðîéêàõ WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5553,37 +5581,37 @@ msgstr "" "\n" "Âíèìàíèå: Çàäåéñòâîâàí òîëüêî ëîêàëüíûé ìîäóëü 7-Zip." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Âûáðàòü ôàéë äëÿ ýêñïîðòà" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Âûáðàòü ôàéë äëÿ èìïîðòà" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Îïöèè, èìïîðòèðîâàííûå èç ôàéëà." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Îïöèè, ýêñïîðòèðóåìûå â ôàéë." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Îøèáêà èìïîðòà îïöèé èç ôàéëà." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Îøèáêà ýêñïîðòà îïöèé â ôàéë." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5594,157 +5622,157 @@ msgstr "" "\n" "Ïðîäîëæèòü?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Ñìåøàííûé" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " Á" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "Êá" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "Ìá" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "Ãá" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "Òá" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "Ïá" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Òèï" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Ðàñïàêîâùèê" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Ïðåäñðàâíåíèå" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Ðåäàêòîð ñêðèïòîâ" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Ñîõðàíèòü ôàéë ñëåâà" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Ñîõðàíèòü ôàéë ñïðàâà" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Ïåðåêëþ÷åíèå ìåæäó ðåæèìàìè ðåäàêòèðîâàíèÿ è ñëèÿíèÿ" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5753,12 +5781,12 @@ msgstr "" "Ïðîñìîòðåòü è îòðåäàêòèðîâàòü êîäèðîâêó\n" "File encoding properties" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Îòêðûòü è ðåøèòü êîíôëèêòíûé ôàéë" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5767,7 +5795,7 @@ msgstr "" "Âûäåëèòü îòëè÷èå â òåêóùåé ñòðîêå\n" "Difference in the Current Line" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5776,7 +5804,7 @@ msgstr "" "Ïåðåéòè íà ñòðîêó èëè îòëè÷èå\n" "Go to (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5785,7 +5813,7 @@ msgstr "" "Óñòàíîâèòü ïðîãðàììíûå íàñòðîéêè\n" "Íàñòðîéêè" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5794,37 +5822,37 @@ msgstr "" "Îáíîâèòü ýêðàí\n" "Refresh (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Ñêîïèðîâàòü âûáðàííûå ñòðîêè â áóôåð îáìåíà, äîáàâëÿÿ â íà÷àëå ñòðîêè åå íîìåð" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Çàêëàäêà" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ïåðåéòè ê ñëåäóþùåé çàêëàäêå" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ïåðåéòè ê ïðåäûäóùåé çàêëàäêå" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Óäàëèòü âñå çàêëàäêè" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5833,7 +5861,7 @@ msgstr "" "Ïîêàçûâàòü îäèíàêîâûå\n" "Show Identical Items" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5842,7 +5870,7 @@ msgstr "" "Ïîêàçûâàòü ðàçëè÷àþùèåñÿ\n" "Show Different Items" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5851,7 +5879,7 @@ msgstr "" "Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñëåâà\n" "Show Left Unique Items" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5860,7 +5888,7 @@ msgstr "" "Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñïðàâà\n" "Show Right Unique Items" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5869,7 +5897,7 @@ msgstr "" "Ïîêàçûâàòü áèíàðíûå ôàéëû\n" "Show Binary Files" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5878,7 +5906,7 @@ msgstr "" "Ïîêàçûâàòü ïðîïóùåííûå\n" "Show Skipped Items" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5887,7 +5915,7 @@ msgstr "" "Âûáðàòü øðèôò äëÿ îòîáðàæåíèÿ îòëè÷èé\n" "Select Diff Font" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5896,27 +5924,27 @@ msgstr "" "Èñïîëüçîâàòü ñèñòåìíûé øðèôò ïî óìîë÷àíèþ äëÿ îòîáðàæåíèÿ îòëè÷èé \n" "Default Font" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Ïîêàçûâàòü íåâèäèìûå çíàêè ðàçìåòêè" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Ïåðåêëþ÷èòü ïàíåëü îòëè÷èé" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Ïàíåëü ëîêàöèé ïîêàçûâàåò ïîëíóþ êàðòèíó îòëè÷èé ìåæäó ôàéëàìè" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Ïîêàçàòü äèàëîã ñðàâíåíèÿ ñòàòèñòèê ïàïîê" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5925,7 +5953,7 @@ msgstr "" "Âûáåðèòå ÿçûê èíòåðôåéñà äëÿ òåêóùåãî ïîëüçîâàòåëÿ\n" "ßçûê" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5934,12 +5962,12 @@ msgstr "" "Ïîêàçàòü îòëè÷èÿ âíóòðè ñòðîê äðóãèìè öâåòàìè\n" "Ïîêàçàòü îòëè÷èÿ â ñòðîêå" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Ïîìåíÿòü ïàíåëè ìåñòàìè" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5948,7 +5976,7 @@ msgstr "" "Ïîêàçûâàòü íîìåðà ñòðîê\n" "Show Line Numbers" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5957,7 +5985,7 @@ msgstr "" "Âêëþ÷èòü ïåðåíîñ ñòðîê\n" "Wrap Lines" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5966,22 +5994,22 @@ msgstr "" "Ïîêàçàòü ïîëÿ íà îáåèõ ïàíåëÿõ\n" "Show Selection Margins" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Óâåëè÷èòü ðàçìåð òåêñòà" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Óìåíüøèòü ðàçìåð òåêñòà" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Ñáðîñèòü ìàñøòàá òåêñòà ê çíà÷åíèþ ïî óìîë÷àíèþ" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5990,7 +6018,7 @@ msgstr "" "Ïåðåéòè ê ïðåäûäóùåìó îòëè÷èþ\n" "Ïðåäûäóþùåå îòëè÷èå (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5999,77 +6027,77 @@ msgstr "" "Ïåðåéòè ê ñëåäóþùåìó îòëè÷èþ\n" "Ñëåäóþùåå îòëè÷èå (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6078,7 +6106,7 @@ msgstr "" "Ïåðåéòè ê ïåðâîìó îòëè÷èþ\n" "Ïåðâîå îòëè÷èå (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6087,7 +6115,7 @@ msgstr "" "Ïåðåéòè ê òåêóùåìó îòëè÷èþ\n" "Òåêóùåå îòëè÷èå (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6096,7 +6124,7 @@ msgstr "" "Ïåðåéòè ê ïîñëåäíåìó îòëè÷èþ\n" "Ïîñëåäíåå îòëè÷èå (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6105,7 +6133,7 @@ msgstr "" "Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñïðàâà\n" "Copy Right (Alt Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6114,7 +6142,7 @@ msgstr "" "Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñëåâà\n" "Copy Left (Alt Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6123,7 +6151,7 @@ msgstr "" "Ñêîïèðîâàòü îòëè÷èå íà ëåâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n" "Copy Right and advance (Ctrl Alt Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6132,7 +6160,7 @@ msgstr "" "Ñêîïèðîâàòü îòëè÷èå íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n" "Copy Left and advance (Ctrl Alt Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6141,7 +6169,7 @@ msgstr "" "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñïðàâà\n" "All Right" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6150,92 +6178,92 @@ msgstr "" "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñëåâà\n" "All Left" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû èç îáîèõ êàòàëîãîâ" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Ñðàâíèòü âûäåëåííûå ýëåìåíòû (ñðàâíèòü ïåðâûé ýë-ò, åñëè âûäåëåíî áîëåå îäíîãî)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Âûáðàòü è ïåðåñòàâèòü ìåñòàìè êîëîíêè ñðàâíåíèÿ êàòàëîãîâ" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Ñîçäàòü ïàò÷" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Âûáîð è ðåäàêòèðîâàíèå ôèëüòðîâ" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Ñîçäàòü îò÷åò èç ðåçóëüòàòîâ ñðàâíåíèÿ" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Ïîêàçàòü ñïèñîê äîñòóïíûõ äîïîëíåíèé" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Âûáðàííûé ïîëüçîâàòåëåì ðàñïàêîâùèê (íå äåéñòâóåò ïðè ñðàâíåíèè êàòàëîãîâ)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Àâòîìàòè÷åñêèé ïîäîáîð ðàñïàêîâùèêà (óêàæèòå ðàñøèðåíèå õîòÿ áû ó îäíîãî èç ôàéëîâ)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Âûáåðèòå ðàñïàêîâùèê äëÿ ðåäàêòèðîâàíèÿ ýòîãî ôàéëà" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Áåç ïðåäñðàâíåíèÿ (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Ñîâåòóåìûå äîïîëíåíèÿ" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Äðóãèå äîïîëíåíèÿ" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Âûãðóçèòü âñå äîïîëíåíèÿ è çàãðóçèòü èõ ñíîâà (äëÿ ðàçðàáîò÷èêîâ)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6244,12 +6272,12 @@ msgstr "" "Àêòèâèðóåò ñëåäóþùèé âèäèìûé ôàéë\n" "Àêòèâèðîâàòü ñëåäóþùèé ôàéë" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Çàêðûòü âñå îòêðûòûå îêíà" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6258,22 +6286,22 @@ msgstr "" "Îòêðûòü ñïðàâêó WinMerge\n" "Ñïðàâêà WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Âûâåñòè èíôîðìàöèþ î òåêóùåé âåðñèè WinMerge è íàñòðîéêàõ â òåêñòîâûé ôàéë" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Ïîêàçàòü ëèöåíçèþ GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "×àñòíûé áèëä: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6282,7 +6310,7 @@ msgstr "" "Îòêðûòü äîêóìåíò ñ çàìå÷àíèÿìè ê ðåëèçó\n" "Çàìå÷àíèÿ ê ðåëèçó" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6291,292 +6319,292 @@ msgstr "" "Ïåðåéòè íà ñòðàíèöó ñ ïåðåâîäàìè\n" "Ïåðåâîäû" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè äîïîëíåíèÿ" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Ïðåäñðàâíåíèå îòñóòñòâóåò" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Åñëè âîçìîæíî, òî ïðåäñðàâíåíèå áóäåò ïðîèçâåäåíî" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå íàéäåí - .sct ñêðèïòû îòêëþ÷åíû" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<Íåò>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<Àâòîìàòè÷åñêè>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Îòêðûòü ôàéë çàðåãèñòðèðîâàííûì ïðèëîæåíèåì" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Îòêðûòü ôàéë âíåøíèì ðåäàêòîðîì" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Îòêðûòü ôàéë âûáðàííîé ïðîãðàììîé" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Íå îòîáðàæàòü ïåðåìåùåííûå áëîêè" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Îòîáðàæàòü âñå ïåðåìåùåííûå áëîêè" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Îòîáðàæàòü ïåðåìåùåííûå áëîêè äëÿ òåêóùåãî îòëè÷èÿ" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ïåðåéòè ê îòëè÷èþ ïîä êóðñîðîì" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Ïåðåéòè ê &ñòðîêå %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Îòêëþ÷åíî" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Êàê íà äèñêå" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Êàê â ñïèñêå íåäàâíèõ äîêóìåíòîâ" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Íåò âûäåëåííîãî" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Áåéñèê" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Ôîðòðàí" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Ïàñêàëü" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Ðåñóðñû" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ñêðûòü ïàíåëü èíñòðóìåíòîâ" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Ìàëåíüêèå çíà÷êè" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 5ce6ad20c..58c978ae5 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -327,7 +327,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Ïðàçàí >" @@ -469,7 +469,7 @@ msgstr " #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -533,7 +533,7 @@ msgstr " #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "Ïîìî&ž" @@ -861,7 +861,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Äå&êîäèðàœå äàòîòåêå..." @@ -1465,37 +1465,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Öåî ñàäðæà¼" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Ñêðàžåíè ñàäðæà¼" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Äàòóì ïðîìåíå" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Èçìåœåí äàòóì è âåëè÷èíà" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Âåëè÷èíà" @@ -1527,7 +1527,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "Ó ðåäó" @@ -1699,14 +1699,14 @@ msgid "&Versioning System:" msgstr "&Èçáîð ïðîãðàìà" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïóòàœà äî cleartool.exe" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Îïøòè èçáîð" @@ -1849,7 +1849,7 @@ msgid "&Find Next" msgstr "&Íàè ñëåäåžå" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Ó ðåäó" @@ -1895,7 +1895,7 @@ msgid "Replace &All" msgstr "Çàìåíè ñâ&å" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Ïðàêòè÷íî ¼àñàí ñëó÷à¼" @@ -1947,7 +1947,7 @@ msgid "Remove" msgstr "Óêëîíè" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Áî¼å" @@ -1976,7 +1976,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Òåêñò" @@ -2027,13 +2027,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Ïîäðàçóìåâàíî" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Ñèñòåì" @@ -2174,7 +2175,7 @@ msgid "Description:" msgstr "Îïèñ:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Ñòàíè" @@ -2236,7 +2237,7 @@ msgid "&Go To" msgstr "&Èäè íà" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Óïîðåèâàœå" @@ -2287,7 +2288,7 @@ msgid "Filter Comments" msgstr "Ôèëòðèð༠íàïîìåíå" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Óðåèâà÷" @@ -2439,7 +2440,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Êîäíà ñòðàíèöà" @@ -2729,7 +2730,7 @@ msgid "Private Filter (only for current user)" msgstr "Ëè÷íè ôèëòåð (ñàìî çà òðåíóòíîã êîðèñíèêà)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Ðàä ñà àðõèâàìà" @@ -2780,7 +2781,7 @@ msgid "Files:" msgstr "Äàòîòåêå" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Ðàçëèêà" @@ -2817,7 +2818,7 @@ msgid "Right:" msgstr "Äåñíà:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Èñòå" @@ -2870,7 +2871,7 @@ msgid "&Apply" msgstr "Ï&ðèìåíè" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "Îòêàæè" @@ -2976,7 +2977,7 @@ msgid "Save..." msgstr "Ñà÷óâà¼..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Ðåçåðâíå äàòîòåêå" @@ -3017,7 +3018,7 @@ msgid "A&ppend timestamp" msgstr "Äî&ä༠äàòóì/âðåìå" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Ïîòâðäè êîïèðàœå" @@ -3058,7 +3059,7 @@ msgid "&Enable plugins" msgstr "Îìîãóžè äîäàòê&å" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Èíòåãðèøè ó 'šóñêó'" @@ -3094,8 +3095,8 @@ msgid "Add &Shell menu to context menu" msgstr "Äîä༠èçáîðíèê 'šóñêå' ó èçáîðíè îêâèð" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Ôàñöèêëà" @@ -3131,69 +3132,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Áèíàðíè" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041904e3" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x419, 1251" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Ñïðåìàí" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3202,12 +3236,12 @@ msgstr "" "Ñòâàðà ïðàçàí äîêóìåíò\n" " Íîâè äîêóìåíò(Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3216,7 +3250,7 @@ msgstr "" "Îòâîðè òðåíóòíó äàòîòåêó\n" "Îòâîðè(Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3225,7 +3259,7 @@ msgstr "" "Çàòâîðè òðåíóòíè äîêóìåíò\n" "Çàòâîðè" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3234,7 +3268,7 @@ msgstr "" "Ñà÷óâ༠òðåíóòíè äîêóìåíò\n" "Ñà÷óâ༠(Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3243,7 +3277,7 @@ msgstr "" "Ñà÷óâ༠òðåíóòíè äîêóìåíò ñà íîâèì èìåíîì\n" "Ñà÷óâ༠êàî..." -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3252,7 +3286,7 @@ msgstr "" "Ïðîìåíè ïîñòàâêå øòàìïå\n" "Ïîäåñè ñòðàíó" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3261,7 +3295,7 @@ msgstr "" "Ïðîìåíè ïîñòàâêå øòàìïà÷à\n" "Ïîäåñè øòàìïà÷" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3270,7 +3304,7 @@ msgstr "" "Îäøòàìï༠òðåíóòíè äîêóìåíò\n" "Îäøòàìïà¼" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3279,27 +3313,27 @@ msgstr "" "Ïðèêàç öåëå ñòðàíå\n" "Ïðåãëåä ïðå øòàìïàœà" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Ïîíîâî ïðèêàæè ñâå ñêðèâåíå ñòàâêå" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Çàìåíè ïðèêàç ñòàáëà" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Ïðîøèðè ñâå ïîòôàñöèêëå" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Çàòâîðè ñâå ïîòôàñöèêëè" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3308,32 +3342,32 @@ msgstr "" "Îòâîðè ïîðååœå\n" "Äàòîòåêà ïîðååœà(Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåïîçíàòà ãðåøêà ïðè îòâàðàœó ïîðååœà" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåïîçíàòà ãðåøêà ïðè ïîêóøà¼ó ÷óâàœà ïîðååœà" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Ïîðååœå" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Ïîðååœå ¼å óñïåøíî ó÷èòàíî" -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Ïîðååœå ¼å óñïåøíî ñà÷óâàíî" -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3342,7 +3376,7 @@ msgstr "" "Ñà÷óâàíà ¼å òðåíóòíà ñòàçà è ïîðååœå\n" "Ñà÷óâ༠ïîðååœå" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3351,7 +3385,7 @@ msgstr "" "Ïðèêàç îáàâåøòåœà î ïðîãðàìó, èçäàœó è àóòîðèìà\n" "Î ïðîãðàìó" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3360,27 +3394,27 @@ msgstr "" "Çàòâîðè ïðîãðàì;óïóòñòâî çà ÷óâàœå äîêóìåíòà\n" "Èçëàç" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Îòâîðè îâ༠äîêóìåíò" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3389,7 +3423,7 @@ msgstr "" "Áèð༠ñëåäåžè ïðîçîð\n" "Ñëåäåžà òàáëà" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3398,7 +3432,7 @@ msgstr "" "Âðàžàœå íà ïðåòõîäíó òàáëó\n" "Ïðåòõîäíà òàáëà" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3407,7 +3441,7 @@ msgstr "" "Óðåäè ïðîçîðå òàêî äà ñå ïðåêëàïà¼ó\n" "Ïðîçîðå ïîðåàíî" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3416,7 +3450,7 @@ msgstr "" "Óðåäè ïðîçîðå âîäîðàâíî,áåç ïðåêëàïàœà\n" "Ïîðåà¼ ïðîçîðå âîäîðàâíî" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3425,7 +3459,7 @@ msgstr "" "Óðåäè ïðîçîðå óñïðàâíî áåç ïðåêëàïàœà\n" "Ïîðåà¼ ïðîçîðå óñïðàâíî" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3434,7 +3468,7 @@ msgstr "" "Óìíîæè îäàáðàíî è ïîñòàâè ó îñòàâó\n" "Óìíîæè" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3443,7 +3477,7 @@ msgstr "" "Èñåöè îäàáðàíî è ïîñòàâè ó îñòàâó\n" "Èñåöè" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3452,7 +3486,7 @@ msgstr "" "Íàè îäðååíè ïî¼àì\n" "Íàè" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3461,7 +3495,7 @@ msgstr "" "Óìåòíè èç îñòàâå\n" "Íàëåïè" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3470,7 +3504,7 @@ msgstr "" "Ïîíîâè ïîñëåäœó ðàäœó\n" "Ïîíîâè" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3479,7 +3513,7 @@ msgstr "" "Çàìåíè îäðååíè òåêñò ñà äðóãèì\n" "Çàìåíè" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3488,7 +3522,7 @@ msgstr "" "Èçàáåðè öåî òåêñò\n" "Èçàáåðè ñâå" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3497,7 +3531,7 @@ msgstr "" "Îïîçîâè çàäœó ðàäœó\n" "Ïîíèøòè(Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3506,7 +3540,7 @@ msgstr "" "Ïîíîâè ïðåòõîäíî îïîçâàòè ðàäœó\n" "Ïîíîâè (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3515,7 +3549,7 @@ msgstr "" "Ïðèêàæè èëè ñàêðè¼ òðàêó àëàòà\n" "Òðàêà àëàòà" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3524,7 +3558,7 @@ msgstr "" "Ïðèêàæè èëè ñàêðè¼ ñòàòóñíó òðàêó\n" "Ñòàòóñíà òðàêà" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3533,7 +3567,7 @@ msgstr "" "Ïðèêàæè èëè ñàêðè¼ òðàêó ¼åçè÷àêà\n" "Òðàêà îçíàêà" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3542,57 +3576,57 @@ msgstr "" "Àóòîìàòñêè ïðèëàãîäè âåëè÷èíó òàáëè\n" "Çàêšó÷༠òàáëå" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Ïðîìåíè âåëè÷èíó ïðîçîðà" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Ïðîìåíè ïîëîæ༠ïðîçîðà" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Ñìàœè ïðîçîð íà èêîíó" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Ïîâåžà¼ ïðåêî öåëîã åêðàíà" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Áèð༠ñëåäåžè ïðîçîð ïîðååœà" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Áèð༠ïðåòõîäíè ïðîçîð ïîðååœà" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Çàòâîðè òðåíóòíè ïðîçîð è òðàæè äà ñå ñà÷óâà äîêóìåíò" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Âðàòè ïðîçîð íà ïðàâó âåëè÷èíó" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Ñïèñàê àêòèâíèõ çàäàòàêà" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Ïîêðåíè îâ༠ïðîçîð" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3601,7 +3635,7 @@ msgstr "" "Çàòâîðè ïðåãëåä ïðå øòàìïàœà\n" "Çàòâîðè ïðåãëåä" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3620,7 +3654,7 @@ msgstr "" "WinMerge.Óïîðåäè äàòîòåêó\n" "WinMerge óïîðåäè äàòîòåêó" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3639,19 +3673,19 @@ msgstr "" "WinMerge.Óïîðåäè ôàñöèêëó\n" "WinMerge óïîðåäè ôàñöèêëó" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Çàäðæè èçâîðíå çíàêîâå êðà¼à ðåäà" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Äåñíè êëèê íà ïóòàœó êî¼ó òðåáà óìíîæèòè" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3660,143 +3694,143 @@ msgstr "" "Ïðîãðàìåðè:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 ¼å ïðîãðàì ÁÅÇ ÃÀÐÀÍÖÈ£Å.Îâî ¼å áåñïëàòàí ïðîãðàì êî¼è ìîæåòå äàšå äåëèòè ïðåìà GNU ¼àâíî¼ ëèöåíöè êî¼ó ïîãëåäà¼òå ó äàòîòåöè /Ïîìîž/" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Ïðåêèíè" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "Ï&îíîâè" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "Çàíåìàð&è" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ç&àíåìàðè ñâå" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ä&à çà ñâå" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Íå" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Íå çà ñ&âå" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "Íàñòà&âè" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Èçî&ñòàâè" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Èçîñò&àâè ñâå" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Íå ïðèêàçó¼ îâó ïîðóêó ïîíîâî" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Íå ïèò༠ïîíîâî" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Ïðîãðàìè" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Ðàçëèêå" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Äî:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Ñ ëåâà:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Ó ëåâî:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Ñ äåñíà:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Ó äåñíî:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Èçäàœå %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Óíèêîä" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Ïîñòàâêå (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Ïîíîâè ïðèêàç ñâèõ ïîðóêà" -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3807,84 +3841,84 @@ msgstr "" "\n" "Ìîëèìî êîðèñòèòå âðåäíîñòè 1 - %1" -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Îòâîðè" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàìè |*.exe;*.bat;*.cmd|Ñâå äàòîòåêå (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Ñâå äàòîòåêå(*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge äàòîòåêå (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ïîñòàâêå äàòîòåêà (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Òåêñò äàòîòåêå (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Ñâå äàòîòåêå (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML äàòîòåêå (*.htm,*.html)|*.htm;*.html|Ñâå äàòîòåêå (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML äàòîòåêå (*.xml)|*.xml|Ñâå äàòîòåêå (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Èìå" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Ïîëîæà¼" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Ôèëòåðè" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Îïèñ" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Èçàáåðè äàòîòåêó çà íîâè ôèëòåð" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Äàòîòåêà ôèëòåðà (*.flt)|*.flt|All Files (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3897,7 +3931,7 @@ msgstr "" "Ìîëèì óìíîæèòå äàòîòåêó %1 ó WinMerge/Ôèëòåð -ôàñöèêëó:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3910,7 +3944,7 @@ msgstr "" "\n" "Ìîëèì, ïðîâåðèòå äà ëè ïîñòî¼è ôàñöèêëà è œåíó äîñòóïíîñò" -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3921,7 +3955,7 @@ msgstr "" "\n" "Ìîëèì, èçàáåðèòå ôàñöèêëó ôèëòåðà ó /Ïîñòàâêå/Ñèñòåì/" -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3934,12 +3968,12 @@ msgstr "" "\n" "Ìîæäà ¼å äàòîòåêà ñàìî çà ÷èòàœå?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Ïðîíàè ôàñöèêëó ôèëòåðà çà èíñòàëàöè¼ó" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3950,17 +3984,17 @@ msgstr "" "\n" "Íå ìîãó óìíîæèòè íîâè ôèëòåð ó ôàñöèêëè ôèëòåðà" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëòåð âåž ïîñòî¼è.Çàìåíè ïîñòî¼åžè ôèëòåð" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Ïðàâèëàí èçðàç" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3971,258 +4005,258 @@ msgstr "" "\n" "Àêî èçàáåðåòå /Íå/ òî ìîæåòå è êàñíè¼å óðàäèòè" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Ïóòàœà äî SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Èñõîäè ïîðååœà ôàñöèêëè" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Óïîðåäè äàòîòåêå" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Íåèìåíîâàíà ëåâà" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Íåèìåíîâàíà äåñíà" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Œèõîâå äàòîòåêå" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Ìî¼å äàòîòåêå" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Ïðåòðàæèâàœå äàòîòåêå" -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Îòâàðàœå îäàáðàíîã" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Óìíîæèòå ëåâó ó äåñíî" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Óìíîæèòå äåñíó ó ëåâî" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Óìíîæèòå ñâå ó ëåâî" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Óìíîæèòå ñâå ó äåñíî" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Óìíîæèòå äàòîòåêå" -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Áðèñàœå äàòîòåêå" -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Ïðåìåøòàœå äàòîòåêà" -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Ïðàâšåœå èçâåøòà¼à" -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Ïîíèøòàâàœå çàäœå ðàäœå..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Ïîíàâšàœå ïðåòõîäíå ðàäœå..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Ðåä: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Óïîðåäè" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Ðàçëèêå %1 îä %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "Íàåíî ðàçëèêà %1" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "Íàåíî ðàçëèêà 1" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Ñòàâêå %1 îä %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Ñòàâêå: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Îäàáåðè äâå ïîñòî¼åžå äàòîòåêå èëè ôàñöèêëå çà ïîðååœå" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Èçàáåðè ôàñöèêëó" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Îäàáåðè äâå ôàñöèêëå èëè äàòîòåêå çà ïîðååœå" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Ëåâà ïóòàœà ¼å íåâàæåžà!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Äåñíà ïóòàœà ¼å íåâàæåžà!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Îáå ïóòàœå ñó íåâàæåžå!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Îäàáåðèòå äâå äàòîòåêå êî¼å ïðèõâàòà àðõèâåð" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Íå ìîãó óïîðåäèòè äàòîòåêó è ôàñöèêëó!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Äàòîòåêà íè¼å ïðîíàåíà" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Äàòîòåêà íè¼å ðàñïàêîâàíà: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4235,12 +4269,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Íå ìîãó ðàø÷ëàíèòè ïðîáëåìàòè÷íó äàòîòåêó" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4251,27 +4285,27 @@ msgstr "" "%1\n" "íè¼å ïðîáëåìàòè÷íà" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Ñà÷óâ༠êàî" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Ñà÷óâ༠èçìåíå %1? " -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 ¼å îçíà÷åíà ñàìî çà ÷èòàœå.Æåëèòå ëè äà ¼å ïîíèøòèòå?(Íå, ñà÷óâàíà ¼å ïîä íîâèì èìåíîì)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Ãðåøêà ïðè ïðàâšåœó ðåçåðâíå äàòîòåêå" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4284,7 +4318,7 @@ msgstr "" "\n" "Íàñòàâèòe?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4301,7 +4335,7 @@ msgstr "" "\t-je çàïàìòèòå ïîä äðóãèì èìåíîì, ïðèòèñíèòå /Ó ðåäó/\n" "\t- èëè ïðèòèñíèòå /Èçàè/çà ïðåêèä ïîñòóïêà?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4316,7 +4350,7 @@ msgstr "" "\n" "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäàœå êàî äàòîòåêó?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4331,7 +4365,7 @@ msgstr "" "\n" "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäàœå êàî äàòîòåêó?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4346,7 +4380,7 @@ msgstr "" "\n" "Çàìåíèòå èçìåœåíó äàòîòåêó?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4355,7 +4389,7 @@ msgstr "" "%1\n" "¼å îçíà÷åíà ñàìî çà ÷èòàœå.Æåëèòå ëè äà ¼å çàìåíèòå?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4368,22 +4402,22 @@ msgstr "" "%1\n" "îä çàäœåã ïðåãëåäà WinMerge-à.Æåëèòå ëè ïîíîâî ó÷èòàòè äàòîòåêó?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Ñà÷óâ༠ëåâó äàòîòåêó êàî" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Ñà÷óâ༠äåñíó äàòîòåêó êàî" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4394,7 +4428,7 @@ msgstr "" "%1\n" "¼å íåñòàëà.Ìîëèìî Âàñ äà ñà÷óâàòå óìíîæåíó äàòîòåêó äà áèñòå íàñòàâèëè" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4405,42 +4439,42 @@ msgstr "" "\n" "Îñâåæè äîêóìåíòå ïðå íàñòàâêà" -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Ìîðàòå îäðåäèòè ñèãóðíó èçâîðíó ïóòàœó àêî æåëèòå íàñòàâèòè (ie: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Ïîâåðà äàòîòåêà íà VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåì ¼å ïîêàçàî ãðåøêó äîê ¼å ïîêóøàâàî äà ïðîâåðè äàòîòåêó.Íå ìîæå äà íàñòàâè..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Ãðåøêà ïðè èçâðøåœó ñèñòåìñêå íàðåäáå" -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ðàäíà ôàñöèêëa è ïîëîæ༠òðåíóòå äàòîòåêå ñå íå ïîêëàïà¼ó.Íàñòàâèòå?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Íåìà VSS áàçå ïîäàòàêà" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Ãðåøêà èç VSS" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4451,7 +4485,7 @@ msgstr "" "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà.\n" "Îïîçîâè ïðîâåðó?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4460,164 +4494,164 @@ msgstr "" "Ñèñòåì ïðèêàçó¼å ãðåøêó äîê ïîêóøàâà äà îïîçîâå ïðîâåðó äàòîòåêå.\n" "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Íèøòà" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìàœè îä 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 è âèøè)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Ñòàíè íà ðàçìàêó" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ñòàíè íà ðàçìàêó èëè èíòåðïóêöè¼è" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Óìíîæè îäàáðàíó ñòàâêó ó èìåíîâàíî¼ ôàñöèêëè" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Óìíîæè îäàáðàíó ñòàâêó ó ïðèëàãîåíî¼ ôàñöèêëè" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Èçáðèøè îäàáðàíó ñòàâêó ñ ëåâà" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Èçáðèøè îäàáðàíó ñòàâêó ñ äåñíà" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Èçáðèøè îäàáðàíó ñòàâêó íà îáå ñòðàíå " -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ñàêðè¼ îäàáðàíó ñòàâêó (ôèëòåð ó õîäó)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Ïðåèìåíó¼ îäàáðàíó ñòàâêó íà îáå ñòðàíå" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Äåñíà ó ëåâî (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Ëåâà ó äåñíî (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåñíà ó ëåâî (%1 îä %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ëåâà ó äåñíî (%1 îä %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Ëåâà ó... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Äåñíà ó... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ëåâà ó... (%1 îä %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåñíà ó... (%1 îä %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Ëåâà (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Äåñíà (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Îáå (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Ëåâà (%1 îä %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Äåñíà (%1 îä %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Îáå(%1 îä %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Ëåâà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Äåñíà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 óñìåðåíèõ äàòîòåêà)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 îä %2 óñìåðåíèõ äàòîòåêà)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4628,17 +4662,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå %d ñòàâêè:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4657,613 +4691,607 @@ msgstr "" "\n" "Ìîëèì, îñâåæèòå ïîðååœå." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ¼å ïðåìåñòèòå:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ïðåìåñòèòå %d ñòàâêè:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Ïîòâðäè ïðåìåøòà¼" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Îòâîðè ëåâó äàòîòåêó" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Îòâîðè ëåâó äàòîòåêó ó äðóãîì óðåèâà÷ó" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Îòâîðè ëåâó äàòîòåêó ñà..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Îòâîðè äåñíó äàòîòåêó" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Îòâîðè äåñíó äàòîòåêó ó äðóãîì óðåèâà÷ó" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Îòâîðè äåñíó äàòîòåêó ñà..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íè¼å óñïåëî ïîêðåòàœå äðóãîã óðåèâà÷à: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Ñà÷óâ༠èìå äàòîòåêå ó îñòàâè" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Ñà÷óâ༠èìå ïóòàœå ëåâå ñòðàíå ó îñòàâè" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Ñà÷óâ༠èìå ïóòàœå äåñíå ñòðàíå ó îñòàâè" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Ñà÷óâ༠èìå ïóòàœå îáå ñòðàíå ó îñòàâè" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Ëåâè èçáîðíèê /šóñêå/" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Äåñíè èçáîðíèê /šóñêå/" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Íåïîçíàò îáëèê àðõèâå" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Äîä༠ñòàâêå ñà ëåâå ñòðàíå ó àðõèâó" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Äîä༠ñòàâêå ñà äåñíå ñòðàíå ó àðõèâó" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Äîä༠ñòàâêå îáå ñòðàíå ó àðõèâó" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Äîä༠ðàçëè÷èòå ñòàâêå ó àðõèâó (îáå ñòðàíå)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Ïðåìåñòè îäàáðàíó äàòîòåêó ñ ëåâà ó èçàáðàíó ôàñöèêëó" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ïðåìåñòè îäàáðàíó äàòîòåêó ñ äåñíà ó èçàáðàíó ôàñöèêëó" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Èìå äàòîòåêå" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Ðåçóëòàò ïîðååœà" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Äàòóì ëåâî" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Äàòóì äåñíî" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Íàñòàâàê" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Âåëè÷èíà ëåâî" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Âåëè÷èíà äåñíî" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Âåëè÷èíà äåñíî (ñêðàžåíî)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Âåëè÷èíà ëåâî (ñêðàžåíî)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Âðåìå ñòâàðàœà ëåâå" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Âðåìå ñòâàðàœà äåñíå" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Íîâè¼à äàòîòåêà" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Èçäàœå ëåâå äàòîòåêå" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Èçäàœå äåñíå äàòîòåêå" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Ñêðàžåíè èñõîä" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Îñîáèíå ëåâå" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Îñîáèíå äåñíå" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Çàâðøåòàê ðåäà ëåâå äàòîòåêå" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Çàâðøåòàê ðåäà äåñíå äàòîòåêå" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Êîäèðàœå ëåâå" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Êîäèðàœå äåñíå" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Çàíåìàðè ðàçëèêå" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Áèíàðíè" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Íå ìîãó óïîðåäèòè äàòîòåêå" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Îäáà÷åíà ñòàâêà" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Èçîñòàâšåíà äàòîòåêà" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Èçîñòàâšåíà ôàñöèêëà" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Ñàìî ëåâà: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Ñàìî äåñíà: %" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíå äàòîòåêå ñó èñòå" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Áèíàðíå äàòîòåêå ñó ðàçëè÷èòå" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Äàòîòåêå ñó ðàçëè÷èòå" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Ôàñöèêëå ñó ðàçëè÷èòå" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Ñàìî ëåâà" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Ñàìî äåñíà" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Ãðåøêà" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâè äàòîòåêà ñó èñòè" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Òåêñòîâè äàòîòåêà ñó ðàçëè÷èòè" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîòåêëî âðåìå: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 ñòàâêà ¼å îäàáðàíà" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 ñòàâêà ¼å îäàáðàíà" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Èìå äàòîòåêå èëè ôàñöèêëå" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìå ïîòôàñöèêëå êàä ñó ïîòôàñöèêëå óêšó÷åíå" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Èçõîä ïîðååœà,äóæè îáëèê" -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Äàòóì ïðîìåíå ëåâå ñòðàíå" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Äàòóì ïðîìåíå äåñíå ñòðàíå" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "/Íàñòàâàê/ äàòîòåêå" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Âåëè÷èíà ëåâå äàòîòåêå ó áà¼òèìà" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Âåëè÷èíà äåñíå äàòîòåêå ó áà¼òèìà" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Ñêðàžåíà ëåâà äàòîòåêà" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Ñêðàžåíà äåñíà äàòîòåêà" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Âðåìå ñòâàðàœà ëåâå ñòðàíå" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Âðåìå ñòâàðàœà äåñíå ñòðàíå" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Êî¼à ñòðàíà èìà íîâè¼è äàòóì ïðîìåíå" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Èçäàœå íà ëåâî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå" -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Èçäàœå íà äåñíî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå" -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Êðàžè ðåçóëòàò ïîðååœà" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Îñîáèíå ëåâå ñòðàíå" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Îñîáèíå äåñíå ñòðàíå" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Íà÷èí çàâðøåòêà ðåäà ëåâå äàòîòåêå" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Íà÷èí çàâðøåòêà ðåäà äåñíå äàòîòåêå" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Êîäèðàœå ëåâå ñòðàíå" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Êîäèðàœå äåñíå ñòðàíå" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áðî¼ çàíåìàðåíèõ ðàçëèêà ó äàòîòåöè.Îâå ðàçëèêå ¼å çàíåìàðèî WinMerge è íå ìîãó áèòè îá¼åäèœåíå" -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áðî¼ ðàçëèêà ó äàòîòåöè.Îâ༠áðî¼ íå óêšó÷ó¼å çàíåìàðåíå ðàçëèêå" -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïðèêàçó¼å çâåçäèöó (*), àêî ¼å äàòîòåêà áèíàðíà" -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Óïîðåäè %1 ñà %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Ñïèñàê ¼å îäâî¼åí çàðåçîì" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Ñïèñàê ¼å îäâî¼åí ¼åçè÷êîì" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "£åäíîñòàâíè HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "£åäíîñòàâíè XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Äàòîòåêà èçâåøòà¼à âåž ïîñòî¼è.Äà ëè æåëèòå çàìåíèòè ïîñòî¼åžó äàòîòåêó" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5272,32 +5300,32 @@ msgstr "" "Ãðåøêà ïðè ïðàâšåœó èçâåøòà¼à:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Èçâåøò༠¼å óñïåøíî íàïðàâšåí" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Èñòà äàòîòåêà ¼å îòâîðåíà ó îáå òàáëå" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Èçàáðàíå äàòîòåêå ñó èñòå" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Äîøëî ¼å äî ãðåøêå ïðè ïîðååœó" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ïðèâðåìåíà äàòîòåêà íå ìîæå áèòè ñòâîðåíà.Ïðîâåðèòå è ïîäåñèòå ïðèâðåìåíó ïóòàœó" -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5312,17 +5340,17 @@ msgstr "" "\n" "Íàïîìåíà:Æåëèòå ëè óâåê çàäðæàòè ðàçëè÷èòå ïðåëàñêà ó äðóãè ðåä, îäàáåðèòå 'Çàíåìàðè ðàçëè÷èòå ïðåëàñêå ó äðóãè ðåä..' ó äè¼àëîøêî¼ êàðòèöè ïîðååœå ïðîçîðà (Óðåèâàœå/Ïîñòàâêå)" -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Îäàáðàíà ôàñöèêëà ¼å íåóïîòðåášèâà" -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íå ìîãó îòâîðèòè áèíàðíó äàòîòåêó ó óðåèâà÷ó" -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5337,7 +5365,7 @@ msgstr "" "%1\n" "íà äðóãî¼ ñòðàíè è îòâîðèòè ¼å?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5348,168 +5376,168 @@ msgstr "" "Ïðèêàç ñâàêå äàòîòåêå ó êîäíî¼ ñòðàíèöè ¼å áîšè àëè ñïà¼àœå/óìíîæàâàœå íîñè îïàñíîñò.\n" "Æåëèòå ëè äà óçìåòå îáå äàòîòåêå êàî ó ïîäðàçóìåâàíîì ïðîçîðó êîäíå ñòðàíèöå (ïðåïîðó÷åíî)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Ïîäàöè ñó èçãóášåíè çáîã ãðåøêå ïðè êîäèðàœó: îáå äàòîòåêå" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Íåìà ðàçëèêå" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Ðàçëè÷èòè ðåä" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåœåí %1 ïî¼àì(à)" -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå ìîãó íàžè ïî¼àì \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Óìíîæè ïóòàœó" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Óìíîæè èìå äàòîòåêå" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Ïîëîæ༠òàáëè" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Ðàçëè÷èòå òàáëå" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Äàòîòåêà ðàçëèêà ¼å óñïåøíî ñà÷óâàíà" -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíàåíà!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíàåíà!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Äàòîòåêà ðàçëèêà âåž ïîñòî¼è.Äà ëè æåëèòå äà je çàìåíèòå?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 îäàáðàíà äàòîòåêà" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Óîáè÷à¼åí" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Ó îêâèðó" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Îá¼åäèœåí" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Íå ìîãó ñà÷óâàòè ó äàòîòåöè %1" -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Íàâåäåíà èçëàçíà ïóòàœà íè¼å ïîòïóíà ïóòàœà: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Îäðåäèòå èçëàçíó äàòîòåêó" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íå ìîæå ñòâîðèòè äàòîòåêó ðàçëèêà èç áèíàðíèõ äàòîòåêà" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íå ìîæå ïîïðàâèòè äàòîòåêó èç ôàñöèêëè" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5520,12 +5548,12 @@ msgstr "" "\n" "Ñòâàðàœå äàòîòåêå ðàçëèêà çàõòåâà äà ïîñòî¼å ïðîìåíå êî¼å íèñó ñà÷óâàíå ó äàòîòåêàìà" -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Ôàñöèêëà íå ïîñòî¼è" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5536,7 +5564,7 @@ msgstr "" "Ñâå ïîòðåáíå êîìïîíåíòå (7-zip è/èëè Merge7z*.dll)çà àðõèâó íå ìîãó áèòè íàåíå.\n" "Ïîãëåäà¼òå óïóòñòâî êàêî îìîãóžèòè ðàä ñà àðõèâàìà" -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5545,7 +5573,7 @@ msgstr "" "\n" "Çàáåëåøêà:Èíòåãðàöè¼à 7-Zip ¼å îíåìîãóžåíà ó ïîäåøàâàœèìà WinMerge-à" -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5554,37 +5582,37 @@ msgstr "" "\n" "Çàáåëåøêà:Èíòåãðàöè¼à 7-Zip ¼å îãðàíè÷åíà íà ñàìîñòàëíî äåëîâàœå ó ïîäåøàâàœèìà WinMerge-à " -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Îäàáåðè äàòîòåêó çà èçâîç" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Îäàáåðè äàòîòåêó çà óâîç" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Óâîç ïîñòàâêè ó äàòîòåêó" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Èçâîç ïîñòàâêè ó äàòîòåêó" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Íè¼å óñïåî äà óâåçå ïîñòàâêå èç äàòîòåêå" -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Íè¼å óñïåî äà çàïàìòè ïîñòàâêå ó äàòîòåöè" -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5595,157 +5623,157 @@ msgstr "" "\n" "Äà ëè æåëèòå íàñòàâèòè?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Âðñòà" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Ðàñïàêèâàœå" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Äåôèíèñàíî ïîðååœå" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Óðåèâà÷ ðóêîïèñà" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Ñà÷óâ༠ëåâó äàòîòåêó" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Ñà÷óâ༠äåñíó äàòîòåêó" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Ñà÷óâ༠ëåâó äàòîòåêó ñà íàçèâîì" -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Ñà÷óâ༠äåñíó äàòîòåêó ñà íàçèâîì" -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Ïðîìåíè êð༠ðåäà íà Windows íà÷èí" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Ïðîìåíè êð༠ðåäà íà Unix íà÷èí" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Ïðîìåíè êð༠ðåäà íà Mac íà÷èí" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Áèð༠èçìåó óðåèâàœà è óïîðåèâàœà" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5754,12 +5782,12 @@ msgstr "" "Ïðèêàæè è ïîäåñè ñâî¼ñòâà êîäèðàœà äàòîòåêå\n" "Ñâî¼ñòâà êîäèðàœà äàòîòåêå" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Îòâîðè è ðåøè ïðîáëåìàòè÷íå äàòîòåêå" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5768,7 +5796,7 @@ msgstr "" "Èçàáåðè ðàçëèêå ó òðåíóòíîì ðåäó\n" "Ðàçëèêå ó òðåíóòíîì ðåäó" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5777,7 +5805,7 @@ msgstr "" "Èäè íà ðåä èëè ðàçëèêó\n" "Èäè íà (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5786,7 +5814,7 @@ msgstr "" "Ïîäåñè ïðîãðàìñêå ïîñòàâêå\n" "Ïîñòàâêå" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5795,37 +5823,37 @@ msgstr "" "Îñâåæè ïðèêàç\n" "Îñâåæè (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Óìíîæè îäàáðàíå ðåäîâå ó îñòàâó äîäà¼óžè îä ïî÷åòêà áðî¼åâå ðåäîâèìà " -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Çàìåíè çàáåëåøêå" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Èäè íà ñëåäåžó çàáåëåøêó" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Èäè íà ïðåòõîäíó çàáåëåøêó" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Óêëîíè ñâå çàáåëåøêå" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5834,7 +5862,7 @@ msgstr "" "Ïðèêàçó¼å ñòàâêå êî¼å ñó ïîòïóíî èñòå\n" "Ïðèêàæè èñòå ñòàâêå" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5843,7 +5871,7 @@ msgstr "" "Ïðèêàçó¼å ñòàâêå êî¼å ñå ðàçëèêó¼ó\n" "Ïðèêàæè ðàçëè÷èòå ñòàâêå" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5852,7 +5880,7 @@ msgstr "" "Ïðèêàçó¼å ñòàâêå êî¼å ïîñòî¼å ñàìî íà ëåâî¼ ñòðàíè\n" "Ïðèêàæè ëåâó ¼åäèíñòâåíó ñòàâêó" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5861,7 +5889,7 @@ msgstr "" "Ïðèêàçó¼å ñòàâêå êî¼å ïîñòî¼å ñàìî íà äåñíî¼ ñòðàíè\n" "Ïðèêàæè äåñíó ¼åäèíñòâåíó ñòàâêó" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5870,7 +5898,7 @@ msgstr "" "Ïðèêàçó¼å áèíàðíå äàòîòåêå\n" "Ïðèêàæè áèíàðíå äàòîòåêå" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5879,7 +5907,7 @@ msgstr "" "Ïðèêàçó¼å ïðåñêî÷åíå ñòàâêå\n" "Ïðèêàæè ïðåñêî÷åíå ñòàâêå" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5888,7 +5916,7 @@ msgstr "" "Èçàáåðèòå ñëîâà çà ïðèêàç\n" "Èçàáåðè ñëîâà" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5897,27 +5925,27 @@ msgstr "" "Âðàòè ñå è êîðèñòè ïîäðàçóìåâàíà ñëîâà çà ïðèêàç\n" "Ïîäðàçóìåâàíà ñëîâà " -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Ïðèêàçó¼å ðàçìàêå è çíàêîâå" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Çàìåíè ñòðàíå" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Ïîëîæ༠òàáëå ïðèêàçó¼å óêóïíó ñëèêó î äàòîòåöè" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Ïðèêàæè ñòàòèñòè÷êî ïîðååœå ôàñöèêëè" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5926,7 +5954,7 @@ msgstr "" "Èçàáåðèòå âàø ¼åçèê ñó÷åšà\n" "£åçèê" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5935,12 +5963,12 @@ msgstr "" "Ïîêàçó¼å ðàçëèêå óíóòàð ðåäîâà ñà ðàçëè÷èòèì áî¼àìà\n" "Ïðèêàæè ðàçëè÷èòå ðåäîâå" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Çàìåíè ìåñòà òàáëàìà" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5949,7 +5977,7 @@ msgstr "" "Ïðèêàçó¼å áðî¼åâå ðåäîâà\n" "Ïðèêàæè áðî¼åâå ðåäîâà" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5958,7 +5986,7 @@ msgstr "" "Îìîãóžè ïðåëîì òåêñòà\n" "Ïðåëàç ó íîâè ðåäà" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5967,22 +5995,22 @@ msgstr "" "Ïîêàçó¼å èçáîð ðóáà çà îáå òàáëå\n" "Ïðèêàæè èçáîð ðóáîâà" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Ïîâåžà¼ âåëè÷èíó òåêñòà" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Óìàœè âåëè÷èíó òåêñòà" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Èçâîðíà âåëè÷èíà òåêñòà" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5991,7 +6019,7 @@ msgstr "" "Ïîìåðè äî ïðåòõîäíå ðàçëèêå\n" "Ïðåòõîäíà ðàçëèêà (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6000,77 +6028,77 @@ msgstr "" "Ïîìåðè äî ñëåäåžå ðàçëèêå\n" "Ñëåäåžà ðàçëèêà (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6079,7 +6107,7 @@ msgstr "" "Ïîìåðè äî ïðâå ðàçëèêå\n" "Ïðâà ðàçëèêà(Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6088,7 +6116,7 @@ msgstr "" "Ïîìåðè äî òðåíóòíå ðàçëèêå\n" "Òðåíóòíà ðàçëèêà (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6097,7 +6125,7 @@ msgstr "" "Ïîìåðè äî ñëåäåžå ðàçëèêå\n" "Ïîñëåäœà ðàçëèêà (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6106,7 +6134,7 @@ msgstr "" "Óìíîæè îçíà÷åíè òåêñò ó äåñíó äàòîòåêó\n" "Óìíîæè ó äåñíó (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6115,7 +6143,7 @@ msgstr "" "Óìíîæè îçíà÷åíè òåêñò ó ëåâó äàòîòåêó\n" "Óìíîæè ó ëåâó (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6124,7 +6152,7 @@ msgstr "" "Óìíîæè ðàçëèêå ó äåñíó è ïðåè íà ñëåäåžå\n" "Óìíîæè ó äåñíó è íàñòàâè (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6133,7 +6161,7 @@ msgstr "" "Óìíîæè ðàçëèêå ó ëåâó è ïðåè íà ñëåäåžå\n" "Óìíîæè ó ëåâó è íàñòàâè (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6142,7 +6170,7 @@ msgstr "" "Óìíîæè ñâå ðàçëèêå ó äåñíó äàòîòåêó\n" "Ñâå ó äåñíó" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6151,104 +6179,104 @@ msgstr "" "Óìíîæè ñâå ðàçëèêå ó ëåâó äàòîòåêó\n" "Ñâå ó ëåâó" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Èçáðèøè èçàáðàíå ñòàâêå èç îáå ôàñöèêëå" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Óïîðåäè îçíà÷åíå ñòàâêå (óïîðåäèòå ïðâå ñòàâêå, àêî ¼å âèøå ñòàâêè îäàáðàíî)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Èçáîð è ðàçìåøò༠ôàñöèêëè ïðåìà óïîðååíèì ñòóáöèìà" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Ïðàâè ïîïðàâêå äàòîòåêà " -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Èçàáåðèòå è ïðîìåíèòå ôèëòåðå" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Ïðàâè èçâåøòà¼å ïîðååœà " -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Ïðèêàçó¼å ñïèñàê äîñòóïíèõ äîäàòàêà" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Êîðèñíèê áèðà ðàñïàêèâàœå (íå ðàñïàêó¼ êàä ñå óïîðåó¼ó ôàñöèêëå)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ïðèëàãîåíî ðàñïàêèâàœå žå ñå êîðèñòèòè çà îáå äàòîòåêå (¼åäíà äàòîòåêà òðåáà íàñòàâàê)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Èçàáåðèòå àðõèâåð äà ïðîìåíèòå îâó äàòîòåêó" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Íåìà äåôèíèñàíîã ïîðååœà (óîáè÷à¼åíî)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Ïðåïîðó÷åíè äîäàöè" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Îñòàëè äîäàöè" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Óêëîíè è ïîíîâî ó÷èò༠ñâå äîäàòêå (çà íàïðåäíå)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" "Activate next File" msgstr "Ïîêðåíè ñëåäåžó âèäšèâó äàòîòåêó" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Çàòâîðè ñâå ïðîçîðå" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6257,22 +6285,22 @@ msgstr "" "Îòâàðà WinMerge ïîìîž\n" "WinMerge /ïîìîž/" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Èçëàçè îáàâåøòåœå î òðåíóòíîì èçäàœó WinMerge-à è ïîäåøåíîñòè ó òåêñòóàëíî¼ äàòîòåöè" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Ïðèêàç GNU ¼àâíå ëèöåíöå" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Ëè÷íà èçðàäà: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6281,7 +6309,7 @@ msgstr "" "Îòâàðà áåëåøêå î èçäàœó äîêóìåíòa\n" "Áåëåøêå î èçäàœó" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6290,292 +6318,292 @@ msgstr "" "Îòâîðè âåá ñà¼ò ïðåâîäà\n" "Ïðåâîäè" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Ïîäåøàâàœà äîäàòàêà" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Íåìà äåôèíèñàíîã ïîðååœà" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Äåôèíèøè ïîðååœå,àêî ¼å ìîãóžå" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íè¼å íàåí - .sct ñêðèïòå ñó îíåìîãóžåíå" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<Íèøòà>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<Àóòîìàòñêè>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Îòâîðè äàòîòåêó ñà ðåãèñòðîâàíèì ïðîãðàìîì" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Îòâîðè äàòîòåêó ñà äðóãèì óðåèâà÷åì" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Îòâîðè äàòîòåêó ñà ïîñåáíèì ïðîãðàìîì" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Íå ïðèêàçó¼ ïðåìåøòåíå ãðóïå" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Ïðèêàæè ñâå ïðåìåøòåíå ãðóïå" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Ïðèêàæè ïðåìåøòåíå ãðóïå ñàìî òðåíóòíèõ ðàçëèêà" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Èäè íà ðàçëèêå ïîä /ïîêàçèâà÷åì/" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "È&äè íà ðåä %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Îíåìîãóžè" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Îä ñèñòåìà" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Èç MRU ñïèñêà" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Íè¼å îçíà÷åíî" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Ïðåíîñíè îá¼åêàò" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ñàêðè¼ òðàêó àëàòà" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Ìàëå èêîíå òðàêå àëàòà" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Âåëèêå èêîíå òðàêå àëàòà" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index af45ea313..0f05bad4f 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Prázdne >" @@ -470,7 +470,7 @@ msgstr "&Automatick #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&Kask #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "Po&moc" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Kódovanie súboru..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Plný obsah" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Rýchly obsah" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Dátum zmeny" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Dátum zmeny a ve¾kos" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Ve¾kos" @@ -1528,7 +1528,7 @@ msgstr "Nav #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "Systém pre správu &verzií:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta ku cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Hlavné nastavenia" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "&Nájdi ïalší" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&OK" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Nahraïi všetko" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Odstráni" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Farby" @@ -1977,7 +1977,7 @@ msgstr "Zmazan #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Text" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Predvolené" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Systém" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Popis:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Zastavi" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Prejs na" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Porovnávanie" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Filtrova komentáre" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2440,7 +2441,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Kódová stránka" @@ -2722,7 +2723,7 @@ msgid "Private Filter (only for current user)" msgstr "Súkromný filter (len pre aktuálneho používate¾a)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Podpora archívov" @@ -2773,7 +2774,7 @@ msgid "Files:" msgstr "Súbory:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Odlišné" @@ -2810,7 +2811,7 @@ msgid "Right:" msgstr "Vpravo:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identické" @@ -2863,7 +2864,7 @@ msgid "&Apply" msgstr "&Použi" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Zruši" @@ -2969,7 +2970,7 @@ msgid "Save..." msgstr "Uloži..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Záložné súbory" @@ -3010,7 +3011,7 @@ msgid "A&ppend timestamp" msgstr "P&rida èasovú známku" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Potvrdi kopírovanie" @@ -3051,7 +3052,7 @@ msgid "&Enable plugins" msgstr "" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "" @@ -3087,8 +3088,8 @@ msgid "Add &Shell menu to context menu" msgstr "" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Adresár" @@ -3124,69 +3125,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binárny" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041b04e2" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x41b, 1250" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Pripravený" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "ROZ" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAPS" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "CEZ" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "ZÁZN" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3195,12 +3229,12 @@ msgstr "" "Vytvorí prázdny dokument\n" "Nové dokumenty (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3209,7 +3243,7 @@ msgstr "" "Otvorí existujúci dokument\n" "Otvor" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3218,7 +3252,7 @@ msgstr "" "Zatvorí aktívny dokument\n" "Zatvor" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3227,7 +3261,7 @@ msgstr "" "Uloží aktívny dokument\n" "Ulož" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3236,7 +3270,7 @@ msgstr "" "Uloží aktívny dokument pod novým menom\n" "Ulož ako" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3245,7 +3279,7 @@ msgstr "" "Zmení parametre tlaèe\n" "Nastavenie tlaèe" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3254,7 +3288,7 @@ msgstr "" "Zmení tlaèiareò a parametre tlaèe\n" "Nastavenie tlaèiarne" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3263,7 +3297,7 @@ msgstr "" "Vytlaèí aktívny dokument\n" "Tlaè" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3272,27 +3306,27 @@ msgstr "" "Zobrazí náh¾ad pred tlaèou\n" "Náh¾ad pred tlaèou" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Zvidite¾ni všetky skryté položky" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3301,32 +3335,32 @@ msgstr "" "Otvorí súbor projektu\n" "Súbor sprojektu (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznáma chyba pri pokuse otvori súbor projektu" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznáma chyba pri pokuse uloži súbor projektu" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Súbor projektu" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Súbor projektu úspešne naèítaný." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Súbor projektu úspešne uložený." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3335,7 +3369,7 @@ msgstr "" "Uloží aktuálne nastavenia a cesty do súboru projektu\n" "Uloži Súbor projektu" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3344,7 +3378,7 @@ msgstr "" "Zobrazí informácie o programe\n" "O programe" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3353,27 +3387,27 @@ msgstr "" "Ukonèí program s otázkou na uloženie súborov\n" "Koniec" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Otvorí dokument" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3382,7 +3416,7 @@ msgstr "" "Prepne na ïalšie okno\n" "Ïalšie okno" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3391,7 +3425,7 @@ msgstr "" "Prepne na predchádzajúce okno\n" "Predchádzajúce okno" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3400,7 +3434,7 @@ msgstr "" "Usporiada otvorené okná kaskádovito\n" "Kaskáda" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3409,7 +3443,7 @@ msgstr "" "Rozloženie okien ako neprelínajúce sa dlaždice vodorovne\n" "Dláždi okná vodorovne" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3418,7 +3452,7 @@ msgstr "" "Rozloženie okien ako neprelínajúce sa dlaždice zvisle\n" "Dláždi okná zvisle" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3427,7 +3461,7 @@ msgstr "" "Skopíruje oznaèené do schránky\n" "Kopírova" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3436,7 +3470,7 @@ msgstr "" "Presununie oznaèené do schránky\n" "Vystrihnú" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3445,7 +3479,7 @@ msgstr "" "Vyh¾adá text\n" "Nájdi" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3454,7 +3488,7 @@ msgstr "" "Vloží obsah schránky\n" "Vloži" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3463,7 +3497,7 @@ msgstr "" "Zopakuje poslednú akciu\n" "Opakuj" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3472,7 +3506,7 @@ msgstr "" "Nahradí text\n" "Nahradi" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3481,7 +3515,7 @@ msgstr "" "Oznaèí všetko\n" "Oznaèi všetko" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3490,7 +3524,7 @@ msgstr "" "Vráti poslednú èinnos\n" "Vráti" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3499,7 +3533,7 @@ msgstr "" "Zopakuje poslednú vrátenú èinnos\n" "Opakova" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3508,7 +3542,7 @@ msgstr "" "Zobrazí alebo skryje panel nástrojov\n" "Panel nástrojov" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3517,7 +3551,7 @@ msgstr "" "Zobrazí alebo skryje stavový riadok\n" "Stavový riadok" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3526,7 +3560,7 @@ msgstr "" "Zobrazí alebo skryje panel záložiek\n" "Panel záložiek" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3535,57 +3569,57 @@ msgstr "" "Automaticky meni ve¾kos panelov\n" "Zamknú panely" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Zmeni ve¾kos okna" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Zmeni pozíciu okna" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Minimalizova okno" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Zväèši okno na pôvodnú ve¾kos" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Prepnú na ïalšie okno" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Prepnú na predchádzajúce okno" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zatvori aktívne okno s možnosou uloženia dokumentov" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Obnovi okná" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Aktivova zoznam úloh" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktivova toto okno" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3594,7 +3628,7 @@ msgstr "" "Zatvorí náh¾ad tlaèe\n" "Zruš náh¾ad" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3606,7 +3640,7 @@ msgid "" "WinMerge File Compare" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3618,160 +3652,160 @@ msgid "" "WinMerge Folder Compare" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Zachova pôvodné zakonèenia riadkov" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Cestu skopírujete po kliknutí pravým tlaèidlom" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 "" -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Zruši" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Znova" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorova" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorova &všetky" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "Á&no" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Áno &pre všetky" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nie pre &všetky" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "Po&kraèova" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Pre&skoèi" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Preskoèi vš&etky" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Už túto správu nezobrazova." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Už sa túto otázku nepýta." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Kontrola verzií" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Rozdiely" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Z¾ava:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Do¾ava:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Sprava:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Do¾ava:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Verzia %1 - Slovenský preklad" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Vlastnosti (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Znova sa zobrazujú všetky okná so správami." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3782,84 +3816,84 @@ msgstr "" "\n" "Použite hodnoty 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Všetky súbory (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projekty (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Súbory s nastavením (*.ini)|*.ini|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textové súbory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML súbory (*.htm,*.html)|*.htm;*.html|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML súbory (*.xml)|*.xml|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Názov" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Umiestnenie" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Zvo¾te názov súboru pre nový filter" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtre súborov (*.flt)|*.flt|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3872,7 +3906,7 @@ msgstr "" "Prosím, skopírujte súbor %1 do adresára WinMerge/Filters :\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3885,7 +3919,7 @@ msgstr "" "\n" "Prosím, uistite sa, že adresár existuje a dá sa doòho zapisova." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3896,7 +3930,7 @@ msgstr "" "\n" "Prosím, vyberte adresár pre filtre v dialógu Nastavienia/Systém." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3909,12 +3943,12 @@ msgstr "" "\n" "Možno je filter len na èítanie?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Nájs súbor filtra, ktorý sa nainštaluje" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3925,273 +3959,273 @@ msgstr "" "\n" "Nepodarilo sa skopírova nový súbor do adresára s filtrami." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter už existuje. Prepísa existujúci filter?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Regulárny výraz" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Výsledok porovnania adresárov" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Porovnávanie súborov" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Nepomenovaný ¾avý" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Nepomenovaný pravý" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Ich súbor" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Môj súbor" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Preh¾adávam súbory..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Otváranie výberu" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopírujem ¾avý do pravého" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopírujem pravý do ¾avého" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopírujem všetko do ¾avého" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopírujem všetko do pravého" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopírujem súbory..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Mažem súbory..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Presúvam súbory..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Vytváram správu..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Riadok: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Zlúèi" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Rozdiel %1 z %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "nájdených %1 rozdielov" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "nájdený jeden rozdiel" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "na èítanie" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 of %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Položky: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vyberte 2 existujúce súbory alebo adresáre na porovnanie" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Výber adresára" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dva adresáre na porovnanie." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "¼avá cesta je neplatná!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je neplatná!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Obe cesty sú neplatné!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zvo¾te si dva súbory pre zapnutie rozba¾ovaèa súborov." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Nemôžem porovna súbor a adresár!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Súbor nenájdený: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Súbor nerozbalený: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4204,12 +4238,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Nepodarilo sa spracova súbor konfliktov." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4220,27 +4254,27 @@ msgstr "" "%1\n" "nie je súbor konfliktov." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Uloži ako" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Uloži zmeny do %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je oznaèený len na èítanie. Chcete aj tak prepísa súbor len na èítanie? (Stlaète Nie ak ho chcete zapísa po novým názvom.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Chyba pri zálohovaní súboru" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4253,7 +4287,7 @@ msgstr "" "\n" "Pokraèova napriek tomu?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4270,7 +4304,7 @@ msgstr "" "\t-použi iný názov súbory (Stlaète Ok)\n" "\t-zruši prebiehajúcu operáciu (Stlaète Zruši)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4285,7 +4319,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4300,7 +4334,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4315,7 +4349,7 @@ msgstr "" "\n" "Prepísa zmenený súbor?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4324,32 +4358,32 @@ msgstr "" "%1\n" "je oznaèený len na èítanie. Želáte si prepísa položku len na èítanie?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Uloži ¾avý súbor ako" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Uloži pravý súbor ako" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4360,42 +4394,42 @@ msgstr "" "\n" "Obnovte dokumenty, než budete pokraèova." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Musíte nastavi cestu k projektu SourceSafe (napr.: $/MojProjekt)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout súborov z VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "SourceSafe vrátil chybu pri pokuse skontrolova súbor. Nemožno pokraèova..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Chyba pri spúšaní príkazu zo Systému Verzií (CVS a pod)." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "pracovný adresár VSS Working Folder a umiestnenie aktuálneho súboru sa nezhodujú. Pokraèova?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Nebola nájdená databáza VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Chyba VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4406,7 +4440,7 @@ msgstr "" " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu.\n" " Vráti operáciu checkout?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4415,164 +4449,164 @@ msgstr "" "Systém pre správu verzií vrátil chybu pri pokuse vráti (checkout) súbor.\n" " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Žiadny" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menšie ako 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyššie)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Preruši na netlaèite¾nom znaku" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Preruši na netlaèite¾nom znaku alebo vetnej diakritike" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopírova oznaèenú položku do pomenovaného adresára" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopírova oznaèenú položku do vlastného adresára" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Zmaž oznaèené položky v¾avo" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Zmaž oznaèené položky vpravo" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Zmaž oznaèené položky na oboch stranách" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skry oznaèené položky (filter poèas behu)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Premenova oznaèenú položku na oboch stranách" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Kopíruj do ¾avej strany %1 z %2 vybraných položiek" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Kopíruj do pravej strany %1 z %2 vybraných položiek" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Sprava do¾ava (%1 z %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Z¾ava doprava (%1 z %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Z¾ava... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Sprava... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Z¾ava... (%1 z %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Sprava... (%1 z %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "¼avý (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Zmaž %1 z %2 vybraných položiek z pravej strany" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Zmaza z oboch strán %1 z %2 vybraných položiek" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "¼avý (%1 z %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Pravý (%1 z %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Oba (%1 z %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "¼avá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Pravá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ovplyvnených súborov)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ovplyvnených súborov z %2)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4583,17 +4617,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Naozaj chcete skopírova:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Naozaj chcete skopírova %d položiek:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4612,613 +4646,607 @@ msgstr "" "\n" "Prosím, obnovte porovnanie." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Otvori ¾avý súbor" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Otvori súbor v¾avo v externom editore" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Otvori ¾avý súbor s..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Otvori pravý súbor" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Otvori pravý súbor v externom editore" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Otvori pravý súbor s..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nepodarilo sa spusti externý editor: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Skopírova názvy súborov do schránky" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Skopírova názvy cesty na ¾avej strane do schránky" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Skopírova názvy cesty na pravej strane do schránky" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Skopírova názvy ciest z oboch strán do schránky" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Neznámy formát archívu" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Prida položky z ¾avej strany do archívu" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Prida položky z pravej strany do archívu" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Prida položky z oboch strán do archívu" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Prida rozdielne položky do archívu (obe strany)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Presunú vybraný súbor na ¾avej strane do adresára, ktorý zadám" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Presunú vybraný súbor na pravej strane do adresára, ktorý zadám" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Názov súboru" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Výsledok porovnania" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Dátum v¾avo" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Dátum vpravo" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Prípona" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Ve¾kos v¾avo" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Ve¾kos vpravo" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Ve¾kos vpravo (krátka)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Ve¾kos v¾avo (krátka)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Èas vzniku v¾avo" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Èas vzniku vpravo" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Novší súbor" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Verzia súboru v¾avo" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Verzia súboru vpravo" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Krátky výsledok" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atribúty v¾avo" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atribúty vpravo" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Konce riadkov v¾avo" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Konce riadkov vpravo" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Kódovanie v¾avo" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Kódovanie vpravo" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ignorovaný rozdiel" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binárny" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Nemožno porovna súbory" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Položka zrušená" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Súbor preskoèený" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Adresár preskoèený" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Iba v¾avo: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Iba vpravo: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binárne súbory sú identické" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binárne súbory sú rozdielne" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Súbory sú rozdielne" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Iba v¾avo" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Iba vpravo" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "jedna vybraná položka" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 vybraných položiek" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Názov súboru alebo adresára." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Názov podadresára, keï obsahuje aj podadresáre." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Výsledok porovnania, dlhý tvar." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Dátum poslednej zmeny na ¾avej strane." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Dátum poslednej zmeny na pravej strane." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Prípona súboru." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Ve¾kos súboru na ¾avej strane v bajtoch." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Ve¾kos súboru na pravej strane v bajtoch." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Ve¾kos súboru na ¾avej strane skrátená." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Ve¾kos súboru na pravej strane skrátená." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Dátum vytvorenia na ¾avej strane." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Dátum vytvorenia na pravej strane." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "ktorý zo súborov má novší èas poslednej zmeny." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzia súboru na ¾avej strane, iba pre rovneký typ súboru." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzia súboru na pravej strane, iba pre rovneký typ súboru." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Krátky výsledok porovnania." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atribúty na ¾avej strane." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atribúty na pravej strane." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Typ zakonèenia riadka súboru na ¾avej strane" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Typ zakonèenia riadka súboru na pravej strane" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Kódovanie na ¾avej strane." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Kódovanie na pravej strane." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Poèet ignorovaných rozdielov v súbore. Tieto rozdiely WinMerge ignoruje a nie je schopný ich zlúèi." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Poèet rozdielov v súbore. V tomto èísle nie sú zahrnuté ignorované rozdiely." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zobrazí hviezdièku (*) ak je súbor binárny." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Porovna %1 s %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Zoznam oddelený èiarkami" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Zoznam oddelený tabulátormi" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Jednoduché HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Jednoduché XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Súbor so správou už existuje. Chcete prepísa existujúci súbor?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5227,32 +5255,32 @@ msgstr "" "Chyba pri vytváraní správy:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Správa bola úspešne vytvorená." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Rovnaký súbor je otvorený v boch paneloch." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Vybrané súbory sú rovnaké." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Poèas porovnávania sa vyskytla chyba." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Doèasné súobry nebolo možné vytvori. Skontrolujte nastavenie odkladacieho adresára." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5267,17 +5295,17 @@ msgstr "" "\n" "Pozn.: Ak chcete, aby som vždy považoval všetky zakonèenia riadkov za ekvivalentné, nastavte vo¾bu 'Ignorova rozdiely zakonèenia riadkov..' v záložke Porovnávanie dialógu Nastavenia (nájdete v Úpravy/Nastavenia)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Zvolený adresár je neplatný." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nemôžem otvori binárny súbor v editore." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5292,7 +5320,7 @@ msgstr "" "%1\n" "na druhej strane a otvori tieto adresáre?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5303,168 +5331,168 @@ msgstr "" "Zobrazenie každého súboru v jeho kódovej stránke lepšie zobrazuje, ale zluèovanie/kopírovanie bude nebezpeèné.\n" "Chcete precova s oboma stránkami akoby boli v predvolenej kódovej stránke Windows (odporúèa sa)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informácie sa stratili kvôli chybám v kódovaní: oba súbory" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Bez rozdielu" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Rozdiely v riadkoch" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahradených %1 reazcov." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nemôžem nájs reazec \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopírova úplnú cestu" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopírova názov súboru" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Lokaèný panel" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Panel rozdielu" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Súbor so záplatou bol úspešne zapísaný." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nenájdená alebo je to adresár!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nenájdená alebo je to adresár!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Súbor so záplatou už existuje. Chcete ho prepísa?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 súbor zvolený]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normálny" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Kontextový" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Zjednotený" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Nedalo sa zapisova do súboru %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Uvedená výstupná cesta nie je absolútna cesta: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "uveïte výstupný súbor" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nemohol som vytvori súbor so záplatou z binárnych súborov." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nemohol som vytvori súbor so záplatou z adresárov." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5475,12 +5503,12 @@ msgstr "" "\n" "vytvorenie záplaty vyžaduje, aby v súboroch neboli neuložené zmeny." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Adresár neexistuje." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5491,7 +5519,7 @@ msgstr "" "Niektoré z komponentov (7-zip a/alebo Merge7z*.dll) potrebných pre podporu archívov neboli nájdené.\n" "Pozri viac informácií o podpore archávov a ako ju zapnú v Príruèke." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5500,7 +5528,7 @@ msgstr "" "\n" "Pozn.: integrácia 7-Zip je vyonutá v Nastaveniach WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5509,37 +5537,37 @@ msgstr "" "\n" "Pozn.: integrácia 7-Zip je obmedzená na samostatnú (standalone) prevádzku v Nastaveniach WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Vyberte súbor pre export" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Vyberte súbor pre import" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Nastavenia importované zo súboru." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Options exportované do súboru." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Nepodarilo sa importova nastavenia zo súboru." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Nepodarilo sa zapísa nastavenia do súboru." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5550,157 +5578,157 @@ msgstr "" "\n" "Chcete pokraèova?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Zmiešaný" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Uloží súbor v¾avo" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Uloží súbor vpravo" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Uloží ¾avý súbor pod názvom..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Uloží pravý súbor pod názvom..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Prepne medzi režimami upravovania a spájania" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5709,12 +5737,12 @@ msgstr "" "Zobrazí a nastaví vlastnosti kódovania súborov\n" "Vlastnosti kódovania súborov" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Otvori a vyrieši súbor konfliktov" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5723,7 +5751,7 @@ msgstr "" "Vyberie oblas rozdielu na aktuálnom riadku\n" "Rozdiel na aktuálnom riadku" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5732,7 +5760,7 @@ msgstr "" "Prejde na riadok alebo rozdiel\n" "Prejs na (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5741,7 +5769,7 @@ msgstr "" "Nastaví možnosti programu\n" "Možnosti" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5750,37 +5778,37 @@ msgstr "" "Obnoví zobrazenie\n" "Obnovi (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Skopíruje vybrané riadky do schránky s pridaným èíslom riadka na zaèiatok" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Prepne záložku" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ide na ïalšiu záložku" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ide na predošlú záložku" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Vymaže všetky záložky" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5789,7 +5817,7 @@ msgstr "" "Zobrazí položky, ktoré sú presne rovnaké\n" "Zobrazi identické položky" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5798,7 +5826,7 @@ msgstr "" "Zobrazí položky, ktoré majú rozdiely\n" "Zobrazi rozdielne položky" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5807,7 +5835,7 @@ msgstr "" "Zobrazí položky, ktoré existujú iba na ¾avej strane\n" "Zobrazi položky jedineèné v¾avo" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5816,7 +5844,7 @@ msgstr "" "Zobrazí položky, ktoré existujú iba na pravej strane\n" "Zobrazi položky jedineèné vpravo" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5825,7 +5853,7 @@ msgstr "" "Zobrazí binárne súbory\n" "Zobrazi binárne súbory" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5834,7 +5862,7 @@ msgstr "" "Zobrazí preskoèené položky\n" "Zobrazi preskoèené položky" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5843,7 +5871,7 @@ msgstr "" "Vyberie font pre zobrazenie\n" "Font pre zobrazenie" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5852,42 +5880,42 @@ msgstr "" "Vráti sa k používaniu predvoleného systémového fontu pre zobrazenie\n" "Predvolený font" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Zobrazí prázdne znaky" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Prepne panel rozdielov" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Lokaèný panel zobrazí celkový obraz súborov" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zobrazí dialóg štatistika porovnania adresárov" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Vymení polohu dvoch panelov" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5896,7 +5924,7 @@ msgstr "" "Zobrazí èísla riadkov\n" "Zobrazi èísla riadkov" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5905,7 +5933,7 @@ msgstr "" "Zapne zalamovanie riadkov na hranici slov\n" "Zalamova riadky" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5914,117 +5942,117 @@ msgstr "" "Zobrazí okraje výberu v oboch paneloch\n" "Zobrazi okraje výberu" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Zväèši ve¾kos písma" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Zmenši ve¾kos písma" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Nastavi písmo na štandardnú ve¾kos" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6033,7 +6061,7 @@ msgstr "" "Skopíruje vybraný text do súboru vpravo\n" "Kopírova vpravo (->)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6042,7 +6070,7 @@ msgstr "" "Skopíruje vybraný text do súboru v¾avo\n" "Kopírova v¾avo (<-)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6051,7 +6079,7 @@ msgstr "" "Skopíruje rozdiel napravo a prejde na ïalší\n" "Skopírova doprava a na ïalší (Ctrl+Alt+vpravo)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6060,7 +6088,7 @@ msgstr "" "Skopíruje rozdiel na¾avo a prejde na ïalší\n" "Skopírova do¾ava a na ïalší (Ctrl+Alt+v¾avo)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6069,7 +6097,7 @@ msgstr "" "Skopíruje všetky rozdiely do súboru vpravo\n" "Všetko vpravo" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6078,122 +6106,122 @@ msgstr "" "Skopírujde všetky rozdiely do súboru v¾avo\n" "Všetko v¾avo" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Zmaže vybrané položky z oboch adresárov" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porovná vybrané položky (ak sú zvolené viaceré položky, porovná prvú položku)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Vyberie a zmení poradie ståpcov pre porovnanie adresárov" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Vytvorí súbor so záplatou" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Vyberie a modifikuje filtre" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Vytvorí správu z výsledkov porovnania" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Používate¾ zvolí rozba¾ovací program (bez rozba¾ovania, keï sa otvára adresár)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Rozba¾ovací program sa použije na oba súbory (pri jednom súbore staèí prípona)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Zvo¾te rozba¾ovací program, ktorým sa bude upravova tento súbor" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Bez predspracovania (bežné)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Odporúèané zásuvné moduly" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Iné zásuvné moduly" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Odoberie z pamäte všetky zásuvné moduly a znovu ich naèíta (pre vývojárov)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Zatvorí všetky otvorené okná" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Vypíše aktuálne informácie o verzii a konfigurácii WinMerge do textového súboru" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Súkromné zostavenie: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6202,7 +6230,7 @@ msgstr "" "Otvorí dokument Poznámky k vydaniu\n" "Poznámky k vydaniu" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6211,292 +6239,292 @@ msgstr "" "Otvorí webstránku prekladov\n" "Preklady" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Nastavenia zásuvných modulov" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Bez preprocesora" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Preprocessing, ak sa dá" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nenájdené - .sct skripty vypnuté" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<Žiadny>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Otvorí súbor registrovanou aplikáciou" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Otvorí súbor externým editorom" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Otvorí súbor konkrétnym programom" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Nezobrazuje presunuté bloky" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Zobrazí všetky posunuté bloky" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Zobrazuje presunuté bloky iba z aktuálneho rozdielu" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ide na rozdiel, ktorý je pod kurzorom" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Ch&oï na riadok %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Vypnuté" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Zo súborového systému" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Zo zoznamu nedávno použitých" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Dávkový" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Zdroje" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Skry panel nástrojov" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Zobrazi malý panel nástrojov" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Zobrazi ve¾ký panel nástrojov" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index b610fe7cf..dfb7f2003 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -329,7 +329,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Prazno >" @@ -471,7 +471,7 @@ msgstr "&Samodejno pretvarjanje" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -535,7 +535,7 @@ msgstr "&Kaskadna okna" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Pomoè" @@ -863,7 +863,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "De&kodiranje datoteke ..." @@ -1467,37 +1467,37 @@ msgid "&Compare method:" msgstr "&Metoda za primerjanje datotek" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Popolna vsebina" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Hitra vsebina" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Spremenjen datum" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Spremenjen datum in velikost" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Velikost" @@ -1529,7 +1529,7 @@ msgstr "Obi #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "V redu" @@ -1701,14 +1701,14 @@ msgid "&Versioning System:" msgstr "&Versioning System:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pot do cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Splošno" @@ -1853,7 +1853,7 @@ msgid "&Find Next" msgstr "&Najdi naslednje" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&V redu" @@ -1899,7 +1899,7 @@ msgid "Replace &All" msgstr "Zamenjaj &vse" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1951,7 +1951,7 @@ msgid "Remove" msgstr "Odstrani" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Barve" @@ -1980,7 +1980,7 @@ msgstr "Izbrisano" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Besedilo" @@ -2031,13 +2031,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Privzeto" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistem" @@ -2178,7 +2179,7 @@ msgid "Description:" msgstr "Opis:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Ustavi" @@ -2240,7 +2241,7 @@ msgid "&Go To" msgstr "Pojdi &na" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Primerjaj" @@ -2291,7 +2292,7 @@ msgid "Filter Comments" msgstr "Komentarji filtrov" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Urejevalnik" @@ -2443,7 +2444,7 @@ msgstr "&Zavr #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Kodna tabela" @@ -2734,7 +2735,7 @@ msgid "Private Filter (only for current user)" msgstr "Zasebni filter (samo za doloèene uporabnike)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Podpora arhivskim datotekam" @@ -2785,7 +2786,7 @@ msgid "Files:" msgstr "Datoteke:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Razlika" @@ -2822,7 +2823,7 @@ msgid "Right:" msgstr "Desno:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Enako" @@ -2875,7 +2876,7 @@ msgid "&Apply" msgstr "&Uporabi" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Preklièi" @@ -2981,7 +2982,7 @@ msgid "Save..." msgstr "Shrani" #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Arhivske datoteke" @@ -3022,7 +3023,7 @@ msgid "A&ppend timestamp" msgstr "&Dodaj datum in èas " #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Potrdi kopiranje" @@ -3063,7 +3064,7 @@ msgid "&Enable plugins" msgstr "&Omogoèi razširitve" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Integracija v lupino" @@ -3099,8 +3100,8 @@ msgid "Add &Shell menu to context menu" msgstr "Dodaj meni lupine k &razširjenemu meniju" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Mapa" @@ -3136,69 +3137,102 @@ msgid "&Quick compare limit (MB):" msgstr "Omejitev za &hitro primerjavo (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binarno" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x407, 1250" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Pripravljen" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3207,12 +3241,12 @@ msgstr "" "Ustvari prazne dokumente\n" "Novi dokumenti (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3221,7 +3255,7 @@ msgstr "" "Odpri obstojèi dokument\n" "Odpri (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3230,7 +3264,7 @@ msgstr "" "Zapri aktiven dokument\n" "Zapri" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3239,7 +3273,7 @@ msgstr "" "Shrani aktivni dokument\n" "Shrani (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3248,7 +3282,7 @@ msgstr "" "Shrani aktivni dokument pod novim imenom\n" "Shrani kot" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3257,7 +3291,7 @@ msgstr "" "Spremeni nastavitve tiskanja\n" "Nastavitev strani" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3266,7 +3300,7 @@ msgstr "" "Zamenjajte tiskalnik in tiskalniške nastavitve\n" "Nastavitve tiskanja" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3275,7 +3309,7 @@ msgstr "" "Natisni aktivni dokument\n" "Natisni" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3284,27 +3318,27 @@ msgstr "" "Prikaži vse strani\n" "Predogled tiskanja" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Naredi vse skrite predmete ponovno vidne" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Zamenjaj drevesni naèin" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Razširi vse podmape" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Skrèi vse podmape" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3313,32 +3347,32 @@ msgstr "" "Odpri datoteko projekta\n" "Datoteka projekta (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznana napaka pri odpiranju datoteke projekta" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznana napaka pri shranjevanju datoteke projekta" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Datoteka projekta" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Datoteka projekta uspešno naložena." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Datoteka projekta uspešno shranjena." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3347,7 +3381,7 @@ msgstr "" "Shrani izbrano pot in možnosti v datoteko projekta\n" "Shrani datoteko projekta" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3356,7 +3390,7 @@ msgstr "" "Prikaži informacije o programu, verziji in avtorske pravice\n" "O programu" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3365,27 +3399,27 @@ msgstr "" "Zapri aplikacijo; opozori na shranjevanje dokumentov\n" "Izhod" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Odpri to datoteko" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3394,7 +3428,7 @@ msgstr "" "Preklopi na naslednji okenski okvir\n" "Naslednji okvir" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3403,7 +3437,7 @@ msgstr "" "Preklopi nazaj na predhodni okenski okvir\n" "Predhodni okvir" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3412,7 +3446,7 @@ msgstr "" "Razvrsti okna kaskadno, s prekrivanjem\n" "Kaskadno" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3421,7 +3455,7 @@ msgstr "" "Uredi okna vodoravno, brez prekrivanja\n" "Okna vodoravno" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3430,7 +3464,7 @@ msgstr "" "Uredi okna vertikalno, bez prekrivanja\n" "Okna vertikalno" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3439,7 +3473,7 @@ msgstr "" "Kopiraj izbrano in odloži na odložišèe\n" "Kopiraj" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3448,7 +3482,7 @@ msgstr "" "Izreži izbrano in odloži na odložišèe\n" "Izreži" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3457,7 +3491,7 @@ msgstr "" "Najdi specifièno besedilo\n" "Najdi" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3466,7 +3500,7 @@ msgstr "" "Vstavi vsebino odložišèa\n" "Prilepi" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3475,7 +3509,7 @@ msgstr "" "Ponovi zadnjo operacijo\n" "Ponovi" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3484,7 +3518,7 @@ msgstr "" "Zamenjaj specifièno besedilo z drugaènim besedilom\n" "Zamenjaj" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3493,7 +3527,7 @@ msgstr "" "Izberi celotni dokument\n" "Oznaèi vse" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3502,7 +3536,7 @@ msgstr "" "Razveljavi zadno operacijo\n" "Razveljavi (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3511,7 +3545,7 @@ msgstr "" "Uveljavi razveljavljeno akcijo\n" "Uveljavi(Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3520,7 +3554,7 @@ msgstr "" "Skrij ali prikaži orodno vrstico\n" "Orodna vrstica" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3529,7 +3563,7 @@ msgstr "" "Skrij ali prikaži statusno vrstico\n" "Statusna vrstica" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3538,7 +3572,7 @@ msgstr "" "Skrij ali prikaži vrstico z listièi\n" "Vrstica z listièi" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3547,57 +3581,57 @@ msgstr "" "Samodejno poveèaj okvirje\n" "Zakleni okvirje" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Spremeni velikost okna" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Spremeni pozicijo okna" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Zmanjšaj okno na velikost ikone" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Poveèaj okno v najveèjo velikost" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Preklopi na naslednjo okno dokumenta" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Preklopi na prejšnje okno dokumenta" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zapri aktivno okno in vprašaj za shranjevanje dokumenta" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Vrni okno na normalno velikost" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Aktiviraj seznam opravil" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktiviraj to okno" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3606,7 +3640,7 @@ msgstr "" "Zapri predogled tiskanja\n" "Zapri predogled" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3625,7 +3659,7 @@ msgstr "" "WinMerge.Primerjava datotek\n" "WinMerge primerjava datotek" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3644,19 +3678,19 @@ msgstr "" "WinMerge.Primerjava map\n" "WinMerge primerjava map" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Obdrži izvorni tip znakov za konec vrstice (EOL)" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Desni klik na pot za kopiranje" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3665,143 +3699,143 @@ msgstr "" "Razvijalci:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 prihaja POPOLNOMA BREZ GARANCIJE. To je brezplaèna programska oprema, dobrodošli ste za njeno razširjanje pod doloèenimi pogoji, veè v GNU licenci v meniju Pomoè." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Prekini" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Poskusi ponovno" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Prezri" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Prezri &vse" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Da za &vse" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Ne za &vse" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Nadaljuj" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Preskoèi" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Preskoèi &vse" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Tega sporoèila ne kaži veè." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Tega vprašanja ne postavi veè." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Sintaksa" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Nadzor razlièic" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Razlike" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Na:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Iz leve:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Na levo:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Iz desne:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Na desno:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Razlièica %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Možnosti (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Vsa sporoèilna okna bodo sedaj ponovno prikazana " -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3813,84 +3847,84 @@ msgstr "" "\n" "Prosimo, uporabite vrednosti 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Odpri" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Izvedljive datoteke|*.exe;*.bat;*.cmd|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Vse datoteke (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Datoteke WinMerge projektov (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Datoteke nastavitev (*.ini)|*.ini|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Besedilne datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Ime" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Lokacija" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtri" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Izberite ime datoteke za nov filter" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3903,7 +3937,7 @@ msgstr "" "Prosimo, kopirajte datoteko %1 v \"WinMerge/Filters\" mapo:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3916,7 +3950,7 @@ msgstr "" "\n" "Prosim preverite, èe mapa obstaja in je zapisljiva." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3927,7 +3961,7 @@ msgstr "" "\n" "Prosim izberite filter mape v Možnosti/Sistem." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3940,12 +3974,12 @@ msgstr "" "\n" "Morda je datoteka zašèitena - samo za branje." -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Poišèi filter datoteko za namestitev" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3956,17 +3990,17 @@ msgstr "" "\n" "Ni mogoèe kopirati nove filter datoteke v filter mapo." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter datoteka že obstaja. Prepišem obstojeèi filter." -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Regularni izraz" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3977,258 +4011,258 @@ msgstr "" "\n" "Èe jih ne želite osvežiti sedaj, lahko izberete Ne in osvežite primerjave kasneje." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pot do SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Rezultati primerjanja map" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Primerjanje map" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Levi neimenovan" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Desni neimenovan" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Njihova datoteka" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Vaša datoteka" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Pregledovanje datoteko ..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Odpiranje izbora" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopiraj z leve na desno" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopiraj iz desne na levo" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopiraj vse na levo" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopiraj vse na desno" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopiranje datotek ..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Brisanje datotek ..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Premikanje datotek ..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Izdelava poroèila ..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Razveljavi zadnje dejanje ..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Ponovi zadnje dejanje ..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Vrstica: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Združi" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Razlika %1 od %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 najdenih razlik" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 najdena razlika" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "SZB" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Predmet %1 od %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Predmetov: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Izberite dve obstojeèi mapi ali datoteki za primerjavo" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Izbira map" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Izberite dve mapi ali dve datoteki za primerjavo." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Leva pot je neveljavna!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Desna pot je neveljavna!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Obe poti sta neveljavni!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Izberite dve datoteki, da boste omogoèili izbiro pretvornika." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne morem primerjati datoteke in mape!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Datoteka ni najdena: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka ni pretvorjena: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4241,12 +4275,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Ne morem razèleniti konfliktne datoteke." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4257,27 +4291,27 @@ msgstr "" "%1\n" "ni konfliktna datoteka." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Shrani kot" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Shrani spremembe v %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je oznaèena samo za branje. Ali jo kljub temu želite prepisati? ( Ne, za shranjevanje pod novim imenom)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Napaka pri shranjevanju arhiva" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4290,7 +4324,7 @@ msgstr "" "\n" "Vseeno nadaljujem?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4307,7 +4341,7 @@ msgstr "" "\t- uporabiti drugaèno ime datoteke (pritisnite V redu)\n" "\t- preklicati trenutno operacijo (pritisnite Preklièi)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4322,7 +4356,7 @@ msgstr "" "\n" "Ali želite shraniti nezapakirano razlièico v drugo datoteko?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4337,7 +4371,7 @@ msgstr "" "\n" "Ali želite shraniti nezapakirano razlièico v drugo datoteko?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4352,7 +4386,7 @@ msgstr "" "\n" "Prepiši spremenjeno datoteko?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4361,7 +4395,7 @@ msgstr "" "%1\n" "je oznaèena samo za branje. Ali jo kljub temu želite prepisati?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4376,22 +4410,22 @@ msgstr "" "\n" "Ali želite posodobljeno ponovno naložiti?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Shrani levo datoteko kot" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Shrani desno datoteko kot" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4402,7 +4436,7 @@ msgstr "" "%1\n" "ne najdem veè. Prosim shranite kopijo datoteke za nadaljevanje." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4413,42 +4447,42 @@ msgstr "" "\n" "Prosim, osvežite dokumente pred nadaljujete." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Navesti morate pot SourceSafe projekta èe želite nadaljevati (npr: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "CheckOut datotek iz VSS ..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versioning System je vrnil napako medtem ko je poskušal dostopati do datoteke. Ni mogoèe nadaljevati ..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Napaka pri izvrševanju Versioning System ukaza." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS delovna mapa in lokacija trenutne datoteke se ne ujemata. Nadaljujem?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Ne morem najti VSS podatkovne baze!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Napaka od VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4459,7 +4493,7 @@ msgstr "" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n" "Zavrzi pregledno operacijo?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4468,164 +4502,164 @@ msgstr "" "Sistem za verzije vraèa napako med preverjanjem datoteke.\n" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda" -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Brez" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (manjši od 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 in višji)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Prelom na praznem znaku" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Prelom na praznem znaku ali loèilu" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiraj izbran predmet v imenovano mapo" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiraj izbran predmet v izbrano mapo" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Izbriši izbran predmet na levi" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Izbriši izbran predmet na desni" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Izbriši izbran(e) predmet(e) na obeh straneh" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skrij izbran(e) predmet(e) (takojšnji filter)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Preimenuj izbran predmet na obeh straneh" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Z desne proti levi (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Z leve proti desni (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Z desne proti levi (%1 od %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Z leve proti desni (%1 od %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Leva do ... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Desna do ... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Leva do ... (%1 od%2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Desna do ... (%1 od%2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Leva (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Desna (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Obe (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Leva (%1 of %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Desna (%1 of %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Obe (%1 of %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Leva stran - izberite ciljno mapo:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Desna stran - izberite ciljno mapo:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 vpletenih datotek)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 of %2 vpletenih datotek)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4636,17 +4670,17 @@ msgstr "" "\n" "%1?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Ali ste preprièani da želite kopirati:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Ali ste preprièani, da želite kopirati %d predmetov:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4665,613 +4699,607 @@ msgstr "" "\n" "Prosim, osvežite primerjavo." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Ali ste preprièani, da želite premakniti:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Ali ste preprièani, da želite premakniti: %d predmetov" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Potrdi premik" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Odpri levo datoteko" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Odpri levo datoteko v zunanjem urejevalniku" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Odpri levo datoteko z ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Odpri desno datoteko" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Odpri desno datoteko v zunanjem urejevalniku" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Odpri desno datoteko z .." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Ni bilo mogoèe zagnati zunanjega urejevalnika: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiraj imena datotek v odložišèe" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiraj levo stran poti v odložišèe" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiraj desno stran poti v odložišèe" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiraj pot obeh strani v odložišèe" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Levi razširitveni meni" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Desni razširitveni meni" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Nepoznan format arhiva" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj predmete iz leve strani v arhiv" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj predmete iz desne strni v arhiv" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj predmete obeh strani v arhiv" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj razliène predmete v arhiv ( obe strani)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Premakni izbrano datoteko na levi v izbrano mapo" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Premakni izbrano datoteko na desni v izbrano mapo " -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Ime datoteke" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Rezultat primerjave" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Levi datum" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Desni datum" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Konènica" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Leva velikost" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Desna velikost" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Desna velikost (kratko)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Leva velikost (kratko)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Datum nastanka leve datoteke" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Datum nastanka desne datoteke" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Novejša datoteka" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Verzija leve datoteke" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Kratek rezultat" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Levi atributi" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Desni atributi" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Znake za konec vrstice (EOL) na levi datoteki" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Znake za konec vrstice (EOL) na desni datoteki" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Kodiranje levo" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Zanemarjene razlike." -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binarno" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Nisem mogel primerjati datotek" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Pregled predmeta prekinjen" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Preskoèena datoteka" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Preskoèena mapa" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Samo leva: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Samo desna: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binarni datoteki sta enaki" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binarni datoteki sta razlièni" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Datoteki sta razlièni" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Mapi sta razlièni" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Samo leva" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Samo desna" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Napaka" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Tekstovni datoteki sta enaki" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Tekstovni datoteki sta razlièni" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Minilo je: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 predmet oznaèen" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 predmetov oznaèenih" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Ime datoteke ali mape" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Imena podmap ko so vkljuèene podmape." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Rezultat primerjave, dolga oblika." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Datum spremembe datoteke na levi strani." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Datum spremembe datoteke na desni strani." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Datoteèna konènica." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Velikost leve datoteke v bajtih." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Velikost desne datoteke v bajtih." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Skrajšana velikost leve datoteke." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Skrajšana velikost desne datoteke." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Datum nastanka na levi strani." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Datum nastanka na desni strani." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Pove katera stran ni še nikoli modificirala datuma" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija leve datoteke, samo za nekatere datoteène tipe." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija desne datoteke, samo za nekatere datoteène tipe." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Rezultat kratke primerjave." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Atributi leve strani." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Atributi desne strani." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Kodna stran leve strani." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Kodna stran desne strani." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Število ignoriranih razlik v datoteki. Te razlike program WinMerge ignorira in ne morejo biti združene." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Število razlik v datoteki. Ta številka ne vsebuje ignoriranih razlik." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaže zvezdico (*) èe je datoteka binarna" -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Primerjaj %1 z %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Seznam, loèen z vejicami" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Seznam, loèen s tabulatorji" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Enostavni HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Enostavni XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Datoteka s poroèilom že obstaja. Ali jo želite prepisati?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5280,32 +5308,32 @@ msgstr "" "Napaka med ustvarjanjem poroèila:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Poroèilo je bilo uspešno izdelano." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je odprta v obeh okvirih" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Izbrani datoteki sta enaki." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Prišlo je do napake med primerjanjem datotek" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Zaèasne datoteko ne morejo biti ustvarjene. Preverite nastavitve za vašo pot zanje (PATH)." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5320,17 +5348,17 @@ msgstr "" "\n" "Opomba: Èe jih želite vedno obravnavati kot enake, nastavite možnost 'Prezri razliènost tipa znakov za zakljuèke vrstic (EOL)' na listièu Primerjave dialoga nastavitev (dostopen pod Urejanje/Nastavitve)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Izbrana mapa ni veljavna." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "V urejevalniku ne morem odpreti binarne datoteke." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5345,7 +5373,7 @@ msgstr "" "%1\n" "na drugi strani in jo odpreti?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5356,168 +5384,168 @@ msgstr "" "Prikaz posamezne datoteke v svoji kodni tabeli bo omogoèilo boljši prikaz, a združevanje/kopiranje bo nevarno.\n" "Ali želite obravnavati obe datoteki kot da sta v isti privzeti windows kodni tabeli (priporoèljivo)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informacija izgubljena pri kodiranju: Obe datatoteki" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Ni razlik" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Razlika v vrstici" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamenjan %1 niz(i)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne morem najti niza \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopiraj celotno pot" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopiraj ime datoteke" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Položajni okvir" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Okvir razlik" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Datoteka s popravki je bila uspešno zapisana" -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. predmet ni najden ali pa je mapa" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. predmet ni najden ali pa je mapa" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Datoteka s popravki že obstaja. Jo želite prepisati?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 izbranih datotek]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normalno" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Pomen" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Poenoteno" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Ne morem pisati v datoteko %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Navedena izhodna pot ni absolutna pot: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Doloèite izhodno datoteko" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Iz map ne morem izdelati datoteke s popravki." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5528,12 +5556,12 @@ msgstr "" " \n" "Izdelava datoteke s popravki zahteva, da so vse datoteke predhodno shranjene." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Mapa ne obstaja" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5544,7 +5572,7 @@ msgstr "" "Vseh potrebnih komponent (7-zip in/ali Merge7z*.dll) za to ne morem najti.\n" "Za veè informacij poglejte v rubriko pomoè o podpori arhivskih datotek in kako jo omogoèiti." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5553,7 +5581,7 @@ msgstr "" "\n" "Sporoèilo: 7-Zip integracija je onemogoèena v WinMerge nastavitvah." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5562,37 +5590,37 @@ msgstr "" "\n" "Sporoèilo: 7-Zip funkcionalnost je omejena na samostojno operacijo v WinMerge nastavitvah." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Izberite datoteko za izvoz" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Izberite datoteko za uvoz" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Možnosti uvožene iz datoteke" -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Možnosti izvožene v datoteko" -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Uvažanje možnosti iz datoteke ni uspelo" -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Izvažanje možnosti v datoteko ni uspelo" -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5603,157 +5631,157 @@ msgstr "" "\n" "Ali želite nadaljevati?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mešano" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr "B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Tip" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Pretvornik" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Predpregled razlik" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Script urejevalnika" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Shrani levo datoteko" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Shrani desno datoteko" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Shrani levo datoteko z imenom.." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Shrani desno datoteko z imenom ..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Pretvori znake za konec vrstice (EOL) v Windows naèin" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Pretvori znake za konec vrstice (EOL) v Unix naèin" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Pretvori znake za konec vrstice (EOL) v Mac naèin" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Preklopi med urejevalnim in združevalnim naèinom" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5762,12 +5790,12 @@ msgstr "" "Prikaži in nastavi lastnosti datoteènega kodiranja\n" "Datoteène lastnosti kodiranja" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Odpri in razreši konfliktno datoteko" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5776,7 +5804,7 @@ msgstr "" "Izberi razlièna polja v izbrani vrstici\n" "Razlike v izbrani vrstici." -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5785,7 +5813,7 @@ msgstr "" "Pojdi na vrstico razlike\n" "Pojdi na (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5794,7 +5822,7 @@ msgstr "" "Nastavi možnosti programa\n" "Možnosti " -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5803,37 +5831,37 @@ msgstr "" "Osveži prikaz\n" "Osveži (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiraj izbrane vrstico v odložišèe z dodajanjem številk vrstic na zaèetku vrstice" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Preklopi med oznakami" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Pojdi na naslednjo oznako" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Pojdi na prejšnjo oznako" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Poèisti vse oznake" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5842,7 +5870,7 @@ msgstr "" "Prikaži predmete, ki so popolnoma enaki\n" "Prikaži enake predmete" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5851,7 +5879,7 @@ msgstr "" "Prikaži predmete, ki se razlikujeta\n" "Prikaži razliène predmete" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5860,7 +5888,7 @@ msgstr "" "Prikaži predmete, ki obstajajo samo na levi strani\n" "Prikaži leve unikatne predmete" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5869,7 +5897,7 @@ msgstr "" "Prikaži predmete, ki obstajajo samo na desni strani\n" "Prikaži desne unikatne predmete" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5878,7 +5906,7 @@ msgstr "" "Prikazovanje binarnih datotek\n" "Prikaži binarne datoteke" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5887,7 +5915,7 @@ msgstr "" "Prikazovanje preskoèenih predmetov\n" "Prikaži preskoèene predmete" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5896,7 +5924,7 @@ msgstr "" "Izberite pisavo za pogled\n" "Izberite pogled pisave" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5905,27 +5933,27 @@ msgstr "" "Vraèanje na uporabo privzete sistemske pisave pogled\n" "Privzeta pisava" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Prikaži prazne znake" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Preklopi na drug okvir razlik" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Položajni okvir prikazuje položaj razlike v datoteki" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Prikaži primerjalno mapo statistiènega okna" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5934,7 +5962,7 @@ msgstr "" "Izberite trenutni uporabniški jezik vmesnika\n" "Jezik" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5943,12 +5971,12 @@ msgstr "" "Prikaži razlike znotraj vrstic z razliènimi barvami\n" "Prikaži vrstiène razlike" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Zamenjaj pozicije okvirov med seboj" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5957,7 +5985,7 @@ msgstr "" "Prikaži številke vrstic\n" "Prikaz številke vrstic" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5966,7 +5994,7 @@ msgstr "" "Omogoèi prelom vrstic\n" "Prelom vrsrtic" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5975,22 +6003,22 @@ msgstr "" "Prikaži izbiro robov za oba okvira\n" "Prikaži izbrane robove" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Poveèaj pisavo besedila" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Zmanjšaj pisavo besedila" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Ponastavi poveèavo besedila na privzeto velikost" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5999,7 +6027,7 @@ msgstr "" "Skoèi na prejšnjo razliko\n" "Prejšnja razlika (Alt+up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6008,77 +6036,77 @@ msgstr "" "Skoèi na naslednjo razliko \n" "Naslednja razlika (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6087,7 +6115,7 @@ msgstr "" "Skoèi na prvo razliko\n" "Prva razlika (alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6096,7 +6124,7 @@ msgstr "" "Pojdi na trenutno razliko\n" "Trenutna razlika (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6105,7 +6133,7 @@ msgstr "" "Pojdi na zadnjo tazliko\n" "Zadnja razlika (alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6114,7 +6142,7 @@ msgstr "" "Kopiraj izbrano besedilo v desno datoteko\n" "Kopiraj desno(Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6123,7 +6151,7 @@ msgstr "" "Kopiraj izbrano besedilo v levo datoteko\n" "Kopiraj levo(Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6132,7 +6160,7 @@ msgstr "" "Kopiraj razliko na desno in se pomakni na naslednjo\n" "Kopiraj Desno in pomakni (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6141,7 +6169,7 @@ msgstr "" "Kopiraj razliko na levo in se pomakni na naslednjo\n" "Kopiraj levo in pomakni(Ctrl+Ald+left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6150,7 +6178,7 @@ msgstr "" "Kopiraj vse razlike v desno datoteko \n" "Vse v desno" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6159,92 +6187,92 @@ msgstr "" "Kopiraj vse razlike v levo datoteko\n" "Vse v levo" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Izbriši izbrane predmete iz obeh map" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Primerjaj izbrane predmete (primerjaj prvega, èe jih je izbranih veè)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Izberi in ponovno razvrsti mape primerjalnih stolpcev" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Izdelaj datoteko s popravki" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Izberi in spremeni filtre" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Izdelaj poroèilo iz rezultatov primerjave" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Prikaži seznam razširitev, ki so na voljo" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Uporabnik izbere pretvornik (brez pretvarjanja med primerjanjem map)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Izbran pretvornik je uporabljen na obeh datotekah (samo ena datoteka potrebuje konènico)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Izberite pretvornik za urejanje te datoteke" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Brez predpregleda razlik (obièajno)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Priporoèene razširitve" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Ostale razširitve" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Ponovno naloži vse razširitve (za razvijalce)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6253,12 +6281,12 @@ msgstr "" "Aktivira naslednjo vidno datoteko\n" "Aktiviraj naslednjo datoteko" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Zapri vsa odprta okna" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6267,22 +6295,22 @@ msgstr "" "Odpre WinMerge Pomoè\n" "WinMerge Pomoè" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Zapiši verzijo programa WinMerge in nastavitve v tekstovno datoteko" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Prikaži GNU javno licenco" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Zasebna gradnja:%1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6291,7 +6319,7 @@ msgstr "" "Odpri dokument z opombami izdaje\n" "Opombe izdaje" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6300,292 +6328,292 @@ msgstr "" "Odpri spletno stran za prevode\n" "Prevodi" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Nastavitve razširitev" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Brez predpregleda razlik" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Predpregled razlik, èe je mogoèe" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ni najden - .sct skripte onemogoèene" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Odpri datoteko z registrirano aplikacijo " -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Odpri datoteko z zunanjim urejevalnikom" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Odpri datoteko z doloèenim programom" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Ne prikazuj premaknjenih blokov" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Prikaži vse premaknjene bloke" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Prikaži premaknjene bloke samo iz trenutnih razlik" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Pojdi na razliko pod kazalcem" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Pojdi &na vrstico %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Onemogoèeno" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Iz datoteènega sistema" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "IZ MRU seznama" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Brez osvetljevanja" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Paket (Batch)" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Prenosni objekt" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Sredstva" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Skrij orodno vrstico" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Pokaži malo orodno vrstico" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Pokaži veliko orodno vrstico" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 350fa2677..ef1fc90e7 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -330,7 +330,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Vacío >" @@ -472,7 +472,7 @@ msgstr "Desempaquetado &autom #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -536,7 +536,7 @@ msgstr "&Cascada" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "A&yuda" @@ -864,7 +864,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "Codi&ficación de archivo..." @@ -1468,37 +1468,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Todo el contenido" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Contenido rápido" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Fecha de modificación" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Fecha de modificación y Tamaño" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Tamaño" @@ -1530,7 +1530,7 @@ msgstr " #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "Aceptar" @@ -1702,14 +1702,14 @@ msgid "&Versioning System:" msgstr "Sistema de &versionado:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ruta a cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "General" @@ -1852,7 +1852,7 @@ msgid "&Find Next" msgstr "Buscar &sig." #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Aceptar" @@ -1898,7 +1898,7 @@ msgid "Replace &All" msgstr "Reempl. Tod&o" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1950,7 +1950,7 @@ msgid "Remove" msgstr "Eliminar" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Colores" @@ -1979,7 +1979,7 @@ msgstr "Eliminada" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Texto" @@ -2030,13 +2030,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Predeterminada" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistema" @@ -2177,7 +2178,7 @@ msgid "Description:" msgstr "Descripción:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Detener" @@ -2239,7 +2240,7 @@ msgid "&Go To" msgstr "Ir &a" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Comparar" @@ -2290,7 +2291,7 @@ msgid "Filter Comments" msgstr "Filtrar comentarios" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2442,7 +2443,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Página de códigos" @@ -2732,7 +2733,7 @@ msgid "Private Filter (only for current user)" msgstr "Filtro privado (solo para el usuario actual)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Soporte de Archivos" @@ -2783,7 +2784,7 @@ msgid "Files:" msgstr "Archivos:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Diferentes" @@ -2820,7 +2821,7 @@ msgid "Right:" msgstr "Derecha:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Iguales" @@ -2873,7 +2874,7 @@ msgid "&Apply" msgstr "&Aplicar" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Cancelar" @@ -2979,7 +2980,7 @@ msgid "Save..." msgstr "Guardar..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Archivos de seguridad" @@ -3020,7 +3021,7 @@ msgid "A&ppend timestamp" msgstr "Agregar &fecha" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" @@ -3061,7 +3062,7 @@ msgid "&Enable plugins" msgstr "&Habilitar plugins" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Integración" @@ -3097,8 +3098,8 @@ msgid "Add &Shell menu to context menu" msgstr "&Agregar al menú contextual del explorador." #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Carpeta" @@ -3134,69 +3135,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binario" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "0c0a04e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0xc0a, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Listo" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "MAY" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3205,12 +3239,12 @@ msgstr "" "Crear documentos vacíos\n" "Nuevo Documento (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3219,7 +3253,7 @@ msgstr "" "Comparar archivos o carpetas\n" "Comparar" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3228,7 +3262,7 @@ msgstr "" "Cerrar ventana\n" "Cerrar" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3237,7 +3271,7 @@ msgstr "" "Guardar los documentos abiertos\n" "Guardar" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3246,7 +3280,7 @@ msgstr "" "Guardar el documento activo con otro nombre\n" "Guardar como" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3255,7 +3289,7 @@ msgstr "" "Cambiar las opciones de impresión\n" "Configurar página" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3264,7 +3298,7 @@ msgstr "" "Cambiar la impresora y las opciones de impresión\n" "Configurar impresora" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3273,7 +3307,7 @@ msgstr "" "Imprimir el documento activo\n" "Imprimir" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3282,27 +3316,27 @@ msgstr "" "Mostrar vista preliminar\n" "Vista preliminar" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Mostrar todos los elementos ocultos" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Cambiar a modo árbol" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas las Subcarpetas" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Contraer todas las carpetas" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3311,32 +3345,32 @@ msgstr "" "Abrir archivos del proyecto\n" "Proyecto (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Error desconocido al intentar abrir el proyecto" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Error desconocido al intentar guardar el proyecto" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Archivo de Proyecto" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Archivo de proyecto cargado con éxito." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Archivo de proyecto guardado con éxito." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3345,7 +3379,7 @@ msgstr "" "Guardar las rutas y configuraciones actuales al archivo de proyecto\n" "Guardar Archivo de Proyecto" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3354,7 +3388,7 @@ msgstr "" "Muestra informacíon de la aplicación, versión, y copyright\n" "Acerca de WinMerge" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3363,27 +3397,27 @@ msgstr "" "Cerrar la aplicación\n" "Salir" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Abrir éste documento" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3392,7 +3426,7 @@ msgstr "" "Cambiar al panel siguiente\n" "Panel Siguiente " -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3401,7 +3435,7 @@ msgstr "" "Cambiar al panel anterior\n" "Panel Anterior" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3410,7 +3444,7 @@ msgstr "" "Organizar ventanas en cascada (superpuestas)\n" "Superponer" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3419,7 +3453,7 @@ msgstr "" "Ordenar las ventanas horizontalmente\n" "Ordenar" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3428,7 +3462,7 @@ msgstr "" "Ordenar las ventanas verticalmente\n" "Ordenar" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3437,7 +3471,7 @@ msgstr "" "Copiar la sección al portapapeles\n" "Copiar" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3446,7 +3480,7 @@ msgstr "" "Cortar la selección en el portapapeles\n" "Cortar" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3455,7 +3489,7 @@ msgstr "" "Buscar el texto especificado\n" "Buscar" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3464,7 +3498,7 @@ msgstr "" "Insertar contenido del portapapeles\n" "Pegar" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3473,7 +3507,7 @@ msgstr "" "Repetir la última acción\n" "Repetir" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3482,7 +3516,7 @@ msgstr "" "Reemplazar un texto especificado con otro\n" "Reemplazar" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3491,7 +3525,7 @@ msgstr "" "Seleccionar el documento completo\n" "Seleccionar todo" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3500,7 +3534,7 @@ msgstr "" "Deshacer el último cambio\n" "Deshacer" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3509,7 +3543,7 @@ msgstr "" "Rehacer\n" "Rehacer" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3518,7 +3552,7 @@ msgstr "" "Muestra la Barra de Herramientas\n" "Barra de Herramientas" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3527,7 +3561,7 @@ msgstr "" "Muestra la Barra de Estado\n" "Barra de Estado" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3536,7 +3570,7 @@ msgstr "" "Muestra las pestañas\n" "Mostrar las pestañas" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3545,57 +3579,57 @@ msgstr "" "Cambia el tamaño del panel automáticamente\n" "Bloquear Paneles" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Cambia el tamaño de la ventana" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Cambia la posición de la ventana" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Reduce la ventana a un icono" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Maximiza la ventaña a tamaño completo" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Cambia a la ventana del documento siguiente" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Cambia a la ventana del documento anterior" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Cierra la ventana activa y pregunta al usuario si desea guardar los cambios" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Devuelve la ventaña a su tamaño normal" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Activa el Administrador de Tareas" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Activa ésta ventana" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3604,7 +3638,7 @@ msgstr "" "Cierra la previsualización\n" "Cancelar previsualización" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3623,7 +3657,7 @@ msgstr "" "WinMerge.CompararArchivo\n" "WinMerge CompararArchivo" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3642,19 +3676,19 @@ msgstr "" "WinMerge.CompararCarpeta\n" "Comparar Carpeta de WinMerge" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar caracteres originales EOL" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Haga clic derecho en la ruta para copiar" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3663,143 +3697,143 @@ msgstr "" "Desarrolladores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 no concede ABSOLUTAMENTE NINGUNA GARANTÍA. Es software libre, y puede ser redistribuido bajo ciertas reglas. Vea la Licencia Pública GNU en el menú Ayuda para más detalles." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Cancelar" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Reintentar" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignor&ar todos" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Sí" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Sí a to&do" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "No a &todo" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Omitir" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "O&mitir todos" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "No mostrar este &mensaje de nuevo." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "No &preguntar de nuevo." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Control de Versiones" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Diferencias" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "De la izquierda:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "A la izquierda:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "De la derecha:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "A la derecha:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Versión %1 - Español" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Configuración (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas las cajas de mensaje se mostrarán de nuevo." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3810,84 +3844,84 @@ msgstr "" "\n" "Por favor, utilice valores 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos los archivos (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Archivos de Proyecto de WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Archivos de opciones (*.ini)|*.ini|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Nombre" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Ubicación" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filtos" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Descripción" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Seleccione nombre de archivo para el nuevo filtro" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Archivo de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3900,7 +3934,7 @@ msgstr "" "Por favor copie el archivo %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3913,7 +3947,7 @@ msgstr "" "\n" "Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3924,7 +3958,7 @@ msgstr "" "\n" "Por favor, seleccione la carpeta de filtros en Configuración/Sistema." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3937,12 +3971,12 @@ msgstr "" "\n" "¿Quiza el archivo es de solo lectura?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Seleccione el archivo de filtros a instalar." -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3953,17 +3987,17 @@ msgstr "" "\n" "No se pudo copiar el archivo de filtros a la carpeta de filtros." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El archivo de filtros ya existe. ¿Desea sobreescribirlo?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Expresión regular" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3974,258 +4008,258 @@ msgstr "" "\n" "Si no quiere actualizar todas las comparaciones puede elegir No y actualizar las comparaciones después." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "R&uta a SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultado de la comparación de carpetas" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Comparación de archivos" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Sin título izquierda" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Sin título derecha" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Archivo externo" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Archivo interno" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Escaneando archivos..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Abriendo la selección" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Copiando lado Izquierdo a lado Derecho" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Copiando lado Derecho a lado Izquierdo" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Copiando todo al lado Izquierdo" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Copiando todo al lado Derecho" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Copiando archivos..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Eliminando archivos..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Moviendo archivos..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Creando el informe..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Deshaciendo la última operación..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Rehaciendo la operación anterior..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Línea: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Diferencia %1 de %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferencias encontradas" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 Diferencia encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Archivo %1 de %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dos carpetas o archivos existentes a comparar" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Selección de carpeta" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dos carpetas o archivos a comparar." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "¡La ruta del lado Izquierdo no es válida!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "¡La ruta del lado Derecho no es válida!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "¡Ninguna ruta es válida!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Elija dos archivos para habilitar selección de desempaquetador." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "¡Imposible comparar un archivo y una carpeta!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Archivo no encontrado: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Archivo no desempaquetado: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4238,12 +4272,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Falló al corregir archivo conflictivo." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4254,27 +4288,27 @@ msgstr "" "%1\n" "no es conflictivo." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Guardar Como" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "¿Guardar los cambios a %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 es de sólo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Error haciendo copia de seguridad del archivo" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4287,7 +4321,7 @@ msgstr "" "\n" "¿Continuar de todas formas?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4304,7 +4338,7 @@ msgstr "" "\t-usar un nombre diferente (Aceptar)\n" "\t-cancelar la operación (Cancelar)" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4319,7 +4353,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4334,7 +4368,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4349,7 +4383,7 @@ msgstr "" "\n" "¿Desea sobreescribir el archivo cambiado?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4358,7 +4392,7 @@ msgstr "" "%1\n" "es de sólo lectura. ¿Desea sobreescribirlo de todos modos?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4373,22 +4407,22 @@ msgstr "" "\n" "¿Desea recargar el archivo?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Guardar lado izquierdo como" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Guardar lado derecho como" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4399,7 +4433,7 @@ msgstr "" "%1\n" "ha desaparecido. Por favor, guarde una copia del archivo para continuar." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4410,42 +4444,42 @@ msgstr "" "\n" "Actualize los documentos antes de continuar." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/MiProyecto)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger archivos de VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "El sistema de versionado devolvío un error mientras trataba de desproteger el archivo. Imposible continuar..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Error ejecutando el comando del sistema de versionado." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La carpeta de trabajo de VSS y la ubicación del archivo actual no coinciden. ¿Continuar?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "¡No se encontraron base(s) de datos de VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Error de VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4456,7 +4490,7 @@ msgstr "" " Por favor, compruebe la configuración de la vista utilizada.\n" " ¿Desea deshacer la desprotección?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4465,164 +4499,164 @@ msgstr "" "El sistema de versionado devolvió un error cuando se intentaba deshacer la desprotección del archivo.\n" " Por favor, compruebe la configuración de la vista utilizada. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Ninguno" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor que 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 y superior)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Detener en espacio en blanco" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Detener en espacio en blanco o puntuación" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar elemento seleccionado a la carpeta" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar elemento seleccionado a la carpeta elegida" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Eliminar elemento selecionado del lado izquierdo" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Eliminar elemento selecionado del lado derecho" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Eliminar elementos seleccionados de ambos lados" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ocultar elementos seleccionados (filtro al vuelo)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Renombrar el elemento seleccionado en ambos lados" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Lado derecho a lado izquierdo (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Lado izquierdo a lado derecho (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Lado derecho a lado izquierdo (%1 de %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lado izquierdo a lado derecho (%1 de %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Lado izquierdo a... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Lado derecho a... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lado izquierdo a... (%1 de %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Lado derecho a... (%1 de %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Lado izquierdo (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Lado derecho (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Ambos lados (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Lado izquierdo (%1 de %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Lado derecho (%1 de %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos lados (%1 de %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Izquierda - Seleccione carpeta destino:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Derecha - Seleccione carpeta destino:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Archivos Afectados)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Archivos Afectados)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4633,17 +4667,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Está seguro de copiar:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Está seguro de copiar %d elementos:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4662,613 +4696,607 @@ msgstr "" "\n" "Por favor actualice la comparación." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Está seguro de mover:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Está seguro de mover %d elementos:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Confirmar Movimiento" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Abrir archivo del lado izquierdo" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Abrir archivo del lado izquierdo con editor externo" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Abrir archivo del lado izquierdo con..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Abrir archivo del lado derecho" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Abrir archivo del lado derecho con editor externo" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Abrir archivo del lado derecho con..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Error al ejecutar editor externo: %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar nombres de archivo al portapapeles" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar rutas del lado izquierdo al portapapeles" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar rutas del lado derecho al portapapeles" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar rutas del ambos lados al portapapeles" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Menú Izquierda" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Menú Derecha" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Formato de archivo desconocido" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Agregar elementos del lado izquierdo al archivo" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Agregar elementos del lado derecho al archivo" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Agregar elementos de ambos lados al archivo" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Agregar elementos diferentes al archivo (ambos lados)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Seleccionar carpeta donde mover archivo selecionado del lado izquierdo" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Seleccionar carpeta donde mover archivo selecionado del lado derecho" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Nombre" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultado" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Fecha izq." -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Fecha dcha." -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Tamaño izq." -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Tamaño dcha." -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dcha. (Corto)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Tamaño izq. (Corto)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Fecha de creacion izq." -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Fecha de creacion dcha." -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Archivo más reciente" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Versión archivo izq." -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Versión archivo dcha." -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Resultados abreviados" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Atributos izq." -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Atributos dcha." -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "EOL izq." -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "EOL dcha." -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Codificación izq." -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Codificación dcha." -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Difs. ignoradas" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binario" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "No se pueden comparar los archivos" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Elemento cancelado" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Archivo omitido" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Carpeta omitida" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Sólo Izquierda: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Sólo Derecha: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Los archivos binarios son iguales" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Los archivos binarios son diferentes" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Las carpetas son diferentes" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Sólo Izquierda" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Sólo Derecha" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Error" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Los archivos son iguales" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tiempo transcurrido: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Nombre de archivo o carpeta." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nombre de subcarpeta cuando se incluyen las subcarpetas." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Resultados de la comparacion, formato largo." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Fecha de modificación del archivo del lado izquierdo." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Fecha de modificación del archivo del lado derecho." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Extensión del archivo." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Tamaño del archivo del lado izquierdo en bytes." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Tamaño del archivo del lado derecho en bytes." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño del archivo del lado izquierdo abreviado." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño del archivo del lado derecho abreviado." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Fecha de creación del archivo del lado izquierdo." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Fecha de creación del archivo del lado derecho." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica que lado tiene la fecha de modificación más reciente." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versión del archivo del lado izquierdo, sólo para algunos tipos de archivo." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versión del archivo del lado derecho, sólo para algunos tipos de archivo." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Resultados de la comparación abreviados." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Attributos del archivo del lado izquierdo." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Attributos del archivo del lado derecho." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL del archivo del lado izquierdo." -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL del archivo del lado derecho." -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Codificación del lado izquierdo." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Codificación del lado derecho." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferencias ignoradas en el archivo. Estas diferencias son ignoradas por WinMerge y no se pueden combinar." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferencias en el archivo. Este número no incluye las diferencias ignoradas." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Muestra un asterisco (*) si el archivo es binario." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Lista separada por comas" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabuladores" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "HTML Simple" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "XML Simple " -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "El archivo de informe ya existe. ¿Desea sobreescribir el archivo?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5277,32 +5305,32 @@ msgstr "" "Error al crear el informe:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "El informe se ha creado correctamente." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "El mismo archivo está abierto en ambos paneles." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Los archivos seleccionados son iguales" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocurrió un error cuando se estaban comparando los archivos" -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Los archivos temporales no se pudieron crear. Compruebe su ruta para archivos temporales." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5317,17 +5345,17 @@ msgstr "" "\n" "Nota: si desea tratar siempre todos los tipos de saltos de línea como equivalentes, seleccione la opción 'Ignorar saltos de línea diferentes..' en la pestaña Comparar del dialogo Configuración (disponible en Editar/Configuración)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada no es válida." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "No se puede abrir un archivo binario en el editor." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5342,7 +5370,7 @@ msgstr "" "%1\n" "al otro lado y abrir éstas carpetas?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5353,168 +5381,168 @@ msgstr "" "Mostrar cada archivo en su página de códigos dará una mejor visualización, pero combinar/copiar sería peligroso.\n" "¿Le gustaría tratar ambos archivos con la página de códigos predeterminada de windows (recomendado)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Información perdida debido a errores de codificación: ambos archivos" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "No hay diferencia" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Diferencia de línea" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Reemplazada(s) %1 cadena(s)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposible encontrar la cadena \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Copiar ruta completa" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Copiar nombre de archivo" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Panel de ubicación" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Panel de diferencias" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Archivo de corrección escrito correctamente." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "El archivo de corrección ya existe. ¿Desea sobreescribirlo?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 archivo(s) selecionado(s)]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "No se pudo escibir en el archivo %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "La ruta de salida especificada no es absoluta: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Especifique un archivo de salida" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No se puede crear un archivo de corrección a partir de un archivo binario." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "No se puede crear un archivo de corrección a partir de una carpeta." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5525,12 +5553,12 @@ msgstr "" "\n" "Crear una corrección requiere que no haya cambios pendientes de ser guardados." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existe." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5541,7 +5569,7 @@ msgstr "" "Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no están disponibles.\n" "Vea el manual para más información acerca del soporte de archivos y cómo habilitarlo." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5550,7 +5578,7 @@ msgstr "" "\n" "Nota: La integración con 7-Zip está deshabilitada en la configuracion de WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5559,37 +5587,37 @@ msgstr "" "\n" "Nota: La integración con 7-Zip está restringida a operación en solitario en la configuracion de WinMerge." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Seleccione archivo a exportar" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Seleccione archivo a importar" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Configuración importada del archivo." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Configuración exportada al archivo." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Fallo al importar la configuración del archivo." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Fallo al exportar la configuración al archivo." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5600,157 +5628,157 @@ msgstr "" "\n" "¿Desea continuar?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Mezclado" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Descompactador" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Precomparación" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Editor de script" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Guardar el archivo del lado izquierdo" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Guardar el archivo del lado derecho" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Guardar el archivo del lado izquierdo como..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Guardar el archivo del lado derecho como..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Convertir EOL a formato Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Convertir EOL a formato Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Convertir EOL a formato Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Cambiar entre modo edición y modo combinación" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5759,12 +5787,12 @@ msgstr "" "Ver y ajustar propiedades de codificación del archivo\n" "Propiedades de codificación del archivo" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Abrir y corregir archivo conflictivo" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5773,7 +5801,7 @@ msgstr "" "Selecciona el área diferente de la línea actual\n" "Diferencias de línea actual" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5782,7 +5810,7 @@ msgstr "" "Ir a línea o diferencia\n" "Ir a (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5791,7 +5819,7 @@ msgstr "" "Configurar las opciones del programa\n" "Configuración" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5800,37 +5828,37 @@ msgstr "" "Actualizar la pantalla\n" "Actualizar (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar las líneas seleccionadas al portapapeles añadiendo números de línea al principio de cada una de ellas" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Alternar marcador" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ir al siguiente marcador" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ir al marcador anterior" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Quitar todos los marcadores" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5839,7 +5867,7 @@ msgstr "" "Muestra los elementos que son exactamente iguales\n" "Mostrar elementos iguales" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5848,7 +5876,7 @@ msgstr "" "Muestra los elementos que tienen diferencias\n" "Mostrar elementos diferentes" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5857,7 +5885,7 @@ msgstr "" "Muestra los elementos que existen solo en la parte izquierda\n" "Mostrar elementos únicos en lado izquierdo" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5866,7 +5894,7 @@ msgstr "" "Muestra los elementos que existen sólo en la parte derecha\n" "Mostrar elementos únicos en lado derecho" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5875,7 +5903,7 @@ msgstr "" "Muestra los archivos binarios\n" "Mostrar archivos binarios" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5884,7 +5912,7 @@ msgstr "" "Muestra los elementos ignorados durante la comparación\n" "Mostrar elementos ignorados" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5893,7 +5921,7 @@ msgstr "" "Seleccione la fuente\n" "Seleccionar fuente" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5902,27 +5930,27 @@ msgstr "" "Usar la fuente del sistema\n" "Fuente predeterminada" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Muestra los espacios en blanco" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Muestra el panel de diferencias" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Muestra el panel de ubicación con una imagen global de los archivos" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Muestra el diálogo de estadísticas de comparación de carpetas" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5931,7 +5959,7 @@ msgstr "" "Permite seleccionar el idioma de la interfaz de usuario\n" "Idioma" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5940,12 +5968,12 @@ msgstr "" "Muestra las diferencias en las líneas en un color diferente\n" "Mostrar diferencias de línea" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Intercambia la posición de los dos paneles" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5954,7 +5982,7 @@ msgstr "" "Muestra los números de línea\n" "Mostrar números de línea" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5963,7 +5991,7 @@ msgstr "" "Ajusta la longitud de las líneas al ancho del panel\n" "Ajuste de línea" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5972,22 +6000,22 @@ msgstr "" "Muestra los márgenes en ambos paneles\n" "Mostrar los márgenes" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Aumentar tamaño de texto" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Disminuir tamaño de texto" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Restablecer el zoom de texto al tamaño predeterminado" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5996,7 +6024,7 @@ msgstr "" "Ir a la diferencia anterior\n" "Diferencia anterior (Alt Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6005,77 +6033,77 @@ msgstr "" "Ir a la diferencia siguiente\n" "Diferencia siguiente (Alt Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6084,7 +6112,7 @@ msgstr "" "Ir a la primer diferencia\n" "Primera diferencia (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6093,7 +6121,7 @@ msgstr "" "Ir a la diferencia actual\n" "Diferencia actual (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6102,7 +6130,7 @@ msgstr "" "Ir a la última diferencia\n" "Última diferencia (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6111,7 +6139,7 @@ msgstr "" "Copiar el texto seleccionado al lado derecho\n" "Copiar a la derecha (Alt Derecha)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6120,7 +6148,7 @@ msgstr "" "Copiar el texto seleccionado al lado izquierdo\n" "Copiar a la izquierda (Alt Izquierda)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6129,7 +6157,7 @@ msgstr "" "Copiar diferencia al lado derecho e ir a la siguiente\n" "Copiar a la derecha y avanzar (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6138,7 +6166,7 @@ msgstr "" "Copiar diferencia al lado izquierdo e ir a la siguiente\n" "Copiar a la izquierda y avanzar (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6147,7 +6175,7 @@ msgstr "" "Copiar todas las diferencias al lado derecho\n" "Todas a la derecha" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6156,92 +6184,92 @@ msgstr "" "Copiar todas las diferencias al lado izquierdo\n" "Todas a la izquierda" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Elimina los elementos seleccionados de ambas carpetas" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Compara el elemento seleccionado (compara el primero si hay múltiples elementos seleccionados)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleccionar y reordenar las columnas de la comparación de carpetas" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Generar un archivo de corrección" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Seleccionar y modificar filtros" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genera un informe con los resultados de la comparación" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Mostrar una lista de plugins disponibles" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "El usuario selecciona el desempaquetador (no se desempaqueta cuando se comparan carpetas)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "El desempaquetador elegido se aplica a ambos archivos (sólo un archivo necesita tener la extensión)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleccione un desempaquetador para editar éste archivo" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Sin precomparación (normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Otros plugins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descargar todos los plugins y actualizarlos (para desarrolladores)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6250,12 +6278,12 @@ msgstr "" "Cambia al siguiente archivo visible\n" "Cambia al siguiente archivo" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Cierra todas las ventanas abiertas" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6264,22 +6292,22 @@ msgstr "" "Abre la Ayuda de WinMerge\n" "Ayuda de WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Escribe la información de la versión actual de Winmerge y la configuración a un archivo de texto" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Muestra la Licencia Pública General GNU" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Compilación Privada: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6288,7 +6316,7 @@ msgstr "" "Abre los documentos de las notas de versiones\n" "Notas de la Versión" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6297,292 +6325,292 @@ msgstr "" "Abre el sitio web de las traducciones\n" "Traducciones" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Configuración de plugin" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Sin precomparación" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Precomparación si es posible" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH no encontrado - scripts .sct deshabilitados" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Abre el archivo con la aplicación registrada" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Abre el archivo con un editor externo" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Abre el archivo con un programa en particular" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "No mostrar bloques movidos" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Mostrar todos los bloques movidos" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostrar sólo bloques movidos a partir de la diferencia actual" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ir a la diferencia bajo el cursor" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Ir a &línea %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Deshabilitado" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Del sistema de archivos" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "De la lista MRU" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "No Seleccionado" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Comprobación" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ocultar la barra de herramientas" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra pequeña de herramientas" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra grande de herramientas" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 690fb9839..0ca642135 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Inga >" @@ -470,7 +470,7 @@ msgstr "&Automatisk Uppackning" #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "& #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Hjälp" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Filkodning..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "&Jämförelsemetod:" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Total jämförelse" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Snabb jämförelse" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Datum för förändring" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Ändrat Datum och Storlek" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Filstorlek" @@ -1528,7 +1528,7 @@ msgstr "Bes #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "OK" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "&Versionsstyrningssystem:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sökväg till Cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Generellt" @@ -1850,7 +1850,7 @@ msgid "&Find Next" msgstr "&Sök nästa" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&OK" @@ -1896,7 +1896,7 @@ msgid "Replace &All" msgstr "Ersätt &alla" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1948,7 +1948,7 @@ msgid "Remove" msgstr "Ta bort" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Kulörer" @@ -1977,7 +1977,7 @@ msgstr "Borttaget" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Text" @@ -2028,13 +2028,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Standard" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "System" @@ -2175,7 +2176,7 @@ msgid "Description:" msgstr "Beskrivning:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Stopp" @@ -2237,7 +2238,7 @@ msgid "&Go To" msgstr "&Gå till" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Jämför" @@ -2288,7 +2289,7 @@ msgid "Filter Comments" msgstr "Filterkommentarer" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Editor" @@ -2440,7 +2441,7 @@ msgstr "Ign&orera allt" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Codepage" @@ -2730,7 +2731,7 @@ msgid "Private Filter (only for current user)" msgstr "Privat filter (bara för den aktuella användaren)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Arkivstöd" @@ -2781,7 +2782,7 @@ msgid "Files:" msgstr "Filer:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Olika" @@ -2818,7 +2819,7 @@ msgid "Right:" msgstr "Höger:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Identisk" @@ -2871,7 +2872,7 @@ msgid "&Apply" msgstr "&Verkställ" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Avbryt" @@ -2977,7 +2978,7 @@ msgid "Save..." msgstr "Spara..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Backup på filer" @@ -3018,7 +3019,7 @@ msgid "A&ppend timestamp" msgstr "L&ägg till tidsmarkering" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Bekräfta kopiering" @@ -3059,7 +3060,7 @@ msgid "&Enable plugins" msgstr "&Starta Plugins" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Gränssnittsintegration" @@ -3095,8 +3096,8 @@ msgid "Add &Shell menu to context menu" msgstr "Lägg till &gränssnittsmeny i kontextmeny" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Katalog" @@ -3132,69 +3133,102 @@ msgid "&Quick compare limit (MB):" msgstr "&Snabb maximal jämförelsestorlek (MB):" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binär" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041d04e4" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x41d, 1252" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3203,12 +3237,12 @@ msgstr "" "Skapar nya dokument\n" "Nya Dokument (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3217,7 +3251,7 @@ msgstr "" "Öppnar ett befintligt dokument\n" "Öppna (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3226,7 +3260,7 @@ msgstr "" "Stänger det aktiva dokumentet\n" "Stäng" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3235,7 +3269,7 @@ msgstr "" "Sparar det aktiva dokumentet\n" "Spara (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3244,7 +3278,7 @@ msgstr "" "Sparar det aktiva dokumentet med ett nytt namn\n" "Spara som" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3253,7 +3287,7 @@ msgstr "" "Ändrar Utskriftsinställningar\n" "Sidinställningar" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3262,7 +3296,7 @@ msgstr "" "Ändrar skrivare och skrivarinställningar\n" "Skrivarinställningar" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3271,7 +3305,7 @@ msgstr "" "Skriver ut det aktiva dokumentet\n" "Skriv ut" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3280,27 +3314,27 @@ msgstr "" "Visar helsidor\n" "Förhandsgranska" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Gör alla dolda objekt synliga igen" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Växla trädmod" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Expandera alla underkataloger" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Minimera alla underkataloger" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3309,32 +3343,32 @@ msgstr "" "Öppna projektfil\n" "Projektfil (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Okänt fel vid försök att öppna Projektfil" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Okänt fel vid försök att spara Projektfil" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Projektfilen är framgångsrikt öppnad." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Projektfilen är framgångsrikt sparad." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3343,7 +3377,7 @@ msgstr "" "Sparar aktuella sökvägar och inställningar till Projektfil\n" "Spara Projektfil" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3352,7 +3386,7 @@ msgstr "" "Visar Programinformation, Versionsnummer och Copyright\n" "Om" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3361,27 +3395,27 @@ msgstr "" "Avslutar WinMerge och frågar om du vill spara dokument\n" "Avsluta" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Öppna detta dokument" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3390,7 +3424,7 @@ msgstr "" "Växlar till nästa fönster\n" "Nästa fönster" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3399,7 +3433,7 @@ msgstr "" "Växlar till förra fönstret\n" "Förra fönstret" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3408,7 +3442,7 @@ msgstr "" "Arrangerar fönstren så att de överlappar varandra\n" "Överlappande fönster" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3417,7 +3451,7 @@ msgstr "" "Ordnar fönstren icke-överlappande horisontellt\n" "Ordna horisontellt" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3426,7 +3460,7 @@ msgstr "" "Ordnar fönstren icke-överlappande vertikalt\n" "Ordna vertikalt" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3435,7 +3469,7 @@ msgstr "" "Kopierar den markerade texten och lägger det i klippbordet\n" "Kopiera" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3444,7 +3478,7 @@ msgstr "" "Klipper ut den markerade texten och lägger det i klippbordet\n" "Klipp ut" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3453,7 +3487,7 @@ msgstr "" "Söker den angivna texten\n" "Sök" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3462,7 +3496,7 @@ msgstr "" "Klistrar in innehållet i klippbordet\n" "Klistra in" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3471,7 +3505,7 @@ msgstr "" "Upprepar den senaste åtgärden\n" "Upprepa" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3480,7 +3514,7 @@ msgstr "" "Ersätter den markerade texten med annan text\n" "Ersätt" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3489,7 +3523,7 @@ msgstr "" "Väljer hela dokumentet\n" "Välj allt" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3498,7 +3532,7 @@ msgstr "" "Ångrar den senaste åtgärden\n" "Ångra" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3507,7 +3541,7 @@ msgstr "" "Gör om den tidigare ångrade åtgärden\n" "Gör om (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3516,7 +3550,7 @@ msgstr "" "Visar eller gömmer verktygsfältet\n" "Växla verktygsfält" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3525,7 +3559,7 @@ msgstr "" "Visar eller gömmer statusfältet\n" "Växla statusfältet" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3534,7 +3568,7 @@ msgstr "" "Visar eller gömmer filraden\n" "Växla filraden" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3543,57 +3577,57 @@ msgstr "" "Automatisk storleksändring av placering\n" "Lås Placering" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Ändra fönsterstorlek" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Flytta fönster" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Minimera fönstret till en ikon" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Maximera fönstret till full storlek" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Växla till nästa dokumentfönster" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Växla till förra dokumentfönstret" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Stäng det aktiva fönstret och fråga om dokumenten skall sparas" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Återställ fönstret till normal storlek" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Lista med aktiva fönster" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Aktiverar det här fönstret" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3602,7 +3636,7 @@ msgstr "" "Stänger Förhandsgranskning\n" "Stäng Förhandsgranskning" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3621,7 +3655,7 @@ msgstr "" "WinMerge.Filjämförelse\n" "WinMerge Filjämförelse" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3640,19 +3674,19 @@ msgstr "" "WinMerge.Katalogjämförelse\n" "WinMerge Katalogjämförelse" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Högerklicka på sökvägen för att kopiera" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3661,143 +3695,143 @@ msgstr "" "Utvecklare:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 är fri programvara och du är välkommen att vidaredistribuera den under vissa omständigheter; se GNU General Public License i Hjälpmenyn för detaljer." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Försök igen" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Ignorera" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Ignorera &allt" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ja till &allt" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Nej till a&llt" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Fortsätt" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Skippa" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Skippa &allt" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Visa inte detta &meddelande igen." -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Fråga inte denna &fråga igen." -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Versionskontroll" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Skillnader" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Till:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Från vänster:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Till vänster:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Från höger:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Till höger:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Egenskaper (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Alla meddelanderutor visas nu igen." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3808,84 +3842,84 @@ msgstr "" "\n" "Var god och använd värden från 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Öppna" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Inställningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, 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:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Namn" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Sökväg" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Beskrivning" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Välj filnamn för nytt filter" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3898,7 +3932,7 @@ msgstr "" "Var god och kopiera filen %1 till WinMerges Filterkatalog:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3911,7 +3945,7 @@ msgstr "" "\n" "Var god och verifiera att katalogen finns och att den är skrivbar." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3922,7 +3956,7 @@ msgstr "" "\n" "Var god och välj filterkatalog i Inställningar/System." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3935,12 +3969,12 @@ msgstr "" "\n" "Kanske är filen bara läsbar?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Ange sökväg för filterfil att installera" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3951,17 +3985,17 @@ msgstr "" "\n" "Kunde inte kopiera ny filterfil till filterkatalogen." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterfilen är redan installerad. Vill du skriva över existerande filterfil?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Reguljärt uttryck" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3972,258 +4006,258 @@ msgstr "" "\n" "Om du inte vill uppdatera alla jämförelser nu kan du välja Nej och uppdatera jämförelser senare." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Sökväg till SS.EXE" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Resultat för jämförda kataloger" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Filjämförelse" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Namnlös vänster" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Namnlös höger" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Deras fil" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Söker filer..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Öppnar val" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Kopiera vänster till höger" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Kopiera höger till vänster" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Kopiera allt till vänster" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Kopiera allt till höger" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Kopierar filer..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Tar bort filer..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Flyttar filer..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Skapar rapport..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Ångrar den sista åtgärden..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Gör om den tidigare åtgärden..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Rad: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Mergemod" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Skillnad %1 av %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 skillnader funna" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 skillnad funnen" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Objekt: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Välj två existerande kataloger eller filer att jämföra" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Val av katalog" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Välj två kataloger eller två filer att jämföra." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Vänster sökväg är felaktig!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Höger sökväg är felaktig!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Båda sökvägarna är felaktiga!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Välj två filer för att starta valet av uppackare." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan inte jämföra en fil med en katalog!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Kan inte hitta: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Filen är inte uppackad: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4236,12 +4270,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Kunde inte tolka Konfliktfilen." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4252,27 +4286,27 @@ msgstr "" "%1\n" "är inte en Konfliktfil." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Spara som" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Spara ändringar i %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 är skrivskyddad. Vill du skriva över filen (välj Nej för att spara filen med ett annat namn)?" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Fel vid backup av filen" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4285,7 +4319,7 @@ msgstr "" "\n" "Vill du fortsätta i alla fall?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4302,7 +4336,7 @@ msgstr "" "\t-använda ett annat filnamn (Tryck Ok)\n" "\t-avbryta sparande av fil (Tryck Avbryt)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4317,7 +4351,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4332,7 +4366,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4347,7 +4381,7 @@ msgstr "" "\n" "Vill du skriva över den förändrade filen?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4356,7 +4390,7 @@ msgstr "" "%1\n" "är markerad bara läsbar. Vill du ändå ändra i den?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4371,22 +4405,22 @@ msgstr "" "\n" "Vill du öppna filen igen?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Spara vänster fil som" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Spara höger fil som" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4397,7 +4431,7 @@ msgstr "" "%1\n" "finns inte nu. Var god och spara en kopia av filen för att fortsätta." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4408,42 +4442,42 @@ msgstr "" "\n" "Uppdatera filerna innan du fortsätter." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du måste ange sökvägen till ett SourceSafe-projekt för att fortsätta (t.ex.: $/MittProjekt)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Hämtar filer från VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versionshanteringssystemet (VSS) returnerade ett fel under försöket att checka ut filen. Det går inte att fortsätta..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Fel vid utförande av kommando för versionshanteringssystem." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS-arbetskatalogen och läget på den aktuella filen matchar inte. Vill du fortsätta ändå?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS databas hittad!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Fel från VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4454,7 +4488,7 @@ msgstr "" " Var god och, kontrollera konfigurationsspecifikation på använd markering.\n" " Ångra checka ut åtgärd?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4463,164 +4497,164 @@ msgstr "" "Versionshanteringssystemet (VSS) returnerade ett fel under försöket att ångra checka ut av filen.\n" " Var god och, kontrollera konfigurationsspecifikation på använd markering. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Inget" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (lägre än 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 eller högre)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Radbryt på mellanslag" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Radbryt på mellanslag eller punkt" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiera valt objekt till angiven katalog" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiera valt objekt till anpassad katalog" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Ta bort valda objekt på vänster sida" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Ta bort valda objekt på höger sida" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Ta bort valda objekt på båda sidor" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Dölj valda objekt (realtidsfilter)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Byt namn på valt objekt på båda sidor" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Höger till vänster (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Vänster till höger (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Höger till vänster (%1 av %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Vänster till höger (%1 av %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Vänster till... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Höger till... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Vänster till... (%1 av %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Höger till... (%1 av %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Vänster (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Höger (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Båda (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Vänster (%1 av %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Höger (%1 av %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Båda (%1 av %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Vänster sida - välj destinationskatalog:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Höger sida - välj destinationskatalog:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påverkade)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påverkade)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4632,17 +4666,17 @@ msgstr "" "%1\n" "?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Är du säker på att du vill kopiera:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Är du säker på att du vill kopiera %d objekt:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4661,613 +4695,607 @@ msgstr "" "\n" "Var god och uppdatera jämförelsen." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Är du säker att du vill flytta:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Är du säker att du vill flytta % objekt:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Bekräfta flyttning" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Öppna den vänstra filen" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Öppna den vänstra filen med en extern editor" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Öppna den vänstra filen med ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Öppna den högra filen" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Öppna den högra filen med en extern editor" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Öppna den högra filen med ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunde inte starta den externa editorn %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiera filnamn till klippbordet" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiera vänster sidas sökvägar till klippbordet" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiera höger sidas sökvägar till klippbordet" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiera båda sidors sökvägar till klippbordet" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Vänster Gränssnittsmeny" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Höger Gränssnittsmeny" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Okänt arkivformat" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Lägg till objekt från vänster sida till arkivet" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Lägg till objekt från höger sida till arkivet" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Lägg till objekt från båda sidor till arkivet" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Lägg till olika objekt till arkivet (från båda sidor)" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flytta vald fil till vänster till anpassad katalog" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flytta vald fil till höger till anpassad katalog" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Filnamn" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Resultat av jämförelsen" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Vänster datum" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Höger datum" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Filsuffix" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Vänster storlek" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Höger storlek" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Höger Filstorlek (Förkortad)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Vänster Filstorlek (Förkortad)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Vänster skapaddatum" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Höger skapaddatum" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Nyare filer" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Filversion på vänster fil" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Filversion på höger fil" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Vänster attribut" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Höger attribut" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Vänster radslutstyp" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Höger radslutstyp" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Vänster kodning" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Höger kodning" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Ignorerade skillnader" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binär" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Kan inte jämföra filerna" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Objekt avbrutet" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Hoppat över filen" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Hoppat över katalogen" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Bara vänster: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Bara höger: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "De binära filerna är identiska" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "De binära filerna är olika" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Filerna är olika" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Katalogerna är olika" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Endast vänster" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Endast höger" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Fel" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Textfilerna är identiska" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Textfilerna är olika" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Förfluten tid: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 objekt valt" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 objekt valda" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Filnamn eller katalognamn." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Underkatalognamn när underkataloger inkluderas." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Jämförelseresultat, lång version." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Vänster sidas ändringsdatum." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Höger sidas ändringsdatum." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Filsuffix." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Vänster fils storlek i bytes." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Höger fils storlek i bytes." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Vänster filstorlek är förkortad." -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Höger filstorlek är förkortad." -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Vänster sidas skapelsetid." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Höger sidas skapelsetid." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Visar vilken sida som har ett nyare ändringsdatum." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Vänster sidas filversion, bara för några filtyper." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Höger sidas filversion, bara för några filtyper." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Kortfattat jämförelseresultat." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Vänster sidas attribut." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Höger sidas attribut." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Vänster sidas filradslutstyp" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Höger sidas filradslutstyp" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Vänster sidas kodning." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Höger sidas kodning." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Antal ignorerade skillnader i filen. Dessa skillnader ignorerades av WinMerge och kan inte läggas samman." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Antal skillnader i filen. Detta antal inkluderar inte ignorerade skillnader." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Visar stjärna (*) om filen är binär." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Jämför %1 med %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Komma-separerad lista" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Tabb-separerad lista" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Rapportfilen finns redan. Vill du skriva över denna fil?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5276,32 +5304,32 @@ msgstr "" "Fel vid skapande av rapport:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Rapporten har skapats." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Samma fil är öppnad i vänster och höger panel." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "De valda filerna är identiska." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Ett fel inträffade under jämförelsen av filerna." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Temporära filer kunde inte skapas. Kontrollera inställningarna för dina temporära sökvägar." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5316,17 +5344,17 @@ msgstr "" "\n" "OBS: Om du alltid vill betrakta alla radslutstyper som likvärdiga, markera alternativet 'Ignorera skillnader i radslut (WINDOWS,UNIX,MAC)' i Jämför-fliken i Inställningar-dialogen (finns under Redigera/Inställningar)." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Den valda katalogen är ogiltig." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan inte öppna en binär fil för att editera." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5341,7 +5369,7 @@ msgstr "" "%1\n" "på andra sidan och öppna dessa kataloger?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5352,168 +5380,168 @@ msgstr "" "Att visa varje fil i dess egen Codepage ger en bättre visning men sammanfogning/kopierande blir farligt.\n" "Vi föreslår att du glömmer Codepage informationen. Önskar du detta ?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information förlorades på grund av kodningsfel i: båda filerna" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Ingen skillnad" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Radskillnad" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Ersatt %1 sträng(ar)." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan inte hitta strängen \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Kopiera hela sökvägen" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Kopiera filnamn" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Skillnadsfält" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Skillnadsbild" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Patchfilen sparad." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "Det gick inte att hitta första filen, eller så är det en katalog!" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "Det gick inte att hitta andra filen, eller så är det en katalog!" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Patchfilen finns redan. Vill du skriva över den?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 fil(er) valda]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Sammanhang" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Förenad" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Kunde inte spara filen %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den specificerade resultatsökvägen är inte en absolut sökväg: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Välj ett filnamn för resultatet" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan inte skapa en patchfil från binära filer." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan inte skapa en patchfil från kataloger." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5524,12 +5552,12 @@ msgstr "" "\n" "Att skapa en patch kräver att det inte finns några osparade förändringar i filerna." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Katalogen finns inte." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5540,7 +5568,7 @@ msgstr "" "Alla krävda komponenter (7-zip och/eller Merge7z*.dll) för arkivstöd kan inte hittas.\n" "Se manualen för mer information om arkivstöd och hur man startar det." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5549,7 +5577,7 @@ msgstr "" "\n" "Notera: 7-Zip integration är avstängd i WinMerges inställningar." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5558,37 +5586,37 @@ msgstr "" "\n" "Notera: 7-Zip integration är begränsad till fristående användning i WinMerges inställningar." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Välj fil att exportera" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Välj fil att importera" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Inställningar importerades från filen." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Inställningar exporterades till filen." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Det gick inte att importera inställningar från filen." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Det gick inte att spara inställningar till filen." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5599,157 +5627,157 @@ msgstr "" "\n" "Vill du göra detta?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "DOS" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "MAC" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "UNIX" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Blandad" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Uppackare" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Editorscript" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Sparar den vänstra filen" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Sparar den högra filen" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Sparar den vänstra filen som..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Sparar den högra filen som..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konverterar radslut till Windows-format" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konverterar radslut till Unix-format" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konverterar radslut till Mac-format" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Växlar mellan Editeramod och Mergemod" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5758,12 +5786,12 @@ msgstr "" "Visar och ändrar filkodningsegenskaper\n" "Filkodningsegenskaper" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Öppna och fixa Konfliktfilen" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5772,7 +5800,7 @@ msgstr "" "Markerar skillnad på aktuell rad\n" "Skillnad på aktuell rad" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5781,7 +5809,7 @@ msgstr "" "Går till rad eller skillnad\n" "Gå till (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5790,7 +5818,7 @@ msgstr "" "Ändrar programinställningar\n" "Inställningar" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5799,37 +5827,37 @@ msgstr "" "Uppdaterar innehållet\n" "Uppdatera (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopierar valda rader till klippboken och lägger till radnummer i början på raderna" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Växlar Bokmärke" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Går till nästa Bokmärke" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Går till tidigare Bokmärke" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Tar bort alla Bokmärken" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5838,7 +5866,7 @@ msgstr "" "Visar objekt som är exakt lika\n" "Visa identiska objekt" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5847,7 +5875,7 @@ msgstr "" "Visar objekt som har skillnader\n" "Visa skillnader i objekt" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5856,7 +5884,7 @@ msgstr "" "Visar objekt som bara finns på vänster sida\n" "Visa vänsterunika objekt" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5865,7 +5893,7 @@ msgstr "" "Visar objekt som bara finns på höger sida\n" "Visa högerunika objekt" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5874,7 +5902,7 @@ msgstr "" "Visar binära filer\n" "Visa binära filer" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5883,7 +5911,7 @@ msgstr "" "Visar överhoppade objekt\n" "Visa överhoppade objekt" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5892,7 +5920,7 @@ msgstr "" "Väljer typsnitt för fönstren\n" "Välj typsnitt" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5901,27 +5929,27 @@ msgstr "" "Väljer standardtypsnitt för fönstren\n" "Välj standardtypsnitt" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Visar ett tecken för mellanslag" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Växla skillnadsbilden" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Skillnadsbilden visar en övergripande bild av filerna" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Visar dialog med katalogjämförelsestatistik" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5930,7 +5958,7 @@ msgstr "" "Väljer språk för användargränssnittet\n" "Språk" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5939,12 +5967,12 @@ msgstr "" "Visar skillnader inom rader med olika färg\n" "Visa radskillnad" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Växlar placering på de två filerna" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5953,7 +5981,7 @@ msgstr "" "Visar radnummer\n" "Visa radnummer" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5962,7 +5990,7 @@ msgstr "" "Startar radbrytning\n" "Radbrytning" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5971,22 +5999,22 @@ msgstr "" "Visar marginaler för båda filerna\n" "Visa filmarginaler" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Öka textstorlek" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Minska textstorlek" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Återställ textzoomning till standardstorlek" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5995,7 +6023,7 @@ msgstr "" "Går till föregående skillnad\n" "Föregående skillnad (Alt+Upp)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6004,77 +6032,77 @@ msgstr "" "Går till nästa skillnad\n" "Nästa skillnad (Alt+Ner)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6083,7 +6111,7 @@ msgstr "" "Går till första skillnaden\n" "Första skillnad (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6092,7 +6120,7 @@ msgstr "" "Går till aktuell skillnad\n" "Aktuell skillnad (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6101,7 +6129,7 @@ msgstr "" "Går till sista skillnaden\n" "Sista skillnad (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6110,7 +6138,7 @@ msgstr "" "Kopierar den valda texten till den högra filen\n" "Kopiera höger (Alt+Höger)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6119,7 +6147,7 @@ msgstr "" "Kopierar den valda texten till den vänstra filen\n" "Kopiera vänster (Alt+Vänster)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6128,7 +6156,7 @@ msgstr "" "Kopierar skillnad till höger och går fram till nästa\n" "Kopiera höger och gå framåt (Ctrl+Alt+Höger)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6137,7 +6165,7 @@ msgstr "" "Kopierar skillnad till vänster och går fram till nästa\n" "Kopiera vänster och gå framåt (Ctrl+Alt+Vänster)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6146,7 +6174,7 @@ msgstr "" "Kopierar alla skillnader till den högra filen\n" "Kopiera allt till höger" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6155,92 +6183,92 @@ msgstr "" "Kopierar alla skillnader till den vänstra filen\n" "Kopiera allt till vänster" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Tar bort valda objekt från båda katalogerna" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Jämför valt objekt (jämför första objektet om flera objekt är valda)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Välj och sortera om kolumnerna för katalogjämförelse" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Skapar en patchfil" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Väljer och ändrar filter" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Genererar en rapport för jämförresultat" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Visar en lista på tillgängliga Plugins" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Användaren väljer uppackare (ingen uppackning när man jämför kataloger)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Den valda uppackaren används för båda filerna (bara en fil behöver ha filsuffixet)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Välj en uppackare för att ändra i denna fil" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (standard)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Föreslagna plugins" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Andra plugins" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Stäng alla plugins och öppna dem igen (för utvecklare)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6249,12 +6277,12 @@ msgstr "" "Aktiverar nästa synliga fil\n" "Aktivera nästa fil" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Stänger alla öppna fönster" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6263,22 +6291,22 @@ msgstr "" "Öppnar WinMerge Hjälp\n" "WinMerge Hjälp" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Sparar aktuell WinMerge Versionsinfo och Konfiguration till en textfil" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Visar GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Privat Kompilering: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6287,7 +6315,7 @@ msgstr "" "Öppnar Releasenoteringsdokumentet\n" "Releasenoteringar" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6296,292 +6324,292 @@ msgstr "" "Öppnar Översättningssidan\n" "Översättningar" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Plugin-inställningar" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Ingen prediffer" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Prediffer om möjligt" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host ('wscript.exe') hittades inte - .sct script är avstängda" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Öppna filen med registerat program" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Öppna filen med extern editor" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Öppna filen med ett speciellt program" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Visa inte flyttade block" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Visa alla flyttade block" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Visa flyttade block bara från aktuell skillnad" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Gå till skillnad under cursor" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "G&å till rad %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Avstängd" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Från Filsystem" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Från Senast Använda filer" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Ingen markering" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portabelt Objekt" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resurser" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Dölj verktygsraden" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Visa liten verktygsrad" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Visa stor verktygsrad" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index f8e151f45..df3ea6861 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -328,7 +328,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Boþ >" @@ -470,7 +470,7 @@ msgstr "Kendili #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -534,7 +534,7 @@ msgstr "&Basamakla" #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "Ya&rdým" @@ -862,7 +862,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Dosya Kodlamasý..." @@ -1466,37 +1466,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Tüm Ýçerik" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Hýzlý Ýçerik" #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Deðiþtirilme Tarihi" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Deðiþtirilme Tarihi ve Boyutu" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Boyut" @@ -1528,7 +1528,7 @@ msgstr "WinMerge Sitesini Ziyaret Edin!" #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "Tamam" @@ -1700,14 +1700,14 @@ msgid "&Versioning System:" msgstr "&Sürümleme Sistemi:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "'cleartool.exe' &yolu:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Genel" @@ -1853,7 +1853,7 @@ msgid "&Find Next" msgstr "So&nrakini Bul" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&Tamam" @@ -1899,7 +1899,7 @@ msgid "Replace &All" msgstr "&Tümünü Deðiþtir" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1951,7 +1951,7 @@ msgid "Remove" msgstr "Kaldýr" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Renkler" @@ -1980,7 +1980,7 @@ msgstr "Silinen" #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Metin" @@ -2031,13 +2031,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Varsayýlan Ayarlar" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Sistem" @@ -2178,7 +2179,7 @@ msgid "Description:" msgstr "Açýklama:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Dur" @@ -2240,7 +2241,7 @@ msgid "&Go To" msgstr "&Git" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Karþýlaþtýr" @@ -2291,7 +2292,7 @@ msgid "Filter Comments" msgstr "Süzgeç Açýklamalarý" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Düzenleyici" @@ -2443,7 +2444,7 @@ msgstr "" #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Kod Sayfasý" @@ -2734,7 +2735,7 @@ msgid "Private Filter (only for current user)" msgstr "Özel Süzgeç (yalnýz þu anki kullanýcý için)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "Sýkýþtýrýlmýþ Dosya Desteði" @@ -2785,7 +2786,7 @@ msgid "Files:" msgstr "Dosyalar:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "Farklýlýk" @@ -2822,7 +2823,7 @@ msgid "Right:" msgstr "Sað:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Ayný" @@ -2875,7 +2876,7 @@ msgid "&Apply" msgstr "&Uygula" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Vazgeç" @@ -2981,7 +2982,7 @@ msgid "Save..." msgstr "Kaydet..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Yedek Dosyalarý" @@ -3022,7 +3023,7 @@ msgid "A&ppend timestamp" msgstr "Sonuna tarih da&mgasý ekle" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "Kopyayý Doðrula" @@ -3063,7 +3064,7 @@ msgid "&Enable plugins" msgstr "&Eklentileri etkinleþtir" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Windows Bütünleþmesi" @@ -3099,8 +3100,8 @@ msgid "Add &Shell menu to context menu" msgstr "Kabuk menüsünü &sað týk menüsüne ekle" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Klasör" @@ -3136,69 +3137,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Binary" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "041f04e6" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x41f, 1254" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Hazýr" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3207,12 +3241,12 @@ msgstr "" "Boþ belgeler oluþtur\n" "Yeni Belgeler (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3221,7 +3255,7 @@ msgstr "" "Varolan bir belgeyi aç\n" "Aç (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3230,7 +3264,7 @@ msgstr "" "Etkin belgeyi kapat\n" "Kapat" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3239,7 +3273,7 @@ msgstr "" "Etkin belgeyi kaydet\n" "Kaydet (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3248,7 +3282,7 @@ msgstr "" "Etkin belgeyi baþka bir adla kaydet\n" "Farklý Kaydet" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3257,7 +3291,7 @@ msgstr "" "Yazdýrma ayarlarýný deðiþtirir\n" "Sayfa Yapýsý" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3266,7 +3300,7 @@ msgstr "" "Yazýcý ve yazdýrma ayarlarýný deðiþtirir\n" "Yazýcý Yapýlandýrmasý" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3275,7 +3309,7 @@ msgstr "" "Etkin belgeyi yazdýr\n" "Yazdýr" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3284,27 +3318,27 @@ msgstr "" "Sayfalarýn tamamýný göster\n" "Baský Önizleme" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Tüm gizli ögeleri yeniden görünür yap" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Aðaç görünümünü aç-kapat" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Tüm alt klasörleri geniþlet" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Tüm alt klasörleri daralt" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3313,32 +3347,32 @@ msgstr "" "Proje dosyasý aç\n" "Proje Dosyasý (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Proje dosyasý açýlýrken bilinmeyen bir hata ile karþýlaþýldý" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Proje dosyasý kaydedilirken bilinmeyen bir hata ile karþýlaþýldý" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Proje Dosyasý" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Proje dosyasý yüklendi." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Proje dosyasý kaydedildi." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3347,7 +3381,7 @@ msgstr "" "Proje dosyasýna þu anki yol ve ayarlarý kaydet\n" "Proje Dosyasýný Kaydet" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3356,7 +3390,7 @@ msgstr "" "Program bilgisi, sürüm numarasý ve telif haklarýný göster\n" "Hakkýnda" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3365,27 +3399,27 @@ msgstr "" "Belgeleri kaydetmeyi sor ve uygulamadan çýk\n" "Çýk" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "Bu belgeyi aç" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3394,7 +3428,7 @@ msgstr "" "Sonraki pencere paneline geç\n" "Sonraki Panel" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3403,7 +3437,7 @@ msgstr "" "Önceki pencere paneline geç\n" "Önceki Panel" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3412,7 +3446,7 @@ msgstr "" "Pencereleri üst üste sýrala\n" "Pencereleri Basamakla" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3421,7 +3455,7 @@ msgstr "" "Pencereleri birbirinin üstüne gelmeyecek þekilde yatay döþe\n" "Pencereleri Yatay Döþe" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3430,7 +3464,7 @@ msgstr "" "Pencereleri birbirinin üstüne gelmeyecek þekilde dikey döþe\n" "Pencereleri Dikey Döþe" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3439,7 +3473,7 @@ msgstr "" "Seçimi panoya kopyala\n" "Kopyala" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3448,7 +3482,7 @@ msgstr "" "Seçimi panoya kes\n" "Kes" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3457,7 +3491,7 @@ msgstr "" "Belirtilen metni bul\n" "Bul" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3466,7 +3500,7 @@ msgstr "" "Panodaki içerikleri yapýþtýr\n" "Yapýþtýr" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3475,7 +3509,7 @@ msgstr "" "Son iþlemi yinele\n" "Yinele" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3484,7 +3518,7 @@ msgstr "" "Belirtilen metni farklý metinle deðiþtir\n" "Deðiþtir" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3493,7 +3527,7 @@ msgstr "" "Tüm belgeyi seç\n" "Tümünü Seç" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3502,7 +3536,7 @@ msgstr "" "Son iþlemi geri al\n" "Geri Al (Ctrl+Z)" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3511,7 +3545,7 @@ msgstr "" "Geri almadan önceki iþlemi yinele\n" "Yinele (Ctrl+Y)" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3520,7 +3554,7 @@ msgstr "" "Araç Çubuðunu Göster veya Gizle\n" "Araç Çubuðunu Göster/Gizle" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3529,7 +3563,7 @@ msgstr "" "Durum çubuðunu göster veya gizle\n" "Durum Çubuðunu Göster/Gizle" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3538,7 +3572,7 @@ msgstr "" "Sekme çubuðunu göster veya gizle\n" "Sekme Çubuðunu Göster/Gizle" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3547,57 +3581,57 @@ msgstr "" "Panelleri kendiliðinden boyutlandýr\n" "Panelleri Kilitle" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Pencere boyutunu deðiþtir" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Pencere konumunu deðiþtir" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Pencereyi simge durumuna küçült" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Pencereyi tam ekran yap" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Sonraki belge penceresine geç" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Önceki belge penceresine geç" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Belgeleri kaydetmeyi sor ve etkin pencereyi kapat" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "Pencereyi normal boyuta döndür" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Görev Listesini Etkinleþtir" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Bu pencereyi etkinleþtir" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3606,7 +3640,7 @@ msgstr "" "Baský önizleme kipini kapat\n" "Önizlemeyi Kapat" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3625,7 +3659,7 @@ msgstr "" "WinMerge.DosyaKarþýlaþtýr\n" "WinMerge Dosya Karþýlaþtýr" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3644,19 +3678,19 @@ msgstr "" "WinMerge.KlasörKarþýlaþtýr\n" "WinMerge Klasör Karþýlaþtýr" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Orijinal satýr sonu (SS) karakterlerini koru" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Kopyalamak için yola sað týklayýn" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3665,143 +3699,143 @@ msgstr "" "Geliþtiriciler:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 size kesinlikle HÝÇBÝR GARANTÝ VERMEZ. Bu program, belirli þartlar altýnda serbestçe çoðaltýp daðýtabileceðiniz özgür bir yazýlýmdýr. Ayrýntýlar için yardým menüsündeki GNU Genel Kamu Lisansý'na bakýn." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Durdur" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "&Yeniden Dene" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Yok Say" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Tümünü yok s&ay" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Evet" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "&Tümüne Evet" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&Hayýr" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "Tü&müne Hayýr" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "&Devam" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "&Atla" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "&Tümünü Atla" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Bu Ýletiyi Yeniden Gösterme!" -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Bu soruyu bir &daha sorma!" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Sürüm Denetimi" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "Farklar" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Kime:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Soldan:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "Sola:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Saðdan:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Saða:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "%1. Sürüm" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Ayarlar (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Tüm iletiler yeniden görünür oldu." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3812,84 +3846,84 @@ msgstr "" "\n" "Lütfen 1 - %1 arasýnda bir deðer yazýn." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "Aç" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programlar|*.exe;*.bat;*.cmd|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Proje Dosyalarý (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Yapýlandýrma Dosyalarý (*.ini)|*.ini|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Metin Dosyalarý (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Dosyalarý (*.htm,*.html)|*.htm;*.html|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Dosyalarý (*.xml)|*.xml|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "Ad" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "Yer" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Süzgeçler" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Açýklama" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Yeni süzgeç için bir isim yazýn" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dosya Süzgeçleri (*.flt)|*.flt|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3902,7 +3936,7 @@ msgstr "" "Lütfen %1 dosyasýný, WinMerge/Filters klasörüne kopyalayýn:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3915,7 +3949,7 @@ msgstr "" "\n" "Klasörün var ve yazýlabilir olduðundan emin olun." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3926,7 +3960,7 @@ msgstr "" "\n" "Lütfen 'Ayarlar/Sistem' Ýçinden Filtre Klasörü Seçiniz." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3939,12 +3973,12 @@ msgstr "" "\n" "Dosya salt okunur olabilir mi?" -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Kurulacak süzgeç dosyasýný seçin" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3955,17 +3989,17 @@ msgstr "" "\n" "Yeni süzgeç dosyasý süzge klasörüne kopyalanamadý" -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Bu süzgeç zaten var. Üzerine yazýlsýn mý?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Koþul Ýfadesi" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3976,258 +4010,258 @@ msgstr "" "\n" "Þimdi istemezseniz, tüm karþýlaþtýrmalarý daha sonra da yenileyebilirsiniz." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "'SS.EXE' &yolu:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Klasör Karþýlaþtýrma Sonuçlarý" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Dosya Karþýlaþtýrma" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Sol Adsýz" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Adsýz sað" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "Onlarýn Dosyasý" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "Benim Dosyam" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Dosyalar taranýyor..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "Sçim açýlýyor" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Soldaki saða kopyalanýyor" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Sað, sola kopyalanýyor" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Tümü sola kopyalanýyor" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Tümü saða kopyalanýyor" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Dosyalar kopyalanýyor..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Dosyalar siliniyor..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Dosyalar taþýnýyor..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Rapor oluþturuluyor..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Son iþlem geri alýnýyor..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Önceki iþlem yineleniyor..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Satýr: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Birleþtir" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "Fark %1 / %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 Fark Bulundu" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "1 Fark Bulundu" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "SO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Öge %1 / %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Ögeler: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Karþýlaþtýrmak için varolan iki klasör veya dosya seçin" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Klasör Seçimi" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Karþýlaþtýrýlacak iki klasör veya dosya seçin." -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Sol yol geçersiz!" -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Sað yol geçersiz!" -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Ýki yolda geçersiz!" -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Ayýklayýcý seçimini etkinleþtirmek için iki dosya seçin." -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Dosya ile klasör karþýlaþtýrýlamaz!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "%1 dosyasý bulunamadý" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "%1 dosyasý ayýklanamadý" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4240,12 +4274,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Fark dosyasý iþlenemedi." -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4256,27 +4290,27 @@ msgstr "" "dosyasý\n" "bir fark dosyasý deðil." -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Farklý Kaydet" -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "%1 içindeki deðiþiklikler kaydedilsin mi? " -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 salt okunur olarak iþaretli. Üzerine yazmak ister misiniz ? (Hayýr seçerseniz, yeni bir adla farklý kaydedebilirsiniz.)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Dosya yedekleme hatasý" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4289,7 +4323,7 @@ msgstr "" "\n" "Gene de devam edilsin mi?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4306,7 +4340,7 @@ msgstr "" "\t-farklý bir ad kullan (Tamam Týklayýn)\n" "\t-bu iþlemi iptal et? (Ýptal Týklayýn)" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4321,7 +4355,7 @@ msgstr "" "\n" "Ayýklanmýþ sürümü baþka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4336,7 +4370,7 @@ msgstr "" "\n" "Ayýklanmýþ sürümü baþka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4351,7 +4385,7 @@ msgstr "" "\n" "deðiþtirilmiþ dosyanýn üzerine yazýlsýn mý?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" @@ -4360,7 +4394,7 @@ msgstr "" "%1\n" "salt okunur olarak iþaretli. Üzerine yazmak istediðinize emin misiniz?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4375,22 +4409,22 @@ msgstr "" "\n" "Dosyayý yeniden yüklemek istiyor musunuz?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Sol Dosyayý Farklý Kaydet" -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Sað Dosyayý Farklý Kaydet" -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4401,7 +4435,7 @@ msgstr "" "dosyasý\n" "yok oldu. Devam etmek için dosyanýn bir kopyasýný kaydedin." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4412,42 +4446,42 @@ msgstr "" "\n" "Devam etmeden önce belgeleri yenileyin." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Devam etmek için bir SourceSafe projesi yolu belirtmelisiniz (örn: $/projem)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Dosyalarý VSS Projesinden Çýkart..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Dosya çýkýþý yapýlmak istenirken sürümleme sisteminde bir hata oluþtu. Devam edilemiyor..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Sürümleme sistemi komutu çalýþtýrýlýrken hata." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS çalýþma klasörü ile þu anki dosyanýn konumu eþleþmiyor. Devam edilsin mi?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "VSS veritabaný bulunamadý!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "VSS Kaynaklý Hata:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4458,7 +4492,7 @@ msgstr "" " Lütfen kullanýlan görünüm yapýlandýrmasýný denetleyin.\n" " Çýkýþ iþlemi geri alýnsýn mý?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4467,164 +4501,164 @@ msgstr "" "Dosya çýkýþý geri alýnmak istenirken sürümleme sisteminde bir hata oluþtu.\n" " Lütfen kullanýlan görünüm yapýlandýrmasýný denetleyin. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Yok" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0'dan önceki sürümler)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ve üstü)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Boþlukta dur" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Boþlukta veya noktalama iþaretinde dur" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Seçili ögeyi adlandýrýlan klasöre kopyala" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Seçili ögeyi özel klasöre kopyala" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Soldaki seçili ögeyi sil" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Saðdaki seçili ögeyi sil" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Her iki taraftaki seçili ögeleri sil" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Seçili ögeleri gizle (anýnda süzgeci)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Seçili ögeyi her iki tarafta yeniden adlandýr" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Saðdakini Sola (%1)" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Soldakini Saða (%1)" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Saðdakini Sola (%1 / %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Soldakini Saða (%1 / %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Soldakini þuraya... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Saðdakini þuraya... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Soldakini þuraya... (%1 / %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Saðdakini þuraya... (%1 / %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "Soldakini (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Saðdakini (%1 tane)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Her ikisini de (%1 tane)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "Soldakini (%1 / %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Saðdakini (%1 / %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Her iki tarafta olaný da (%1 / %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "Sol tarafýn hedef klasörünü seç:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Sað tarafýn hedef klasörünü seç:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dosya Etkilendi)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Toplam %2 taneden %1 dosya etkilendi)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4635,17 +4669,17 @@ msgstr "" "\n" "%1" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Þunu kopyalamak istediðinizden emin misiniz:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "%d ögeyi kopyalamak istediðinize emin misiniz:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4664,613 +4698,607 @@ msgstr "" "\n" "Lütfen karþýlaþtýrmayý yenileyin." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Bunu taþýmak istediðinize emin misiniz:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "%d ögeyi taþýmak istediðinize emin misiniz:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "Taþýmayý Onayla" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "Sol dosyayý aç" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "Sol dosyayý dýþ düzenleyici ile aç" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "Sol dosyayý birlikte aç..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "Sað dosyayý aç" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "Sað dosyayý dýþ düzenleyici ile aç" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "Sað dosyayý birlikte aç..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "%1 dýþ düzenleyicisi çalýþtýrýlamadý" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Dosya adlarýný panoya kopyala" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Sol tarafýn yolunu panoya kopyala" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Sað tarafýn yolunu panoya kopyala" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Ýki tarafýn yolunu panoya kopyala" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "Sol taraf sað týk menüsü" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Sað taraf sað týk menüsü" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Bilinmeyen sýkýþtýrma biçimi" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Sol taraftaki ögeleri arþiv dosyasýna ekle" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Sað taraftaki ögeleri arþiv dosyasýna ekle" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Ýki taraftaki ögeleri de arþiv dosyasýna ekle" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Ýki taraftaki farklý ögeleri arþiv dosyasýna ekle" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Sol taraftaki seçili dosyayý özel klasöre taþý" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Sað taraftaki seçili dosyayý özel klasöre taþý" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "Dosya Adý" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Karþýlaþtýrma sonucu" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Soldakinin Tarihi" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Saðdakinin Tarihi" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Uzantý" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Soldakinin Boyutu" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Saðdakinin Boyutu" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Saðdakinin Boyutu (Kýsa)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Soldakinin Boyutu (Kýsa)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "Soldakinin Oluþturulma Zamaný" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "Saðdakinin Oluþturulma Zamaný" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Daha Yeni Dosya" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Soldaki Dosya Sürümü" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Saðdaki Dosya Sürümü" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Özet Sonuç" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Soldakinin Öznitelikleri" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Saðdakinin Öznitelikleri" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "Sol Satýr Sonu" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Sað Satýr Sonu" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Soldaki Kodlama" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Saðdaki Kodlama" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Yok Sayýlan Farklýlýklar" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Binary" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Dosyalar karþýlaþtýrýlamýyor" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Öge iptal edildi" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Dosya atlandý" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Klasör atlandý" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Yalnýz solda: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Yalnýz saðda: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Binary dosyalarý ayný" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Binary dosyalarý farklý" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Dosyalar farklý" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Klasörler farklý" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Yalnýz Soldaki" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Yalnýz Saðdaki" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Hata" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Metin dosyalarý ayný" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Metin dosyalarý farklý" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Geçen süre: %ld ms" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "1 öge seçildi" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "%1 öge seçildi" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "Dosya veya klasör adý." -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Alt klasörler katýldýðýnda alt klasör adý." -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Karþýlaþtýrma sonucu, uzun biçim." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "Soldakinin deðiþtirilme tarihi." -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "Saðdakinin deðiþtirilme tarihi." -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Dosya uzantýsý." -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Soldaki dosyanýn bayt olarak boyutu." -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Saðdaki dosyanýn bayt olarak boyutu." -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Soldaki dosyanýn kýsaca boyutu" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Saðdaki dosyanýn kýsaca boyutu" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "Sol tarafýn oluþturulma zamaný." -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "Sað tarafýn oluþturulma zamaný." -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Hangi tarafýn en son deðiþiklik tarihine sahip olduðunu söyler." -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Sol taraftaki dosya sürümü, yalnýz bazý dosya tipleri için." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Sað taraftaki dosya sürümü, yalnýz bazý dosya tipleri için." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Kýsa karþýlaþtýrma sonucu." -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Soldaki dosyanýn öznitelikleri." -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Saðdaki dosyanýn öznitelikleri." -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Soldaki dosyanýn satýr sonu tipi" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Soldaki dosyanýn satýr sonu tipi" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Sol tarafýn kodlamasý." -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Sol tarafýn kodlamasý." -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Dosyadaki yok sayýlan farklarýn sayýsý. Bu farklar WinMerge tarafýndan yok sayýldý ve birleþtirilemezler." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Dosyadaki farklarýn sayýsý. Bu sayýya yok sayýlan farklar katýlmamýþtýr." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Eðer dosya Binary ise yýldýz (*) iþareti koy." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "%1 ile %2 ögesini karþýlaþtýr" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Virgül ile ayrýlmýþ liste" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Sekme ile ayrýlmýþ liste" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Basit HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Basit XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Rapor dosyasý zaten var. Üzerine yazmak istiyor musunuz?" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5279,32 +5307,32 @@ msgstr "" "Rapor hazýrlanýrken hata oldu:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Rapor tamamlandý." -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Ýki panelde de ayný dosya açýldý." -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Seçili Dosyalar Birbiri Ýle Ayný." -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Dosyalar karþýlaþtýrýlýrken bir hata oluþtu." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Geçici klasör oluþturulamadý. Geçici klasör yolu ayarlarýnýzý denetleyin." -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5319,17 +5347,17 @@ msgstr "" "\n" "Not: Eðer genel olarak satýr sonu tiplerinin ayný kabul edilmesini istiyorsanýz, Düzen/Ayarlar menüsünden Karþýlaþtýr bölümüne giderek, 'Satýr Sonu Farklýlýklarýný Yok Say..' seçeneðini iþaretleyin." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Seçilen klasör geçersiz." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Bir binary dosyasý düzenleyicide açýlamaz." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5344,7 +5372,7 @@ msgstr "" "%1\n" "ve bu klasörleri açmak istiyor musunuz?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5355,168 +5383,168 @@ msgstr "" "Her dosyayý kendi kod sayfasýnda görüntülemek daha iyi bir görüntü saðlar ama birleþtirme/kopyalama riske girer.\n" "Her iki dosyayý da varsayýlan Windows kod sayfasýna sahipmiþ gibi iþlemek ister misiniz (önerilir)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Kodlama hatalarý yüzünden iki dosyada da bilgi kaybý" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Fark yok" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Satýr farký" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 metin deðiþtirildi." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Aradýðýnýz \"%s\" metni bulunamadý" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Tam Yolu Kopyala" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Dosya adýný kopyala" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "Durum Penceresi" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "Fark Penceresi" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Yama dosyasý yazýldý." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. öge bulunamadý veya bir klasör" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. öge bulunamadý veya bir klasör" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Yama dosyasý zaten var. Üzerine yazmak istiyor musunuz?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 dosya seçildi]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Baðlam" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Birleþik" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "%1 dosyasýna yazýlamadý." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Belirtilen çýktý klasörü mutlak bir yol deðil: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Bir çýktý dosyasý belirtin" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Binary dosyalarýndan, yama dosyasý hazýrlanamaz." -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Klasörlerden yama dosyasý hazýrlanamaz." -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5527,12 +5555,12 @@ msgstr "" "\n" "Bir yama hazýrlamak, dosyalardaki deðiþikliklerin kaydedilmiþ olmasýný gerektirir." -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Klasör bulunamadý." -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5543,7 +5571,7 @@ msgstr "" "Sýkýþtýrýlmýþ dosya desteði için gereken hiç bir bileþen bulunamadý (7-zip ve/veya Merge7z*.dll).\n" "Sýkýþtýrýlmýþ dosya desteði ve nasýl etkinleþtirileceði ile ilgili ayrýntýlý bilgi için kullaným kitabýna bakýn." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5552,7 +5580,7 @@ msgstr "" "\n" "Not: 7-Zip bütünleþtirmesi WinMerge ayarlarýndan devre dýþý býrakýlmýþ." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5561,37 +5589,37 @@ msgstr "" "\n" "Not: WinMerde ayarlarýnda 7-Zip bütünleþtirmesi baðýmsýz çalýþacak þekilde sýnýrlanmýþtýr." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Verilecek dosyayý seçin" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "alýnacak dosyayý seçin" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Ayarlar dosyadan alýndý." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Ayarlar dosyaya kaydedildi." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Ayarlar dosyadan alýnamadý." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Ayarlar dosyaya yazýlamadý." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5602,157 +5630,157 @@ msgstr "" "\n" "Devam etmek istiyor musunuz?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "Karma" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Tür" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Ayýklayýcý" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Ön Fark" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Düzenleyici betiði" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Sol dosyayý kaydet" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Sað dosyayý kaydet" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Sol dosyayý þu adla kaydet..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Sað dosyayý þu adla kaydet..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Satýr sonunu Windows kipine dönüþtür" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Satýr sonunu Unix kipine dönüþtür" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Satýr sonunu Mac kipine dönüþtür" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Düzenleme ve birleþtirme kipleri arasýnda geçiþ yap" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5761,12 +5789,12 @@ msgstr "" "Dosya kodlama ayarlarýna bak ve deðiþtir\n" "Dosya kodlama ayarlarý" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "Fark dosyasýný aç ve çözümle" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5775,7 +5803,7 @@ msgstr "" "Ýmleç satýrýndaki fark bölgesini seç\n" "Ýmleç Satýrýndaki Fark" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5784,7 +5812,7 @@ msgstr "" "Satýra feya farka git\n" "Git (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5793,7 +5821,7 @@ msgstr "" "Program ayarlarýný yap\n" "Ayarlar" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5802,37 +5830,37 @@ msgstr "" "Görüntüyü yenile\n" "Yenile (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Seçili satýrlarý, satýr baþýna satýr numaralarýný da ekleyerek panoya kopyala" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Yer imini koy/kaldýr" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Sonraki yer imine git" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Önceki yer imine git" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Tüm yer imlerini temizle" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5841,7 +5869,7 @@ msgstr "" "Týpatýp ayný olan ögeleri gösterir\n" "Eþ Ögeleri Göster" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5850,7 +5878,7 @@ msgstr "" "Farklý olan ögeleri gösterir\n" "Farklý Ögeleri Göster" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5859,7 +5887,7 @@ msgstr "" "Yalnýz sol tarafta olan, saðda olmayan ögeleri gösterir\n" "Soldaki Eþsiz Ögeleri Göster" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5868,7 +5896,7 @@ msgstr "" "Yalnýz sað tarafta olan, solda olmayan ögeleri gösterir\n" "Saðdaki Eþsiz Ögeleri Göster" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5877,7 +5905,7 @@ msgstr "" "Binary dosyalarýný gösterir\n" "Binary Dosyalarý Göster" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5886,7 +5914,7 @@ msgstr "" "Atlanan ögeleri gösterir\n" "Atlanan Ögeleri Göster" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5895,7 +5923,7 @@ msgstr "" "Ekran için yazý tipinþ seçin\n" "Ekran Yazý Tipini Seç" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5904,27 +5932,27 @@ msgstr "" "Ekran yazý tipini varsayýlan sistem yazý tipine çevirir\n" "Varsayýlan Yazý Tipi" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Boþluk karakterlerini göster" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Fark Penceresini Aç/Kapa" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Durum penceresi dosyalarýn genel resmini gösterir" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Klasör karþýlaþtýrma istatistikleri penceresini göster" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5933,7 +5961,7 @@ msgstr "" "Kullanýlacak arayüz dilini seçin\n" "Dil" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5942,12 +5970,12 @@ msgstr "" "Satýr içlerindeki farklarý, farklý renklerle gösterir\n" "Satýrdaki Farklarý Göster" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Ýki panelin yerini deðiþtir" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5956,7 +5984,7 @@ msgstr "" "Satýr numaralarýný gösterir\n" "Satýr Numaralarýný Göster" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5965,7 +5993,7 @@ msgstr "" "Sözcük kaydýrmayý etkinleþtir\n" "Sözcük Kaydýr" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5974,22 +6002,22 @@ msgstr "" "Her iki panelin seçim sýnýrlarýný gösterir\n" "Seçim Sýnýrlarýný Göster" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Metin boyutunu büyüt" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Metin boyutunu küçült" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Metin yakýnlaþtýrmasýný varsayýlana çevir" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5998,7 +6026,7 @@ msgstr "" "Önceki farka git\n" "Önceki Fark (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -6007,77 +6035,77 @@ msgstr "" "Sonraki farka git\n" "Sonraki Fark (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6086,7 +6114,7 @@ msgstr "" "Ýlk farka git\n" "Ýlk Fark" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6095,7 +6123,7 @@ msgstr "" "Ýmleçteki farka git\n" "Ýmleçteki Fark(Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6104,7 +6132,7 @@ msgstr "" "Son farka git\n" "Son Fark (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6113,7 +6141,7 @@ msgstr "" "Seçili metni saðdaki dosyaya kopyala\n" "Saða Kopyala (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6122,7 +6150,7 @@ msgstr "" "Seçili metni soldaki dosyaya kopyala\n" "Sola Kopyala (Alt+Right)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6131,7 +6159,7 @@ msgstr "" "Farký saða kopyala ve sonraki farka geç\n" "Saða Kopyala ve Ýlerle (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6140,7 +6168,7 @@ msgstr "" "Farký sola kopyala ve sonraki farka geç\n" "Sola Kopyala ve Ýlerle (Ctrl+Alt+Right)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6149,7 +6177,7 @@ msgstr "" "Tüm farklarý saðdaki dosyaya kopyala\n" "Tümünü Saða" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6158,92 +6186,92 @@ msgstr "" "Tüm farklarý soldaki dosyaya kopyala\n" "Tümünü Sola" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Seçili ögeleri her iki klasörden de sil" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Seçili ögeyi karþýlaþtýr (birden çok öge seçilmiþse ilk ögeyi karþýlaþtýr)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Klasör karþýlaþtýrma sütunlarýný seç ve yeniden sýrala" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Bir yama dosyasý oluþtur" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Süzgeçleri seç ve deðiþtir" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Karþýlaþtýrma sonuçlarýndan bir rapor hazýrlar" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Yüklenebilir eklentilerin listesini göster" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Kullanýcý ayýklayýcýyý seçer (klasör karþýlaþtýrýlýrken ayýklama yapýlmaz)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Uyarlanan ayýklayýcý iki dosyayada uygulandý (sadece bir dosya bu uzantýya gerek duyuyor)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Bu dosyayý düzenlemek için bir ayýklayýcý seçin" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Ön fark yok (Normal)" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Önerilen eklentiler" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "Diðer eklentiler" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Tüm eklentileri kaldýr ve yeniden yükle (geliþtiriciler için)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6252,12 +6280,12 @@ msgstr "" "Sonraki görülebilir dosyayý etkinleþtir\n" "Sonraki Dosyayý Etkinleþtir" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Tüm açýk pencereleri kapatýr" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6266,22 +6294,22 @@ msgstr "" "WinMerge yardýmýný açar\n" "WinMerge Yardýmý" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Kullanýlan WinMerge sürüm bilgisini ve yapýlandýrmasýný metin dosyasýna aktarýr" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "GNU Genel Kamu Lisansýný Göster" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Özel Yapým: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6290,7 +6318,7 @@ msgstr "" "Yayýn notlarý belgesini açar\n" "Yayýn Notlarý" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6299,292 +6327,292 @@ msgstr "" "Çeviriler web sitesini açar\n" "Çeviriler" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Eklenti Ayarlarý" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Ön fark yok" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Olabiliyorsa Ön Fark" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host bulunamadý - .sct betikleri devre dýþý" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "Dosyayý kayýtlý uygulama ile aç" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "Dosyayý dýþ düzenleyici ile aç" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "Dosyayý özel bir programla aç" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Taþýnmýþ bloklarý gösterme!" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Taþýnmýþ tüm bloklarý göster" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Yalnýz imleçteki farktan taþýnan bloklarý göster" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ýmlecin altýndaki farka git" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "%1. &Satýra Git" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Devre dýþý" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "Dosya sisteminden" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "Sýk Kullanýlanlar Listesinden" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Vurgulama Yok" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Araç çubuðunu gizle" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Küçük araç çubuðunu göster" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Büyük araç çubuðunu göster" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index 2764d7413..07e21a8c3 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -329,7 +329,7 @@ msgstr "" #: Merge.rc:255 #: Merge.rc:417 #: Merge.rc:579 -#: Merge.rc:3014 +#: Merge.rc:3029 #, c-format msgid "< Empty >" msgstr "< Íåìà >" @@ -471,7 +471,7 @@ msgstr "& #: Merge.rc:203 #: Merge.rc:332 #: Merge.rc:570 -#: Merge.rc:1969 +#: Merge.rc:1983 #, c-format msgid "&Edit with Unpacker..." msgstr "" @@ -535,7 +535,7 @@ msgstr "& #: Merge.rc:218 #: Merge.rc:347 #: Merge.rc:595 -#: Merge.rc:2221 +#: Merge.rc:2235 #, c-format msgid "&Help" msgstr "&Äîâ³äêà" @@ -863,7 +863,7 @@ msgid "Re&load\tCtrl+F5" msgstr "" #: Merge.rc:408 -#: Merge.rc:1968 +#: Merge.rc:1982 #, c-format msgid "&File Encoding..." msgstr "&Êîäóâàííÿ ôàéëó..." @@ -1467,37 +1467,37 @@ msgid "&Compare method:" msgstr "" #: Merge.rc:737 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format msgid "Full Contents" msgstr "Ïîâíèé ïîøóê çà âì³ñòîì" #: Merge.rc:738 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format msgid "Quick Contents" msgstr "Øâèäêèé ïîøóê çà âì³ñòîì " #: Merge.rc:739 -#: Merge.rc:2299 +#: Merge.rc:2314 #, c-format msgid "Binary Contents" msgstr "" #: Merge.rc:740 -#: Merge.rc:2300 +#: Merge.rc:2315 #, c-format msgid "Modified Date" msgstr "Çà ðîçõîäæåííÿìè â äàò³" #: Merge.rc:741 -#: Merge.rc:2301 +#: Merge.rc:2316 #, c-format msgid "Modified Date and Size" msgstr "Çà äàòîþ çì³íè ³ ðîçì³ðó" #: Merge.rc:742 -#: Merge.rc:2302 +#: Merge.rc:2317 #, c-format msgid "Size" msgstr "Çà ðîçì³ðîì" @@ -1529,7 +1529,7 @@ msgstr "³ #: Merge.rc:1662 #: Merge.rc:1677 #: Merge.rc:1908 -#: Merge.rc:1967 +#: Merge.rc:1981 #, c-format msgid "OK" msgstr "Ãàðàçä" @@ -1701,14 +1701,14 @@ msgid "&Versioning System:" msgstr "&Ñèñòåìà êîíòðîëþ âåðñ³é:" #: Merge.rc:926 -#: Merge.rc:2345 +#: Merge.rc:2360 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Øëÿõ äî cleartool.exe:" #: Merge.rc:933 -#: Merge.rc:2229 -#: Merge.rc:2242 +#: Merge.rc:2243 +#: Merge.rc:2256 #, c-format msgid "General" msgstr "Îñíîâí³" @@ -1851,7 +1851,7 @@ msgid "&Find Next" msgstr "&Äàë³" #: Merge.rc:1024 -#: Merge.rc:2203 +#: Merge.rc:2217 #, c-format msgid "&Ok" msgstr "&OÊ" @@ -1897,7 +1897,7 @@ msgid "Replace &All" msgstr "Ç&àì³íèòè âñþäè" #: Merge.rc:1063 -#: Merge.rc:2478 +#: Merge.rc:2493 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1949,7 +1949,7 @@ msgid "Remove" msgstr "Âèëó÷èòè" #: Merge.rc:1098 -#: Merge.rc:2232 +#: Merge.rc:2246 #, c-format msgid "Colors" msgstr "Êîëüîðè" @@ -1978,7 +1978,7 @@ msgstr " #: Merge.rc:1127 #: Merge.rc:1596 #: Merge.rc:1812 -#: Merge.rc:2233 +#: Merge.rc:2247 #, c-format msgid "Text" msgstr "Òåêñò" @@ -2029,13 +2029,14 @@ msgstr "" #: Merge.rc:1399 #: Merge.rc:1642 #: Merge.rc:1949 -#: Merge.rc:1959 +#: Merge.rc:1963 +#: Merge.rc:1973 #, c-format msgid "Defaults" msgstr "Çâè÷àéí³ ïàðàìåòðè" #: Merge.rc:1218 -#: Merge.rc:2235 +#: Merge.rc:2249 #, c-format msgid "System" msgstr "Ñèñòåìà" @@ -2176,7 +2177,7 @@ msgid "Description:" msgstr "Îïèñ:" #: Merge.rc:1347 -#: Merge.rc:2182 +#: Merge.rc:2196 #, c-format msgid "Stop" msgstr "Çóïèíèòè" @@ -2238,7 +2239,7 @@ msgid "&Go To" msgstr "Ïåðåéò&è" #: Merge.rc:1383 -#: Merge.rc:2230 +#: Merge.rc:2244 #, c-format msgid "Compare" msgstr "Ïîð³âíÿííÿ" @@ -2289,7 +2290,7 @@ msgid "Filter Comments" msgstr "Ô³ëüòð êîìåíòàð³â" #: Merge.rc:1404 -#: Merge.rc:2231 +#: Merge.rc:2245 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" @@ -2441,7 +2442,7 @@ msgstr " #: Merge.rc:1491 #: Merge.rc:1752 -#: Merge.rc:2237 +#: Merge.rc:2251 #, c-format msgid "Codepage" msgstr "Ñòîð³íêà êîäóâàííÿ" @@ -2727,7 +2728,7 @@ msgid "Private Filter (only for current user)" msgstr "Îñîáèñòèé ô³ëüòð (ëèøå äëÿ ïîòî÷íîãî êîðèñòóâà÷à)" #: Merge.rc:1683 -#: Merge.rc:2238 +#: Merge.rc:2252 #, c-format msgid "Archive Support" msgstr "ϳäòðèìêà àðõ³â³â" @@ -2778,7 +2779,7 @@ msgid "Files:" msgstr "Ôàéëè:" #: Merge.rc:1709 -#: Merge.rc:2648 +#: Merge.rc:2663 #, c-format msgid "Different" msgstr "³äð³çíÿþòüñÿ" @@ -2815,7 +2816,7 @@ msgid "Right:" msgstr "Ïðàâîðó÷:" #: Merge.rc:1732 -#: Merge.rc:2638 +#: Merge.rc:2653 #, c-format msgid "Identical" msgstr "Îäíàêîâ³" @@ -2868,7 +2869,7 @@ msgid "&Apply" msgstr "&Çàñòîñóâàòè" #: Merge.rc:1776 -#: Merge.rc:2204 +#: Merge.rc:2218 #, c-format msgid "&Cancel" msgstr "&Ñêàñóâàòè" @@ -2974,7 +2975,7 @@ msgid "Save..." msgstr "Çáåðåãòè..." #: Merge.rc:1855 -#: Merge.rc:2239 +#: Merge.rc:2253 #, c-format msgid "Backup Files" msgstr "Ðåçåðâí³ êîﳿ" @@ -3015,7 +3016,7 @@ msgid "A&ppend timestamp" msgstr "Äîäàòè äàòó" #: Merge.rc:1880 -#: Merge.rc:2533 +#: Merge.rc:2548 #, c-format msgid "Confirm Copy" msgstr "ϳäòâåðäæåííÿ" @@ -3056,7 +3057,7 @@ msgid "&Enable plugins" msgstr "&Ââ³ìêíóòè äîïîâíåííÿ" #: Merge.rc:1914 -#: Merge.rc:2240 +#: Merge.rc:2254 #, c-format msgid "Shell Integration" msgstr "Âæèâëåííÿ â îáîëîíêó" @@ -3092,8 +3093,8 @@ msgid "Add &Shell menu to context menu" msgstr "Äîäàòè &ìåíþ îáîëîíêè äî êîíòåêñòíîãî ìåíþ" #: Merge.rc:1932 -#: Merge.rc:2243 -#: Merge.rc:2582 +#: Merge.rc:2257 +#: Merge.rc:2597 #, c-format msgid "Folder" msgstr "Òåêà" @@ -3129,69 +3130,102 @@ msgid "&Quick compare limit (MB):" msgstr "" #: Merge.rc:1954 -#: Merge.rc:2244 +#: Merge.rc:2259 +#: Merge.rc:2638 +#: Merge.rc:2853 +#, c-format +msgid "Binary" +msgstr "Á³íàðíèé" + +#: Merge.rc:1957 +#, c-format +msgid "Binary File &Patterns:" +msgstr "" + +#: Merge.rc:1959 +#, c-format +msgid "Frhed settings" +msgstr "" + +#: Merge.rc:1960 +#, c-format +msgid "View &Settings..." +msgstr "" + +#: Merge.rc:1961 +#, c-format +msgid "&Binary Mode..." +msgstr "" + +#: Merge.rc:1962 +#, c-format +msgid "&Character Set..." +msgstr "" + +#: Merge.rc:1968 +#: Merge.rc:2258 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1971 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1984 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1995 +#: Merge.rc:2009 #, c-format msgid "040904e4" msgstr "042204e3" #. VarFileInfo.Translation -#: Merge.rc:2011 +#: Merge.rc:2025 #, c-format msgid "0x409, 1252" msgstr "0x422, 1251" -#: Merge.rc:2026 +#: Merge.rc:2040 #, c-format msgid "Ready" msgstr "Ãîòîâî" -#: Merge.rc:2032 +#: Merge.rc:2046 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:2033 +#: Merge.rc:2047 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:2034 +#: Merge.rc:2048 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:2035 +#: Merge.rc:2049 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:2036 +#: Merge.rc:2050 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:2037 +#: Merge.rc:2051 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:2043 +#: Merge.rc:2057 #, c-format msgid "" "Create empty documents\n" @@ -3200,12 +3234,12 @@ msgstr "" "Ñòâîðèòè ïîðîæí³ äîêóìåíòè\n" "Ñòâîðèòè äîêóìåíòè (Ctrl+N)" -#: Merge.rc:2044 +#: Merge.rc:2058 #, c-format msgid "Create empty documents (3 panes)\nNew Documents" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2059 #, c-format msgid "" "Open an existing document\n" @@ -3214,7 +3248,7 @@ msgstr "" "³äêðèòè ³ñíóþ÷èé äîêóìåíò\n" "³äêðèòè (Ctrl+O)" -#: Merge.rc:2046 +#: Merge.rc:2060 #, c-format msgid "" "Close the active document\n" @@ -3223,7 +3257,7 @@ msgstr "" "Çàêðèòè àêòèâíèé äîêóìåíò\n" "Çàêðèòè" -#: Merge.rc:2047 +#: Merge.rc:2061 #, c-format msgid "" "Save the active document\n" @@ -3232,7 +3266,7 @@ msgstr "" "Çáåðåãòè àêòèâíèé äîêóìåíò\n" "Çáåðåãòè (Ctrl+S)" -#: Merge.rc:2048 +#: Merge.rc:2062 #, c-format msgid "" "Save the active document with a new name\n" @@ -3241,7 +3275,7 @@ msgstr "" "Çáåðåãòè àêòèâíèé äîêóìåíò ï³ä íîâèì ³ì'ÿì\n" "Çáåðåãòè ï³ä íîâèì ³ì'ÿì" -#: Merge.rc:2049 +#: Merge.rc:2063 #, c-format msgid "" "Change the printing options\n" @@ -3250,7 +3284,7 @@ msgstr "" "Çì³íèòè íàëàøòóâàííÿ äðóêó\n" "Íàëàøòóâàííÿ ñòîð³íêè" -#: Merge.rc:2050 +#: Merge.rc:2064 #, c-format msgid "" "Change the printer and printing options\n" @@ -3259,7 +3293,7 @@ msgstr "" "Çì³íèòè íàëàøòóâàííÿ äðóêà÷à ³ äðóêó\n" "Íàëàøòóâàííÿ äðóêó" -#: Merge.rc:2051 +#: Merge.rc:2065 #, c-format msgid "" "Print the active document\n" @@ -3268,7 +3302,7 @@ msgstr "" "Äðóêóâàòè àêòèâíèé äîêóìåíò\n" "Äðóêóâàòè" -#: Merge.rc:2052 +#: Merge.rc:2066 #, c-format msgid "" "Display full pages\n" @@ -3277,27 +3311,27 @@ msgstr "" "Ïîêàçóâàòè ïîâí³ ñòîð³íêè\n" "Ïîïåðåäí³é ïåðåãëÿä" -#: Merge.rc:2057 +#: Merge.rc:2071 #, c-format msgid "Make all hidden items visible again" msgstr "Ïîêàçàòè âñ³ ñõîâàí³ åëåìåíòè" -#: Merge.rc:2058 +#: Merge.rc:2072 #, c-format msgid "Toggle tree mode" msgstr "Ïåðåìêíóòè ðåæèì äåðåâà" -#: Merge.rc:2059 +#: Merge.rc:2073 #, c-format msgid "Expand all subfolders" msgstr "Ðîçãîðíóòè âñ³ ï³äòåêè" -#: Merge.rc:2060 +#: Merge.rc:2074 #, c-format msgid "Collapse all subfolders" msgstr "Çãîðíóòè âñ³ ï³äòåêè" -#: Merge.rc:2066 +#: Merge.rc:2080 #, c-format msgid "" "Open project file\n" @@ -3306,32 +3340,32 @@ msgstr "" "³äêðèòè ôàéë ïðîåêòó\n" "Ôàéë ïðîåêòó (Ctrl+J)" -#: Merge.rc:2067 +#: Merge.rc:2081 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåâ³äîìà ïîìèëêà ïðè â³äêðèòò³ ôàéëó ïðîåêòó" -#: Merge.rc:2068 +#: Merge.rc:2082 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåâ³äîìà ïîìèëêà ïðè çáåðåæåíí³ ôàéëó ïðîåêòó" -#: Merge.rc:2069 +#: Merge.rc:2083 #, c-format msgid "Project File" msgstr "Ôàéë ïðîåêòó" -#: Merge.rc:2070 +#: Merge.rc:2084 #, c-format msgid "Project file successfully loaded." msgstr "Ôàéë ïðîåêòó óñï³øíî çàâàíòàæåíèé." -#: Merge.rc:2071 +#: Merge.rc:2085 #, c-format msgid "Project file successfully saved." msgstr "Ôàéë ïðîåêòó óñï³øíî çáåðåæåíèé." -#: Merge.rc:2072 +#: Merge.rc:2086 #, c-format msgid "" "Save current paths and options to project file\n" @@ -3340,7 +3374,7 @@ msgstr "" "Çáåðåãòè ïîòî÷í³ øëÿõè ³ íàëàøòóâàííÿ â ôàéë ïðîåêòó\n" "Çáåðåãòè ôàéë ïðîåêòó" -#: Merge.rc:2077 +#: Merge.rc:2091 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -3349,7 +3383,7 @@ msgstr "" "Ïîêàçàòè ³íôîðìàö³þ ïðî ïðîãðàìó, íîìåð âåðñ³¿ ³ êîï³ðàéò\n" "Ïðî ïðîãðàìó" -#: Merge.rc:2078 +#: Merge.rc:2092 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -3358,27 +3392,27 @@ msgstr "" "Âèéòè ç ïðîãðàìè; çàïèòàòè ïðî çáåðåæåííÿ äîêóìåíò³â\n" "Âèéòè" -#: Merge.rc:2084 -#: Merge.rc:2085 -#: Merge.rc:2086 -#: Merge.rc:2087 -#: Merge.rc:2088 -#: Merge.rc:2089 -#: Merge.rc:2090 -#: Merge.rc:2091 -#: Merge.rc:2092 -#: Merge.rc:2093 -#: Merge.rc:2094 -#: Merge.rc:2095 -#: Merge.rc:2096 -#: Merge.rc:2097 #: Merge.rc:2098 #: Merge.rc:2099 +#: Merge.rc:2100 +#: Merge.rc:2101 +#: Merge.rc:2102 +#: Merge.rc:2103 +#: Merge.rc:2104 +#: Merge.rc:2105 +#: Merge.rc:2106 +#: Merge.rc:2107 +#: Merge.rc:2108 +#: Merge.rc:2109 +#: Merge.rc:2110 +#: Merge.rc:2111 +#: Merge.rc:2112 +#: Merge.rc:2113 #, c-format msgid "Open this document" msgstr "³äêðèòè öåé äîêóìåíò" -#: Merge.rc:2104 +#: Merge.rc:2118 #, c-format msgid "" "Switch to the next window pane\n" @@ -3387,7 +3421,7 @@ msgstr "" "Ïåðåìêíóòèñÿ íà íàñòóïíó â³êîííó ïàíåëü\n" "Íàñòóïíà ïàíåëü" -#: Merge.rc:2105 +#: Merge.rc:2119 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -3396,7 +3430,7 @@ msgstr "" "Ïåðåìêíóòèñÿ íà ïîïåðåäíþ â³êîííó ïàíåëü\n" "Ïîïåðåäíÿ ïàíåëü" -#: Merge.rc:2111 +#: Merge.rc:2125 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -3405,7 +3439,7 @@ msgstr "" "Ðîçòàøóâàòè â³êíà êàñêàäîì ç ïåðåêðèòòÿì\n" "³êíà êàñêàäîì" -#: Merge.rc:2112 +#: Merge.rc:2126 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -3414,7 +3448,7 @@ msgstr "" "Ðîçòàøóâàòè â³êíà ãîðèçîíòàëüíîþ ÷åðåïèöåþ, ÿêà íå ïåðåêðèâàºòüñÿ,\n" "³êíà ÷åðåïèöåþ" -#: Merge.rc:2113 +#: Merge.rc:2127 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -3423,7 +3457,7 @@ msgstr "" "Ðîçòàøóâàòè â³êíà âåðòèêàëüíîþ ÷åðåïèöåþ, ÿêà íå ïåðåêðèâàºòüñÿ,\n" "³êíà âåðòèêàëüíîþ ÷åðåïèöåþ" -#: Merge.rc:2119 +#: Merge.rc:2133 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -3432,7 +3466,7 @@ msgstr "" "Ñêîï³þâàòè â áóôåð îáì³íó\n" "Êîï³þâàòè" -#: Merge.rc:2120 +#: Merge.rc:2134 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -3441,7 +3475,7 @@ msgstr "" "Âèð³çàòè ³ ïîì³ñòèòè â áóôåð îáì³íó\n" "Âèð³çàòè" -#: Merge.rc:2121 +#: Merge.rc:2135 #, c-format msgid "" "Find the specified text\n" @@ -3450,7 +3484,7 @@ msgstr "" "Çíàéòè çàçíà÷åíèé òåêñò\n" "Çíàéòè" -#: Merge.rc:2122 +#: Merge.rc:2136 #, c-format msgid "" "Insert Clipboard contents\n" @@ -3459,7 +3493,7 @@ msgstr "" "Âñòàâèòè âì³ñò áóôåðà îáì³íó\n" "Âñòàâèòè" -#: Merge.rc:2123 +#: Merge.rc:2137 #, c-format msgid "" "Repeat the last action\n" @@ -3468,7 +3502,7 @@ msgstr "" "Ïîâòîðèòè îñòàííþ ä³þ\n" "Ïîâòîðèòè" -#: Merge.rc:2124 +#: Merge.rc:2138 #, c-format msgid "" "Replace specific text with different text\n" @@ -3477,7 +3511,7 @@ msgstr "" "Çàì³íèòè çàçíà÷åíèé òåêñò íà ³íøèé\n" "Çàì³íèòè" -#: Merge.rc:2125 +#: Merge.rc:2139 #, c-format msgid "" "Select the entire document\n" @@ -3486,7 +3520,7 @@ msgstr "" "³äçíà÷èòè âåñü äîêóìåíò\n" "³äçíà÷èòè âñå" -#: Merge.rc:2126 +#: Merge.rc:2140 #, c-format msgid "" "Undo the last action\n" @@ -3495,7 +3529,7 @@ msgstr "" "Ñêàñóâàòè îñòàííþ ä³þ\n" "Ñêàñóâàòè" -#: Merge.rc:2127 +#: Merge.rc:2141 #, c-format msgid "" "Redo the previously undone action\n" @@ -3504,7 +3538,7 @@ msgstr "" "Ïîâåðíóòè ñêàñîâàíó ä³þ\n" "³äíîâèòè" -#: Merge.rc:2133 +#: Merge.rc:2147 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3513,7 +3547,7 @@ msgstr "" "Ïîêàçàòè àáî ñõîâàòè ïàíåëü ³íñòðóìåíò³â\n" "Ïàíåëü ³íñòðóìåíò³â" -#: Merge.rc:2134 +#: Merge.rc:2148 #, c-format msgid "" "Show or hide the status bar\n" @@ -3522,7 +3556,7 @@ msgstr "" "Ïîêàçàòè àáî ñõîâàòè ðÿäîê ñòàíó\n" "Ðÿäîê ñòàíó" -#: Merge.rc:2135 +#: Merge.rc:2149 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3531,7 +3565,7 @@ msgstr "" "Ïîêàçàòè àáî ñõîâàòè ïàíåëü çàêëàäîê\n" "Ïàíåëü çàêëàäîê" -#: Merge.rc:2136 +#: Merge.rc:2150 #, c-format msgid "" "Automatically resize panes\n" @@ -3540,57 +3574,57 @@ msgstr "" "Àâòîìàòè÷íî çì³íþâàòè ðîçì³ð ïàíåëåé\n" "Çàáëîêóâàòè ïàíåë³" -#: Merge.rc:2142 +#: Merge.rc:2156 #, c-format msgid "Change the window size" msgstr "Çì³íèòè ðîçì³ð â³êíà" -#: Merge.rc:2143 +#: Merge.rc:2157 #, c-format msgid "Change the window position" msgstr "Çì³íèòè ïîëîæåííÿ â³êíà" -#: Merge.rc:2144 +#: Merge.rc:2158 #, c-format msgid "Reduce the window to an icon" msgstr "Çãîðíóòè â³êíî äî ï³êòîãðàìè" -#: Merge.rc:2145 +#: Merge.rc:2159 #, c-format msgid "Enlarge the window to full size" msgstr "Ðîçãîðíóòè â³êíî äî ìàêñèìóìó" -#: Merge.rc:2146 +#: Merge.rc:2160 #, c-format msgid "Switch to the next document window" msgstr "Ïåðåìêíóòèñÿ íà íàñòóïíèé äîêóìåíò" -#: Merge.rc:2147 +#: Merge.rc:2161 #, c-format msgid "Switch to the previous document window" msgstr "Ïåðåìêíóòèñÿ íà ïîïåðåäí³é äîêóìåíò" -#: Merge.rc:2148 +#: Merge.rc:2162 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Çàêðèòè àêòèâíå â³êíî ³ çàïèòàòè ïðî çáåðåæåííÿ äîêóìåíò³â" -#: Merge.rc:2153 +#: Merge.rc:2167 #, c-format msgid "Restore the window to normal size" msgstr "³äíîâèòè íîðìàëüí³ ðîçì³ðè â³êíà" -#: Merge.rc:2154 +#: Merge.rc:2168 #, c-format msgid "Activate Task List" msgstr "Àêòèâóâàòè ñïèñîê çàâäàíü" -#: Merge.rc:2155 +#: Merge.rc:2169 #, c-format msgid "Activate this window" msgstr "Àêòèâóâàòè öå â³êíî" -#: Merge.rc:2161 +#: Merge.rc:2175 #, c-format msgid "" "Close print preview mode\n" @@ -3599,7 +3633,7 @@ msgstr "" "Çàêðèòè â³êíî ïîïåðåäíüîãî ïåðåãëÿäó\n" "Ñêàñóâàòè ïîïåðåäí³é ïåðåãëÿä" -#: Merge.rc:2168 +#: Merge.rc:2182 #, c-format msgid "" "\n" @@ -3618,7 +3652,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Ïîð³âíÿííÿ ôàéë³â" -#: Merge.rc:2169 +#: Merge.rc:2183 #, c-format msgid "" "\n" @@ -3637,19 +3671,19 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Ïîð³âíÿííÿ òåê" -#: Merge.rc:2176 +#: Merge.rc:2190 #, c-format msgid "Preserve original EOL chars" msgstr "Çáåð³ãàòè îðèã³íàëüí³ ñèìâîëè çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:2188 -#: Merge.rc:2189 -#: Merge.rc:2190 +#: Merge.rc:2202 +#: Merge.rc:2203 +#: Merge.rc:2204 #, c-format msgid "Right click on the path to copy" msgstr "Êëàöàííÿ ïðàâîþ ïî øëÿõó, ùîá ñêîï³þâàòè" -#: Merge.rc:2196 +#: Merge.rc:2210 #, c-format msgid "" "Developers:\n" @@ -3658,143 +3692,143 @@ msgstr "" "Ðîçðîáíèêè:\n" "ijí Ãð³ì (Dean Grimm), Êð³ñò³àí ˳ñò (Christian List), ʳìî Âàð³ñ (Kimmo Varis), Éîõåí Òóõò (Jochen Tucht), Ò³ì Ãåðóíäò (Tim Gerundt), Òàêàø³ Ñàâàíàê³ (Takashi Sawanaki), Ãåë Õàìåð (Gal Hammer), Îëåêñàíäð Ñê³ííåð (Alexander Skinner)" -#: Merge.rc:2197 +#: Merge.rc:2211 #, 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 ïîñòàâëÿºòüñÿ ÁÅÇ ÁÓÄÜ-ßÊί ÃÀÐÀÍÒ²¯. Öå â³ëüíå ÏÎ ³ ìè ïðèâ³òàºìî éîãî ïîøèðåííÿ çã³äíî äåÿêèõ óìîâ; îçíàéîìòåñÿ ç GNU General Public License â ìåíþ Äîâ³äêà äëÿ äîêëàäí³øî¿ ³íôîðìàö³¿." -#: Merge.rc:2205 +#: Merge.rc:2219 #, c-format msgid "&Abort" msgstr "&Ïåðåðâàòè" -#: Merge.rc:2206 +#: Merge.rc:2220 #, c-format msgid "&Retry" msgstr "Ïîâ&òîðþâàòè" -#: Merge.rc:2207 +#: Merge.rc:2221 #, c-format msgid "&Ignore" msgstr "&Íåõòóâàòè" -#: Merge.rc:2208 +#: Merge.rc:2222 #, c-format msgid "Ignore &all" msgstr "Íåõòóâàòè &âñ³ì" -#: Merge.rc:2209 +#: Merge.rc:2223 #, c-format msgid "&Yes" msgstr "&Òàê" -#: Merge.rc:2215 +#: Merge.rc:2229 #, c-format msgid "Yes to &all" msgstr "Ò&àê äëÿ âñ³õ" -#: Merge.rc:2216 +#: Merge.rc:2230 #, c-format msgid "&No" msgstr "&ͳ" -#: Merge.rc:2217 +#: Merge.rc:2231 #, c-format msgid "No to a&ll" msgstr "ͳ ä&ëÿ âñ³õ" -#: Merge.rc:2218 +#: Merge.rc:2232 #, c-format msgid "&Continue" msgstr "Ïðî&äîâæèòè" -#: Merge.rc:2219 +#: Merge.rc:2233 #, c-format msgid "&Skip" msgstr "Ï&ðîïóñòèòè" -#: Merge.rc:2220 +#: Merge.rc:2234 #, c-format msgid "Skip &all" msgstr "Ïðîï&óñòèòè âñå" -#: Merge.rc:2222 +#: Merge.rc:2236 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçóâàòè &öå ïîâ³äîìëåííÿ çíîâó " -#: Merge.rc:2223 +#: Merge.rc:2237 #, c-format msgid "Don't ask this &question again." msgstr "Íå çàäàâàòè &öå çàïèòàííÿ çíîâó" -#: Merge.rc:2234 +#: Merge.rc:2248 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2250 #, c-format msgid "Version Control" msgstr "Êîíòðîëü âåðñ³é" -#: Merge.rc:2241 -#: Merge.rc:2622 +#: Merge.rc:2255 +#: Merge.rc:2637 #, c-format msgid "Differences" msgstr "³äì³ííîñò³" -#: Merge.rc:2251 +#: Merge.rc:2266 #, c-format msgid "To:" msgstr "Íà:" -#: Merge.rc:2252 +#: Merge.rc:2267 #, c-format msgid "From left:" msgstr "Çë³âà:" -#: Merge.rc:2253 +#: Merge.rc:2268 #, c-format msgid "To left:" msgstr "˳âîðó÷:" -#: Merge.rc:2254 +#: Merge.rc:2269 #, c-format msgid "From right:" msgstr "Ñïðàâà:" -#: Merge.rc:2255 +#: Merge.rc:2270 #, c-format msgid "To right:" msgstr "Ïðàâîðó÷:" -#: Merge.rc:2261 +#: Merge.rc:2276 #, c-format msgid "Version %1" msgstr "Âåðñ³ÿ %1" -#: Merge.rc:2262 +#: Merge.rc:2277 #, c-format msgid "Unicode" msgstr "Þí³êîä" -#: Merge.rc:2263 +#: Merge.rc:2278 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2269 +#: Merge.rc:2284 #, c-format msgid "Options (%1)" msgstr "Íàëàøòóâàííÿ (%1)" -#: Merge.rc:2270 +#: Merge.rc:2285 #, c-format msgid "All message boxes are now displayed again." msgstr "Òåïåð âñ³ ïîâ³äîìëåííÿ çíîâó â³äîáðàæàòèìóòüñÿ." -#: Merge.rc:2272 +#: Merge.rc:2287 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3805,84 +3839,84 @@ msgstr "" "\n" "Âèêîðèñòàéòå çíà÷åííÿ 1 - %1." -#: Merge.rc:2278 +#: Merge.rc:2293 #, c-format msgid "Open" msgstr "³äêðèòè" -#: Merge.rc:2279 +#: Merge.rc:2294 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàìè|*.exe;*.bat;*.cmd|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2280 +#: Merge.rc:2295 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2281 +#: Merge.rc:2296 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Ôàéëè ïðîåêò³â WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëè êîíô³ãóðàö³¿ (*.ini)|*.ini|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2289 +#: Merge.rc:2304 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Òåêñòîâ³ ôàéëè (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2290 +#: Merge.rc:2305 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Ôàéëè HTML (*.htm,*.html)|*.htm;*.html|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2291 +#: Merge.rc:2306 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Ôàéëè XML (*.xml)|*.xml|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2308 -#: Merge.rc:2858 +#: Merge.rc:2323 +#: Merge.rc:2873 #, c-format msgid "Name" msgstr "²ì'ÿ" -#: Merge.rc:2309 +#: Merge.rc:2324 #, c-format msgid "Location" msgstr "̳ñöå ðîçòàøóâàííÿ" -#: Merge.rc:2310 +#: Merge.rc:2325 #, c-format msgid "Filters" msgstr "Ô³ëüòðè" -#: Merge.rc:2311 +#: Merge.rc:2326 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2312 -#: Merge.rc:2860 +#: Merge.rc:2327 +#: Merge.rc:2875 #, c-format msgid "Description" msgstr "Îïèñ" -#: Merge.rc:2313 +#: Merge.rc:2328 #, c-format msgid "Select filename for new filter" msgstr "Âêàæ³òü ³ì'ÿ ôàéëó äëÿ íîâîãî ô³ëüòðà" -#: Merge.rc:2314 +#: Merge.rc:2329 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëè ô³ëüòð³â (*.flt)|*.flt|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2316 +#: Merge.rc:2331 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3895,7 +3929,7 @@ msgstr "" "Ñêîï³þéòå ôàéë %1 ó òåêó ç ô³ëüòðàìè:\n" "%2." -#: Merge.rc:2318 +#: Merge.rc:2333 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3908,7 +3942,7 @@ msgstr "" "\n" "Ïåðåêîíàéòåñÿ, ùî òåêà ³ñíóº ³ äîñòóïíà äëÿ çàïèñóâàííÿ." -#: Merge.rc:2320 +#: Merge.rc:2335 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3919,7 +3953,7 @@ msgstr "" "\n" "Âêàæ³òü òåêó ç ô³ëüòðàìè íà âêëàäö³ Ñèñòåìà â Íàëàøòóâàííÿõ." -#: Merge.rc:2322 +#: Merge.rc:2337 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3932,12 +3966,12 @@ msgstr "" "\n" "Ìîæëèâî ôàéë âèêîðèñòîâóºòüñÿ." -#: Merge.rc:2323 +#: Merge.rc:2338 #, c-format msgid "Locate filter file to install" msgstr "Âêàçàòè ôàéë ô³ëüòðà" -#: Merge.rc:2325 +#: Merge.rc:2340 #, c-format msgid "" "Installing filter file failed.\n" @@ -3948,17 +3982,17 @@ msgstr "" "\n" "Íåìîæëèâî ñêîï³þâàòè ôàéë ô³ëüòðà â òåêó ç ô³ëüòðàìè." -#: Merge.rc:2327 +#: Merge.rc:2342 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ô³ëüòð óæå ³ñíóº. Ïåðåçàïèñàòè?" -#: Merge.rc:2333 +#: Merge.rc:2348 #, c-format msgid "Regular expression" msgstr "Ðåãóëÿðíèé âèðàç" -#: Merge.rc:2339 +#: Merge.rc:2354 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3969,258 +4003,258 @@ msgstr "" "\n" "ßêùî âè íå õî÷åòå ïîíîâëþâàòè âñ³ ïîð³âíÿííÿ çàðàç, Âè ìîæåòå âèáðàòè ͳ ³ ïîíîâèòè ¿õ çãîäîì." -#: Merge.rc:2346 +#: Merge.rc:2361 #, c-format msgid "&Path to SS.EXE:" msgstr "&Øëÿõ äî SS.EXE:" -#: Merge.rc:2352 +#: Merge.rc:2367 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëüòàòè ïîð³âíÿííÿ òåê" -#: Merge.rc:2353 +#: Merge.rc:2368 #, c-format msgid "File Comparison" msgstr "Ïîð³âíÿííÿ ôàéë³â" -#: Merge.rc:2354 +#: Merge.rc:2369 #, c-format msgid "Untitled left" msgstr "Áåç³ìåííèé ë³âîðó÷" -#: Merge.rc:2355 +#: Merge.rc:2370 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2371 #, c-format msgid "Untitled right" msgstr "Áåç³ìåííèé ïðàâîðó÷" -#: Merge.rc:2357 +#: Merge.rc:2372 #, c-format msgid "Theirs File" msgstr "¯õé ôàéë" -#: Merge.rc:2358 +#: Merge.rc:2373 #, c-format msgid "Mine File" msgstr "̳é ôàéë" -#: Merge.rc:2364 +#: Merge.rc:2379 #, c-format msgid "Scanning files..." msgstr "Ñêàíóâàííÿ ôàéë³â..." -#: Merge.rc:2365 +#: Merge.rc:2380 #, c-format msgid "Opening selection" msgstr "³äêðèâàþ âèáðàíå" -#: Merge.rc:2366 +#: Merge.rc:2381 #, c-format msgid "Copying Left to Right" msgstr "Êîï³þâàííÿ çë³âà ïðàâîðó÷" -#: Merge.rc:2367 +#: Merge.rc:2382 #, c-format msgid "Copying Right to Left" msgstr "Êîï³þâàííÿ ñïðàâà ë³âîðó÷" -#: Merge.rc:2368 +#: Merge.rc:2383 #, c-format msgid "Copying Left to Middle" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2384 #, c-format msgid "Copying Right to Middle" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2385 #, c-format msgid "Copying From Left" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2386 #, c-format msgid "Copying From Right" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2387 #, c-format msgid "Copying All to Left" msgstr "Êîï³þâàííÿ âñ³õ ôàéë³â ë³âîðó÷" -#: Merge.rc:2373 +#: Merge.rc:2388 #, c-format msgid "Copying All to Right" msgstr "Êîï³þâàííÿ âñ³õ ôàéë³â ïðàâîðó÷" -#: Merge.rc:2374 +#: Merge.rc:2389 #, c-format msgid "Copying files..." msgstr "Êîï³þâàííÿ ôàéë³â..." -#: Merge.rc:2375 +#: Merge.rc:2390 #, c-format msgid "Deleting files..." msgstr "Âèëó÷åííÿ ôàéë³â..." -#: Merge.rc:2376 +#: Merge.rc:2391 #, c-format msgid "Moving files..." msgstr "Ïåðåì³ùåííÿ ôàéë³â..." -#: Merge.rc:2377 +#: Merge.rc:2392 #, c-format msgid "Creating the report..." msgstr "Ñòâîðþºòüñÿ çâ³ò..." -#: Merge.rc:2378 +#: Merge.rc:2393 #, c-format msgid "Undoing the last operation..." msgstr "Ñêàñóâàííÿ îñòàííüî¿ ä³¿..." -#: Merge.rc:2379 +#: Merge.rc:2394 #, c-format msgid "Redoing the previous operation..." msgstr "Ïîâòîðåííÿ îñòàííüî¿ ä³¿..." -#: Merge.rc:2380 +#: Merge.rc:2395 #, c-format msgid "Doing Auto Merge..." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2401 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2402 #, c-format msgid "Line: %s" msgstr "Ðÿäîê: %s" -#: Merge.rc:2388 +#: Merge.rc:2403 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2404 #, c-format msgid "Merge" msgstr "Îá'ºäíàííÿ" -#: Merge.rc:2390 +#: Merge.rc:2405 #, c-format msgid "Difference %1 of %2" msgstr "³äì³íí³ñòü %1 ç %2" -#: Merge.rc:2391 +#: Merge.rc:2406 #, c-format msgid "%1 Differences Found" msgstr "%1 â³äì³ííîñòåé çíàéøëîñÿ" -#: Merge.rc:2392 +#: Merge.rc:2407 #, c-format msgid "1 Difference Found" msgstr "Çíàéäåíà âñüîãî îäíà â³äì³íí³ñòü" #. Abbreviation from "Read Only" -#: Merge.rc:2393 +#: Merge.rc:2408 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2399 +#: Merge.rc:2414 #, c-format msgid "Item %1 of %2" msgstr "Åëåìåíò %1 ç %2" -#: Merge.rc:2400 +#: Merge.rc:2415 #, c-format msgid "Items: %1" msgstr "Åëåìåíò³â: %1" -#: Merge.rc:2406 +#: Merge.rc:2421 #, c-format msgid "Select two existing folders or files to compare" msgstr "Âèáåð³òü äâ³ ²ÑÍÓÞײ òåêè àáî ôàéëè äëÿ ïîð³âíÿííÿ" -#: Merge.rc:2407 +#: Merge.rc:2422 #, c-format msgid "Folder Selection" msgstr "Âèá³ð òåêè" -#: Merge.rc:2408 +#: Merge.rc:2423 #, c-format msgid "Select two folders or two files to compare." msgstr "Âèáåð³òü äëÿ ïîð³âíÿííÿ äâ³ òåêè àáî ôàéëè" -#: Merge.rc:2409 +#: Merge.rc:2424 #, c-format msgid "Left path is invalid!" msgstr "Øëÿõ çë³âà çàçíà÷åíèé íåïðàâèëüíî " -#: Merge.rc:2410 +#: Merge.rc:2425 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2426 #, c-format msgid "Right path is invalid!" msgstr "Øëÿõ ñïðàâà çàçíà÷åíèé íåïðàâèëüíî " -#: Merge.rc:2412 +#: Merge.rc:2427 #, c-format msgid "Both paths are invalid!" msgstr "Îáèäâà øëÿõè çàçíà÷åí³ íåïðàâèëüíî " -#: Merge.rc:2413 +#: Merge.rc:2428 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2429 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2430 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2431 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2432 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Âèáåð³òü äâà ôàéëè, ùîá ââ³ìêíóòè âèá³ð ðîçïàêóâàëüíèêà" -#: Merge.rc:2418 +#: Merge.rc:2433 #, c-format msgid "Cannot compare file and folder!" msgstr "Íåìîæëèâå ïîð³âíÿííÿ ôàéëó ³ òåêè!" -#: Merge.rc:2424 +#: Merge.rc:2439 #, c-format msgid "File not found: %1" msgstr "Ôàéë íå çíàéäåíèé: %1" -#: Merge.rc:2425 +#: Merge.rc:2440 #, c-format msgid "File not unpacked: %1" msgstr "Ôàéë íå ðîçïàêîâàíèé: %1" -#: Merge.rc:2426 +#: Merge.rc:2441 #, c-format msgid "" "Cannot open file\n" @@ -4233,12 +4267,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2427 +#: Merge.rc:2442 #, c-format msgid "Failed to parse conflict file." msgstr "Ïîìèëêà ðîçáèðàííÿ ôàéëó êîíôë³êò³â" -#: Merge.rc:2428 +#: Merge.rc:2443 #, c-format msgid "" "The file\n" @@ -4249,27 +4283,27 @@ msgstr "" "%1\n" "íå º ôàéëîì êîíôë³êò³â" -#: Merge.rc:2434 +#: Merge.rc:2449 #, c-format msgid "Save As" msgstr "Çáåðåãòè ÿê..." -#: Merge.rc:2435 +#: Merge.rc:2450 #, c-format msgid "Save changes to %1?" msgstr "Çáåðåãòè çì³íè â %1?" -#: Merge.rc:2436 +#: Merge.rc:2451 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 ïîçíà÷åíèé ÿê ëèøå äëÿ ÷èòàííÿ. ×è çãîäí³ âè çàì³íèòè öåé ôàéë ? (Íå äîçâîëÿº âêàçàòè íîâå ³ì'ÿ ôàéëó)" -#: Merge.rc:2437 +#: Merge.rc:2452 #, c-format msgid "Error backing up file" msgstr "Ïîìèëêà ñòâîðåííÿ ðåçåðâíî¿ êîﳿ" -#: Merge.rc:2439 +#: Merge.rc:2454 #, c-format msgid "" "Unable to backup original file:\n" @@ -4282,7 +4316,7 @@ msgstr "" "\n" "Ïðîäîâæèòè â áóäü-ÿêîìó âèïàäêó?" -#: Merge.rc:2440 +#: Merge.rc:2455 #, c-format msgid "" "Saving file failed.\n" @@ -4299,7 +4333,7 @@ msgstr "" "\t-âèêîðèñòàòè ³íøå ³ì'ÿ ôàéëó (Íàòèñí³òü OÊ)\n" "\t-ñêàñóâàòè ïîòî÷íó îïåðàö³þ (Íàòèñí³òü Ñêàñóâàòè)?" -#: Merge.rc:2441 +#: Merge.rc:2456 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -4314,7 +4348,7 @@ msgstr "" "\n" "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?" -#: Merge.rc:2442 +#: Merge.rc:2457 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -4329,7 +4363,7 @@ msgstr "" "\n" "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?" -#: Merge.rc:2443 +#: Merge.rc:2458 #, c-format msgid "" "Another application has updated file\n" @@ -4344,14 +4378,14 @@ msgstr "" "\n" "Ïåðåçàïèñàòè çì³íåíèé ôàéë?" -#: Merge.rc:2444 +#: Merge.rc:2459 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 ïîçíà÷åíèé ÿê ëèøå äëÿ ÷èòàííÿ. ×è çãîäí³ âè çàì³íèòè öåé ôàéë?" -#: Merge.rc:2445 +#: Merge.rc:2460 #, c-format msgid "" "Another application has updated file\n" @@ -4366,22 +4400,22 @@ msgstr "" "\n" "Âè õî÷åòå ïåðåçàâàíòàæèòè ôàéë?" -#: Merge.rc:2446 +#: Merge.rc:2461 #, c-format msgid "Save Left File As" msgstr "Çáåðåãòè ôàéë ë³âîðó÷ ÿê..." -#: Merge.rc:2447 +#: Merge.rc:2462 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2463 #, c-format msgid "Save Right File As" msgstr "Çáåðåãòè ôàéë ïðàâîðó÷ ÿê..." -#: Merge.rc:2449 +#: Merge.rc:2464 #, c-format msgid "" "The file\n" @@ -4392,7 +4426,7 @@ msgstr "" "%1\n" "âèëó÷àºòüñÿ. Çáåðåæ³òü êîï³þ ôàéëó äëÿ ïðîäîâæåííÿ." -#: Merge.rc:2455 +#: Merge.rc:2470 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -4403,42 +4437,42 @@ msgstr "" "\n" "Îíîâ³òü äîêóìåíòè ïåðåä ïðîäîâæåííÿì." -#: Merge.rc:2461 +#: Merge.rc:2476 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Ùîá ïðîäîâæèòè, Âè ìàºòå âêàçàòè øëÿõ äî ïðîåêòó SourceSafe (íàïðèêëàä: $/MyProject)" -#: Merge.rc:2462 +#: Merge.rc:2477 #, c-format msgid "Checkout files from VSS..." msgstr "Îòðèìóºìî ôàéëè ç VSS..." -#: Merge.rc:2463 +#: Merge.rc:2478 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåìà êîíòðîëþ âåðñ³é âèÿâèëà ïîìèëêó ïðè ñïðîá³ âçÿòè ôàéë ï³ä êîíòðîëü. Íåìà ìîæëèâîñò³ ïðîäîâæóâàòè..." -#: Merge.rc:2464 +#: Merge.rc:2479 #, c-format msgid "Error executing versioning system command." msgstr "Ïîìèëêà âèêîíàííÿ ñèñòåìíî¿ êîìàíäè Ñèñòåìè êîíòðîëþ âåðñ³é." -#: Merge.rc:2465 +#: Merge.rc:2480 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ðîáî÷à òåêà VSS ³ ðîçòàøóâàííÿ ì³ñöå ïîòî÷íîãî ôàéëó íå ñï³âïàäàþòü. Ïðîäîâæèòè ?" -#: Merge.rc:2466 +#: Merge.rc:2481 #, c-format msgid "No VSS database(s) found!" msgstr "Íå çíàéäåíà áàçà äàíèõ VSS!" -#: Merge.rc:2467 +#: Merge.rc:2482 #, c-format msgid "Error from VSS:" msgstr "Ïîìèëêà VSS:" -#: Merge.rc:2468 +#: Merge.rc:2483 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -4449,7 +4483,7 @@ msgstr "" " Ïåðåâ³ðòå íàëàøòóâàííÿ.\n" " Ñêàñóâàòè ä³þ?" -#: Merge.rc:2469 +#: Merge.rc:2484 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -4458,164 +4492,164 @@ msgstr "" "VSS çíàéøëà ïîìèëêó ïðè ñïðîá³ ñêàñóâàííÿ 䳿.\n" "Ïåðåâ³ðòå íàëàøòóâàííÿ. " -#: Merge.rc:2475 -#: Merge.rc:2842 +#: Merge.rc:2490 +#: Merge.rc:2857 #, c-format msgid "None" msgstr "Íåìà" -#: Merge.rc:2476 +#: Merge.rc:2491 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìåíøå, í³æ 5.0)" -#: Merge.rc:2477 +#: Merge.rc:2492 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ³ âèùå)" -#: Merge.rc:2479 +#: Merge.rc:2494 #, c-format msgid "Break at whitespace" msgstr "Ðîçáèâàòè çà ïðîïóñêàìè" -#: Merge.rc:2480 +#: Merge.rc:2495 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ðîçáèâàòè çà ïðîïóñêàìè ³ ñèìâîëàìè ïóíêòóàö³¿" -#: Merge.rc:2486 -#: Merge.rc:2488 +#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "Copy selected item to named directory" msgstr "Ñêîï³þâàòè âèáðàí³ ôàéëè â çàçíà÷åíó òåêó" -#: Merge.rc:2487 -#: Merge.rc:2489 +#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "Copy selected item to custom directory" msgstr "Ñêîï³þâàòè âèáðàí³ ôàéëè â çàçíà÷åíó òåêó" -#: Merge.rc:2490 +#: Merge.rc:2505 #, c-format msgid "Delete selected item on left" msgstr "Âèëó÷èòè âèáðàíèé åëåìåíò ë³âîðó÷" -#: Merge.rc:2491 +#: Merge.rc:2506 #, c-format msgid "Delete selected item on right" msgstr "Âèëó÷èòè âèáðàíèé åëåìåíò ïðàâîðó÷" -#: Merge.rc:2492 +#: Merge.rc:2507 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Âèëó÷èòè âèáðàí³ åëåìåíòè ç îáîõ ñòîð³í" -#: Merge.rc:2493 +#: Merge.rc:2508 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ñõîâàòè âèáðàí³ åëåìåíòè (øâèäêèé ô³ëüòð)" -#: Merge.rc:2494 +#: Merge.rc:2509 #, c-format msgid "Rename selected item on both sides" msgstr "Ïåðåéìåíóâàòè âèáðàí³ åëåìåíòè ç îáîõ ñòîð³í" -#: Merge.rc:2495 +#: Merge.rc:2510 #, c-format msgid "Right to Left (%1)" msgstr "Ñêîï³þâàòè íà ë³âó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â" -#: Merge.rc:2496 +#: Merge.rc:2511 #, c-format msgid "Left to Right (%1)" msgstr "Ñêîï³þâàòè íà ïðàâó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â" -#: Merge.rc:2497 +#: Merge.rc:2512 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Ñïðàâà ë³âîðó÷ (%1 ç %2)" -#: Merge.rc:2498 +#: Merge.rc:2513 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Çë³âà ïðàâîðó÷ (%1 ç %2)" -#: Merge.rc:2499 #: Merge.rc:2514 +#: Merge.rc:2529 #, c-format msgid "Left to... (%1)" msgstr "Çë³âà... (%1)" -#: Merge.rc:2500 #: Merge.rc:2515 +#: Merge.rc:2530 #, c-format msgid "Right to... (%1)" msgstr "Ñïðàâà... (%1)" -#: Merge.rc:2501 #: Merge.rc:2516 +#: Merge.rc:2531 #, c-format msgid "Left to... (%1 of %2)" msgstr "Çë³âà... (%1 ç %2)" -#: Merge.rc:2502 #: Merge.rc:2517 +#: Merge.rc:2532 #, c-format msgid "Right to... (%1 of %2)" msgstr "Ñïðàâà... (%1 ç %2)" -#: Merge.rc:2508 +#: Merge.rc:2523 #, c-format msgid "Left (%1)" msgstr "˳âîðó÷ (%1)" -#: Merge.rc:2509 +#: Merge.rc:2524 #, c-format msgid "Right (%1)" msgstr "Ïðàâîðó÷ (%1)" -#: Merge.rc:2510 +#: Merge.rc:2525 #, c-format msgid "Both (%1)" msgstr "Îáèäâà (%1)" -#: Merge.rc:2511 +#: Merge.rc:2526 #, c-format msgid "Left (%1 of %2)" msgstr "˳âîðó÷ (%1 ç %2)" -#: Merge.rc:2512 +#: Merge.rc:2527 #, c-format msgid "Right (%1 of %2)" msgstr "Ïðàâîðó÷ (%1 ç %2)" -#: Merge.rc:2513 +#: Merge.rc:2528 #, c-format msgid "Both (%1 of %2)" msgstr "Ðàçîì (%1 ç %2)" -#: Merge.rc:2518 +#: Merge.rc:2533 #, c-format msgid "Left side - select destination folder:" msgstr "˳âà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:" -#: Merge.rc:2519 +#: Merge.rc:2534 #, c-format msgid "Right side - select destination folder:" msgstr "Ïðàâà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:" -#: Merge.rc:2520 +#: Merge.rc:2535 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ôàéë³â îïðàöüîâàí³)" -#: Merge.rc:2521 +#: Merge.rc:2536 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ç %2 ôàéë³â îïðàöüîâàí³)" -#: Merge.rc:2527 +#: Merge.rc:2542 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4626,17 +4660,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2528 +#: Merge.rc:2543 #, c-format msgid "Are you sure you want to copy:" msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè:" -#: Merge.rc:2529 +#: Merge.rc:2544 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè %d åëåìåíò³â:" -#: Merge.rc:2530 +#: Merge.rc:2545 #, c-format msgid "" "Operation aborted!\n" @@ -4655,613 +4689,607 @@ msgstr "" "\n" "Îíîâ³òü ïîð³âíÿííÿ." -#: Merge.rc:2531 +#: Merge.rc:2546 #, c-format msgid "Are you sure you want to move:" msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè:" -#: Merge.rc:2532 +#: Merge.rc:2547 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè %d åëåìåíò³â:" -#: Merge.rc:2534 +#: Merge.rc:2549 #, c-format msgid "Confirm Move" msgstr "ϳäòâåðäæåííÿ ïåðåì³ùåííÿ" -#: Merge.rc:2535 +#: Merge.rc:2550 #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2556 #, c-format msgid "Open left file" msgstr "³äêðèòè ôàéë ë³âîðó÷" -#: Merge.rc:2542 +#: Merge.rc:2557 #, c-format msgid "Open the left file to external editor" msgstr "³äêðèòè ôàéë ë³âîðó÷ â çîâí³øíüîìó ðåäàêòîð³" -#: Merge.rc:2543 +#: Merge.rc:2558 #, c-format msgid "Open left file with ..." msgstr "³äêðèòè ôàéë ë³âîðó÷ çà äîïîìîãîþ ..." -#: Merge.rc:2544 +#: Merge.rc:2559 #, c-format msgid "Open right file" msgstr "³äêðèòè ôàéë ïðàâîðó÷" -#: Merge.rc:2545 +#: Merge.rc:2560 #, c-format msgid "Open the right file to external editor" msgstr "³äêðèòè ôàéë ïðàâîðó÷ â çîâí³øíüîìó ðåäàêòîð³" -#: Merge.rc:2546 +#: Merge.rc:2561 #, c-format msgid "Open right file with..." msgstr "³äêðèòè ôàéë ïðàâîðó÷ çà äîïîìîãîþ..." -#: Merge.rc:2547 +#: Merge.rc:2562 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íåìîæëèâî âèêîíàòè %1" -#: Merge.rc:2548 +#: Merge.rc:2563 #, c-format msgid "Copy filenames to clipboard" msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â â áóôåð îáì³íó" -#: Merge.rc:2549 +#: Merge.rc:2564 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â ç ë³âî¿ ÷àñòèíè â áóôåð îáì³íó" -#: Merge.rc:2550 +#: Merge.rc:2565 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â ç ïðàâî¿ ÷àñòèíè â áóôåð îáì³íó" -#: Merge.rc:2551 +#: Merge.rc:2566 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â ç îáîõ ïàíåëåé ó áóôåð îáì³íó" -#: Merge.rc:2552 +#: Merge.rc:2567 #, c-format msgid "Copy selected left item to clipboard" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2568 #, c-format msgid "Copy selected right item to clipboard" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2574 #, c-format msgid "Left Shell menu" msgstr "˳âå ìåíþ îáîëîíêè" -#: Merge.rc:2560 +#: Merge.rc:2575 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2576 #, c-format msgid "Right Shell menu" msgstr "Ïðàâå ìåíþ îáîëîíêè" -#: Merge.rc:2567 +#: Merge.rc:2582 #, c-format msgid "Unknown archive format" msgstr "Íåâ³äîìèé ôîðìàò àðõ³âó" -#: Merge.rc:2568 +#: Merge.rc:2583 #, c-format msgid "Add items from left side to archive" msgstr "Çààðõ³âóâàòè åëåìåíòè ç ë³âî¿ ñòîðîíè" -#: Merge.rc:2569 +#: Merge.rc:2584 #, c-format msgid "Add items from right side to archive" msgstr "Çààðõ³âóâàòè åëåìåíòè ç ïðàâî¿ ñòîðîíè" -#: Merge.rc:2570 +#: Merge.rc:2585 #, c-format msgid "Add items from both sides to archive" msgstr "Çààðõ³âóâàòè åëåìåíòè ç îáîõ ñòîð³í" -#: Merge.rc:2571 +#: Merge.rc:2586 #, c-format msgid "Add different items to archive (both sides)" msgstr "Çààðõ³âóâàòè äîâ³ëüí³ åëåìåíòè ç îáîõ ñòîð³í" -#: Merge.rc:2573 +#: Merge.rc:2588 #, c-format msgid "Move selected file on left to custom directory" msgstr "Ïåðåì³ñòèòè âèáðàí³ ë³âîðó÷ ôàéëè â ³íøó òåêó" -#: Merge.rc:2575 +#: Merge.rc:2590 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ïåðåì³ñòèòè âèáðàí³ ïðàâîðó÷ ôàéëè â ³íøó òåêó" -#: Merge.rc:2581 +#: Merge.rc:2596 #, c-format msgid "Filename" msgstr "²ì'ÿ ôàéëó" -#: Merge.rc:2583 +#: Merge.rc:2598 #, c-format msgid "Comparison result" msgstr "Ðåçóëüòàò ïîð³âíÿííÿ" -#: Merge.rc:2584 +#: Merge.rc:2599 #, c-format msgid "Left Date" msgstr "Äàòà ë³âîðó÷" -#: Merge.rc:2585 +#: Merge.rc:2600 #, c-format msgid "Right Date" msgstr "Äàòà ïðàâîðó÷" -#: Merge.rc:2586 +#: Merge.rc:2601 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2602 #, c-format msgid "Extension" msgstr "Ðîçøèðåííÿ" -#: Merge.rc:2588 +#: Merge.rc:2603 #, c-format msgid "Left Size" msgstr "Ðîçì³ð ë³âîðó÷" -#: Merge.rc:2589 +#: Merge.rc:2604 #, c-format msgid "Right Size" msgstr "Ðîçì³ð ïðàâîðó÷" -#: Merge.rc:2590 +#: Merge.rc:2605 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2606 #, c-format msgid "Right Size (Short)" msgstr "Ðîçì³ð ïðàâîðó÷ (ñêîð.)" -#: Merge.rc:2592 +#: Merge.rc:2607 #, c-format msgid "Left Size (Short)" msgstr "Ðîçì³ð ë³âîðó÷ (ñêîð.)" -#: Merge.rc:2593 +#: Merge.rc:2608 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2614 #, c-format msgid "Left Creation Time" msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2600 +#: Merge.rc:2615 #, c-format msgid "Right Creation Time" msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2601 +#: Merge.rc:2616 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2617 #, c-format msgid "Newer File" msgstr "Íîâ³øèé ôàéë" -#: Merge.rc:2603 +#: Merge.rc:2618 #, c-format msgid "Left File Version" msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2604 +#: Merge.rc:2619 #, c-format msgid "Right File Version" msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2605 +#: Merge.rc:2620 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2621 #, c-format msgid "Short Result" msgstr "Ñïðîùåíèé ðåçóëüòàò" -#: Merge.rc:2607 +#: Merge.rc:2622 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòè ôàéëó ë³âîðó÷" -#: Merge.rc:2608 +#: Merge.rc:2623 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷" -#: Merge.rc:2609 +#: Merge.rc:2624 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2625 #, c-format msgid "Left EOL" msgstr "˳âå çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:2611 +#: Merge.rc:2626 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2627 #, c-format msgid "Right EOL" msgstr "Ïðàâå çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:2618 +#: Merge.rc:2633 #, c-format msgid "Left Encoding" msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2619 +#: Merge.rc:2634 #, c-format msgid "Right Encoding" msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2620 +#: Merge.rc:2635 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2636 #, c-format msgid "Ignored Diff." msgstr "Çíåõ. â³äì³ííîñò³" -#: Merge.rc:2623 -#: Merge.rc:2838 -#, c-format -msgid "Binary" -msgstr "Á³íàðíèé" - -#: Merge.rc:2629 +#: Merge.rc:2644 #, c-format msgid "Unable to compare files" msgstr "Íåìîæëèâî ïîð³âíÿòè ôàéëè" -#: Merge.rc:2630 +#: Merge.rc:2645 #, c-format msgid "Item aborted" msgstr "Ïîð³âíÿííÿ ïåðåðâàíå" -#: Merge.rc:2631 +#: Merge.rc:2646 #, c-format msgid "File skipped" msgstr "Ôàéë ïðîïóùåíèé" -#: Merge.rc:2632 +#: Merge.rc:2647 #, c-format msgid "Folder skipped" msgstr "Òåêà ïðîïóùåíà" -#: Merge.rc:2633 +#: Merge.rc:2648 #, c-format msgid "Left only: %1" msgstr "Ëèøå ë³âîðó÷: %1" -#: Merge.rc:2634 +#: Merge.rc:2649 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2650 #, c-format msgid "Right only: %1" msgstr "Ëèøå ïðàâîðó÷: %1" -#: Merge.rc:2636 +#: Merge.rc:2651 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2652 #, c-format msgid "Binary files are identical" msgstr "Á³íàðí³ ôàéëè íå ìàþòü â³äì³ííîñòåé" -#: Merge.rc:2639 +#: Merge.rc:2654 #, c-format msgid "Binary files are different" msgstr "Á³íàðí³ ôàéëè â³äð³çíÿþòüñÿ" -#: Merge.rc:2640 +#: Merge.rc:2655 #, c-format msgid "Files are different" msgstr "Ôàéëè â³äð³çíÿþòüñÿ" -#: Merge.rc:2641 +#: Merge.rc:2656 #, c-format msgid "Folders are different" msgstr "Òåêè ð³çí³" -#: Merge.rc:2642 +#: Merge.rc:2657 #, c-format msgid "Left Only" msgstr "Ëèøå ë³âîðó÷" -#: Merge.rc:2643 +#: Merge.rc:2658 #, c-format msgid "Right Only" msgstr "Ëèøå ïðàâîðó÷" -#: Merge.rc:2644 +#: Merge.rc:2659 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2660 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2661 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2662 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2664 #, c-format msgid "Error" msgstr "Ïîìèëêà" -#: Merge.rc:2650 +#: Merge.rc:2665 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâ³ ôàéëè îäíàêîâ³" -#: Merge.rc:2655 +#: Merge.rc:2670 #, c-format msgid "Text files are different" msgstr "Òåêñòîâ³ ôàéëè ð³çí³" -#: Merge.rc:2661 +#: Merge.rc:2676 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîéøëî ÷àñó: %ld ìñ" -#: Merge.rc:2662 +#: Merge.rc:2677 #, c-format msgid "1 item selected" msgstr "Âèáðàíèé 1 åëåìåíò" -#: Merge.rc:2663 +#: Merge.rc:2678 #, c-format msgid "%1 items selected" msgstr "Âèáðàí³ åëåìåíòè: %1" -#: Merge.rc:2669 +#: Merge.rc:2684 #, c-format msgid "Filename or folder name." msgstr "²ì'ÿ ôàéëó àáî òåêè" -#: Merge.rc:2670 +#: Merge.rc:2685 #, c-format msgid "Subfolder name when subfolders are included." msgstr "²ìåíà ï³äòåê, ÿêùî ï³äòåêè âêëþ÷åí³" -#: Merge.rc:2671 +#: Merge.rc:2686 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëüòàò ïîð³âíÿííÿ, äîâãà ôîðìà." -#: Merge.rc:2672 +#: Merge.rc:2687 #, c-format msgid "Left side modification date." msgstr "×àñ çì³íè ôàéëó ë³âîðó÷" -#: Merge.rc:2673 +#: Merge.rc:2688 #, c-format msgid "Right side modification date." msgstr "×àñ çì³íè ôàéëó ïðàâîðó÷" -#: Merge.rc:2674 +#: Merge.rc:2689 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2690 #, c-format msgid "File's extension." msgstr "Ðîçøèðåííÿ ôàéëó" -#: Merge.rc:2676 +#: Merge.rc:2691 #, c-format msgid "Left file size in bytes." msgstr "Ðîçì³ð ôàéëó ë³âîðó÷ ó áàéòàõ" -#: Merge.rc:2677 +#: Merge.rc:2692 #, c-format msgid "Right file size in bytes." msgstr "Ðîçì³ð ôàéëó ïðàâîðó÷ ó áàéòàõ" -#: Merge.rc:2678 +#: Merge.rc:2693 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2694 #, c-format msgid "Left file size abbreviated." msgstr "Ðîçì³ð ë³âîãî ôàéëó (ñêîð.)" -#: Merge.rc:2680 +#: Merge.rc:2695 #, c-format msgid "Right file size abbreviated." msgstr "Ðîçì³ð ïðàâîãî ôàéëó (ñêîð.)" -#: Merge.rc:2681 +#: Merge.rc:2696 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2702 #, c-format msgid "Left side creation time." msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2688 +#: Merge.rc:2703 #, c-format msgid "Right side creation time." msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2689 +#: Merge.rc:2704 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2705 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçàòè, ç ÿêî¿ ç³ ñòîð³í äàòà çì³íè ôàéëó íîâ³øà" -#: Merge.rc:2691 +#: Merge.rc:2706 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â." -#: Merge.rc:2692 +#: Merge.rc:2707 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â." -#: Merge.rc:2693 +#: Merge.rc:2708 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2709 #, c-format msgid "Short comparison result." msgstr "Ðåçóëüòàò øâèäêîãî ïîð³âíÿííÿ" -#: Merge.rc:2695 +#: Merge.rc:2710 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòè ôàéëó ë³âîðó÷" -#: Merge.rc:2696 +#: Merge.rc:2711 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷" -#: Merge.rc:2697 +#: Merge.rc:2712 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2713 #, c-format msgid "Left side file EOL type" msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ë³âîãî ôàéëó" -#: Merge.rc:2699 +#: Merge.rc:2714 #, c-format msgid "Right side file EOL type" msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ïðàâîãî ôàéëó" -#: Merge.rc:2700 +#: Merge.rc:2715 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2721 #, c-format msgid "Left side encoding." msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2707 +#: Merge.rc:2722 #, c-format msgid "Right side encoding." msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2708 +#: Merge.rc:2723 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2724 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ʳëüê³ñòü ³ãíîðîâàíèõ â³äì³ííîñòåé ó ôàéë³. Ö³ â³äì³ííîñò³ áóëè ³ãíîðîâàí³ WinMerge ³ íå ìîæóòü áóòè îïðàöüîâàí³." -#: Merge.rc:2710 +#: Merge.rc:2725 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ʳëüê³ñòü â³äì³ííîñòåé ó ôàéë³. ²ãíîðîâàí³ â³äì³ííîñò³ íå âðàõîâàí³." -#: Merge.rc:2711 +#: Merge.rc:2726 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàçàòè ç³ðî÷êó (*) ÿêùî ôàéë á³íàðíèé." -#: Merge.rc:2717 +#: Merge.rc:2732 #, c-format msgid "Compare %1 with %2" msgstr "Ïîð³âíÿííÿ %1 ç %2" -#: Merge.rc:2718 +#: Merge.rc:2733 #, c-format msgid "Comma-separated list" msgstr "Ñïèñîê, ðîçä³ëåíèé êîìàìè" -#: Merge.rc:2719 +#: Merge.rc:2734 #, c-format msgid "Tab-separated list" msgstr "Ñïèñîê, ðîçä³ëåíèé òàáóëÿòîðàìè" -#: Merge.rc:2720 +#: Merge.rc:2735 #, c-format msgid "Simple HTML" msgstr "Ïðîñòèé HTML" -#: Merge.rc:2721 +#: Merge.rc:2736 #, c-format msgid "Simple XML" msgstr "Ïðîñòèé XML" -#: Merge.rc:2723 +#: Merge.rc:2738 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéë çâ³òó âæå ³ñíóº. Ïåðåçàïèñàòè??" -#: Merge.rc:2724 +#: Merge.rc:2739 #, c-format msgid "" "Error creating the report:\n" @@ -5270,32 +5298,32 @@ msgstr "" "Ïîìèëêà ïðè ñòâîðåíí³ çâ³òó:\n" "%1" -#: Merge.rc:2725 +#: Merge.rc:2740 #, c-format msgid "The report has been created successfully." msgstr "Çâ³ò óñï³øíî ñòâîðåíèé" -#: Merge.rc:2731 +#: Merge.rc:2746 #, c-format msgid "The same file is opened in both panels." msgstr "Íà îáîõ ïàíåëÿõ â³äêðèòèé òîé ñàìèé ôàéë" -#: Merge.rc:2732 +#: Merge.rc:2747 #, c-format msgid "The selected files are identical." msgstr "Âèáðàí³ ôàéëè íå ìàþòü â³äì³ííîñòåé" -#: Merge.rc:2733 +#: Merge.rc:2748 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïðè ïîð³âíÿíí³ ôàéë³â âèíèêëà ïîìèëêà." -#: Merge.rc:2734 +#: Merge.rc:2749 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Òèì÷àñîâ³ ôàéëè íå ìîæóòü áóòè ñòâîðåí³. Ïåðåâ³ðòå íàëàøòóâàííÿ øëÿõ³â äëÿ òèì÷àñîâèõ ôàéë³â" -#: Merge.rc:2735 +#: Merge.rc:2750 #, c-format msgid "" "These files use different carriage return types.\n" @@ -5310,17 +5338,17 @@ msgstr "" "\n" "Óâàãà: ßêùî âàñ íå ö³êàâëÿòü ðîçõîäæåííÿ â çàê³í÷åííÿõ ðÿäêà, íàëàøòóéòå îïö³þ 'Íåõòóâàòè ð³çíèöåþ â çàê³í÷åííÿõ ðÿäê³â' íà âêëàäö³ Ïîð³âíÿííÿ â Íàëàøòóâàííÿõ." -#: Merge.rc:2736 +#: Merge.rc:2751 #, c-format msgid "The selected folder is invalid." msgstr "Íåìîæëèâî â³äêðèòè âèáðàíó òåêó." -#: Merge.rc:2737 +#: Merge.rc:2752 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íåìîæëèâî â³äêðèòè á³íàðíèé ôàéë ó ðåäàêòîð³." -#: Merge.rc:2738 +#: Merge.rc:2753 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -5335,7 +5363,7 @@ msgstr "" "%1\n" "ç ³íøî¿ ñòîðîíè ³ â³äêðèòè îáèäâ³?" -#: Merge.rc:2744 +#: Merge.rc:2759 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -5346,168 +5374,168 @@ msgstr "" "Êîæíèé ç ôàéë³â ìîæå áóòè ïîêàçàíèé â ñâîºìó êîäóâàíí³, àëå ¿õíº çëèòòÿ àáî êîï³þâàííÿ ìîæå ïîøêîäèòè ³íôîðìàö³þ.\n" "Ïîêàçàòè îáèäâà ôàéëè â ñèñòåìíîìó êîäóâàíí³ (ðåêîìåíäóºòüñÿ)?" -#: Merge.rc:2745 +#: Merge.rc:2760 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "²íôîðìàö³ÿ âòðà÷åíà ÷åðåç ïîìèëêîâå êîäóâàííÿ: îáèäâà ôàéëè" -#: Merge.rc:2746 +#: Merge.rc:2761 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2762 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2763 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2769 #, c-format msgid "No difference" msgstr "Íåìà â³äì³ííîñòåé" -#: Merge.rc:2755 +#: Merge.rc:2770 #, c-format msgid "Line difference" msgstr "Ðÿäîê â³äì³ííîñòåé" -#: Merge.rc:2761 +#: Merge.rc:2776 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàì³íåíî %1 ðÿäê³â." -#: Merge.rc:2762 +#: Merge.rc:2777 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå âäàëîñÿ çíàéòè ðÿäîê \"%s\"" -#: Merge.rc:2768 +#: Merge.rc:2783 #, c-format msgid "Copy Full Path" msgstr "Ñêîï³þâàòè ïîâíèé øëÿõ" -#: Merge.rc:2769 +#: Merge.rc:2784 #, c-format msgid "Copy Filename" msgstr "Ñêîï³þâàòè ³ì'ÿ ôàéëó" -#: Merge.rc:2775 +#: Merge.rc:2790 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2797 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2798 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2799 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2800 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2801 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2807 #, c-format msgid "Location Pane" msgstr "̳ñöÿ ðîçòàøóâàííÿ" -#: Merge.rc:2793 +#: Merge.rc:2808 #, c-format msgid "Diff Pane" msgstr "³äì³ííîñò³" -#: Merge.rc:2799 +#: Merge.rc:2814 #, c-format msgid "Patch file successfully written." msgstr "Ëàòêà óñï³øíî çàïèñàíà." -#: Merge.rc:2800 +#: Merge.rc:2815 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Åëåìåíò íå çíàéäåíèé àáî öå òåêà" -#: Merge.rc:2801 +#: Merge.rc:2816 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Åëåìåíò íå çíàéäåíèé àáî öå òåêà" -#: Merge.rc:2802 +#: Merge.rc:2817 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ëàòêà âæå ³ñíóº. Õî÷åòå ïåðåçàïèñàòè ¿¿?" -#: Merge.rc:2803 +#: Merge.rc:2818 #, c-format msgid "[%1 files selected]" msgstr "[%1 ôàéë³â âèáðàí³]" -#: Merge.rc:2804 +#: Merge.rc:2819 #, c-format msgid "Normal" msgstr "Íîðìàëüíèé" -#: Merge.rc:2805 +#: Merge.rc:2820 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2806 +#: Merge.rc:2821 #, c-format msgid "Unified" msgstr "Óí³ô³êîâàíèé" -#: Merge.rc:2807 -#: Merge.rc:3058 +#: Merge.rc:2822 +#: Merge.rc:3073 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2808 +#: Merge.rc:2823 #, c-format msgid "Could not write to file %1." msgstr "Íåìà ìîæëèâîñò³ çàïèñàòè ó ôàéë %1." -#: Merge.rc:2809 +#: Merge.rc:2824 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Çàçíà÷åíèé øëÿõ äëÿ ê³íöåâîãî ôàéëó íå º àáñîëþòíèì: %1" -#: Merge.rc:2810 +#: Merge.rc:2825 #, c-format msgid "Specify an output file" msgstr "Âêàçàòè ê³íöåâèé ôàéë" -#: Merge.rc:2811 +#: Merge.rc:2826 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç á³íàðíèõ ôàéë³â" -#: Merge.rc:2812 +#: Merge.rc:2827 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç òåê" -#: Merge.rc:2813 +#: Merge.rc:2828 #, c-format msgid "" "Please save all files first.\n" @@ -5518,12 +5546,12 @@ msgstr "" "\n" "Ñòâîðåííÿ ëàòêè âèìàãàº, ùîá â ôàéëàõ íå áóëî íå çáåðåæåíèõ çì³í" -#: Merge.rc:2814 +#: Merge.rc:2829 #, c-format msgid "Folder does not exist." msgstr "Òåêà íå ³ñíóº" -#: Merge.rc:2819 +#: Merge.rc:2834 #, c-format msgid "" "Archive support is not enabled.\n" @@ -5535,7 +5563,7 @@ msgstr "" "Íå çíàéäåí³ âñ³ íåîáõ³äí³ êîìïîíåíòè (7-zip ³/àáî Merge7z*.dll) . \n" "Ïîäèâ³òüñÿ ³íñòðóêö³þ, ùîá äîâ³äàòèñÿ á³ëüøå ïðî ï³äòðèìêó àðõ³â³â ³ ÿê ¿¿ ââ³ìêíóòè." -#: Merge.rc:2820 +#: Merge.rc:2835 #, c-format msgid "" "\n" @@ -5544,7 +5572,7 @@ msgstr "" "\n" "Óâàãà: ²íòåãðàö³ÿ ç 7-Zip âèìêíóòà â íàëàøòóâàííÿõ WinMerge." -#: Merge.rc:2821 +#: Merge.rc:2836 #, c-format msgid "" "\n" @@ -5553,37 +5581,37 @@ msgstr "" "\n" "Óâàãà: Çàä³ÿíèé ëèøå ëîêàëüíèé ìîäóëü 7-Zip." -#: Merge.rc:2822 +#: Merge.rc:2837 #, c-format msgid "Select file for export" msgstr "Âèáðàòè ôàéë äëÿ åêñïîðòó" -#: Merge.rc:2823 +#: Merge.rc:2838 #, c-format msgid "Select file for import" msgstr "Âèáðàòè ôàéë äëÿ ³ìïîðòó" -#: Merge.rc:2824 +#: Merge.rc:2839 #, c-format msgid "Options imported from the file." msgstr "Îïö³¿, ³ìïîðòîâàí³ ç ôàéëó." -#: Merge.rc:2825 +#: Merge.rc:2840 #, c-format msgid "Options exported to the file." msgstr "Îïö³¿, åêñïîðòîâàí³ â ôàéë." -#: Merge.rc:2826 +#: Merge.rc:2841 #, c-format msgid "Failed to import options from the file." msgstr "Ïîìèëêà ³ìïîðòó îïö³é ç ôàéëó." -#: Merge.rc:2827 +#: Merge.rc:2842 #, c-format msgid "Failed to write options to the file." msgstr "Ïîìèëêà åêñïîðòó îïö³é â ôàéë." -#: Merge.rc:2828 +#: Merge.rc:2843 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5594,157 +5622,157 @@ msgstr "" "\n" "Ïðîäîâæèòè?" -#: Merge.rc:2834 +#: Merge.rc:2849 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2835 +#: Merge.rc:2850 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2836 +#: Merge.rc:2851 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2837 +#: Merge.rc:2852 #, c-format msgid "Mixed" msgstr "̳øàíèé" -#: Merge.rc:2839 +#: Merge.rc:2854 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2840 +#: Merge.rc:2855 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2841 +#: Merge.rc:2856 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2848 +#: Merge.rc:2863 #, c-format msgid " B" msgstr " Á" -#: Merge.rc:2849 +#: Merge.rc:2864 #, c-format msgid " KB" msgstr "Êá" -#: Merge.rc:2850 +#: Merge.rc:2865 #, c-format msgid " MB" msgstr "Ìá" -#: Merge.rc:2851 +#: Merge.rc:2866 #, c-format msgid " GB" msgstr "Ãá" -#: Merge.rc:2852 +#: Merge.rc:2867 #, c-format msgid " TB" msgstr "Òá" -#: Merge.rc:2853 +#: Merge.rc:2868 #, c-format msgid " PB" msgstr "Ïá" -#: Merge.rc:2859 +#: Merge.rc:2874 #, c-format msgid "Type" msgstr "Òèï" -#: Merge.rc:2861 +#: Merge.rc:2876 #, c-format msgid "Unpacker" msgstr "Ðîçïàêóâàëüíèê" -#: Merge.rc:2862 +#: Merge.rc:2877 #, c-format msgid "Prediffer" msgstr "Íåõòóâà÷" -#: Merge.rc:2863 +#: Merge.rc:2878 #, c-format msgid "Editor script" msgstr "Ñöåíàð³é ðåäàêòîðà" -#: Merge.rc:2870 +#: Merge.rc:2885 #, c-format msgid "Save the left file" msgstr "Çáåðåãòè ë³âèé ôàéë" -#: Merge.rc:2871 +#: Merge.rc:2886 #, c-format msgid "Save the middle file" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2887 #, c-format msgid "Save the right file" msgstr "Çáåðåãòè ïðàâèé ôàéë" -#: Merge.rc:2873 +#: Merge.rc:2888 #, c-format msgid "Save the left file with name..." msgstr "Çáåðåãòè ë³âèé ôàéë ÿê..." -#: Merge.rc:2874 +#: Merge.rc:2889 #, c-format msgid "Save the middle file with name..." msgstr "" -#: Merge.rc:2875 +#: Merge.rc:2890 #, c-format msgid "Save the right file with name..." msgstr "Çáåðåãòè ïðàâèé ôàéë ÿê..." -#: Merge.rc:2876 +#: Merge.rc:2891 #, c-format msgid "Change left file/folder read-only status" msgstr "" -#: Merge.rc:2877 +#: Merge.rc:2892 #, c-format msgid "Change middle file/folder read-only status" msgstr "" -#: Merge.rc:2878 +#: Merge.rc:2893 #, c-format msgid "Change right file/folder read-only status" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2894 #, c-format msgid "Convert EOL to Windows mode" msgstr "Ïåðåòâîðèòè çàê³í÷åííÿ ðÿäê³â äî ïðèéíÿòèõ â Windows" -#: Merge.rc:2880 +#: Merge.rc:2895 #, c-format msgid "Convert EOL to Unix mode" msgstr "Ïåðåòâîðèòè çàê³í÷åííÿ ðÿäê³â äî ïðèéíÿòèõ â Unix" -#: Merge.rc:2881 +#: Merge.rc:2896 #, c-format msgid "Convert EOL to Mac mode" msgstr "Ïåðåòâîðèòè çàê³í÷åííÿ ðÿäê³â äî ïðèéíÿòèõ â Mac" -#: Merge.rc:2882 +#: Merge.rc:2897 #, c-format msgid "Switch between editing and merging modes" msgstr "Ïåðåìèêàííÿ ì³æ ðåæèìàìè ðåäàãóâàííÿ ³ çëèòòÿ" -#: Merge.rc:2883 +#: Merge.rc:2898 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5753,12 +5781,12 @@ msgstr "" "Ïåðåãëÿíóòè ³ â³äðåäàãóâàòè êîäóâàííÿ\n" "Ðåãóëþâàííÿ êîäóâàííÿ" -#: Merge.rc:2884 +#: Merge.rc:2899 #, c-format msgid "Open and resolve conflict file" msgstr "³äêðèòè ³ âèð³øèòè êîíôë³êòíèé ôàéë" -#: Merge.rc:2890 +#: Merge.rc:2905 #, c-format msgid "" "Select difference area in the current line\n" @@ -5767,7 +5795,7 @@ msgstr "" "³äçíà÷èòè â³äì³íí³ñòü ó ïîòî÷íîìó ðÿäêó\n" "³äì³íí³ñòü ó ïîòî÷íîìó ðÿäêó" -#: Merge.rc:2891 +#: Merge.rc:2906 #, c-format msgid "" "Go to line or difference\n" @@ -5776,7 +5804,7 @@ msgstr "" "Ïåðåéòè äî ðÿäêó àáî â³äì³ííîñò³\n" "Ïåðåéòè äî (Ctrl+G)" -#: Merge.rc:2892 +#: Merge.rc:2907 #, c-format msgid "" "Set program options\n" @@ -5785,7 +5813,7 @@ msgstr "" "Âñòàíîâèòè ïðîãðàìí³ íàëàøòóâàííÿ\n" "Íàëàøòóâàííÿ" -#: Merge.rc:2893 +#: Merge.rc:2908 #, c-format msgid "" "Refresh display\n" @@ -5794,37 +5822,37 @@ msgstr "" "Ïîíîâèòè åêðàí\n" "Ïîíîâèòè (F5)" -#: Merge.rc:2894 +#: Merge.rc:2909 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Ñêîï³þâàòè âèáðàí³ ðÿäêè â áóôåð îáì³íó, äîäàþ÷è íà ïî÷àòêó ðÿäêà éîãî íîìåð" -#: Merge.rc:2895 +#: Merge.rc:2910 #, c-format msgid "Refresh/Reload selected items" msgstr "" -#: Merge.rc:2896 +#: Merge.rc:2911 #, c-format msgid "Toggle bookmark" msgstr "Çàêëàäêà" -#: Merge.rc:2897 +#: Merge.rc:2912 #, c-format msgid "Go to next bookmark" msgstr "Ïåðåéòè äî íàñòóïíî¿ çàêëàäêè" -#: Merge.rc:2898 +#: Merge.rc:2913 #, c-format msgid "Go to previous bookmark" msgstr "Ïåðåéòè äî ïîïåðåäíüî¿ çàêëàäêè" -#: Merge.rc:2899 +#: Merge.rc:2914 #, c-format msgid "Clear all bookmarks" msgstr "Âèëó÷èòè âñ³ çàêëàäêè" -#: Merge.rc:2905 +#: Merge.rc:2920 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5833,7 +5861,7 @@ msgstr "" "Ïîêàçóâàòè îäíàêîâ³ åëåìåíòè\n" "Åëåìåíòè ç ³äåíòè÷íîñòÿìè" -#: Merge.rc:2906 +#: Merge.rc:2921 #, c-format msgid "" "Displays items that have differences\n" @@ -5842,7 +5870,7 @@ msgstr "" "Ïîêàçóâàòè åëåìåíòè ç â³äì³ííîñòÿìè\n" "Åëåìåíòè ç â³äì³ííîñòÿìè" -#: Merge.rc:2907 +#: Merge.rc:2922 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5851,7 +5879,7 @@ msgstr "" "Ïîêàçóâàòè ïðèñóòí³ ëèøå ë³âîðó÷\n" "Óí³êàëüí³ åëåìåíòè çë³âà" -#: Merge.rc:2908 +#: Merge.rc:2923 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5860,7 +5888,7 @@ msgstr "" "Ïîêàçóâàòè ïðèñóòí³ ëèøå ïðàâîðó÷\n" "Óí³êàëüí³ åëåìåíòè ñïðàâà" -#: Merge.rc:2909 +#: Merge.rc:2924 #, c-format msgid "" "Displays binary files\n" @@ -5869,7 +5897,7 @@ msgstr "" "Ïîêàçóâàòè á³íàðí³ ôàéëè\n" "Á³íàðí³ ôàéëè" -#: Merge.rc:2910 +#: Merge.rc:2925 #, c-format msgid "" "Displays skipped items\n" @@ -5878,7 +5906,7 @@ msgstr "" "Ïîêàçóâàòè ïðîïóùåí³ åëåìåíòè\n" "Ïðîïóùåí³ åëåìåíòè" -#: Merge.rc:2916 +#: Merge.rc:2931 #, c-format msgid "" "Select the font for the view\n" @@ -5887,7 +5915,7 @@ msgstr "" "Âèáðàòè øðèôò äëÿ â³äîáðàæåííÿ â³äì³ííîñòåé\n" "Øðèôò â³äì³ííîñòåé" -#: Merge.rc:2917 +#: Merge.rc:2932 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5896,27 +5924,27 @@ msgstr "" "Âèêîðèñòîâóâàòè çâè÷àéíèé ñèñòåìíèé øðèôò äëÿ â³äîáðàæåííÿ â³äì³ííîñòåé \n" "Çâè÷àéíèé øðèôò" -#: Merge.rc:2918 +#: Merge.rc:2933 #, c-format msgid "Shows whitespace characters" msgstr "Ïîêàçóâàòè ïðîïóñêè" -#: Merge.rc:2919 +#: Merge.rc:2934 #, c-format msgid "Toggle Diff Pane" msgstr "Ïåðåìêíóòè ïàíåëü â³äì³ííîñòåé" -#: Merge.rc:2920 +#: Merge.rc:2935 #, c-format msgid "Location pane shows overall picture from files" msgstr "Ïàíåëü ëîêàö³é ïîêàçóº ïîâíó êàðòèíó â³äì³ííîñòåé ì³æ ôàéëàìè" -#: Merge.rc:2921 +#: Merge.rc:2936 #, c-format msgid "Show folder compare statistics dialog" msgstr "Ïîêàçàòè ä³àëîã ïîð³âíÿííÿ ñòàòèñòèê òåê" -#: Merge.rc:2922 +#: Merge.rc:2937 #, c-format msgid "" "Select the current user interface language\n" @@ -5925,7 +5953,7 @@ msgstr "" "Âèáåð³òü ìîâó ³íòåðôåéñó äëÿ ïîòî÷íîãî êîðèñòóâà÷à\n" "Ìîâà" -#: Merge.rc:2923 +#: Merge.rc:2938 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5934,12 +5962,12 @@ msgstr "" "Ïîêàçàòè â³äì³ííîñò³ âñåðåäèí³ ðÿäê³â ³íøèìè êîëüîðàìè\n" "Ïîêàçàòè â³äì³ííîñò³ â ðÿäêó" -#: Merge.rc:2924 +#: Merge.rc:2939 #, c-format msgid "Swap the positions of the two panes" msgstr "Ïîì³íÿòè ïàíåë³ ì³ñöÿìè" -#: Merge.rc:2925 +#: Merge.rc:2940 #, c-format msgid "" "Shows line numbers\n" @@ -5948,7 +5976,7 @@ msgstr "" "Ïîêàçóâàòè íîìåðà ðÿäê³â\n" "Íîìåðà ðÿäê³â" -#: Merge.rc:2926 +#: Merge.rc:2941 #, c-format msgid "" "Enable word wrap\n" @@ -5957,7 +5985,7 @@ msgstr "" "Ââ³ìêíóòè ïåðåíåñåííÿ ðÿäê³â\n" "Ïåðåíåñåííÿ ðÿäê³â" -#: Merge.rc:2927 +#: Merge.rc:2942 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5966,22 +5994,22 @@ msgstr "" "Ïîêàçàòè ïîëÿ íà îáîõ ïàíåëÿõ\n" "³äçíà÷åí³ ïîëÿ" -#: Merge.rc:2928 +#: Merge.rc:2943 #, c-format msgid "Increase text size" msgstr "Çá³ëüøèòè ðîçì³ð òåêñòó" -#: Merge.rc:2929 +#: Merge.rc:2944 #, c-format msgid "Decrease text size" msgstr "Çìåíøèòè ðîçì³ð òåêñòó" -#: Merge.rc:2930 +#: Merge.rc:2945 #, c-format msgid "Reset text zoom to default size" msgstr "Ñêèíóòè ìàñøòàá òåêñòó äî çâè÷àéíîãî çíà÷åííÿ" -#: Merge.rc:2936 +#: Merge.rc:2951 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5990,7 +6018,7 @@ msgstr "" "Ïåðåéòè äî ïîïåðåäíüî¿ â³äì³ííîñò³\n" "Ïîïåðåäíÿ â³äì³íí³ñòü (Alt+Up)" -#: Merge.rc:2937 +#: Merge.rc:2952 #, c-format msgid "" "Scroll to the next difference\n" @@ -5999,77 +6027,77 @@ msgstr "" "Ïåðåéòè äî íàñòóïíî¿ â³äì³ííîñò³\n" "Íàñòóïíà â³äì³íí³ñòü (Alt+Down)" -#: Merge.rc:2938 +#: Merge.rc:2953 #, c-format msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2939 +#: Merge.rc:2954 #, c-format msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2940 +#: Merge.rc:2955 #, c-format msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)" msgstr "" -#: Merge.rc:2941 +#: Merge.rc:2956 #, c-format msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2957 #, c-format msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2958 #, c-format msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2959 #, c-format msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)" msgstr "" -#: Merge.rc:2945 +#: Merge.rc:2960 #, c-format msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)" msgstr "" -#: Merge.rc:2946 +#: Merge.rc:2961 #, c-format msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)" msgstr "" -#: Merge.rc:2947 +#: Merge.rc:2962 #, c-format msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)" msgstr "" -#: Merge.rc:2948 +#: Merge.rc:2963 #, c-format msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)" msgstr "" -#: Merge.rc:2949 +#: Merge.rc:2964 #, c-format msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)" msgstr "" -#: Merge.rc:2950 +#: Merge.rc:2965 #, c-format msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)" msgstr "" -#: Merge.rc:2951 +#: Merge.rc:2966 #, c-format msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)" msgstr "" -#: Merge.rc:2952 +#: Merge.rc:2967 #, c-format msgid "" "Scroll to the first difference\n" @@ -6078,7 +6106,7 @@ msgstr "" "Ïåðåéòè äî ïåðøî¿ â³äì³ííîñò³\n" "Ïåðøà â³äì³íí³ñòü (Alt+Home)" -#: Merge.rc:2953 +#: Merge.rc:2968 #, c-format msgid "" "Scroll to the current difference\n" @@ -6087,7 +6115,7 @@ msgstr "" "Ïåðåéòè äî ïîòî÷íî¿ â³äì³ííîñò³\n" "Ïîòî÷íà â³äì³íí³ñòü (Alt+Enter)" -#: Merge.rc:2954 +#: Merge.rc:2969 #, c-format msgid "" "Scroll to the last difference\n" @@ -6096,7 +6124,7 @@ msgstr "" "Ïåðåéòè äî îñòàííüî¿ â³äì³ííîñò³\n" "Îñòàííÿ â³äì³íí³ñòü (Alt+End)" -#: Merge.rc:2955 +#: Merge.rc:2970 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6105,7 +6133,7 @@ msgstr "" "Ñêîï³þâàòè âèáðàíèé òåêñò â ôàéë ïðàâîðó÷\n" "Ñêîï³þâàòè â ôàéë ïðàâîðó÷ (Alt+Right)" -#: Merge.rc:2956 +#: Merge.rc:2971 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6114,7 +6142,7 @@ msgstr "" "Ñêîï³þâàòè âèáðàíèé òåêñò â ôàéë ë³âîðó÷\n" "Ñêîï³þâàòè â ôàéë ë³âîðó÷ (Alt+Left)" -#: Merge.rc:2957 +#: Merge.rc:2972 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6123,7 +6151,7 @@ msgstr "" "Ñêîï³þâàòè â³äì³íí³ñòü íà ïðàâó ïàíåëü ³ ïåðåéòè äî íàñòóïíî¿\n" "Ñêîï³þâàòè âïðàâî ³ äàë³ (Ctrl+Alt+Right)" -#: Merge.rc:2958 +#: Merge.rc:2973 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6132,7 +6160,7 @@ msgstr "" "Ñêîï³þâàòè â³äì³íí³ñòü íà ë³âó ïàíåëü ³ ïåðåéòè äî íàñòóïíî¿\n" "Ñêîï³þâàòè âë³âî ³ äàë³ (Ctrl+Alt+Left)" -#: Merge.rc:2959 +#: Merge.rc:2974 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6141,7 +6169,7 @@ msgstr "" "Ñêîï³þâàòè âñ³ â³äì³ííîñò³ â ôàéë ïðàâîðó÷\n" "Âñå âïðàâî" -#: Merge.rc:2960 +#: Merge.rc:2975 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6150,92 +6178,92 @@ msgstr "" "Ñêîï³þâàòè âñ³ â³äì³ííîñò³ â ôàéë ë³âîðó÷\n" "Âñå âë³âî" -#: Merge.rc:2961 +#: Merge.rc:2976 #, c-format msgid "Delete selected items from both directories" msgstr "Âèëó÷èòè âèáðàí³ åëåìåíòè ç îáîõ òåê" -#: Merge.rc:2962 +#: Merge.rc:2977 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Ïîð³âíÿòè âèáðàí³ åëåìåíòè (ïîð³âíÿòè ïåðøèé åëåìåíò, ÿêùî âèáðàíî á³ëüøå îäíîãî)" -#: Merge.rc:2963 +#: Merge.rc:2978 #, c-format msgid "Add a manual point for synchronization of changes between files" msgstr "" -#: Merge.rc:2964 +#: Merge.rc:2979 #, c-format msgid "Clear manual change synchronization points " msgstr "" -#: Merge.rc:2965 +#: Merge.rc:2980 #, c-format msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2971 +#: Merge.rc:2986 #, c-format msgid "Select and reorder directory compare columns" msgstr "Âèáðàòè ³ ïåðåñòàâèòè ì³ñöÿìè ñòîâï÷èêè ïîð³âíÿííÿ òåê" -#: Merge.rc:2972 +#: Merge.rc:2987 #, c-format msgid "Generate a patch-file" msgstr "Ñòâîðèòè ëàòêó" -#: Merge.rc:2973 +#: Merge.rc:2988 #, c-format msgid "Select and modify filters" msgstr "Âèá³ð ³ ðåäàãóâàííÿ ô³ëüòð³â" -#: Merge.rc:2974 +#: Merge.rc:2989 #, c-format msgid "Generates a report from compare results" msgstr "Ñòâîðèòè çâ³ò ç ðåçóëüòàò³â ïîð³âíÿííÿ" -#: Merge.rc:2980 +#: Merge.rc:2995 #, c-format msgid "Shows a list of available plugins" msgstr "Ïîêàçóº ñïèñîê äîñòóïíèõ äîïîâíåíü äî ïðîãðàìè" -#: Merge.rc:2981 +#: Merge.rc:2996 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Âèáðàíèé êîðèñòóâà÷åì ðîçïàêóâàëüíèê (íå ïðàöþº ïðè ïîð³âíÿíí³ òåê)" -#: Merge.rc:2982 +#: Merge.rc:2997 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Àâòîìàòè÷íèé ï³äá³ð ðîçïàêóâàëüíèêà (âêàæ³òü ðîçøèðåííÿ õî÷à á îäíîãî ç ôàéë³â)" -#: Merge.rc:2983 +#: Merge.rc:2998 #, c-format msgid "Select an unpacker to edit this file" msgstr "Âèáåð³òü ðîçïàêóâàëüíèê äëÿ ðåäàãóâàííÿ öüîãî ôàéëó" -#: Merge.rc:2984 +#: Merge.rc:2999 #, c-format msgid "No prediffer (normal)" msgstr "Áåç ïîïåðåäíüîãî ïîð³âíÿííÿ" -#: Merge.rc:2985 +#: Merge.rc:3000 #, c-format msgid "Suggested plugins" msgstr "Ðåêîìåíäîâàí³ äîïîâíåííÿ" -#: Merge.rc:2986 +#: Merge.rc:3001 #, c-format msgid "Other plugins" msgstr "²íø³ äîïîâíåííÿ" -#: Merge.rc:2987 +#: Merge.rc:3002 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Âèâàíòàæèòè âñ³ äîïîâíåííÿ ³ çàâàíòàæèòè ¿õ çíîâó (äëÿ ðîçðîáíèê³â)" -#: Merge.rc:2993 +#: Merge.rc:3008 #, c-format msgid "" "Activates next visible file\n" @@ -6244,12 +6272,12 @@ msgstr "" "Àêòèâóº íàñòóïíèé âèäèìèé ôàéë\n" "Àêòèâóâàòè íàñòóïíèé ôàéë" -#: Merge.rc:2994 +#: Merge.rc:3009 #, c-format msgid "Closes all open windows" msgstr "Çàêðèòè âñ³ â³äêðèò³ â³êíà" -#: Merge.rc:3000 +#: Merge.rc:3015 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -6258,22 +6286,22 @@ msgstr "" "³äêðèòè äîâ³äêó WinMerge\n" "Äîâ³äêà WinMerge" -#: Merge.rc:3001 +#: Merge.rc:3016 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Âèâåñòè ³íôîðìàö³þ ïðî ïîòî÷íó âåðñ³þ WinMerge ³ íàëàøòóâàííÿ ó òåêñòîâèé ôàéë" -#: Merge.rc:3002 +#: Merge.rc:3017 #, c-format msgid "Display the GNU General Public License" msgstr "Ïîêàçàòè ë³öåíç³þ GNU General Public License" -#: Merge.rc:3003 +#: Merge.rc:3018 #, c-format msgid "Private Build: %1" msgstr "Ïðèâàòíèé á³ëä: %1" -#: Merge.rc:3004 +#: Merge.rc:3019 #, c-format msgid "" "Opens the release notes document\n" @@ -6282,7 +6310,7 @@ msgstr "" "³äêðèòè äîêóìåíò ç çàóâàæåííÿìè äî ðåë³çó\n" "Çàóâàæåííÿ äî ðåë³çó" -#: Merge.rc:3005 +#: Merge.rc:3020 #, c-format msgid "" "Opens the translations website\n" @@ -6291,292 +6319,292 @@ msgstr "" "Ïåðåéòè íà ñòîð³íêó ç ïåðåêëàäàìè\n" "Ïåðåêëàäè" -#: Merge.rc:3011 +#: Merge.rc:3026 #, c-format msgid "Plugin Settings" msgstr "Íàëàøòóâàííÿ äîïîâíåííÿ" -#: Merge.rc:3012 +#: Merge.rc:3027 #, c-format msgid "No prediffer" msgstr "Ïîïåðåäíº ïîð³âíÿííÿ â³äñóòíº" -#: Merge.rc:3013 +#: Merge.rc:3028 #, c-format msgid "Prediff if possible" msgstr "Ïî ìîæëèâîñò³ ïîïåðåäíº ïîð³âíÿííÿ áóäå âèêîíàíèì" -#: Merge.rc:3015 +#: Merge.rc:3030 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå çíàéäåíèé - .sct ñöåíà𳿠âèìêíóò³" -#: Merge.rc:3016 +#: Merge.rc:3031 #, c-format msgid "" msgstr "<Íåìà>" -#: Merge.rc:3017 +#: Merge.rc:3032 #, c-format msgid "" msgstr "<Àâòîìàòè÷íî>" -#: Merge.rc:3023 +#: Merge.rc:3038 #, c-format msgid "Open the file with registered application" msgstr "³äêðèòè ôàéë çàðåºñòðîâàíèì çàñòîñóíêîì" -#: Merge.rc:3024 +#: Merge.rc:3039 #, c-format msgid "Open the file with external editor" msgstr "³äêðèòè ôàéë çîâí³øí³ì ðåäàêòîðîì" -#: Merge.rc:3025 +#: Merge.rc:3040 #, c-format msgid "Open the file with a particular program" msgstr "³äêðèòè ôàéë âèáðàíîþ ïðîãðàìîþ" -#: Merge.rc:3031 +#: Merge.rc:3046 #, c-format msgid "Do not display moved blocks" msgstr "Íå ïîêàçóâàòè ïåðåì³ùåí³ áëîêè" -#: Merge.rc:3032 +#: Merge.rc:3047 #, c-format msgid "Display all moved blocks" msgstr "Ïîêàçóâàòè âñ³ ïåðåì³ùåí³ áëîêè" -#: Merge.rc:3033 +#: Merge.rc:3048 #, c-format msgid "Display moved blocks only from current diff" msgstr "Ïîêàçóâàòè ïåðåì³ùåí³ áëîêè äëÿ ïîòî÷íî¿ â³äì³ííîñò³" -#: Merge.rc:3034 +#: Merge.rc:3049 #, c-format msgid "Go to diff under cursor" msgstr "Ïåðåéòè äî â³äì³ííîñò³ ï³ä âêàç³âíèêîì" -#: Merge.rc:3035 +#: Merge.rc:3050 #, c-format msgid "G&oto Line %1" msgstr "Ïåðåéòè äî &ðÿäêà %1" -#: Merge.rc:3041 +#: Merge.rc:3056 #, c-format msgid "Disabled" msgstr "Âèìêíóòèé" -#: Merge.rc:3042 +#: Merge.rc:3057 #, c-format msgid "From file system" msgstr "ßê íà äèñêó" -#: Merge.rc:3043 +#: Merge.rc:3058 #, c-format msgid "From MRU list" msgstr "ßê â ñïèñêó íåùîäàâí³õ äîêóìåíò³â" -#: Merge.rc:3049 +#: Merge.rc:3064 #, c-format msgid "No Highlighting" msgstr "Íå ï³äñâ³÷óâàòè" -#: Merge.rc:3050 +#: Merge.rc:3065 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:3051 +#: Merge.rc:3066 #, c-format msgid "Basic" msgstr "Áåéñ³ê" -#: Merge.rc:3052 +#: Merge.rc:3067 #, c-format msgid "Batch" msgstr "Áåò÷" -#: Merge.rc:3053 +#: Merge.rc:3068 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:3054 +#: Merge.rc:3069 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:3055 +#: Merge.rc:3070 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:3056 +#: Merge.rc:3071 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:3057 +#: Merge.rc:3072 #, c-format msgid "Fortran" msgstr "Ôîðòðàí" -#: Merge.rc:3059 +#: Merge.rc:3074 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:3060 +#: Merge.rc:3075 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:3061 +#: Merge.rc:3076 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:3062 +#: Merge.rc:3077 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:3063 +#: Merge.rc:3078 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:3064 +#: Merge.rc:3079 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:3065 +#: Merge.rc:3080 #, c-format msgid "Pascal" msgstr "Ïàñêàëü" -#: Merge.rc:3066 +#: Merge.rc:3081 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:3067 +#: Merge.rc:3082 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:3068 +#: Merge.rc:3083 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:3069 +#: Merge.rc:3084 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:3070 +#: Merge.rc:3085 #, c-format msgid "Python" msgstr "ϳòîí" -#: Merge.rc:3071 +#: Merge.rc:3086 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:3072 +#: Merge.rc:3087 #, c-format msgid "Resources" msgstr "Ðåñóðñè" -#: Merge.rc:3073 +#: Merge.rc:3088 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:3074 +#: Merge.rc:3089 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:3075 +#: Merge.rc:3090 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:3076 +#: Merge.rc:3091 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:3077 +#: Merge.rc:3092 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:3078 +#: Merge.rc:3093 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:3079 +#: Merge.rc:3094 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:3080 +#: Merge.rc:3095 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:3081 +#: Merge.rc:3096 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:3086 +#: Merge.rc:3101 #, c-format msgid "Hide the toolbar" msgstr "Ñõîâàòè ïàíåëü ³íñòðóìåíò³â" -#: Merge.rc:3087 +#: Merge.rc:3102 #, c-format msgid "Show small toolbar" msgstr "Ìàëåíüê³ ï³êòîãðàìè" -#: Merge.rc:3088 +#: Merge.rc:3103 #, c-format msgid "Show big toolbar" msgstr "Âåëèê³ ï³êòîãðàìè" -#: Merge.rc:3093 +#: Merge.rc:3108 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:3094 +#: Merge.rc:3109 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:3095 +#: Merge.rc:3110 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:3096 +#: Merge.rc:3111 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:3101 +#: Merge.rc:3116 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:3106 +#: Merge.rc:3121 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" -- 2.11.0