From 29a3ba1cfc5d49b8f5f1dcded21a5b342eadd6dd Mon Sep 17 00:00:00 2001 From: sdottaka Date: Mon, 4 May 2015 00:42:37 +0900 Subject: [PATCH] Update translations --HG-- branch : stable --- Translations/WinMerge/Basque.po | 659 ++++++++++++--------------- Translations/WinMerge/Brazilian.po | 659 ++++++++++++--------------- Translations/WinMerge/Bulgarian.po | 659 ++++++++++++--------------- Translations/WinMerge/Catalan.po | 659 ++++++++++++--------------- Translations/WinMerge/ChineseSimplified.po | 659 ++++++++++++--------------- Translations/WinMerge/ChineseTraditional.po | 659 ++++++++++++--------------- Translations/WinMerge/Croatian.po | 659 ++++++++++++--------------- Translations/WinMerge/Czech.po | 659 ++++++++++++--------------- Translations/WinMerge/Danish.po | 659 ++++++++++++--------------- Translations/WinMerge/Dutch.po | 659 ++++++++++++--------------- Translations/WinMerge/English.pot | 661 ++++++++++++---------------- Translations/WinMerge/French.po | 659 ++++++++++++--------------- Translations/WinMerge/Galician.po | 659 ++++++++++++--------------- Translations/WinMerge/German.po | 661 ++++++++++++---------------- Translations/WinMerge/Greek.po | 659 ++++++++++++--------------- Translations/WinMerge/Hungarian.po | 659 ++++++++++++--------------- Translations/WinMerge/Italian.po | 659 ++++++++++++--------------- Translations/WinMerge/Japanese.po | 659 ++++++++++++--------------- Translations/WinMerge/Korean.po | 659 ++++++++++++--------------- Translations/WinMerge/Norwegian.po | 659 ++++++++++++--------------- Translations/WinMerge/Persian.po | 659 ++++++++++++--------------- Translations/WinMerge/Polish.po | 659 ++++++++++++--------------- Translations/WinMerge/Portuguese.po | 659 ++++++++++++--------------- Translations/WinMerge/Romanian.po | 659 ++++++++++++--------------- Translations/WinMerge/Russian.po | 659 ++++++++++++--------------- Translations/WinMerge/Serbian.po | 659 ++++++++++++--------------- Translations/WinMerge/Slovak.po | 659 ++++++++++++--------------- Translations/WinMerge/Slovenian.po | 659 ++++++++++++--------------- Translations/WinMerge/Spanish.po | 659 ++++++++++++--------------- Translations/WinMerge/Swedish.po | 659 ++++++++++++--------------- Translations/WinMerge/Turkish.po | 659 ++++++++++++--------------- Translations/WinMerge/Ukrainian.po | 659 ++++++++++++--------------- 32 files changed, 9345 insertions(+), 11747 deletions(-) diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 92029e861..df432cc20 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -249,7 +249,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Hutsik >" @@ -2482,7 +2482,7 @@ msgid "Files:" msgstr "Agiriak:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Ezberdin" @@ -2519,7 +2519,7 @@ msgid "Right:" msgstr "Eskuin:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Berdin" @@ -2729,7 +2729,7 @@ msgid "A&ppend timestamp" msgstr "Erantsi &denbora" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Berretsi Kopiatzea" @@ -2807,7 +2807,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Agiritegia" @@ -2844,8 +2844,8 @@ msgstr "&Alderaketa azkar muga (MB):" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binarioa" @@ -3111,7 +3111,7 @@ msgid "Version Control" msgstr "Bertsio Kontrola" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Ezberdintasunak" @@ -3218,7 +3218,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Agiriak (*.xml)|*.xml|Agiri Denak (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Izena" @@ -3239,7 +3239,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Azalpena" @@ -3383,206 +3383,131 @@ msgstr "Mine Agiria" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Agiriak mihatzen..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Hautapena irekitzen" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Ezkerra Eskuinera kopiatzen" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Eskuina Ezkerrera kopiatzen" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Dena Ezkerrera kopiatzen" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Dena Eskuinera kopiatzen" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Agiriak kopiatzen..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Agiriak ezabatzen..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Agiriak mugitzen..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Jakinarazpena sortzen..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Azken eragiketa desegiten..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Aurreko eragiketa birregiten..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Lerroa: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Batu" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Ezberdintasuna %1 %2-tik" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 Ezberdintasun Aurkiturik" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 Ezberdintasun Aurkituta" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Gaiak %1 %2-tik" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Gaiak:%1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Hautatu badauden bi agiritegi edo agiri alderatzeko" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Agirtegi Hautapena" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Hautatu bi agiritegiak edo bi agiriak alderatzeko." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Ezker helburua baliogabea da!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Eskuin helburua baliogabea da!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Bi helburuak baliogabeak dira!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Hautatu bi agiriak despaketatzaile hautapena gaitzeko" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Ezin dira agiria eta agiritegia alderatu!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Agiria ez da aurkitu: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Agiria ez da despaketatu: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3595,12 +3520,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Hutsegitea gatazka agiria aztertzerakoan." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3611,27 +3536,27 @@ msgstr "" "agiria\n" "ez da agiri gatazkatsu bat." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Gorde Honela" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Gorde aldaketak %1-ri?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Akatsa babeskopia agirian" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3644,7 +3569,7 @@ msgstr "" "\n" "Jarraitu horrela ere?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3661,7 +3586,7 @@ msgstr "" "\t-agirizen ezberdin bat erabiltzea (Sakatu Ongi)\n" "\t-uneko eragiketa uztea (Sakatu Ezeztatu)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3676,7 +3601,7 @@ msgstr "" "\n" "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3691,7 +3616,7 @@ msgstr "" "\n" "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3706,7 +3631,7 @@ msgstr "" "\n" "Gainidatzi aldatutako agiria?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3715,7 +3640,7 @@ msgstr "" "%1\n" "irakurtzeko-bakarrik markatuta dago. Irakurtzeko-bakarrik gaia ezeztatzea nahi duzu?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3730,22 +3655,22 @@ msgstr "" "\n" "Nahi duzu agiria birgertatzea?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Gorde Ezker Agiria Honela" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Gorde Eskuineko Agiria Honela" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3756,7 +3681,7 @@ msgstr "" "%1\n" "ezagertuta dago. Mesedez gorde agiriaren kopia bat jarraitzeko." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3767,42 +3692,42 @@ msgstr "" "\n" "Berritu agiriak jarraitu aurretik." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Egiaztatu agiriak VSS-tik..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Akatsa bertsio sistema komandoari ekitean." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Ez da aurkitu VSS datubaserik!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Akatsa VSS-tik:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3813,7 +3738,7 @@ msgstr "" "Mesedez, egiaztatu erabilitako ikuspen itxurap. berez.\n" "Desegin eragiketa?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3822,127 +3747,127 @@ msgstr "" "Bertsio sistema akats bat itzuli du agiran egiaztatzen saiatzerakoan.\n" "Mesedez, egiaztatu erabilitako ikuspen itxurap. berez." -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Bat ere ez" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 azpikoa)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 edo gainekoa)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Hautsi zurigunean" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Hautsi zurigunean edo puntuaketan" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Eskuina Ezkerrera (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Ezkerra Eskuinera (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Eskuina Ezkerrera (%1 %2-tik)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ezkerra Eskuinera (%1 %2-tik)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Ezkerra hona... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Eskuina hona... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ezkerra hona... (%1 %2-tik)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Eskuina hona... (%1 %2-tik)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Ezkerra (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Eskuina (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Biak (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Ezkerra (%1 %2-tik)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Eskuina (%1 %2-tik)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Biak (%1 %2-tik)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Ezkerraldea - hautatu helmuga agiritegia:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Eskuinaldea - hautatu helmuga agiritegia:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Agiri Eraginda)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 Agiri %2-tik Eraginda)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3953,17 +3878,17 @@ msgstr "" "\n" "%1?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Zihur zaude hona kopiatzea nahi duzula:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Zihur zaude %d gaiak kopiatzea nahi dituzula:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3982,502 +3907,502 @@ msgstr "" "\n" "Mesedez berritu alderaketa." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Zihur zaude mugitzea nahi duzula:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Zihur zaude %d gaiak mugitzea nahi dituzula:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Berretsi Mugitzea" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Hutsegitea kanpoko editatzailea ekiterakoan: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Agiri heuskarri ezezaguna" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Agirizena" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Alderaketa emaitza" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Ezker Eguna" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Eskuin Eguna" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Luzapena" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Ezker Neurria" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Eskuin Neurria" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Eskuin Neurria (Laburra)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Ezker Neurria (Laburra)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Ezkerreko Sortze Denbora" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Eskuineko Sortze Denbora" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Agiri Berriena" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Ezkerreko Agiri Bertsioa" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Eskuineko Agiri Bertsioa" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Emaitz Laburra" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Ezkerraren Ezaugarriak" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Eskuinaren Ezaugarriak" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Ezker EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Eskuin EOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Ezker Kodeaketa" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Eskuin Kodeaketa" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ezikusitako Ezberd." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Ezinezkoa agiriak alderatzea" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Gaia utzita" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Agiria Jauzita" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Agiritegia jauzita" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Ezkerra bakarrik: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Eskuina bakarrik: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Agiri binarioak berdinak dira" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Agiri binarioak ezberdinak dira" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Agiriak ezberdinak dira" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Agiritegiak ezberdinak dira" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Ezkerra Bakarrik" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Eskuina Bakarrik" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Akatsa" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Idazki agiriak berdinak dira" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Idazki agiriak ezberdinak dira" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Igarotako denbora: %ld sm" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 gai hautatuta" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 gai hautatuta" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Agirizena edo agiritegi izena" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Azpiagiritegi izena azpiagiritegiak barne direnean." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Alderaketa emaitza, modu luzean." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Ezkerralde aldaketa eguna." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Eskuinalde aldaketa eguna." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Agiriaren luzapena." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Ezkerreko agiriaren neurria byte-tan" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Eskuineko agiriaren neurria byte-tan" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Ezkerreko agiri neurria laburtuta." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Eskuineko agiri neurria laburtuta." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Ezkerraldearen sortze denbora." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Eskuinaldearen sortze denbora." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Esaten du zein aldek duen aldaketa egun berriagoa." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Ezkerraldeko agiri bertsioa, agiri-mota batzuentzat bakarrik." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Eskuinaldeko agiri bertsioa, agiri-mota batzuentzat bakarrik." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Alderaketa laburraren emaitza." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Ezkerraldearen ezaugarriak." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Eskuinaldearen ezaugarriak." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Ezkerraldeko agiria EOL motakoa da" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Eskuinaldeko agiria EOL motakoa da" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Eskuinalde kodeaketa." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Ezkerralde kodeaketa." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Erakutsi asteriskoa (*) agiria binarioa bada." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Alderatu %1 %2-rekin" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Kakotxaz banandutako zerrenda" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Fitxaz banandutako zerrenda" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML Arrunta" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "XML Arrunta" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4486,32 +4411,32 @@ msgstr "" "Akatsa jakinarazpena sortzean:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Jakinarazpena ongi sortu da." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Agiri berdina dago irekita bi paneletan." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Hautatutako agiriak berdinak dira." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Akats bat gertatu da agiriak alderatzerakoan." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4526,17 +4451,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Hautatutako agiritegia ez da baliogarria" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ezinenezkoa agiri binarioa editatzailera irekitzea" -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4551,7 +4476,7 @@ msgstr "" "%1\n" "beste aldean eta agiritegi hauek irekitzea?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4562,152 +4487,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informazioa galduta kodeaketa akatsengaitik: bi agirietan" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Ezberdintasunik ez" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Lerro ezberdintasuna" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Ordeztuta %1 kate." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ezin da kate hau aurkitu: \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Kokaleku Panela" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Ezberdint. Panela" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Eranskina agiria ongi idatzi da." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. gaia ez da aurkitu edo zuzenbidea da!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. gaia ez da aurkitu edo zuzenbidea da!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Eranskin agiria jadanik badago. Gainidaztea nahi duzu?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 agiri hautatuta]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normala" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Hitzingurua" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Bateratuta" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Ezin da %1 agirira idatzi." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Adierazitako irteera helburua ez helburu osoa: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Adierazi irteera agiri bat" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ezin da eranski agiria sortu agiri binarioetatik." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ezin da eranskina agiria sortu zuzenbideetatik" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4718,12 +4643,12 @@ msgstr "" "\n" "Eranskina sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Agiritegia ez dago." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4734,37 +4659,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Hautatu esportatzeko agiria" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Hautatu inportatzeko agiria" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Agiritik inportatutako aukerak" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Agiritik esportatutako aukerak" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Hutsegitea agiritik aukerak inportatzerakoan." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Hutsegitea aukerak agirian idazterakoan." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4775,247 +4700,247 @@ msgstr "" "\n" "Jarraitzea nahi duzu?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Mota" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Despaketatzailea" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Aurrezberd" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Editatzaile eskripta" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Ez aurrezberd (normala)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Iradokitutako pluginak" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Beste pluginak" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Bilduma Pribatua: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Plugin Ezarpenak" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ez da aurkitu - .sct eskriptak ezgaituta" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "&Joan lerro honetara: %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Ezgaituta" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Agiri sistematik" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "MRU zerrendatik" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Ez Nabarmenduta" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 36c5cbbf7..70bdcda93 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -248,7 +248,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -2481,7 +2481,7 @@ msgid "Files:" msgstr "Arquivos:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Diferente" @@ -2518,7 +2518,7 @@ msgid "Right:" msgstr "Direita:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Idênticos" @@ -2728,7 +2728,7 @@ msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Confirmar a Cópia" @@ -2806,7 +2806,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Pasta" @@ -2843,8 +2843,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binário" @@ -3110,7 +3110,7 @@ msgid "Version Control" msgstr "Controle da Versão" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Diferenças" @@ -3217,7 +3217,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nome" @@ -3238,7 +3238,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Descrição" @@ -3382,206 +3382,131 @@ msgstr "Meu Arquivo" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Escaneando arquivos..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Abrindo a seleção" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Copiando da Esquerda para a Direita" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Copiando da Direita para a Esquerda" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Copiando Tudo para a Esquerda" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Copiando Tudo para a Direita" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Copiando os arquivos..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Apagando os arquivos..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Movendo os arquivos..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Criando o relatório..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Desfazendo a última operação..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Refazendo a operação anterior" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferenças Achadas" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 Diferença Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Seleção de Pastas" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo é inválido!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito é inválido!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos são inválidos!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a seleção do desempacotador." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Não pôde comparar o arquivo e a pasta!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Arquivo não achado: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo não desempacotado: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3594,12 +3519,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3610,27 +3535,27 @@ msgstr "" "%1\n" "não é um arquivo de conflito." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudanças em %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Erro ao fazer o backup do arquivo" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3643,7 +3568,7 @@ msgstr "" "\n" "Continuar de qualquer maneira?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3660,7 +3585,7 @@ msgstr "" "\t-usar um nome de arquivo diferente (Pressione Ok)\n" "\t-abortar a operação atual (Pressione Cancelar)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3675,7 +3600,7 @@ msgstr "" "\n" "Você quer salvar a versão desempacotada em outro arquivo?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3690,7 +3615,7 @@ msgstr "" "\n" "Você quer salvar a versão despachada em outro arquivo?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3705,7 +3630,7 @@ msgstr "" "\n" "Sobrescrever o arquivo mudado?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3714,7 +3639,7 @@ msgstr "" "%1\n" "está marcado como somente-leitura. Você gostaria de sobrescrever o item somente-leitura?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3729,22 +3654,22 @@ msgstr "" "\n" "Você quer recarregar o arquivo?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Salvar o Arquivo a Esquerda Como" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Salvar o Arquivo a Direita Como" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3755,7 +3680,7 @@ msgstr "" "%1\n" "desapareceu. Por favor salve uma cópia do arquivo para continuar." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3766,42 +3691,42 @@ msgstr "" "\n" "Atualize os documentos antes de continuar." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Ver os arquivos da VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar o comando do sistema de versões." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Não foram achadas base(s) de dados VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Erro da VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3812,7 +3737,7 @@ msgstr "" " Por favor, verifique a spec da config da visualização usada.\n" " Desfazer a operação de verificação?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3821,127 +3746,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor do que 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e acima)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Quebrar no espaço em branco" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebrar no espaço em branco ou pontuação" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Direita para a Esquerda (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Esquerda para a Direita (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Direita para a Esquerda (%1 de %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Esquerda para a Direita (%1 de %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Esquerda para... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Direita para... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Esquerda para... (%1 de %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Direita para... (%1 de %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Direita (%1 de %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - selecionar a pasta de destino:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - selecionar a pasta de destino:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Arquivos Afetados)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Arquivos Afetados)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3952,17 +3877,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Você tem certeza de que você quer copiar:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, 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:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3981,502 +3906,502 @@ msgstr "" "\n" "Por favor atualize a comparação." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Você tem certeza que você quer mover:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, 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:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Confirmar o Movimento" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Falhou em executar o editor externo: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Formato do arquivo desconhecido" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nome do Arquivo" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultado da comparação" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Data da Esquerda" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Data da Direita" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Tamanho a Esquerda" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Tamanho a Direita" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Tamanho a Direita (Curto)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Tamanho a Esquerda (Curto)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Hora da Criação a Esquerda" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Hora da Criação a Direita" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Arquivo Mais Novo" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Versão do Arquivo a Esquerda" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Versão do Arquivo a Direita" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Resultado Curto" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atributos da Esquerda" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atributos da Direita" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "EOL a esquerda" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "EOL a direita" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Codificação a Esquerda" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Codificação a Direita" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Diferença Ignorada." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Incapaz de comparar os arquivos" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Arquivo pulado" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Pasta pulada" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Apenas a esquerda: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Apenas a direita: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binários são idênticos" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Os arquivos binários são diferentes" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Os arquivos são diferentes" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "As pastas são diferentes" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Apenas a Esquerda" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Apenas a Direita" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Os arquivos texto são idênticos" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Os arquivos texto são diferentes" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 item selecionado" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 itens selecionados" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou nome da pasta." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome da sub-pasta quando as sub-pastas são incluídas." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparação, formulário longo" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Data de modificação do lado esquerdo." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Data de modificação do lado direito." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Extensão do arquivo." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do arquivo a esquerda em bytes." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do arquivo a direita em bytes." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do arquivo a esquerda abreviado." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do arquivo a direita abreviado." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Hora de criação do lado esquerdo." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Hora da criação do lado direito." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Diz qual lado tem a data de modificação mais nova." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Resultado curto da comparação." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo do lado esquerdo" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo do lado direito" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Codificação do lado esquerdo." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Codficação do lado direito." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostrar um asterisco (*) se o arquivo é binário." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Comparar o %1 com o %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vírgula" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Lista separada por aba" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML Simples" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "XML Simples" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4485,32 +4410,32 @@ msgstr "" "Erro ao criar o relatório:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "O relatório foi criado com sucesso." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo está aberto em ambos os painéis." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Os arquivos selecionados são idênticos." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Um erro ocoreu enquanto comparava os arquivos." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4525,17 +4450,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "A pasta selecionada é inválida." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Não pode abrir um arquivo binário no editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4550,7 +4475,7 @@ msgstr "" "%1\n" "no outro lado e abrir estas pastas?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4561,152 +4486,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Sem diferença" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Diferença da linha" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituiu %1 string(s)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Não pôde achar a string \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Painel de Localização" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Painel das Diferenças" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Arquivo patch gravado com sucesso." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. o item não foi achado ou é diretório!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. o item não foi achado ou é diretório!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos selecionados]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Não pôde gravar no arquivo %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Especificar um arquivo de saída" -#: Merge.rc:2579 +#: Merge.rc:2559 #, 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:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Não pode criar um arquivo patch dos diretórios." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4717,12 +4642,12 @@ msgstr "" "\n" "Criar um patch requer que não hajam mudanças não salvas nos arquivos." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "A pasta não existe." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4733,37 +4658,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Selecione o arquivo para exportar" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Selecione o arquivo para importar" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Opções importadas do arquivo" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Opções exportadas para o arquivo." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Falhou em importar as opções do arquivo." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Falhou em gravar as opções no arquivo." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4774,247 +4699,247 @@ msgstr "" "\n" "Você quer continuar?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Desempacotador" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Script do editor" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Sem prediffer (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Build Privado: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Configurações dos Plugins" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH não achado - scripts .sct desativados" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "I&r para a Linha %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Desativado" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Da lista da MRU" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Sem Destacamento" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Objeto Portátil" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 236831b79..50b353d01 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Ïðàçåí >" @@ -2475,7 +2475,7 @@ msgid "Files:" msgstr "Ôàéëà:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Ðàçëè÷íè" @@ -2512,7 +2512,7 @@ msgid "Right:" msgstr "Äÿñíî:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Èäåíòè÷íè" @@ -2722,7 +2722,7 @@ msgid "A&ppend timestamp" msgstr "Äîáàâè âðåìå" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Ïîòâúðäè êîïèðàíå" @@ -2800,7 +2800,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Äèðåêòîðèÿ" @@ -2837,8 +2837,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Äâîè÷åí" @@ -3072,7 +3072,7 @@ msgid "Version Control" msgstr "Êîíòðîë íà âåðñèÿòà" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Ðàçëèêè" @@ -3179,7 +3179,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ôàéëîâå (*.xml)|*.xml|Âñè÷êè ôàéëîâå (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Èìå" @@ -3200,7 +3200,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Îïèñàíèå" @@ -3338,206 +3338,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Ñêàíèðàíå íà ôàéëîâåòå..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Îòâàðÿ èçáðàíîòî" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Êîïèðà îò ëÿâî íà äÿñíî" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Êîïèðà îò äÿñíî íà ëÿâî" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Êîïèðà âñè÷êî â ëÿâî" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Êîïèðà âñè÷êî â äÿñíî" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Êîïèðàíå íà ôàéëîâå..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Èçòðèâàíå íà ôàéëîâå..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Ïðåìåñòâàíå íà ôàéëîâå..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Ñúçäàâàíå íà îò÷åò..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Ðåä: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Ñëèâàíå" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Ðàçëèêè %1 îò %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 Íàìåðåíè ðàçëèêè" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 Íàìåðåíà ðàçëèêà" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "Ñ×" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Åëåìåíò %1 îò %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Îáùî: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Èçáåðåòå äâå ÑÚÙÅÑÒÂÓÂÀÙÈ äèðåêòîðèè èëè ôàéëîâå çà ñðàâíåíèå" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Èçáîð íà äèðåêòîðèÿ" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Èçáåðåòå äâå ïàïêè èëè äâà ôàéëà çà ñðàâíåíèå." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Íåâàëèäåí ëÿâ ïúò!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Íåâàëèäåí äåñåí ïúò!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Äâàòà ïúòÿ ñà íåâàëèäíè!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Èçáåðåòå äâà ôàéëà çà àêòèâèðàíå íà èçáîðà çà ðàçàðõèâèðàíå." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Íå ìîæå äà ñå ñðàâíè ôàéë ñ äèðåêòîðèÿ!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Íå å íàìåðåí ôàéëà: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Íå å ðàçàðõèâèðàí ôàéëà: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3550,37 +3475,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Ãðåøêà ïðè ðàçáîðà íà êîíôëèêòåí ôàéë" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Ôàéëúò\n%1\níå å êîíôëèêòåí." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Çàïèøè êàòî" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Çàïèøè ïðîìåíèòå íà %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ðåçåðâíî êîïèå" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3593,7 +3518,7 @@ msgstr "" "\n" "Äà ïðîäúëæà ëè?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3610,7 +3535,7 @@ msgstr "" "\t-èçïîëçâàòå ðàçëè÷íî èìå (íàòèñíåòå Ok)\n" "\t-îòìåíèòå òåêóùàòà îïåðàöèÿ (íàòèñíåòå Îòìåíè)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3625,7 +3550,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3640,7 +3565,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3655,7 +3580,7 @@ msgstr "" "\n" "Äà çàìåíÿ ëè ïðîìåíåíèÿ ôàéë?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3664,32 +3589,32 @@ msgstr "" "%1\n" "å ìàðêèðàí ñàìî ç ÷åòåíå. Èñêàòå ëè äà çàìåíèòå åëåìåíòà ñàìî çà ÷åòåíå?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Çàïèøè ëåâèÿ ôàéë êàòî" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Çàïèøè äåñíèÿ ôàéë êàòî" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3700,42 +3625,42 @@ msgstr "" "\n" "Îáíîâåòå äîêóìåíòèòå ïðåäè äà ïðîäúëæèòå." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Âèå òðÿáâà äà èçáåðåòå SourceSafe ïðîåêò çà äà ïðîäúëæèòå (ïð: $/MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Ïðîâåðÿâàíå íà ôàéëîâå îò VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versioning System âúðíà ãðåøêà ïðè îïèòà äà ïðîâåðè ôàéëà. Íå ìîæå äà ïðîäúëæè..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Ãðåøêà ïðè ñòàðòèðàíå íà êîìàíäà îò versioning system." -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ðàáîòíàòà ïàïêà è ðàçïîëîæåíèåòî íà ôàéëà íå ñúâïàäàò. Ùå ïðîäúëæèòå ëè?" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Íå å íàìåðåíà VSS áàçà äàííè!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Ãðåøêà îò VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3746,7 +3671,7 @@ msgstr "" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä.\n" " Äà îòìåíÿ ëè ïðîâåðêàòà?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3755,127 +3680,127 @@ msgstr "" "Versioning System âúðíà ãðåøêà äîêàòî ñå îïèòâà äà îòìåíè ïðîâåðêàòà íà ôàéëà.\n" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä." -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Íÿìà" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ïðåäè â.5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (â.5.0 è íàãîðå)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî èëè ïóíêòóàöèÿ" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Îò äÿñíî êúì ëÿâî (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Îò ëÿâî êúì äÿñíî (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåñåí êúì ëÿâ (%1 îò %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ëÿâ êúì äåñåí (%1 îò %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Ëÿâ êúì... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Äåñåí êúì... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ëÿâ êúì... (%1 îò %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåñåí êúì... (%1 îò %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Ëÿâî (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Äÿñíî (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Äâåòå(%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Ëÿâ (%1 îò %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Äåñåí (%1 îò %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Äâåòå (%1 îò %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Ëÿâà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Äÿñíà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Ôàéëà çàñåãíàòè)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 îò %2 ôàéëà çàñåãíàòè)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3886,17 +3811,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Èñêàòå ëè äà êîïèðàòå:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Èñêàòå ëè äà êîïèðàòå %d åëåìåíòè:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3915,502 +3840,502 @@ msgstr "" "\n" "Ìîëÿ, îáíîâåòå ñðàâíÿâàíåòî." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íå ìîæå äà ñå ñòàðòèðà âúíøíèÿ ðåäàêòîð: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Íåïîçíàò àðõèâåí ôîðìàò" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Èìå" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Ðåçóëòàòè ïðè ñðàâíÿâàíå" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Ëÿâà äàòà" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Äÿñíà äàòà" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Ðàçøèðåíèå" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Ðàçìåð íà ëÿâàòà ÷àñò" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Ðàçìåð íà äÿñíàòà ÷àñò" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð îò äÿñíî (Êðàòúê)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð îò ëÿâî (Êðàòúê)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Âðåìå çà íàïðàâà íà ëÿâàòà ÷àñò" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Âðåìå çà íàïðàâà íà äÿñíàòà ÷àñò" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Íîâè ôàéëîâå" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ íà ëåâèÿ ôàéë" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ íà äåñíèÿ ôàéë" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Áúðçè ðåçóëòàòè" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòè îò ëÿâî" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòè îò äÿñíî" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Ëÿâ EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Äåñåí EOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Ëÿâà êîäèðîâêà" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Äÿñíà êîäèðîâêà" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Èãíîðèðàíè ðàçëèêè" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Íå ìîæå äà ñå ñðàâíÿò ôàéëîâåòå" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Ïðåêúñíàò ôàéë" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Ïðîïóñíàò ôàéë" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Ïðîïóñíàòà äèðåêòîðèÿ" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Îò ëÿâî ñàìî: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Îò äÿñíî ñàìî: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíèòå ôàéëîâå ñà åäíàêâè" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Áèíàðíèòå ôàéëîâå ñà ðàçëè÷íè" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Ðàçëè÷íè ôàéëîâå" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Ñàìî ëåâèÿò" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Ñàìî äåñíèÿò" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Ãðåøêà" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Îñòàâàùî âðåìå: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 èçáðàí îáåêò" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 èçáðàíè îáåêòà" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Èìå íà ïàïêàòà èëè ôàéëà." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìå íà ïîäïàïêàòà, êîãàòî ñà âêëþ÷åíè ïîäïàïêèòå." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëòàò íà ñðàâíåíèåòî, äúëãà ôîðìà." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Äàòà íà ïðîìÿíà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Äàòà íà ïðîìÿíà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Ðàçøèðåíèå íà ôàéëà." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð íà ëåâèÿ ôàéë â áàéòà." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð íà äåñíèÿ ôàéë â áàéòà." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â ëÿâî." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â äÿñíî." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Äàòà íà ñúçäàâàíå íà ëÿâàòà ñòðàíà." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Äàòà íà ñúçäàâàíå íà äÿñíàòà ñòðàíà." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçâà êîÿ ñòðàíà èìà ïî-íîâà äàòà íà ïðîìÿíà." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò ëÿâî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò äÿñíî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Êðàòêè ðåçóëòàòè íà ñðàâíÿâàíå." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòè íà ëÿâàòà ñòðàíà." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòè íà äÿñíàòà ñòðàíà." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "EOL òèï íà ëåâèÿ ôàéë" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "EOL òèï íà äåñíèÿ ôàéë" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâêà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâêà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áðîé íà èãíîðèðàíèòå ðàçëèêè âúâ ôàéë. Òåçè ðàçëèêè ñà èãíîðèðàíè îò WinMerge è íå ìîãàò äà áúäàò ñìåñåíè." -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áðîé íà ðàçëè÷èÿòà âúâ ôàéë. Òîçè áðîé íå âêëþ÷âà èãíîðèðàíèòå ðàçëèêè." -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàæè çâåçäè÷êà (*), àêî ôàéëúò å äâîè÷åí." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíÿâàíå íà %1 ñ %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñúñ çàïåòàÿ" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñ òàáóëàöèÿ" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "×èñò HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "×èñò XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéëúò ñ îò÷åòà âå÷å ñúùåñòâóâà. Èñêàòå ëè äà çàìåíèòå ñúùåñòâóâàùèÿ ôàéë?" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4419,32 +4344,32 @@ msgstr "" "Ãðåøêà ïðè ñúçäàâàíå íà îò÷åòà:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åòúò áåøå ñúçäàäåí óñïåøíî." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Åäíàêâè ôàéëîâå ñà îòâîðåíè â äâàòà ïàíåëà." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Èçáðàíèòå ôàéëîâå ñà åäíàêâè." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïîëó÷è ñå ãðåøêà ïðè ñðàâíÿâàíå íà ôàéëîâåòå." -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Íå ìîæå äà ñå ñúçäàäàò âðåìåííè ôàéëîâå. Ïðîâåðåòå íàñòðîéêèòå çà âðåìåííè ôàéëîâå." -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4459,22 +4384,22 @@ msgstr "" "\n" "Áåëåæêà: Àêî èñêàòå äà ñ÷èòàòå âñè÷êè âúðíàòè òèïîâå êàòî åäíàêâè, çàäàéòå îïöèÿòà 'Èãíîðèðàé ðàçëè÷íèòå âúðíàòè òèïîâå..' â ðàçäåëà Ñðàâíÿâàíå îò ïðîçîðåöà ñ íàñòðîéêèòå (íàìèðà ñå îò Ðåäàêòèðàíå/Íàñòðîéêè)." -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Èçáðàíàòà ïàïêà å íåâàëèäíà." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íå ìîæå äà ñå îòâîðè äâîè÷åí ôàéë ñ ðåäàêòîð." -#: Merge.rc:2513 +#: Merge.rc:2493 #, 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:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4485,152 +4410,152 @@ msgstr "" "Ïîêàçâàíåòî íà âñåêè ôàéë ñ íåãîâàòà êîäèðîâêà ùå äàäå ïî-äîáðà âèäèìîñò, íî ñðàâíÿâàíåòî èëè êîïèðàíåòî ùå å îïàñíî.\n" "Èñêàòå ëè ôàéëîâåòå äà ñå îáðàáîòâàò, èçïîëçâàéêè çàäàäåíàòà êîäèðîâêà íà Windows (ïðåïîðú÷èòåëíî)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Çàãóáà íà èíôîðìàöèÿ, ïîðàäè ãðåøêà â êîäèðîâêàòà íà: äâàòà ôàéëà" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Áåç ðàçëèêè" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Ðàçëèêè â ðåäîâåòå" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíè %1 íèç(à)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå ìîæå äà ñå íàìåðè íèçà \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèå" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Ðàçëèêè" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Ïà÷úò å ãîòîâ." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïà÷à âå÷å ñúùåñòâóâà. Ùå ãî ïðåçàïèøåòå ëè?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 èçáðàíè ôàéëîâå]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Íîðìàëåí" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Óíèôèöèðàí" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Íå ìîæå äà ñå çàïèøå âúðõó %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Çàäàäåíèÿò ïúò íå å ïúëåí ïúò: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Çàäàéòå èçõîäåí ôàéë" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äâîè÷íè ôàéëîâå." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äèðåêòîðèè." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4641,12 +4566,12 @@ msgstr "" "\n" "Ñúçäàâàíåòî íà ïà÷ èçèñêâà äà íÿìà íåçàïèñàíè ïðîìåíè âúâ ôàéëîâåòå." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Ïàïêàòà íå ñúùåñòâóâà." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4657,37 +4582,37 @@ msgstr "" "Íå ñà íàìåðåíè íåîáõîäèìèòå êîìïîíåíòè (7-zip è/èëè Merge7z*.dll) çà ïîääðúæêàòà íà àðõèâè.\n" "Ïîãëåäíåòå ðúêîâîäñòâîòî çà ïîâå÷å èíôîðìàöèÿ îòíîñíî ïîääðúæêàòà íà àðõèâè è êàê äà ÿ âêëþ÷èòå." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Èçáåðåòå ôàéë çà åêñïîðò" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Èçáåðåòå ôàéë çà èìïîðò" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Íàñòðîéêèòå ñà èìïîðòèðàíè îò ôàéë." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Íàñòðîéêèòå ñà åêñïîðòèðàíè âúâ ôàéë." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Íå ìîæå äà ñå èìïîðòèðàò íàñòðîéêèòå îò ôàéë." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Íå ìîæå äà ñå åêñïîðòèðàò íàñòðîéêèòå âúâ ôàéë." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4698,247 +4623,247 @@ msgstr "" "\n" "Èñêàòå ëè äà ïðîäúëæèòå?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Ñìåñåí" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Çàäàäåíèÿ ðàçàðõèâàòîð ùå ñå ïðèëîæè è çà äâàòà ôàéëà (íåîáõîäèìî å ðàçøèðåíèå ñàìî íà åäèíèÿ ôàéë)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ (íîðìàëåí)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Ïðåäëîæåíà äîáàâêà" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Äðóãè äîáàâêè" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Âúòðåøåí áèëä: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè íà äîáàâêèòå" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå å íàìåðåí - .sct ñêðèïòîâåòå ñà çàáðàíåíè" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<Íÿìà>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<Àâòîìàòè÷íî>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Îòèäè íà ðåä %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Çàáðàíåí" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Îò ôàéëîâàòà ñèñòåìà" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Îò MRU ñïèñúê" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Ðåñóðñè" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 6c3eb5fc0..656b6114d 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -245,7 +245,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Buit >" @@ -2474,7 +2474,7 @@ msgid "Files:" msgstr "Fitxers:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Diferents" @@ -2511,7 +2511,7 @@ msgid "Right:" msgstr "Dreta:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Idèntics" @@ -2721,7 +2721,7 @@ msgid "A&ppend timestamp" msgstr "A&fegeix una marca horària" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Confirmació de còpia" @@ -2799,7 +2799,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Directori" @@ -2836,8 +2836,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binari" @@ -3071,7 +3071,7 @@ msgid "Version Control" msgstr "Control de versions" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Diferències" @@ -3178,7 +3178,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fitxers XML (*.xml)|*.xml|All Files (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nom" @@ -3199,7 +3199,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Descripció" @@ -3337,206 +3337,131 @@ msgstr "" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "S'estan examinant els fitxers..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "S'està obrint la selecció" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "S'està copiant de l'esquerra a la dreta" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "S'està copiant de la dreta a l'esquerra" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "S'està copiant tot a l'esquerra" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "S'està copiant tot a la dreta" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "S'estan copiant els fitxers..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "S'estan suprimint els fitxers..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "S'estan movent els fitxers..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Creant l'informe..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Línia: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Combina" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Diferència %1 de %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "S'han trobat %1 diferènces" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "S'ha trobat una diferència" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Element %1 de %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Elements: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecciona dos directoris o fitxers existents per a comparar" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Selecció de directori" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecciona dos directoris o dos fitxers per a comparar." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "El camí de l'esquerra és invalid!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "El camí de la dreta és invalid!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Ambdós camins són invalids!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Tria dos fitxers per a habilitar la selecció del desempaquetador." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "No es pot comparar un fitxer i un directori!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "El fitxer no s'ha trobat: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "El fitxer no s'ha desempaquetat: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3549,37 +3474,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Anomena i desa" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Voleu desar els canvis a %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Hi ha hagut un error en crear una còpia de seguretat del fitxer" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3592,7 +3517,7 @@ msgstr "" "\n" "Voleu continuar tot i així?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3609,7 +3534,7 @@ msgstr "" "\t-desar-lo amb un nom diferent (premeu D'acord)\n" "\t-avortar l'operació actual (Premeu Cancel·lar)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3624,7 +3549,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3639,7 +3564,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3654,7 +3579,7 @@ msgstr "" "\n" "Voleu sobreescriure el fitxer?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3663,32 +3588,32 @@ msgstr "" "%1\n" "està marcat com a només de lectura. Voleu substituir l'element només de lectura?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Anomena i desa el fitxer de l'esquerra" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Anomena i desa el fitxer de la dreta" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3699,42 +3624,42 @@ msgstr "" "\n" "Cal que refresqueu els documents abans de continuar." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Extreu (check-out) fitxers del VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, 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:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "No s'han trobat cap base de dades del VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Error del VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3745,7 +3670,7 @@ msgstr "" "Reviseu les especificacions de configuració de la vista emprada.\n" "Voleu desfer la operació d'extracció (check-out)?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3754,127 +3679,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Cap" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (anterior al 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i posterior)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Separa a l'espai" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Separa a l'espai o puntuació" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Dreta a esquerra (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Esquerra a dreta (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Dreta a esquerra (%1 de %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Esquerra a dreta (%1 de %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Esquerra a... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Dreta a... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Esquerra a... (%1 de %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Dreta a... (%1 de %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Esquerra (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Dreta (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Ambdós (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerra (%1 de %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Dreta (%1 de %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Ambdós (%1 de %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Costat esquerre - seleccioneu la carpeta de destinació:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Costat dret - seleccioneu la carpeta de destinació:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fitxers afectats)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 fitxers afectats)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3885,17 +3810,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Esteu segur que voleu copiar:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Esteu segur que voleu copiar %d elements:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3914,502 +3839,502 @@ msgstr "" "\n" "Actualitzeu la comparació." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "No s'ha pogut executar l'editor extern: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "El format de l'arxiu és desconegut" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nom" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultat de la comparació" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Data esquerra" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Data dreta" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extensió" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Mida esquerra" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Mida dreta" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Mida dreta (breu)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Mida esquerra (breu)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Data de creació esquerra" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Data de creació dreta" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Fitxer més nou" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Versió del fitxer esquerra" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Versió del fitxer dreta" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Resultat breu" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atributs esquerra" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atributs dreta" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Salt de línia esquerra" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Salt de línia dreta" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Codificació esquerra" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Codificació dreta" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Diferències ignorades" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "No es pot comparar els fitxers" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Element avortat" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Fitxer omès" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Directori omès" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Només esquerra: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Només dreta: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Els fitxers binaris són idèntics" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Els fitxers binaris són diferents" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Els fitxers són diferents" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Només l'esquerre" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Només el dret" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps transcorregut: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 element seleccionat" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 elements seleccionats" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nom del fitxer o directori." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom del subdirectori quan s'incloguin els subdirectoris." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparació, en forma llarga." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Data de modificació del costat esquerre." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Data de modificació del costat dret." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Extensió del fitxer." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Mida en bytes del fitxer esquerre." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Mida en bytes del fitxer dret." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Mida del fitxer esquerre en format abreujat." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Mida del fitxer dret en format abreujat." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Data de creació del fitxer esquerre." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Data de creació del fitxer dret." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Diu quin costat te una data de modificació més recent." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Resultat breu de la comparació." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atributs del costat esquerre." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atributs del costat dret." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat esquerre" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat dret" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Codificació del costat esquerre." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Codificació del costat dret." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisc (*) si el fitxer és binari." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Compara %1 amb %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Llista delimitada per comes" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Llista delimitada per tabulacions" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML símple" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "XML símple" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4418,32 +4343,32 @@ msgstr "" "Hi ha hagut un error creant l'informe:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "L'informe s'ha creat satisfactòriament." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "El mateix fitxer és obert a ambdues subfinestres." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Els fitxers seleccionats són idèntics." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "S'ha produït un error en comparar els fitxers." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4458,22 +4383,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada és invàlida." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "No es poden obrir fitxers binaris a l'editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, 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:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4484,152 +4409,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Sense diferències" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Diferència de línia" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "S'ha(n) substituït %1 cadena(s)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "No s'ha trobat la cadena \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Subfinestra d'ubicació" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Subfinestra de diferències" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "El pedaç s'ha generat satisfactòriament." -#: Merge.rc:2568 +#: Merge.rc:2548 #, 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:2569 +#: Merge.rc:2549 #, 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:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 fitxers seleccionats]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "No s'ha pogut escriure al fitxer %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Especifiqueu un fitxer de sortida" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No es pot crear un pedaç de fitxers binaris." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "No es pot crear un pedaç de directoris." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4640,12 +4565,12 @@ msgstr "" "\n" "Cal que no hi hagi cap fitxer pendent de salvar per tal de crear un pedaç." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existeix." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4656,37 +4581,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Trieu el fitxer per a exportar" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Trieu el fitxer per a importar" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "S'ha importat les opcions des del fitxer." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "S'ha exportat les opcions al fitxer." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "No s'ha pogut importar les opcions del fitxer." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "No s'ha pogut escriure les opcions al fitxer." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4694,247 +4619,247 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Barrejat" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "No prediferencia (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Connectors suggerits" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Altres connectors" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Muntatge privat: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Ajustos del connector" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "No s'ha trobat el WSH - seqüències d'ordres .sct inhabilitades" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Va fins a la línia %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Inhabilitat" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Des del sistema de fitxers" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Des de la llista de recents" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index e0295d62f..54a2873e5 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< ¿Õ >" @@ -2475,7 +2475,7 @@ msgid "Files:" msgstr "Îļþ:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "²»Í¬" @@ -2512,7 +2512,7 @@ msgid "Right:" msgstr "ÓÒ²à:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "ÍêÈ«Ïàͬ" @@ -2722,7 +2722,7 @@ msgid "A&ppend timestamp" msgstr "Ìí¼Óʱ¼ä´Á(&P)" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "È·Èϸ´ÖÆ" @@ -2800,7 +2800,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Îļþ¼Ð" @@ -2837,8 +2837,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "¶þ½øÖÆ" @@ -3072,7 +3072,7 @@ msgid "Version Control" msgstr "°æ±¾¿ØÖÆ" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "²»Í¬´¦" @@ -3179,7 +3179,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Îļþ (*.xml)|*.xml|ËùÓÐÎļþ (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Ãû³Æ" @@ -3200,7 +3200,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "ÃèÊö" @@ -3337,206 +3337,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "ɨÃèÎļþ..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "´ò¿ªÑ¡Ôñ" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "ÕýÔÚ´Ó×ó²à¸´ÖƵ½ÓÒ²à" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "ÕýÔÚ´ÓÓҲิÖƵ½×ó²à" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½×ó²à" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ²à" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "ÕýÔÚ¸´ÖÆÎļþ..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "ÕýÔÚɾ³ýÎļþ..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "ÕýÔÚÒƶ¯Îļþ..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "´´½¨±¨¸æ..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "ÐÐ: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "ºÏ²¢" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "µÚ %1 ´¦²»Í¬(¹² %2 ´¦)" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "¹²ÕÒµ½ %1 ´¦²»Í¬" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "ÕÒµ½ 1 ´¦²»Í¬" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "Ö»¶Á" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "µÚ %1 ÏîÄ¿£¬¹² %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "ÏîÄ¿: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Ñ¡ÔñÁ½¸öÒÑ´æÔÚµÄÎļþ¼Ð»òÎļþ½øÐжԱÈ" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Ñ¡ÔñÎļþ¼Ð" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Ñ¡ÔñÒª½øÐжԱȵÄÁ½¸öÎļþ¼Ð»òÁ½¸öÎļþ¡£" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "×ó²à·¾¶²»´æÔÚ!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "ÓҲ෾¶²»´æÔÚ!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Á½¸ö·¾¶¶¼²»´æÔÚ!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Ñ¡ÔñÁ½¸öÎļþÒÔÆôÓýâ°ü³ÌÐò." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "²»ÄÜÔÚÎļþºÍÎļþ¼ÐÖ®¼ä½øÐжԱÈ!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "ÕÒ²»µ½Îļþ: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Îļþδ½â°ü: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3549,37 +3474,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "½âÎö³åÍ»Îļþʱʧ°Ü" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Îļþ\n%1\n²»ÊÇÒ»¸ö³åÍ»Îļþ" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Áí´æΪ" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "±£´æ¸ü¸Äµ½ %1£¿" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "±¸·ÝÎļþʱ³ö´í" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3592,7 +3517,7 @@ msgstr "" "\n" "ÈÔÈ»¼ÌÐøÂð£¿" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3609,7 +3534,7 @@ msgstr "" "\t-ÓÃÆäËüÎļþÃû±£´æ(µã»÷¡°È·¶¨¡±)\n" "\t-ÖÐÖ¹µ±Ç°²Ù×÷(µã»÷¡°È¡Ïû¡±)" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3624,7 +3549,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3639,7 +3564,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3654,7 +3579,7 @@ msgstr "" "\n" "Òª¸²¸ÇÒѱ»Ð޸ĵÄÎļþÂð£¿" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3663,32 +3588,32 @@ msgstr "" "%1\n" "Îļþ±ê¼ÇΪֻ¶Á¡£ÄúÒª¸²¸ÇÖ»¶ÁµÄÎļþÂð£¿" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "×ó²àÎļþÁí´æΪ" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "ÓÒ²àÎļþÁí´æΪ" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3699,42 +3624,42 @@ msgstr "" "\n" "ÇëË¢ÐÂÎĵµºóÔÙ¼ÌÐø¡£" -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺 $/MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "´ÓVSSÖÐÇ©³öÎļþ..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "ÔÚÇ©³ö(Checkout)Îļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÒ»¸ö´íÎó¡£ÎÞ·¨¼ÌÐø..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Ö´Ðа汾¿ØÖÆϵͳÃüÁîʱ³ö´í¡£" -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¹¤×÷Îļþ¼Ð(Working Folder)Ó뵱ǰÎļþλÖò»·û¡£ÊÇ·ñ¼ÌÐø£¿" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "δÕÒµ½ VSS Êý¾Ý¿â£¡" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "VSS ·µ»Ø´íÎó:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3745,7 +3670,7 @@ msgstr "" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷.\n" " ³·ÏúÇ©³ö²Ù×÷Âð?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3754,127 +3679,127 @@ msgstr "" "ÔÚ³¢ÊÔ³·ÏúÇ©³öÎļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÁËÒ»¸ö´íÎó.\n" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷. " -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "ÎÞ" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ÒÔÇ°°æ±¾)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ¼°ÒÔºó°æ±¾)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "ÒÔ¿Õ°×·Ö¸ô" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÒÔ¿Õ°×»ò±êµã·Ö¸ô" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "ÓҲൽ×ó²à (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "×ó²àµ½ÓÒ²à (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "ÓҲൽ×ó²à (%1 ¹²%2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "×ó²àµ½ÓÒ²à (%1 ¹²%2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "×ó²àµ½... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "ÓҲൽ... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "×ó²àµ½... (%1 ¹²%2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "ÓҲൽ... (%1 ¹²%2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "×ó²à (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "ÓÒ²à (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Á½²à (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "×ó²à (%1 ¹²%2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "ÓÒ²à (%1 ¹²%2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Á½²à (%1 ¹²%2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "×ó²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "ÓÒ²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(Ó°Ïì %1 ¸öÎļþ)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Ó°Ïì %2 ÎļþÖÐµÄ %1 ¸ö)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3886,17 +3811,17 @@ msgstr "" "%1\n" "Âð£¿" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆÂð:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆ %d ¸öÏîÄ¿Âð:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3915,502 +3840,502 @@ msgstr "" "\n" "ÇëˢбȽϴ°¿Ú." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íⲿ±à¼­Æ÷ÔËÐÐʧ°Ü: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "δ֪µÄѹËõ°ü¸ñʽ" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "ÎļþÃû³Æ" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "¶Ô±È½á¹û" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "×ó²àÈÕÆÚ" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "ÓÒ²àÈÕÆÚ" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "À©Õ¹Ãû" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "×ó²àÎļþ´óС" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "ÓÒ²àÎļþ´óС" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "ÓÒ²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "×ó²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "×ó²à½¨Á¢Ê±¼ä" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "ÓҲཨÁ¢Ê±¼ä" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "½ÏеÄÎļþ" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "×ó²àÎļþ°æ±¾" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "ÓÒ²àÎļþ°æ±¾" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "¼ò¶ÌµÄ½á¹û" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "×ó²àÊôÐÔ" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "ÓÒ²àÊôÐÔ" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "×ó²à»»Ðзû" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "ÓҲ໻Ðзû" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "×ó²àÎļþ±àÂë" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "ÓÒ²àÎļþ±àÂë" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "ºöÂԵIJ»Í¬´¦" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "ÎÞ·¨¶Ô±ÈÎļþ" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "ÏîÄ¿È¡Ïû" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "ÎļþÒÑÌø¹ý" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Îļþ¼ÐÒÑÌø¹ý" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "½öÔÚ×ó²à: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "½öÔÚÓÒ²à: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "¶þ½øÖÆÎļþÍêÈ«Ïàͬ" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "¶þ½øÖÆÎļþ²»Í¬" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Îļþ²»Í¬" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Ö»´æÔÚ×ó²à" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Ö»´æÔÚÓÒ²à" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "´íÎó" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ö´ÐÐʱ¼ä: %ld ºÁÃë" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "Ñ¡ÔñÁË 1 ¸öÏîÄ¿" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "Ñ¡ÔñÁË %1 ¸öÏîÄ¿" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "ÎļþÃû»òÎļþ¼ÐÃû¡£" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Ëù´¦µÄ×ÓÎļþ¼ÐÃû¡£" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "¶Ô±È½á¹û£¬½Ï³¤µÄ¸ñʽ¡£" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "×ó²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "ÓÒ²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "ÎļþµÄÀ©Õ¹Ãû¡£" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "×ó²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "ÓÒ²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "×ó²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "ÓÒ²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "×ó²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "ÓÒ²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "ÏÔʾ³öÄıßÊǽÏÍíÐ޸ĹýµÄ¡£" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "×ó²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "ÓÒ²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "¶Ì¸ñʽµÄ¶Ô±È½á¹û¡£" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "×ó²àµÄÊôÐÔ¡£" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "ÓÒ²àµÄÊôÐÔ¡£" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "×ó²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "ÓÒ²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "×ó²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "ÓÒ²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "±»ÂÔ¹ýµÄ²»Í¬Êý. ÓÉWinMergeºöÂԵIJ»Í¬, ÎÞ·¨¶ÔËüÃǽøÐкϲ¢." -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÎļþÖеIJ»Í¬Êý. ²»°üÀ¨ºöÂԵIJ»Í¬." -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "ÔÚ¶þ½øÖÆÎļþ´¦ÏÔʾÐǺÅ(*)¡£" -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "¶Ô±È %1 ºÍ %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "¶ººÅ·Ö¸ôµÄÁбí" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "ÖƱí·û·Ö¸ôµÄÁбí" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "¼òµ¥HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "¼òµ¥XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "±¨¸æÎļþÒѾ­´æÔÚ£¬Òª¸²¸ÇÂð£¿" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4419,32 +4344,32 @@ msgstr "" "´´½¨±¨¸æʱ³ö´í:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "³É¹¦´´½¨±¨¸æ¡£" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Á½²à´ò¿ªµÄÊÇͬһ¸öÎļþ¡£" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Ò»¸ö´íÎó·¢ÉúÓÚ¶Ô±ÈÎļþʱ¡£" -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "ÎÞ·¨´´½¨ÁÙʱÎļþ¡£Çë¼ì²éÄúµÄÁÙʱ·¾¶ÉèÖá£" -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4459,22 +4384,22 @@ msgstr "" "\n" "Ìáʾ£ºÈç¹ûÄú×ÜÊǺöÂÔ»»ÐзûµÄ²»Í¬£¬ÇëÔÚ¡°±à¼­/Ñ¡ÏµÄ¡°¶Ô±È¡±Ò³Öй´Ñ¡¡°ºöÂÔ»»Ðзû²îÒ족¡£" -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Ñ¡ÖеÄÎļþ¼ÐÎÞЧ¡£" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "ÎÞ·¨Óñ༭Æ÷´ò¿ª¶þ½øÖÆÎļþ¡£" -#: Merge.rc:2513 +#: Merge.rc:2493 #, 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:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4485,152 +4410,152 @@ msgstr "" "·Ö±ðÒÔ²»Í¬´úÂëÒ³ÏÔʾ½«»áÓнϺõÄЧ¹û£¬µ«ÊǺϲ¢/¸´ÖÆ»áÓÐΣÏÕ¡£\n" "ÄúÒªÒÔWindowsĬÈϵĴúÂëÒ³ÏÔʾÁ½¸öÎļþÂð(ÍƼö)£¿" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ÓÉÓÚ×Ö·û±àÂë´íÎóÔì³ÉÁ½¸öÎļþÐÅÏ¢¶ªÊ§" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "ûÓв»Í¬" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "ÐÐÄÚ²»Í¬" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£" -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÎÞ·¨²éÕÒ×Ö·û´®¡¸%s¡¹" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "λÖÃʾÒâ" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "²»Í¬´¦ÏÔʾ" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "³É¹¦Ð´ÈëpatchÎļþ¡£" -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "patchÎļþÒѾ­´æÔÚ£¬ÄúÒª¸²¸ÇËüÂð£¿" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[Ñ¡ÖÐ %1 ¸öÎļþ]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "ÆÕͨ" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "ÉÏÏÂÎÄ" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "ͳһ" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "ÎÞ·¨Ð´ÈëÎļþ %1¡£" -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ö¸¶¨µÄ·¾¶²»ÊǾø¶Ô·¾¶: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "ÇëÖ¸¶¨Êä³öÎļþ" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ÎÞ·¨Îª¶þ½øÖÆÎļþ´´½¨ patch¡£" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "ÎÞ·¨ÎªÎļþ¼Ð´´½¨ patch¡£" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4641,12 +4566,12 @@ msgstr "" "\n" "´´½¨ patch ÒªÇóÎļþÖÐûÓÐδ±£´æµÄ¸Ä¶¯¡£" -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Îļþ¼Ð²»´æÔÚ¡£" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4658,37 +4583,37 @@ msgstr "" "ûÕÒµ½Ö§³ÖѹËõ°üËùÐèÒªµÄ×é¼þ(7-zip »ò Merge7z*.dll)¡£\n" "Çë²é¿´ÊÖ²á»ñµÃÓйØѹËõ°üÖ§³Ö¼°ÈçºÎÆôÓõĸü¶àÐÅÏ¢¡£" -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Ñ¡Ôñµ¼³öÎļþ" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Ñ¡Ôñµ¼ÈëÎļþ" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Ñ¡ÏîÒÑ´ÓÎļþµ¼Èë." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Ñ¡ÏîÒѾ­µ¼³öµ½Îļþ." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Ñ¡Ïîµ¼Èëʧ°Ü." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Ñ¡Ïîµ¼³öʧ°Ü." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4696,247 +4621,247 @@ msgid "" "Do you want to continue?" msgstr "ÄúÕýÒª¹Ø±Õ¶à¸ö¶Ô±È´°¿Ú¡£\nÊÇ·ñ¼ÌÐø£¿" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "»ìºÏ" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "ÔÚÁ½¸öÎļþÉÏÓ¦ÓÃÊʵ±µÄ½â°ü³ÌÐò (ÎļþÖ»ÐèÒªÓÐÊʵ±µÄÀ©Õ¹Ãû)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò (ÆÕͨ)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "ÍƼöµÄ²å¼þ" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "ÆäËü²å¼þ" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "²å¼þÉèÖÃ" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH δÕÒµ½ - .sct ½Å±¾ÒѽûÓÃ" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<ÎÞ>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<×Ô¶¯>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "תµ½µÚ %1 ÐÐ(&O)" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "½ûÓÃ" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "ÓÉÎļþϵͳѡÔñ" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "ÓÉ×î½üʹÓõÄÎļþÑ¡Ôñ" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Åú´¦Àí" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "×ÊÔ´Îļþ" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 3c052395e..fb42b5a62 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< µL >" @@ -2488,7 +2488,7 @@ msgid "Files:" msgstr "ÀɮסG" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "¤£¦P" @@ -2525,7 +2525,7 @@ msgid "Right:" msgstr "¥kÃä¡G" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "¥þ¦P" @@ -2735,7 +2735,7 @@ msgid "A&ppend timestamp" msgstr "ªþ¤W®É¶¡ÂW°O(&P)" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "½T»{½Æ»s" @@ -2813,7 +2813,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "¸ê®Æ§¨" @@ -2850,8 +2850,8 @@ msgstr " #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "¤G¶i¨î" @@ -3117,7 +3117,7 @@ msgid "Version Control" msgstr "ª©¥»±±¨î" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "®t²§" @@ -3224,7 +3224,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÀÉ (*.xml)|*.xml|All Files (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "¦WºÙ" @@ -3245,7 +3245,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "´y­z" @@ -3390,206 +3390,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "±½´yÀÉ®×..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "¶}±Ò¿ï¨ú" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "¥¿½Æ»s¥ªÃä¨ì¥kÃä" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "¥¿½Æ»s¥kÃä¨ì¥ªÃä" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "¥¿½Æ»s¥þ³¡¨ì¥ªÃä" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "¥¿½Æ»s¥þ³¡¨ì¥kÃä" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "¥¿½Æ»sÀÉ®×..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "¥¿§R°£ÀÉ®×..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "¥¿²¾°ÊÀÉ®×..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "¥¿²£¥Í³ø§i..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "ºM¦^¤W¦¸ªº¾Þ§@..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "¦A°µ¤W¦¸ªº¾Þ§@..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "¦æ¡G %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "¦X¨Ö" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "%2 ­Ó®t²§¤¤¤§²Ä %1" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "§ä¨ì %1 ­Ó®t²§" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "§ä¨ì 1 ­Ó®t²§" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "%2 ­Ó¶µ¥Ø¤§²Ä %1" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "¶µ¥Ø¡G%1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "¿ï¨ú¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "¸ê®Æ§¨¿ï¨ú" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "¿ï¨ú¨â­Ó¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï¡C" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "¥ªÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "¥kÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "¨âÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¿ï¨âÀÉ¥H±Ò¥Î¸Ñ¥]¾¹¿ï¨ú¡C" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "µLªk¤ñ¸ûÀɮשM¸ê®Æ§¨¡I" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "§ä¤£¨ìÀɮסG%1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "¥¼¸Ñ¥]ªºÀɮסG%1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3602,12 +3527,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "µLªk¸ÑªR½Ä¬ðÀÉ¡C" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3618,27 +3543,27 @@ msgstr "" "%1\n" "¤£¬O½Ä¬ðÀÉ¡C" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "¥t¦s·sÀÉ" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Àx¦s§ó§ï¨ì %1¡H" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "³Æ¥÷Àɮ׮ɵo¥Í¿ù»~" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3651,7 +3576,7 @@ msgstr "" "\n" "¤´ÂÂÄ~Äò¶Ü¡H" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3668,7 +3593,7 @@ msgstr "" "\t-¥H¤£¦P¦WºÙÀx¦sÀÉ®× («ö¡u½T©w¡v)\n" "\t-©ñ±ó¥Ø«e¾Þ§@(«ö¡u¨ú®ø¡v)¡H" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3683,7 +3608,7 @@ msgstr "" "\n" "­nÀx¦s¸Ñ¥]ª©¦¨¥t¤@Àɮ׶ܡH" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3698,7 +3623,7 @@ msgstr "" "\n" "§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3713,7 +3638,7 @@ msgstr "" "\n" "­nÂмg¨º§ó·s¹LªºÀɮ׶ܡH" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3722,7 +3647,7 @@ msgstr "" "%1\n" "¤w¼Ð°O¦¨°ßŪ¡C¤´­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3737,22 +3662,22 @@ msgstr "" "\n" "­n­«·s¸ü¤J¥¦¶Ü¡H" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Àx¦s¥ªÃäÀɮ׬°" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Àx¦s¥kÃäÀɮ׬°" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3763,7 +3688,7 @@ msgstr "" "%1\n" "®ø¥¢¡C½ÐÀx¦sÀÉ®×°Æ¥»¦AÄ~Äò¡C" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3771,42 +3696,42 @@ msgid "" "Refresh documents before continuing." msgstr "¦p¥¼­«¾ãÀɮסAWinMerge ¤£¯à¨Ö¤J²§°Ê¡C" -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "¥Ñ VSS ¨ú¥XÀÉ®×..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "°õ¦æª©¥»¨t²Î«ü¥O®Éµo¥Í¿ù»~¡C" -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "§ä¤£¨ì VSS ¸ê®Æ®w¡I" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "VSS µo¥Í¿ù»~¡G" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3817,7 +3742,7 @@ msgstr "" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C\n" " ºM¦^¨ú¥X¡H" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3826,127 +3751,127 @@ msgstr "" "ºM¦^¨ú¥XÀɮ׮ɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡C\n" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C" -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "µL" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (¦­©ó 5.0 ª©)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ª©©M§ó±ßªºª©¥»)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "ªÅ¥Õ³B¤¤Â_" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "ªÅ¥Õ³B©Î¼ÐÂI³B¤¤Â_" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "¥kÃä¨ì¥ªÃä (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "¥ªÃä¨ì¥kÃä (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "¥kÃä¨ì¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¥ªÃä¨ì¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "¥ªÃä¨ì... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "¥kÃä¨ì... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "¥ªÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "¥kÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "¥ªÃä (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "¥kÃä (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "¨âÃä (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "¨âÃä (%2 ¤§ %1)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "¥ªÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "¥kÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ¨ü¼vÅTÀÉ®×)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%2 ¨ü¼vÅTÀɮפ§ %1)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3957,17 +3882,17 @@ msgstr "" "\n" "%1¡H" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "½T©w­n½Æ»s¡G" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "½T©w­n½Æ»s %d ¶µ¥Ø¡G" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3986,502 +3911,502 @@ msgstr "" "\n" "½Ð­«¾ã¤ñ¸û¡C" -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "½T©w­n²¾°£¡G" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "½T©w­n²¾°£ %d ¶µ¥Ø¡G" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "½T»{²¾°£" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "µLªk°õ¦æ¥~³¡½s¿è¾¹ %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "¥¼ª¾À£ÁY®æ¦¡" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "ÀɮצWºÙ" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "¤ñ¹ïµ²ªG" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "¥ªÃä¤é´Á" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "¥kÃä¤é´Á" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "°ÆÀɦW" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "¥ªÃä¤j¤p" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "¥kÃä¤j¤p" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "¥kÃä¤j¤p (²)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "¥ªÃä¤j¤p (²)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "¥ªÃä«Ø¥ß®É¶¡" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "¥kÃä«Ø¥ß®É¶¡" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "¸û·sÀÉ®×" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "¥ªÃäÀɮת©¥»" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "¥kÃäÀɮת©¥»" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "²¦¡µ²ªG" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "¥ªÃäÄÝ©Ê" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "¥kÃäÄÝ©Ê" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "¥ªÃä EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "¥kÃä EOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "¥ªÃä½s½X" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "¥kÃä½s½X" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "©¿²¤ªº®t²§" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "µLªk¤ñ¸ûÀÉ®×" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "¤¤Â_ªº¶µ¥Ø" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "²¤¹LªºÀÉ®×" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "²¤¹Lªº¸ê®Æ§¨" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "¶È¥ªÃä¡G%1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "¶È¥kÃä¡G%1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "¤G¶i¨îÀɧ¹¥þ¬Û¦P" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "¤G¶i¨îÀɤ£¦P" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Àɮפ£¦P" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "¨â¸ê®Æ§¨¤£¦P" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "¶È¥ªÃä" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "¶È¥kÃä" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "¿ù»~" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "¤å¦rÀɤº®e¬Û¦P" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "¤å¦rÀɤº®e¤£¦P" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "¸g¹L®É¶¡¡G %ld ²@¬í" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "¤w¿ï¨ú 1 ­Ó¶µ¥Ø" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "¤w¿ï¨ú %1 ­Ó¶µ¥Ø" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "ÀɮצWºÙ©Î¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¥]¬A¤l¸ê®Æ§¨®É¤§¤l¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "¤ñ¸ûµ²ªG¡Aªø¦¡ªí³æ¡C" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "°ÆÀɦW¡C" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "¥ªÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "¥kÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "¥ªÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "¥kÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "¥ªÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "¥kÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "§iª¾¨ºÃ䦳¸û·sªº­×§ï¤é´Á¡C" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¥ªÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¥kÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "µu¦¡¤ñ¸ûµ²ªG¡C" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "¥ªÃäÄÝ©Ê¡C" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "¥kÃäÄÝ©Ê¡C" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "¥ªÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "¥kÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "¥ªÃä½s½X¡C" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "¥kÃä½s½X¡C" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Àɮפ¤ªº®t²§­Ó¼Æ¡C¦¹¼Æ¤£¥]¬A³Q©¿²¤ªº®t²§¡C" -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¬O¤G¶i¨îÀÉ¡A´NÅã¥Ü¬P¸¹ (*)" -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "¤ñ¸û %1 ©M %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "³r¸¹¤À¹j¦Cªí" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "¸õ®æ¸¹¤À¹j¦Cªí" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "³æ¯Â HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "³æ¯Â XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4490,32 +4415,32 @@ msgstr "" "²£¥Í³ø§i®Éµo¥Í¿ù»~¡G\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "¦¨¥\²£¥Í³ø§i¡C" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "¬Û¦PÀɮ׶}±Ò¨ì¨âÃä¡C" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "©Ò¿ïÀɮק¹¥þ¬Û¦P¡C" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "¤ñ¹ïÀɮ׮ɵo¥Í¿ù»~¡C" -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4530,17 +4455,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "©Ò¿ïªº¸ê®Æ§¨µL®Ä¡C" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "½s¿è¾¹¤£¯à¶}±Ò¤G¶i¨îÀÉ¡C" -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4555,7 +4480,7 @@ msgstr "" "%1\n" "¨ì¥t¤@Ãä¡AµM«á¶}±Ò¨â§¨¶Ü¡H" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4566,156 +4491,156 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "µL®t²§" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "¦æ¤º®t²§" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "¤w¨ú¥N %1 ­Ó¦r¦ê¡C" -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "§ä¤£¨ì \"%s\" ¦r¦ê" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" # also refer to line 5584 # ¦ì¸mµ¡®æ -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "»·±æµ¡®æ" # also refer to line 5578 # ®t²§µ¡®æ -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "ªñ¹îµ¡®æ" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "¸ÉºóÀɦ¨¥\¼g¤J¡C" -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "¸ÉºóÀɤw¦s¦b¡C­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 ­ÓÀɮפw¿ï¨ú]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "¤@¯ë" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "¯ßµ¸" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "¦P¤@¤Æ" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "µLªk¼g¤J¨ìÀÉ®× %1¡C" -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "«ü©wªº¿é¥X¸ô®|¤£¬Oµ´¹ï¸ô®|¡G%1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "«ü©w¤@­Ó¿é¥XÀÉ" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "µLªk±q¤G¶i¨îÀɫظɺóÀÉ¡C" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "µLªk±q¥Ø¿ý«Ø¸ÉºóÀÉ¡C" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4726,12 +4651,12 @@ msgstr "" "\n" "«Ø¸ÉºóÀÉ«e±o¥ýÀx¦sÀɤº©Ò¦³²§°Ê¡C" -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "¸ê®Æ§¨¤£¦s¦b¡C" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4742,37 +4667,37 @@ msgstr "" "§ä¤£¨ì¤ä´©À£ÁYªº©Ò¦³¥²­n¤¸¥ó (7-Zip ©M/©Î Merge7z*.dll)¡C\n" "½Ð°Ñ¦Ò¤â¥U¨ú±o§ó¦h¦³ÃöÀ£ÁY¤ä´©©M±Ò¥ÎÀ£ÁYªº¸ê°T¡C" -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "¿ï¨úÀÉ®×¥H¶×¥X" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "¿ï¨úÀÉ®×¥H¶×¤J" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "µLªk±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "µLªk¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4783,249 +4708,249 @@ msgstr "" "\n" "­nÄ~Äò¶Ü¡H" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "²V¦X" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Ãþ«¬" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "¸Ñ¥]¾¹" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "¥ý¦æ³B²z¾¹" # What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"? -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "½s¿è¾¹ÀHĶ§Y¦æ½X" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" # Instead of "one file only needs the extension" I would suggest "at least one file should have a needed extension". -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¥H¿ï¥Îªº¸Ñ¥]¾¹¥Î¨ì¨â­ÓÀÉ (¦Ü¤Ö¤@­ÓÀɮ׻ݰÆÀɦW)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "¤£­n¥ý¦æ³B²z¾¹ (±`ºA)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "«Øijªº¥~±¾" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "¨ä¥L¥~±¾" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "¨p¤H½sĶ¡G%1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "¥~±¾³]©w" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "§ä¤£¨ì WSH - °±¥Î .sct «ü¥O½X" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<µL>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<¦Û°Ê>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "¦Ü²Ä %1 ¦æ(&O)" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Ãö³¬" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "±qÀɮרt²Î" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "±q MRU ªí" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "µL°ª«G«×Åã¥Ü" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "¥iÄ⦡ª«¥ó" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index ad50236f9..ec51fccf0 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< ništa >" @@ -2479,7 +2479,7 @@ msgid "Files:" msgstr "Datoteke:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Razlika" @@ -2516,7 +2516,7 @@ msgid "Right:" msgstr "Desno:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identièno" @@ -2726,7 +2726,7 @@ msgid "A&ppend timestamp" msgstr "&Dodaj datum i vrijeme" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Potvrdite kopiranje" @@ -2804,7 +2804,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Mapa" @@ -2841,8 +2841,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binarno" @@ -3108,7 +3108,7 @@ msgid "Version Control" msgstr "Programi" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Razlike" @@ -3215,7 +3215,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Sve datoteke (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Naziv" @@ -3236,7 +3236,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Opis" @@ -3380,206 +3380,131 @@ msgstr "Moje datoteke" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Pretraživanje datoteka..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Otvaranje odabranog" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopiranje lijevo u desno" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopiranje desno u lijevo" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopiranje sve u lijevo" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopiranje sve u desno" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopiranje datoteka..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Brisanje datoteka..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Premještanje datoteka..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Stvaranje izvještaja..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Poništenje zadnje operacije..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Ponavljanje prethodne operacije..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Redak: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Usporedo" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Razlika: %1 od %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "Naðeno razlika: %1" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "Naðeno razlika: 1" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "SÈ" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Stavka %1 od %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Stavke: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Odaberite dvije datoteke ili mape za usporedbu" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Izbor mape" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Odabir dvije datoteke ili mape za usporedbu." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Nedostaje staza do lijeve datoteke!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Nedostaje staza do desne datoteke!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Obje staze su krive!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Molim izaberite dvije datoteke koje prihvaæa arhiver." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne mogu usporediti datoteku i mapu." -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Nema datoteke: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka nije raspakirana: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3592,12 +3517,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Ne mogu podjeliti konfliktnu datoteku." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3608,27 +3533,27 @@ msgstr "" "%1\n" "nije konfliktna." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Pohrani kao" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Pohraniti izmjene %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Greška pri stvaranju rezervne datoteke" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3641,7 +3566,7 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3658,7 +3583,7 @@ msgstr "" "\t- Pritisnite 'U redu' za pohranu pod drugim nazivom\n" "\t- ili pritisnite 'Odustajem' za prekid postupka." -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3673,7 +3598,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3688,7 +3613,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3703,7 +3628,7 @@ msgstr "" "\n" "Natpisati datoteku?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3712,7 +3637,7 @@ msgstr "" "%1\n" "je oznaèena samo za èitanje. Natpisati zaštiæenu stavku?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3727,22 +3652,22 @@ msgstr "" "\n" "Želite li ponovno uèitanje datoteke?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Pohrani lijevu datoteku kao" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Pohrani desnu datoteku kao" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3753,7 +3678,7 @@ msgstr "" "%1\n" "je nestala. Za nastavak, pohranite kopiju." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3764,42 +3689,42 @@ msgstr "" "\n" "Osvježite dokumente prije nastavka." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Provjera datoteka na VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Greška pri izvršenju sistemske naredbe." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Nema VSS baze" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Greška iz VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3810,7 +3735,7 @@ msgstr "" " Molimo pregledajte podešenost korištenog izgleda. .\n" " Odustati?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3819,127 +3744,127 @@ msgstr "" "Versioning Sistem pokazuje grešku dok pokušava provjeriti datoteku.\n" " Molimo pregledajte podešenost korištenog izgleda. " -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Ništa" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Stani na razmaku" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Stani na razmaku ili interpunkciji" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Desno do lijevo (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Lijevo do desno (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Desno do lijevo (%1 od %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lijevo do desno (%1 od %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Lijevo do... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Desno do... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lijevo do... (%1 od %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Desno do... (%1 od %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Lijevo (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Desno (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Oba panela (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Lijevo (%1 od %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Desno (%1 od %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Oba panela (%1 od %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Lijeva strana - odaberite odredišnu mapu:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Desna strana - odaberite odredišnu mapu:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 datoteka doraðeno)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 od %2 datoteka doraðeno)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3950,17 +3875,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Kopirati? -" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Kopirati %d stavku:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3979,502 +3904,502 @@ msgstr "" "\n" "Osvježite usporedbu." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Premjestiti?" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Premjestiti %d stavku?" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Potvrdite premještanje" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Greška pri pokretanju vanjskog editora: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Nepoznat oblik arhiva" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Naziv datoteke" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Rezultat usporedbe" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Datum lijevo" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Datum sadašnji" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Tip" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Velièina lijevo" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Velièina desno" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Velièina desno (skraæeno)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Velièina lijevo (skraæeno)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Tim lijeve datoteke" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Tim desne datoteke" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Novija datoteka" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Verzija lijeve datoteke" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Rezultat skraæeno" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atributi lijevo" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atributi desno" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Završetak reda lijevo" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Završetak retka desne datoteke." -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Kodiranje lijevo" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Zanemari razlike" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Ne mogu usporediti datoteke" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Odbaèena stavka" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Izostavljene datoteke" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Izostavljene mape" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Samo lijevi: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Samo desni: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binarne datoteke su identiène" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binarne datoteke su razlièite" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Datoteke su razlièite" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Mape su razlièite" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Samo lijevo" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Samo desno" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Greška" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Tekstovi su identièni" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Tekstovi su razlièiti" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Proteklo vrijeme: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 stavka oznaèena" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 stavki oznaèeno" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Naziv datoteke ili mape." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazivi podmapa ako su podmape ukljuèene." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Rezultat usporedbe, duži oblik." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Lijeva strana - datum promjene." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Desna strana - datum promjene." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Tip (ekstenzija) datoteke" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Velièina u bajtima, lijeve datoteke." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Velièina u bajtima, desne datoteke." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Skraæenice lijeve datoteke" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Skraæenice desne datoteke" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Lijeva strana - vrijeme stvaranja." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Desna strana - vrijeme stvaranja." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Koja strana je promijenjena ranije?" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija na lijevoj strani, samo za neke tipove." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija na desnoj strani, samo za neke tipove." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Rezultat usporedbe, kraæi oblik." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atributi lijeve datoteke" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atributi desne strane" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Naèin završetka retka lijeve datoteke." -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Naèin završetka retka desne datoteke." -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Kodirana lijeva strana" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Kodiranje desne strane" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaži zvjezdicu (*) uz binarnu datoteku." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Usporedi %1 s %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Popis odvojen zarezom" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Popis odvojen tabulatorom" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Jednostavni HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Jednostavni HTML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Datoteka izvještaja veæ postoji. Natpisati?" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4483,32 +4408,32 @@ msgstr "" "Greška pri stvaranju izvještaja:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Izvještaj je uspješno stvoren." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je otvorena u oba panela." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Datoteke su identiène." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Greška pri usporedbi datoteka." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4523,17 +4448,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Odabrana mapa je pogrešna." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne mogu otvoriti binarnu datoteku u ureðivaèu" -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4548,7 +4473,7 @@ msgstr "" "%1\n" "na drugoj strani i otvoriti je?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4559,152 +4484,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Greškom pri kodiranju izgubljena je informacija: obje datoteke" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Nema razlike" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Razlièiti redak" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamijenjeno %1 pojam (pojmova)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne mogu naæi pojam \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Položaj panela" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Panel razlika" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Datoteka razlika je pohranjena." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. stavka ili mapa ne postoji!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. stavka ili mapa ne postoji!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Datoteka razlika veæ postoji. Natpisati?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 datoteka odabrano]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Uobièajeno" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Detaljnije" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Združeno" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Ne mogu pohraniti u datoteku" -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Dana staza ne odgovara: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Odredite izlaznu datoteku" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne mogu stvoriti datoteku razlika mapa." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4715,12 +4640,12 @@ msgstr "" "\n" "Prije stvaranja datoteke razlika, sve datoteke trebaju biti pohranjene." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Mapa ne postoji" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4731,37 +4656,37 @@ msgstr "" "Nema nužnih komponenata (7-zip i/ili Merge7z*.dll) .\n" "Pregledajte upute kako omoguæiti rad s arhivama." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Odabir datoteke za izvoz" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Odabir datoteke za uvoz" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Uvoz postavki u datoteku" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Izvoz postavki u datoteku" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Greška pri uèitanju postavki" -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Greška pri pohrani odabranih postavki." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4772,247 +4697,247 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Tip" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Raspakiravaè" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Ureðivaè skripti" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Bez dodataka (uobièajeno)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Preporuèljivi dodaci" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Ostali dodaci" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Osobni uradak: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Postavke dodataka" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH dodatak nije naðen! - .sct skripte su onemoguæene" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "Ništa" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "Automatski" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Idi &na redak" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Onemoguæeno" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Sistem datoteka" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Popis zadnje korištenih" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Nije oznaèeno" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Prenosni objekt" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resursi" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 5857d8191..1a9b257d0 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< žádné >" @@ -2477,7 +2477,7 @@ msgid "Files:" msgstr "Soubory:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Rozdílné" @@ -2514,7 +2514,7 @@ msgid "Right:" msgstr "Vpravo:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Shodné" @@ -2724,7 +2724,7 @@ msgid "A&ppend timestamp" msgstr "Pøipojit è&asové razítko" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Potvrdit kopírování" @@ -2802,7 +2802,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Složky" @@ -2839,8 +2839,8 @@ msgstr "&Omezen #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binární" @@ -3074,7 +3074,7 @@ msgid "Version Control" msgstr "Kontrola verzí" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Rozdíly" @@ -3181,7 +3181,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Soubory XML (*.xml)|*.xml|Všechny soubory (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Název" @@ -3202,7 +3202,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Popis" @@ -3340,206 +3340,131 @@ msgstr "" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Prohledávaní souborù..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Otevírání výbìru" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopírování zleva doprava" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopírování zprava doleva" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopírování všech doleva" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopírování všech doprava" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopírování souborù..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Odstranìní souborù..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Pøesouvání souborù..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Vytváøení protokolu..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Vracení poslední operace..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Opakování pøedchozí operace..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Øádek: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Slouèit" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Rozdíl %1 z %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "Nalezeno %1 rozdílù" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "Nalezen 1 rozdíl" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "Pro ètení" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 z %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Položek: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, 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:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Vybrat složku" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dvì složky nebo dva soubory k porovnání" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Levá cesta je chybná!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je chybná!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Obì cesty jsou chybné!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vyberte dva soubory k zpøístupnìní volby pøevadìèe" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Nelze porovnat soubor a složku!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Soubor nebyl nalezen: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Soubor nebyl pøeveden: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3552,37 +3477,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Uložit jako" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Uložit zmìny do %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Chyba pøi zálohování souboru" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3595,7 +3520,7 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3612,7 +3537,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:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3627,7 +3552,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3642,7 +3567,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3657,7 +3582,7 @@ msgstr "" "\n" "Pøepsat zmìnìný soubor?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3666,32 +3591,32 @@ msgstr "" "%1\n" "je oznaèen pouze pro ètení. Chcete nahradit tuto položku?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Uložit levý soubor jako" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Uložit pravý soubor jako" -#: Merge.rc:2261 +#: Merge.rc:2241 #, 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:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3702,42 +3627,42 @@ msgstr "" "\n" "Pøed dalším pokraèováním dokumenty obnovte." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3745,134 +3670,134 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2281 +#: Merge.rc:2261 #, 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Žádný" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (nižší než 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyšší)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Pøerušit v mezerách" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Pøerušit v mezerách nebo v interpunkci" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "P&ravé doleva (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "&Levé doprava (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "P&ravé doleva (%1 z %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "&Levé doprava (%1 z %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "L&evé do... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Pr&avé do... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "L&evé do... (%1 z %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Pr&avé do... (%1 z %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "&Levé (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "P&ravé (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "O&boje (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "&Levé (%1 z %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "P&ravé (%1 z %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "O&boje (%1 z %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z levé strany:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z pravé strany:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(ovlivnìno souborù: %1)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(ovlivnìno souborù: %1 z %2)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3883,17 +3808,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Opravdu chcete zkopírovat:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Opravdu chcete zkopírovat %d položek:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3912,502 +3837,502 @@ msgstr "" "\n" "Obnovte prosím porovnání." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Opravdu chcete pøesunout:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Opravdu chcete pøesunout %d položek:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Potvrdit pøesunutí" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nelze spustit externí editor: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Neznámý formát archivu" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Název souboru" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Výsledek porovnání" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Datum vlevo" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Datum vpravo" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Pøípona" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Velikost vlevo" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Velikost vpravo" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Velikost vpravo (krátce)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Velikost vlevo (krátce)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Datum vytvoøení vlevo" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Datum vytvoøení vpravo" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Novìjší soubor" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Verze souboru vlevo" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Verze souboru vpravo" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Struèný výsledek" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atributy vlevo" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atributy vpravo" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Konce øádkù vlevo" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Konce øádkù vpravo" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Kódování vlevo" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Kódování vpravo" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ignor. rozdílù" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Soubory nelze porovnat" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Pøerušeno" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Soubor pøeskoèen" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Složka pøeskoèena" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Pouze vlevo: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Pouze vpravo: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binární soubory jsou shodné" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binární soubory jsou rozdílné" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Soubory jsou rozdílné" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Složky jsou rozdílné" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Pouze vlevo" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Pouze vpravo" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Textové soubory jsou shodné" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Textové soubory jsou rozdílné" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "Vybrána 1 položka" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "Vybráno %1 položek" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Název souboru nebo složky" -#: Merge.rc:2445 +#: Merge.rc:2425 #, 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:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Výsledek porovnání, dlouhý popis" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Datum zmìny souboru na levé stranì" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Datum zmìny souboru na pravé stranì" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Pøípona souboru" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Velikost souboru na levé stranì v bytech" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Velikost souboru na pravé stranì v bytech" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Velikost souboru na levé stranì zkrácenì" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Velikost souboru na pravé stranì zkrácenì" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Datum vytvoøení souboru na levé stranì" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Datum vytvoøení souboru na pravé stranì" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Ukáže, na které stranì je novìjší datum zmìny" -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Struèný výsledek porovnání" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atributy souboru na levé stranì" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atributy souboru na pravé stranì" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Typ konce øádkù v souboru na levé stranì" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Typ konce øádkù v souboru na pravé stranì" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Kódování souboru na levé stranì" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Kódování souboru na pravé stranì" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ukáže hvìzdièku (*), pokud je soubor binární" -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Porovnání %1 s %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Seznam oddìlený èárkami" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Seznam oddìlený tabelátory" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Soubor HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Soubor XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4416,32 +4341,32 @@ msgstr "" "Chyba pøi vytváøení protokolu:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Protokol byl úspìšnì vytvoøen." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "V obou panelech je otevøen stejný soubor." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Vybrané soubory jsou shodné." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Bìhem porovnání souborù se vyskytla chyba." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4456,22 +4381,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Zvolená složka je chybná." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Binární soubor nelze otevøít pro úpravy." -#: Merge.rc:2513 +#: Merge.rc:2493 #, 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:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4482,152 +4407,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Žádný rozdíl" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Rozdíl v øádku" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahrazeno %1 øetìzcù." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nelze najít øetìzec \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Poloha" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Rozdíly" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Opravný soubor byl úspìšnì vytvoøen." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[vybráno %1 souborù]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Nelze zapisovat do souboru %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Zadejte výstupní soubor" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nelze vytvoøit opravný soubor z binárních souborù." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nelze vytvoøit opravný soubor ze složek." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4638,12 +4563,12 @@ msgstr "" "\n" "Vytvoøení opravného souboru vyžaduje, aby v souborech nebyly žádné neuložené zmìny." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Složka neexistuje." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4655,37 +4580,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Uložit nastavení" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Naèíst nastavení" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Nastavení bylo naèteno ze souboru." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Nastavení bylo uloženo do souboru." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Naètení nastavení ze souboru se nezdaøilo." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Uložení nastavení do souboru se nezdaøilo." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4696,247 +4621,247 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Rùzné" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Pøevadìè" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Navržené pluginy" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Ostatní pluginy" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Nastavení pluginù" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Program Windows Script Host nebyl nalezen - skripty .sct jsou vypnuté" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<žádný>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "&Pøejít na øádek %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Vypnuto" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Systém souborù" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Naposledy použité" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Žádné zvýraznìní" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index b35614b81..f18ed9a8c 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -247,7 +247,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Tom >" @@ -2486,7 +2486,7 @@ msgid "Files:" msgstr "Filer:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Forskellige" @@ -2523,7 +2523,7 @@ msgid "Right:" msgstr "Højre:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identiske" @@ -2733,7 +2733,7 @@ msgid "A&ppend timestamp" msgstr "T&ilføj tidsstempel" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Bekræft kopi" @@ -2811,7 +2811,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Mappe" @@ -2848,8 +2848,8 @@ msgstr "&Gr #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binær" @@ -3123,7 +3123,7 @@ msgid "Version Control" msgstr "Versionskontrol" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Forskelle" @@ -3234,7 +3234,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Filer (*.xml)|*.xml|Alle filer (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Navn" @@ -3255,7 +3255,7 @@ msgid "[F] " msgstr "[F]" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Beskrivelse" @@ -3400,206 +3400,131 @@ msgstr "Min fil" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Skanner filer..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Åbner valgte" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopierer venstre til højre" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopierer højre til venstre" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopierer alt til venstre" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopierer alt til højre" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopierer filer..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Sletter filer..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Flytter filer..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Opretter rapport" - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Fortryd sidste handling..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Gentager sidste handling..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Flet" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Forskel %1 af %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 forskelle fundet" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 forskel fundet" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Emne %1 of %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Emner: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vælg to eksisterende mapper eller filer at sammenligne" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Valgt mappe" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Vælg to mapper eller to filer at sammenligne." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Ventre sti er ugyldig!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Højre sti er ugyldig!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldige!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vælg to filer for at aktivere udvælgelse af udpakker." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne en fil og en mappe!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Fil ikke fundet: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke udpakket: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3612,12 +3537,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Kunne ikke fortolke konfliktfil" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3628,17 +3553,17 @@ msgstr "" "%1\n" "er ikke en konfliktfil." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Gem som" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Gem ændringer til %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3647,12 +3572,12 @@ msgstr "" "%1 er markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? " "(Nej for at gemme til et andet filnavn.)" -#: Merge.rc:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Fejl under backup af filen" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3665,7 +3590,7 @@ msgstr "" "\n" "Fortsæt alligevel?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3682,7 +3607,7 @@ msgstr "" "\t-bruge et andet filenavn (Tryk Ok)\n" "\t-afbryd aktuel operation (Tryk Annuller)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3698,7 +3623,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3714,7 +3639,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3729,7 +3654,7 @@ msgstr "" "\n" "Vil du overskrive den ændrede fil?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3739,7 +3664,7 @@ msgstr "" "er markeret som skrivebeskyttet. Vil du overskrive den skrivebeskyttede fil " "alligevel?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3754,22 +3679,22 @@ msgstr "" "\n" "Vil du genindlæse filen?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Gem venstre fil som" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Gem højre fil som" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3780,7 +3705,7 @@ msgstr "" "%1\n" "er forsvundet. Gem en kopi af filen for at fortsætte." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3791,7 +3716,7 @@ msgstr "" "\n" "Opdater dokumenter før du fortsætter." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3799,12 +3724,12 @@ msgid "" msgstr "" "Du skal angive en SourceSafe projekt sti for at fortsætte (ie: $/MitProjekt)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout filer fra VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -3813,12 +3738,12 @@ msgstr "" "Versionsstyringssystemet returnerede en fejl under forsøget på at " "kontrollere filen. Kan ikke fortsætte..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Fejl under udførelse af versionsstyringssystem kommando." -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -3827,17 +3752,17 @@ msgstr "" "Arbejdsmappen for VSS og mappen for den aktuelle fil er ikke ens. Vil du " "fortsætte?" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) fundet!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Fejl fra VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3849,7 +3774,7 @@ msgstr "" "Kontroller konfiguration af visning.\n" "Fortryd kontrol operation?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3860,127 +3785,127 @@ msgstr "" "filkontrol.\n" "Knotroller konfiguration af visning." -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mindre end 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og over)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Bryd ved mellemrum" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Bryd ved mellemrum eller tegnsætning" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Højre til venstre (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til højre (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Højre til venstre (%1 af %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til højre (%1 af %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Højre til... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 af %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Højre til... (%1 af %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Højre (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 af %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Højre (%1 af %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 af %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Venstre side - vælg destinationsmappen" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Højre side - vælg destinationsmappen" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påvirket)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 af %2 filer påvirket)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3991,17 +3916,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Er du sikker på du vil kopiere:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Er du sikker på du vil kopiere %d emner:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -4020,457 +3945,457 @@ msgstr "" "\n" "Opdater sammenligning." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Er du sikker på du vil flytte:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Er du sikker på du vil flytte: %d emner:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Bekræft flytning" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunne ikke eksekvere ekstern editor: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Ukendt arkivformat" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultat af sammenligning" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Højre dato" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Udvidelse" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Højre størrelse" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Højre størrelse (kort)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Venstre oprettelsesdato" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Højre oprettelsesdato" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Nyeste fil" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Venstre filversion" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Højre filversion" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Højre attributter" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Venstre EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Højre EOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Venstre encoding" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Højre encoding" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ignoreret forskel" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Emne fortrudt" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Fil sprunget over" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Mappe sprunget over" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Venstre kun: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Højre kun: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskellige" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Filer er forskellige" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Mapper er forskellige" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Kun venstre" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Kun højre" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Fejl" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Tekstfiler er identiske" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Tekstfiler er forskellige" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tid forløbet: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Filnavn eller mappenavn." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkluderet." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultat af sammenligning, lang form." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Venstre side ændringsdato." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Højre side ændringsdato." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Filens extension." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i bytes." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Højre filstørrelse i bytes." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Venstre filstørrelse forkortet." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Højre filstørrelse forkortet." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Venstre side oprettelsesdato." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Højre side oprettelsesdato." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Fortæller hvilken side har den nyeste ændringsdato." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversion, kun for nogle filtyper." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Højre side filversion, kun for nogle filtyper." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Kort resultat af sammenligning." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Højre side attributter." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Venstre sidefil EOL type" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Højre sidefil EOL type" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Venstre side encoding." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Højre side encoding." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4479,50 +4404,50 @@ msgstr "" "Antal ignorerede forskelle i filen. Disse forskelle er ignoreret af WinMerge " "og kan ikke blive flettet." -#: Merge.rc:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Vis stjerne (*) hvis fil er binær." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Sammenlign %1 med %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Komma opdelt liste" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Tab opdelt liste" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Simpel HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Simpel XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4531,27 +4456,27 @@ msgstr "" "Fejl ved opretning af rapporten:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Rapporten blev oprettet succesfuldt." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Den samme fil er åbnet på begge sider." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "De valgte filer er identiske." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Der skete en fejl under sammenligning af filerne." -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4559,7 +4484,7 @@ msgstr "" "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for " "midlertidig (temp) mappe." -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4579,17 +4504,17 @@ msgstr "" "valget 'Ignorer returtegn forskelle ..' i Fanen: Indstillinger -> " "Sammenlign (findes under Redigér)." -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Den valgte mappe er ugyldig." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan ikke åbne en binær fil til editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4604,7 +4529,7 @@ msgstr "" "%1\n" "til den anden side og åbne disse mapper?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4619,152 +4544,152 @@ msgstr "" "Vil du behandle begge filer som værende i standard Windows codepage " "(anbefalet)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Oplysninger tabt, på grund af kodnings fejl: begge filer" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Ingen forskel" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Linje forskel" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(e)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finde strengen \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Placerings vindue" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Forskels vindue" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Patch fil oprettet med succes." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element er ikke fundet eller er en mappe!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element er ikke fundet eller er en mappe!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Samlet" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Angiv en output fil" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke lave patch filer fra binære filer." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke lave patch filer fra mapper." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4775,12 +4700,12 @@ msgstr "" "\n" "Oprettelse af en patch kræver at alle ændringer i filen er gemt." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Mappen eksisterer ikke." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4794,37 +4719,37 @@ msgstr "" "Se manualen for mere information om arkiv support og hvordan man aktivere " "det." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Vælg fil til eksport" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Vælg fil til import" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Indstillinger importeret fra filen." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Indstillinger eksporteret til filen." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Kunne ikke importere indstillinger fra filen." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Kunne ikke skrive indstillinger til filen." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4835,117 +4760,117 @@ msgstr "" "\n" "Vil du fortsætte?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Udpakker" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Editor script" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -4954,132 +4879,132 @@ msgstr "" "Udpakkeren bruges på begge filer (kun den ene fil behøves en korrekt " "extension)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Anbefalede plugins" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Andre plugins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Privat Udgave: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Plugin indstillinger" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke fundet - .sct scripts afbrudt" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Deaktiveret" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Fra filsystem" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Fra MRU liste" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Ingen fremhævning" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Transportabelt Objekt" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resourser" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 9b9614fd5..1a33f70d5 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -248,7 +248,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Leeg >" @@ -2487,7 +2487,7 @@ msgid "Files:" msgstr "Bestanden:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Verschillend" @@ -2524,7 +2524,7 @@ msgid "Right:" msgstr "Rechts:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identiek" @@ -2734,7 +2734,7 @@ msgid "A&ppend timestamp" msgstr "Voeg tijdstem&pel toe" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Kopiëren bevestigen" @@ -2812,7 +2812,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Map" @@ -2849,8 +2849,8 @@ msgstr "Limiet snelvergelijking (MB):" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binair" @@ -3124,7 +3124,7 @@ msgid "Version Control" msgstr "Versiebeheer" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Verschillen" @@ -3235,7 +3235,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Naam" @@ -3256,7 +3256,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Beschrijving" @@ -3403,206 +3403,131 @@ msgstr "Mijn bestand" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Bestanden aan het scannen..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Bezig met openen van selectie" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Aan het kopiëren van links naar rechts" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Aan het kopiëren van rechts naar links" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Alles naar links aan het kopiëren" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Alles naar rechts aan het kopiëren" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Bezig met kopiëren van bestanden..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Bezig met verwijderen van bestanden..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Bezig met verplaatsen van bestanden..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Rapport genereren..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Laatste handeling ongedaan maken..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Vorige handeling opnieuw doen..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Regel: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Samenvoegen" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Verschil %1 van %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 verschillen gevonden" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "Eén verschil gevonden" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "AL" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Item %1 van %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Items: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Selectie van mappen" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecteer twee mappen of bestanden om te vergelijken." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Linker pad is ongeldig!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Rechter pad is ongeldig!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Beide paden zijn ongeldig!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan geen bestand met een map vergelijken!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Bestand niet gevonden: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Bestand niet uitgepakt: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3615,12 +3540,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Analyseren van conflictbestand mislukt." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3631,17 +3556,17 @@ msgstr "" "%1\n" "is geen conflictbestand." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Opslaan als" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Wijzigingen opslaan in %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3650,12 +3575,12 @@ msgstr "" "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand " "overschrijven? (Niet opslaan onder nieuwe naam.)" -#: Merge.rc:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Fout bij het maken van een veiligheidskopie" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3668,7 +3593,7 @@ msgstr "" "\n" "Toch doorgaan?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3683,7 +3608,7 @@ msgstr "" "%2\n" "Wilt u het bestand onder een andere naam opslaan?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3698,7 +3623,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3713,7 +3638,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3728,7 +3653,7 @@ msgstr "" "\n" "Het gewijzigde bestand overschrijven?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3737,7 +3662,7 @@ msgstr "" "%1\n" "is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3752,22 +3677,22 @@ msgstr "" "\n" "Wilt u het bestand opnieuw laden?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Linker bestand opslaan als" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Rechter bestand opslaan als" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3778,7 +3703,7 @@ msgstr "" "%1\n" "is verdwenen. Sla een kopie van het bestand op om door te gaan." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3789,7 +3714,7 @@ msgstr "" "\n" "Vernieuw documenten voordat u doorgaat." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3798,12 +3723,12 @@ msgstr "" "U moet een SourceSafe project path specificeren voordat u verder kunt (bv: " "$/MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Bestanden vanuit VSS uitchecken..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -3812,12 +3737,12 @@ msgstr "" "SourceSafe gaf een foutmelding bij de check out van het bestand. Kan niet " "verder gaan..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht." -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -3826,17 +3751,17 @@ msgstr "" "De VSS werkmap en de lokatie van het huidige bestand komen niet overeen. " "Doorgaan?" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Geen VSS database(s) gevonden!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Fout uit VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3847,7 +3772,7 @@ msgstr "" " Controleer configuratie-specificaties van de gebruikte weergave.\n" " Checkout ongedaan maken?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3858,127 +3783,127 @@ msgstr "" "bestands-checkout.\n" " Controleer configuratie-specificaties van de gebruikte weergave." -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Geen" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 of lager)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 en hoger)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Afbreken bij witruimte" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Afbreken bij witruimte of interpunctie" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Van rechts naar links (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Van links naar rechts (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Van rechts naar links (%1 van %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Van links naar rechts (%1 van %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Van links naar... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Van rechts naar... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Van links naar... (%1 van %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Van rechts naar... (%1 van %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 of %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 of %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 of %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Linkerkant - selecteer doelmap:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Rechterkant - selecteer doelmap:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Bestanden Aangepast)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 van %2 Bestanden Aangepast)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3990,17 +3915,17 @@ msgstr "" "%1\n" "wilt verwijderen?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Bent u zeker dat u het volgende wilt kopiëren:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, 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:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -4019,457 +3944,457 @@ msgstr "" "\n" "Vernieuw a.u.b. de vergelijking." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Bent u zeker dat u wilt verplaatsen:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Bent u zeker dat u %d items wilt verplaatsen:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Bevestig Verplaatsen" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Uitvoeren externe editor mislukt: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Onbekend archiefformaat" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Bestandsnaam" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Vergelijkingsresultaat" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Datum links" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Datum rechts" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Grootte links" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Grootte rechts" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Grootte rechts (Kort)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Grootte links (Kort)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Aanmaaktijd links" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Aanmaaktijd rechts" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Nieuwer bestand" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Bestandsversie links" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Bestandsversie rechts" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Kort resultaat" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Attributen links" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Attributen rechts" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Links regeleinde" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Rechts regeleinde" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Tekenset links" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Tekenset rechts" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Genegeerde Versch." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Kan bestanden niet vergelijken" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Item afgebroken" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Bestand overgeslagen" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Map overgeslagen" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Alleen links: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Alleen rechts: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binaire bestanden zijn identiek" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binaire bestanden zijn niet gelijk" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Bestanden zijn niet gelijk" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Mappen zijn verschillend" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Alleen links" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Alleen rechts" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Fout" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Tekstbestanden zijn identiek" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Tekstbestanden zijn verschillend" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Verstreken tijd: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 item geselecteerd" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 items geselecteerd" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Bestandsnaam of mapnaam." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Naam van submap als submappen erbij horen." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultaat van vergelijking, lange vorm." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Wijzigingsdatum linker zijde." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Wijzigingsdatum rechter zijde." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Bestandsextensie." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Bestandsgrootte in bytes voor linker zijde." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Bestandsgrootte in bytes voor rechter zijde." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Linker bestandsgrootte ingekort." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Rechter bestandsgrootte ingekort." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Aanmaaktijdstip linker zijde." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Aanmaaktijdstip rechter zijde." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Geeft aan welke zijde het recentst gewijzigd is." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bestandsversie linker zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Bestandsversie rechter zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Kort vergelijkingsresultaat." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Attributen linker zijde." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Attributen rechter zijde." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Type regeleinde linker bestand" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Type regeleinde rechter bestand" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Tekenset linker zijde." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Tekenset rechter zijde." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4478,7 +4403,7 @@ msgstr "" "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd " "door WinMerge en kunnen niet samengevoegd worden." -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "" "Number of differences in file. This number does not include ignored " @@ -4486,43 +4411,43 @@ msgid "" msgstr "" "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen." -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Toont sterretje (*) als het een binair bestand is." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "%1 met %2 vergelijken" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Komma-gescheiden lijst" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Tab-gescheiden lijst" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Simpele html" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Simpele xml" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4531,27 +4456,27 @@ msgstr "" "Fout bij maken van rapport:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Het rapport is met succes opgesteld." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Hetzelfde bestand is in beide vensters geopend." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "De geselecteerde bestanden zijn identiek" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Fout opgetreden tijdens het vergelijken van de bestanden" -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4559,7 +4484,7 @@ msgstr "" "Tijdelijke bestanden konden niet aangemaakt worden. Controleer de instelling " "voor het pad van tijdelijke bestanden." -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4580,17 +4505,17 @@ msgstr "" "behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in " "de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)" -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "De geselecteerde map is ongeldig." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan geen binair bestand openen met de editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4605,7 +4530,7 @@ msgstr "" "%1\n" "maken aan de andere kant en deze mappen openen?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4621,152 +4546,152 @@ msgstr "" "Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel " "zijn (aangeraden)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Geen verschil" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Regelverschil" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 tekenreeks(en) vervangen." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan tekenreeks \"%s\" niet vinden" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Locatievenster" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Verschilvenster" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Patch-bestand met succes weggeschreven." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1ste item niet gevonden! (is het een map?)" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2de item niet gevonden! (is het een map?)" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 bestanden geselecteerd]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normaal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Verenigd" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Kan niet schrijven naar bestand %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Specifieer een uitvoerbestand" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan geen patch-bestand maken uit binaire bestanden." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan geen patch-bestand maken uit mappen." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4778,12 +4703,12 @@ msgstr "" "Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in " "bestanden zijn." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Map bestaat niet." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4797,37 +4722,37 @@ msgstr "" "Zie de handleiding voor meer info over archiefondersteuning en hoe het in te " "schakelen." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Selecteer te exporteren bestand" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Selecteer te importeren bestand" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Opties geïmporteerd van bestand" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Opties geëxporteerd naar bestand." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Opties importeren van bestand mislukt." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Opties schrijven naar bestand mislukt." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4839,117 +4764,117 @@ msgstr "" "\n" "Wilt u doorgaan?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Gemengd" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Uitpakker" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Voorvergelijken" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Editor-script" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -4958,132 +4883,132 @@ msgstr "" "De overgenomen uitpakker wordt gebruikt voor beide bestanden (een bestand " "hoeft maar de extensie te hebben)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Geen voorvergelijking (normaal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Voorgestelde plug-ins" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Andere plug-ins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Private Versie: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Plug-in instellingen" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH niet gevonden - .sct scripts uitgeschakeld" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "G&a naar regel %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Uitgeschakeld" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Van bestandssysteem" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Van MRU-lijst" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Geen Markering" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Draagbaar Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Bronnen" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 965c896a3..33e4bbab6 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-04-26 19:34+0000\n" +"POT-Creation-Date: 2015-05-04 00:01+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -242,7 +242,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "" @@ -2471,7 +2471,7 @@ msgid "Files:" msgstr "" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "" @@ -2508,7 +2508,7 @@ msgid "Right:" msgstr "" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "" @@ -2718,7 +2718,7 @@ msgid "A&ppend timestamp" msgstr "" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "" @@ -2796,7 +2796,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "" @@ -2833,8 +2833,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "" @@ -3068,7 +3068,7 @@ msgid "Version Control" msgstr "" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "" @@ -3169,7 +3169,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "" @@ -3190,7 +3190,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "" @@ -3292,1471 +3292,1396 @@ msgstr "" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "" - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "" - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "" - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "" - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "" - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2232 #, 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:2253 +#: Merge.rc:2233 #, 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:2254 +#: Merge.rc:2234 #, 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:2255 +#: Merge.rc:2235 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2260 #, 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:2281 +#: Merge.rc:2261 #, 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2313 #, 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:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:2490 #, 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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2493 #, 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:2519 +#: Merge.rc:2499 #, 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2567 #, 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 1b8f6ed3b..8fe3fa119 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -250,7 +250,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Vide >" @@ -2483,7 +2483,7 @@ msgid "Files:" msgstr "Fichiers:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Différent" @@ -2520,7 +2520,7 @@ msgid "Right:" msgstr "Droit:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identique" @@ -2730,7 +2730,7 @@ msgid "A&ppend timestamp" msgstr "Apposer une estampille &temporelle" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Confirmation de copie" @@ -2808,7 +2808,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Répertoire" @@ -2845,8 +2845,8 @@ msgstr "&Limite de comparaison rapide (MO):" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binaire" @@ -3112,7 +3112,7 @@ msgid "Version Control" msgstr "Contrôle de version" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Différences" @@ -3218,7 +3218,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nom" @@ -3239,7 +3239,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Description" @@ -3383,206 +3383,131 @@ msgstr "Mon fichier" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Balayage des fichiers en cours..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Ouverture en cours..." - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Copie de gauche à droite en cours..." - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Copie de droite à gauche en cours..." - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Copie de tout vers la gauche en cours..." - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Copie de tout vers la droite en cours..." - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Copie des fichiers en cours..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Suppression des fichiers en cours..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Déplacement des fichiers en cours..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Création du rapport..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Annuler la dernière opération..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Refaire l'opération précédente..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Ligne: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Fusion" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Différence %1 de %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 Différences trouvées" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 Différence trouvée" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "LS" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Élément %1 de %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Élément: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Comparez deux fichiers ou deux répertoires !" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Sélection de répertoire" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Sélectionner deux répertoires ou deux fichiers à comparer" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Le chemin de gauche est invalide !" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Le chemin de droite est invalide !" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Les deux chemins sont invalides !" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Choisissez deux fichiers pour activer la sélection du décompresseur." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne peut comparer un fichier et un répertoire !" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Fichier %1 non trouvé" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Fichier non décompressé : %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3595,12 +3520,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "L'analyse du fichier en conflit a échoué." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3611,27 +3536,27 @@ msgstr "" "%1\n" "n'est pas un fichier en conflit." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Enregistrer sous" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Enregistrer les changements de %1 ?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Erreur durant la prise de fichiers d'archive" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3644,7 +3569,7 @@ msgstr "" "\n" "Continuer quand même ?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3661,7 +3586,7 @@ msgstr "" "\t-utiliser un nom autre nom de fichier (Ok)\n" "\t-avorter l'opération en cours (Annuler)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3676,7 +3601,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3691,7 +3616,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3706,7 +3631,7 @@ msgstr "" "\n" "Voulez-vous écraser le fichier mis à jour ?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3715,7 +3640,7 @@ msgstr "" "%1\n" "est en lecture seule. Voulez-vous outrepasser ?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3730,22 +3655,22 @@ msgstr "" "\n" "Voulez-vous actualiser le fichier?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Enregistrer le fichier de gauche sous" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Enregistrer le fichier de droite sous" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3756,7 +3681,7 @@ msgstr "" "%1\n" "a disparu. Veuillez enregistrer une copie du fichier pour continuer." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3767,42 +3692,42 @@ msgstr "" "\n" "Actualiser les documents avant de poursuivre." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Extraire les fichiers de VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, 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:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Aucune base de données de VSS trouvée !" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Erreur de VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3813,7 +3738,7 @@ msgstr "" " Veuillez vérifier la configuration.\n" " Annuler l'operation d'extraction?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3822,127 +3747,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Aucun" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inférieur à 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 et supérieur)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Distinguer sur espacement" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Distinguer sur espacement ou ponctuation" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "De droite à gauche (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "De gauche à droite (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "De droite à gauche (%1 de %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "De gauche à droite (%1 de %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "De gauche vers... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "De droite vers... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "De gauche vers... (%1 de %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "De droite vers... (%1 de %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "À gauche (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "À droite (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Des deux côtés (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "À gauche (%1 de %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "À droite (%1 de %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Des deux côtés (%1 de %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Côté gauche - choisir répertoire de destination:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Côté droit - choisir répertoire de destination:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Fichiers concernés)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Fichiers concernés)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3953,17 +3878,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Voulez-vous vraiment copier:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Voulez-vous vraiment copier %d éléments:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3982,502 +3907,502 @@ msgstr "" "\n" "Veuillez actualiser la comparaison." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Êtes-vous sûr de vouloir déplacer:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, 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:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Confirmez le déplacement" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Lancement de l'éditeur externe a échoué: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Format d'archives inconnu" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nom du fichier" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Résultat de la comparaison" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Date mod. gauche" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Date mod. droite" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extension" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Taille gauche" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Taille droite" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Taille droite (abrégée)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Taille gauche (abrégée)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Date cré. gauche" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Date cré. droit" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Plus récent" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Version gauche" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Version droite" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Résultat" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Attributs gauches" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Attributs droits" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Fin de ligne gauche" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Fin de ligne droit" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Page de code gauche" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Page de code droite" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Différences ignorées" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Impossible de comparer les fichiers" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Élément abandonné" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Fichier ignoré" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Répertoire ignoré" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Juste à gauche: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Juste à droite: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Les fichiers binaires sont identiques" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Les fichiers binaires sont différents" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Les fichiers sont différents" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Les répertoires sont différents" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Juste à gauche" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Juste à droite" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Erreur" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Les fichiers de texte sont identiques" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Les fichiers de texte sont différents" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps écoulé: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 élément sélectionné" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 éléments sélectionnés" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nom de fichier ou de répertoire." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom du sous-répertoire lorsque ceux-ci sont inclus." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparison, format étendu." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Date de modification du côté gauche." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Date de modification du côté droit." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Extension du fichier." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Taille du fichier du côté gauche en octets." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Taille du fichier du côté droit en octets." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Taille du fichier du côté gauche abrégée." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Taille du fichier du côté droit abrégée." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Date de creation du côté gauche." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Date de creation du côté droit." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, 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:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Version du fichier du côté gauche, certains fichiers seulement." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Version du fichier du côté droit, certains fichiers seulement." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Resultat de la comparison, format abrégé." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Attributs du côté gauche." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Attributs du côté droit." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Type de fin de ligne du côté gauche" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Type de fin de ligne du côté droit" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Page de code du côté gauche." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Page de code du côté droit." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Indique un astérisque (*) si le fichier est binaire." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Comparer %1 avec %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Liste délimitée par des virgules" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Liste délimitée par des tabulations" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Format HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Format XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4486,32 +4411,32 @@ msgstr "" "Erreur à la création du rapport:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Le rapport a été créé avec succès." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Le même fichier est ouvert dans les deux volets." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Les fichiers sélectionnés sont identiques." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Erreur lors de la comparaison des fichiers." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4526,17 +4451,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Le répertoire sélectionné est invalide." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne peut ouvrir un fichier binaire avec l'éditeur." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4551,7 +4476,7 @@ msgstr "" "%1\n" "à l'autre côté et ouvrir ces répertoires" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4562,152 +4487,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Aucune différence" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Ligne différente" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 remplacement(s) effectué(s)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Texte non trouvé \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Barre de localisation" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Détail des différences" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Fichier de retouche écrit avec succès." -#: Merge.rc:2568 +#: Merge.rc:2548 #, 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:2569 +#: Merge.rc:2549 #, 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:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 fichiers sélectionnés]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Contexte" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unifié" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Ne peut écrire au fichier %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Indiquez un fichier de sortie" -#: Merge.rc:2579 +#: Merge.rc:2559 #, 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:2580 +#: Merge.rc:2560 #, 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:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4718,12 +4643,12 @@ msgstr "" "\n" "Générer une retouche requiert l'état non modifié des fichiers." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Le répertoire n'existe pas." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4734,37 +4659,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Sélectionner le fichier pour exportation" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Sélectionner le fichier pour importation" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Préférences importées du fichier." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Préférences exportées au fichier." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "L'importation (lecture) du fichier des préférences a échoué." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "L'exportation (écriture) du fichier des préférences a échoué." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4775,247 +4700,247 @@ msgstr "" "\n" "Voulez-vous continuer ?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Combiné" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Décompresseur" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Pré-comparaison" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Éditeur de script" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Pas de pré-comparaison (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Plugiciels suggérés" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Plugiciels autres" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Compilation personnelle: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Ajuster les plugiciels" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH pas trouvé - .sct les scripts sont désactivés" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Atteindre la ligne %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Désactivé" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "A partir du système de fichier" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "A partir de la liste des fichiers récents" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Pas de surbrillance" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Objet portatif" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Ressources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 188ed33f7..6249b7425 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Baleiro >" @@ -2480,7 +2480,7 @@ msgid "Files:" msgstr "Arquivos:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Diferente" @@ -2517,7 +2517,7 @@ msgid "Right:" msgstr "Dereita" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Iguais" @@ -2727,7 +2727,7 @@ msgid "A&ppend timestamp" msgstr "&Engadir etiqueta coa data" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" @@ -2805,7 +2805,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Cartafol" @@ -2842,8 +2842,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binario" @@ -3109,7 +3109,7 @@ msgid "Version Control" msgstr "Control de versións" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Diferenzas" @@ -3216,7 +3216,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os arquivos(*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nome" @@ -3237,7 +3237,7 @@ msgid "[F] " msgstr "[F]" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Descrición" @@ -3381,206 +3381,131 @@ msgstr "O Meu Arquivo" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "A escanear arquivos..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Abrindo selección" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "A copiar da esquerda para a dereita" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "A copiar da dereita para a esquerda" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "A copiar todo para a esquerda" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "A copiar todo para a dereita" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "A copiar arquivos..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "A borrar arquivos..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "A mover arquivos..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "A crear o informe..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Desfacendo a última operación..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Refacendo a operación previa..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Liña: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Diferenza %1 de %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenzas atopadas" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 diferenza atopada" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 de %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Escolle dous cartafoles ou arquivos para comparar" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Selección de cartafol" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Escolle dous cartafoles ou arquivos para comparar." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "O camiño esquerdo non é válido!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "O camiño dereito non é válido!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os camiños non son válidos!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolle dous arquivos para activar a selección de desempaquetador." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Non se pode comparar un arquivo cun cartafol!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "No se atopou o arquivo: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "O arquivo non está desempaquetado: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3593,12 +3518,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Fallo na análise interpretativa do arquivo de conflito." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3609,27 +3534,27 @@ msgstr "" "%1\n" "non é un arquivo de conflito." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Gardar como" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Queres gardar os cambios en %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Erro ao facer unha copia de seguridade do arquivo" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3642,7 +3567,7 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3659,7 +3584,7 @@ msgstr "" "\t-usar un nome de arquivo distinto (preme Aceptar)\n" "\t-abortar a operación (preme Abortar)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3674,7 +3599,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3689,7 +3614,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3704,7 +3629,7 @@ msgstr "" "\n" "Queres sobre-escribir o arquivo cambiado?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3713,7 +3638,7 @@ msgstr "" "%1\n" " está marcado como de só-lectura. Queres sobre-escribir o elemento?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3728,27 +3653,27 @@ msgstr "" "\n" "Queres recargar o arquivo?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Gardar o arquivo esquerdo como" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Gardar o arquivo dereito como" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3759,42 +3684,42 @@ msgstr "" "\n" "Actualizar os documentos antes de seguir." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Desprotexer arquivos de VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar un comando no sistema de versionado" -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Non se atopou banco de datos VSS ningún" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Erro de VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3805,7 +3730,7 @@ msgstr "" "Comproba a configuración da visualización.\n" "Queres anular a operación de desprotección?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3814,127 +3739,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Ningún" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior de 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiores)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Parar no espazo en branco" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Parar en espazo en branco ou puntuación" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Da dereita para a esquerda (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Da esquerda para a dereita(%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da dereita para a esquerda (%1 de %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da esquerda para a dereita (%1 de %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Banda esquerda a...(%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Banda dereita a...(%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Banda esquerda a...(%1 de %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Banda dereita a...(%1 de %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Dereita (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Ambas (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Dereita (%1 de %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Ambas as bandas (%1 de %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Banda esquerda - escoller cartafol de destino:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Banda dereita - escoller cartafol de destino:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 arquivos afectados)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 arquivos afectados)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3945,17 +3870,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Tes a certeza de quereres copiar:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Tes a certeza de quereres copiar %d elementos: " -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3974,534 +3899,534 @@ msgstr "" "\n" "Actualiza a comparación. " -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Tes a certeza de quereres mover:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Tes a certeza de quereres mover %d elementos: " -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Confirmar Movemento" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Non se puido executar o editor externo: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo descoñecido" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nome do arquivo" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultado da comparación" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Data esquerda" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Data dereita" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Tamaño esquerda" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Tamaño dereita" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dereita (curto)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Tamaño esquerda (curto)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Data de creación esquerda" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Data de creación dereita" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Arquivo máis recente" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Versión do arquivo esquerdo" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Versión do arquivo dereito" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Resultado curto" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atributos da esquerda" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atributos da dereita" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "EOL esquerdo" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "EOL dereito" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Codificación esquerda" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Codificación dereita" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Diferenzas ignoradas" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Non é posible comparar os arquivos" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Elemento abortado" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Arquivo saltado" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Cartafol saltado" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Só esquerda: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Só dereita: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binarios son idénticos" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Os arquivos binarios son diferentes" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Os arquivos son diferentes" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Os cartafoles son diferentes" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Só esquerda" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Só dereita" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Os arquivos de texto son idénticos" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Os arquivos de texto son diferentes" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou cartafol." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome do sub-cartafol cando os sub-cartafoles están incluídos" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultados da comparación, formato completo." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Data de modificación da banda esquerda." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Data de modificación da banda dereita" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Extensión do arquivo." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Tamaño do arquivo esquerdo en bytes." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Tamaño do arquivo dereito en bytes." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño abreviado do arquivo esquerdo." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño abreviado do arquivo dereito. " -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Data de creación do arquivo esquerdo." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Data de creación do arquivo dereito." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Di que parte foi modificada máis recentemente." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Resultados curtos da comparación." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atributos da banda esquerda." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atributos da banda dereita." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo esquerdo" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo dereito" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Codificación da banda esquerda." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Codificación da banda dereita." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Amosa un asterisco (*) se o arquivo é binario." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Listaxe separada por comas" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Listaxe separada por tabulacións" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML simple" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "XML simple" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "Erro ao crear o informe:n%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "O informe creouse correctamente." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo está aberto en ambos paneis." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Os arquivos escollidos son idénticos." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Produciuse un erro durante a comparación dos arquivos." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4516,17 +4441,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "O cartafol seleccionado non é válido." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Non se pode abrir un arquivo binario no editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4541,7 +4466,7 @@ msgstr "" "%1\n" "que coincida co anterior e abrir ámbolos dous?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4552,152 +4477,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Non hai diferenzas" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Diferenzas de liña" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituídas %1 cadea(s)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Non se atopou a cadea \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Panel de situación" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Panel de diferenzas" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Escribiuse correctamente o arquivo de mendo." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos seleccionados]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Non se puido escribir no arquivo %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Especifica un arquivo de saída" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Non se pode crear un arquivo patch desde arquivos binarios." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Non se pode crear un arquivo patch desde un cartafol." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4708,12 +4633,12 @@ msgstr "" "\n" "Crear un arquivo patch precisa que todos os cambios nos arquivos estean gardados." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "O cartafol non existe." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4724,37 +4649,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Escolle un arquivo para exportar" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Escolle un arquivo para importar" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Opcións importadas desde o arquivo." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Opcións exportadas desde o arquivo." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Fallo na importación das opcións deste arquivo." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Fallo ao escribir as opcións no arquivo." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4765,247 +4690,247 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mesturado" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Desempaquetador" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Pre-comparación" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Script do Editor" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Sen pre-comparación (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Plugins recomendados" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Configuración do plugin" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non atopado - scripts .sct desactivados" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "I&r á liña %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Da listaxe MRU" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Sen Resaltar" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Obxecto Portable" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 2bc544e2f..e16c22740 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -249,7 +249,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Leer >" @@ -2484,7 +2484,7 @@ msgid "Files:" msgstr "Dateien:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Unterschiedlich" @@ -2521,7 +2521,7 @@ msgid "Right:" msgstr "Rechts:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identisch" @@ -2731,7 +2731,7 @@ msgid "A&ppend timestamp" msgstr "&Zeitstempel anhängen" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Kopieren bestätigen" @@ -2809,7 +2809,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Ordner" @@ -2846,8 +2846,8 @@ msgstr "&Limit f #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binär" @@ -3085,7 +3085,7 @@ msgid "Version Control" msgstr "Versionskontrolle" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Unterschiede" @@ -3192,7 +3192,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Name" @@ -3213,7 +3213,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Beschreibung" @@ -3357,208 +3357,131 @@ msgstr "Meine Datei" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Überprüfe Dateien..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Öffne Auswahl" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopiere links nach rechts" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopiere rechts nach links" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopiere alles nach links" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopiere alles nach rechts" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopiere Dateien..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Lösche Dateien..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Verschiebe Dateien..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Erzeugt den Bericht..." - -# Use action instead operation, like the rest of the undo/redo system. -#: Merge.rc:2190 -#, 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:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Wiederholen der vorherigen Aktion..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Zeile: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Merge" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Unterschied %1 von %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 Unterschiede gefunden" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 Unterschied gefunden" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 von %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Objekte: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Ordnerauswahl" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen auswählen." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Der linke Pfad ist ungültig!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Der rechte Pfad ist ungültig!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Beide Pfade sind ungültig!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl auswählen." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Datei und Ordner können nicht verglichen werden!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Datei nicht gefunden: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Datei nicht entpackt: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3571,12 +3494,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Fehler beim Analysieren der Konflikt-Datei." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3587,27 +3510,27 @@ msgstr "" "%1\n" "ist keine Konflikt-Datei." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Speichern unter" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Änderungen in %1 speichern?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Fehler beim Erstellen einer Sicherheitskopie" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3620,7 +3543,7 @@ msgstr "" "\n" "Trotzdem fortfahren?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3637,7 +3560,7 @@ msgstr "" "\t-einen anderen Dateinamen verwenden? (Ok drücken)\n" "\t-die aktuelle Operation abbrechen? (Abbruch drücken)" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3652,7 +3575,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3667,7 +3590,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3682,7 +3605,7 @@ msgstr "" "\n" "Geänderte Datei überschreiben?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3691,32 +3614,32 @@ msgstr "" "%1\n" "ist als schreibgeschützt markiert. Möchten Sie das schreibgeschützte Objekt überschreiben?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Speichere linke Datei unter" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Speichere rechte Datei unter" -#: Merge.rc:2261 +#: Merge.rc:2241 #, 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:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3727,42 +3650,42 @@ msgstr "" "\n" "Aktualisieren Sie die Dokumente, bevor Sie fortfahren." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Dateien auschecken vom VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Fehler beim Ausführen eines Befehles des Versionierungssystems." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Keine VSS Datenbank(en) gefunden!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Fehler vom VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3773,7 +3696,7 @@ msgstr "" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht.\n" " Auschecken rückgängig machen?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3782,127 +3705,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Keines" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (kleiner als 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 und höher)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "An Leerzeichen abbrechen" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "An Leerzeichen oder Interpunktion abbrechen" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Rechts nach Links (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Links nach Rechts (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Rechts nach Links (%1 von %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Links nach Rechts (%1 von %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Links nach... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Rechts nach... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Links nach... (%1 von %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Rechts nach... (%1 von %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 von %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 von %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 von %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Linke Seite - Zielordner auswählen:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Rechte Seite - Zielordner auswählen:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dateien betroffen)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 von %2 Dateien betroffen)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3914,17 +3837,17 @@ msgstr "" "%1\n" "löschen?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Wollen Sie wirklich kopieren:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Wollen Sie wirklich %d Objekte kopieren:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3943,502 +3866,502 @@ msgstr "" "\n" "Bitte aktualisieren Sie den Vergleich." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Wollen Sie wirklich verschieben:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Wollen Sie wirklich %d Objekte verschieben:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Verschieben bestätigen" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Konnte externen Editor nicht ausführen: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Unbekanntes Archiv Format" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Dateiname" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Vergleichsergebnis" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Linkes Datum" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Rechtes Datum" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Erweiterung" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Linke Größe" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Rechte Größe" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Rechte Größe (Kurz)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Linke Größe (Kurz)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Linkes Erstellungsdatum" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Rechtes Erstellungsdatum" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Neuere Datei" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Linke Dateiversion" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Rechte Dateiversion" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Kurz-Ergebnis" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Linke Attribute" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Rechte Attribute" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Linkes Zeilenende" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Rechtes Zeilenende" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Linke Kodierung" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Rechte Kodierung" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ignorierte Unter." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Dateien können nicht verglichen werden" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Objekt abgebrochen" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Datei übersprungen" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Ordner übersprungen" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Nur Links: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Nur Rechts: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binärdateien sind identisch" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binärdateien sind unterschiedlich" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Dateien sind unterschiedlich" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Ordner sind unterschiedlich" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Nur Links" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Nur Rechts" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Fehler" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Textdateien sind identisch" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Textdateien sind unterschiedlich" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ausführungszeit: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 Objekt ausgewählt" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 Objekte ausgewählt" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Dateiname oder Ordnername." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Unterordnername, wenn Unterordner vorhanden sind." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Vergleichsergebnis, langes Format." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Linkes Änderungsdatum." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Rechtes Änderungsdatum." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Dateierweiterung." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Linke Dateigröße in Byte." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Rechte Dateigröße in Byte." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Linke Dateigröße gekürzt." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Rechte Dateigröße gekürzt." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Linkes Erstellungsdatum." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Rechtes Erstellungsdatum." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Zeigt, welche Seite ein neueres Änderungsdatum hat." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Linke Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Rechte Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Vergleichsergebnis, kurzes Format." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Linke Attribute." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Rechte Attribute." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Linker Zeilenenden-Typ" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Rechter Zeilenenden-Typ" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Linke Zeichensatz-Kodierung." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Rechte Zeichensatz-Kodierung." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zeigt ein Asterisk (*), wenn die Datei binär ist." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Vergleiche %1 mit %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Komma-getrennte Liste" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Tab-getrennte Liste" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Einfaches HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Einfaches XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Der Bericht existiert bereits. Überschreiben?" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4447,32 +4370,32 @@ msgstr "" "Fehler beim Erzeugen des Berichtes:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Der Bericht wurde erfolgreich geschrieben." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Die gleiche Datei ist in beiden Feldern ausgewählt." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Die ausgewählten Dateien sind identisch." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4487,17 +4410,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Der ausgewählte Ordner ist ungültig." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kann keine Binärdatei im Editor öffnen." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4512,7 +4435,7 @@ msgstr "" "%1\n" "auf der anderen Seite erzeugen und die Ordner öffnen?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4523,152 +4446,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informationsverlust wegen Kodierungsfehlern: Beide Dateien" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Kein Unterschied" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Zeilen-Unterschied" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 Vorkommen ersetzt." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kann \"%s\" nicht finden" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Positionsleiste" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Unterschiedsleiste" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Die Patchdatei wurde erfolgreich geschrieben." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Die Patchdatei existiert bereits. Überschreiben?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 Dateien ausgewählt]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unified" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Konnte nicht in die Datei %1 schreiben." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Geben Sie eine Ausgabedatei an." -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kann keine Patchdatei von Binärdateien erzeugen." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kann keine Patchdatei von Verzeichnissen erzeugen." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4679,12 +4602,12 @@ msgstr "" "\n" "Das Erzeugen eines Patches erfordert, dass es keine ungespeicherten Änderungen in den Dateien gibt." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Der Ordner existiert nicht." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4695,37 +4618,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Datei zum Exportieren auswählen" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Datei zum Importieren auswählen" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Einstellungen aus der Datei importiert." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Einstellungen in die Datei exportiert." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Konnte die Einstellungen nicht aus der Datei importieren." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Konnte die Einstellungen nicht in die Datei exportieren." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4736,247 +4659,247 @@ msgstr "" "\n" "Möchten Sie wirklich fortfahren?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Gemischt" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Entpacker" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Editor-Skript" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Kein Prediffer (Normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Vorgeschlagene Plugins" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Andere Plugins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Plugin Einstellungen" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nicht gefunden - .sct Skripte deaktiviert." -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "G&ehe nach Zeile %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Deaktiviert" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Von Dateisystem" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Von MRU-Liste" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Keine Hervorhebung" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Ressourcen" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index b82ae2e43..be243b1db 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -245,7 +245,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< ¢äåéï >" @@ -2474,7 +2474,7 @@ msgid "Files:" msgstr "Áñ÷åßá:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "ÄéáöïñåôéêÜ" @@ -2511,7 +2511,7 @@ msgid "Right:" msgstr "ÄåîéÜ:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Ðáíïìïéüôõðá" @@ -2721,7 +2721,7 @@ msgid "A&ppend timestamp" msgstr "ÐñïóèÞêç &çìåñïìçíßáò ê´ þñáò" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Åðéâåâáßùóç ÁíôéãñáöÞò" @@ -2799,7 +2799,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "ÖÜêåëïò" @@ -2836,8 +2836,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Äõáäéêü" @@ -3103,7 +3103,7 @@ msgid "Version Control" msgstr "Äéá÷åßñéóç Åêäüóåùí" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "ÄéáöïñÝò" @@ -3210,7 +3210,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Áñ÷åßá XML (*.xml)|*.xml|All Files (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "¼íïìá" @@ -3231,7 +3231,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "ÐåñéãñáöÞ" @@ -3369,206 +3369,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "ÁíÜëõóç Áñ÷åßùí..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "¢íïéãìá åðéëïãÞò" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "ÁíôéãñáöÞ åî Áñéóôåñþí ðñïò ôá ÄåîéÜ" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "ÁíôéãñáöÞ åê Äåîéþí ðñïò ôá ÁñéóôåñÜ" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "ÁíôéãñáöÞ üëùí ÁñéóôåñÜ" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "ÁíôéãñáöÞ üëùí ÄåîéÜ" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "ÁíôéãñáöÞ áñ÷åßùí..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "ÄéáãñáöÞ áñ÷åßùí..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Ìåôáêßíçóç áñ÷åßùí..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Äçìéïõñãßá ôçò áíáöïñÜò..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Áíáßñåóç ôçò ôåëåõôáßáò ëåéôïõñãßáò..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "ÅðáíÜëçøç ôçò ôåëåõôáßáò ëåéôïõñãßáò..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "ÃñáììÞ: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Óõã÷þíåõóç" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "ÄéáöïñÜ %1 áðü %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 ÄéáöïñÝò âñÝèçêáí" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 ÄéáöïñÜ âñÝèçêå" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "ÌãÁ" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Áíôéêåßìåíï %1 áðü %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Áíôéêåßìåíá: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "ÅðéëÝîáôå äýï õðÜñ÷ïíôåò öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "ÅðéëïãÞ ÖáêÝëùí" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "ÅðéëÝîáôå äýï öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ áñéóôåñïý!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ äåîéïý!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "ÓöÜëìá óå áìöüôåñåò ôéò äéáäñïìÝò!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "ÅðéëÝîáôå äýï áñ÷åßá þóôå íá åíåñãïðïéçèåß ç åðéëïãÞ áðïóõìðéåóôéêïý." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Ç óýãêñéóç áñ÷åßïõ êáé öáêÝëïõ äåí åßíáé äõíáôÞ!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Ôï áñ÷åßï äå âñÝèçêå: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Ôï áñ÷åßï äåí áðïóõìðéÝóèçêå: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3581,12 +3506,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Áðïôõ÷ßá áíáëýóåùò áñ÷åßïõ äéåíÝîåùí." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3597,27 +3522,27 @@ msgstr "" "%1\n" "äåí åßíáé áñ÷åßï äéåíÝîåùí." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "ÁðïèÞêåõóç Ùò" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "ÁðïèÞêåõóç ìåôáâïëþí óôï %1;" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Áðïôõ÷ßá äçìéïõñãßáò åöåäñéêïý áñ÷åßïõ" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3630,7 +3555,7 @@ msgstr "" "\n" "ÓõíÝ÷åéá ùò Ý÷åé;" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3647,7 +3572,7 @@ msgstr "" "\t-÷ñçóéìïðïéÞóåôå Ýíá äéáöïñåôéêü üíïìá (ÐéÝóôå ÏÊ)\n" "\t-ìáôáéþóåôå ôçí ôñÝ÷ïõóá åíÝñãåéá (ÐéÝóôå ¢êõñï);" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3662,7 +3587,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3677,7 +3602,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3692,7 +3617,7 @@ msgstr "" "\n" "ÁíôéêáôÜóôáóç ìåôáâëçèÝíôïò áñ÷åßïõ?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3701,32 +3626,32 @@ msgstr "" "Ôï %1\n" "Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï;" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "ÁðïèÞêåõóç Áñéóôåñïý Áñ÷åßïõ Ùò" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "ÁðïèÞêåõóç Äåîéïý Áñ÷åßïõ Ùò" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3737,42 +3662,42 @@ msgstr "" "\n" "Áíáíåþóôå ôá áñ÷åßá ðñéí óõíå÷ßóåôå." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "ÐñÝðåé íá ïñßóåôå ìßá äéáäñïìÞ Ýñãïõ ôïõ SourceSafe þóôå íá óõíå÷ßóåôå (äçë. $/Ôï¸ñãïìïõ)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "¸ëåã÷ïò ê´ ¸îïäïò áðü ôï VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôïí Ýëåã÷ï ê´ Ýîïäï ôïõ áñ÷åßïõ. Ç óõíÝ÷åéá åßíáé áäýíáôç..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç åíôïëÞò ôïõ óõóôÞìáôïò äéá÷åéñßóåùò åêäüóåùí." -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ï öÜêåëïò åñãáóßáò ôïõ VSS êáé ç èÝóç ôïõ ôñÝ÷ïíôïò áñ÷åßïõ äåí åßíáé óå óõìöùíßá. ÓõíÝ÷åéá;" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Äå âñÝèçêáí âÜóåéò äåäïìÝíùí ôïõ VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "ÓöÜëìá ôïõ VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3783,7 +3708,7 @@ msgstr "" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" " Áíáßñåóç åíåñãåßáò åëÝã÷ïõ ê´ åîüäïõ;" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3792,127 +3717,127 @@ msgstr "" "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôçí áíáßñåóç åëÝã÷ïõ ê´ åîüäïõ ôïõ áñ÷åßïõ.\n" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "×ùñßò" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (Ýêäïóç ðñï ôçò 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (Ýêäïóç 5.0 êáé ìåôáãåíÝóôåñï)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "ÓôÜóç óôá êåíÜ" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÓôÜóç óôá êåíÜ Þ óôá óçìåßá óôßîåùò" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Äåîéü óôï Áñéóôåñü (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Áñéóôåñü óôï Äåîéü (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåîéü óôï Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Áñéóôåñü óôï Äåîéü (%1 áðü %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Áñéóôåñü óôï... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Äåîéü óôï... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Áñéóôåñü óôï... (%1 áðü %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåîéü óôï... (%1 áðü %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Áñéóôåñü (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Äåîéü (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Áìöüôåñá (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Äåîéü (%1 áðü %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Áìöüôåñá (%1áðü %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "ÁñéóôåñÞ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "ÄåîéÜ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 áðü %2 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3923,17 +3848,17 @@ msgstr "" "\n" "%1 ;" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå %d áíôéêåßìåíá:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3952,502 +3877,502 @@ msgstr "" "\n" "Ðáñáêáëþ áíáíåþóôå ôç óýãêñéóç." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå %d áíôéêåßìåíá:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Åðéâåâáéþóáôå Ìåôáêßíçóç" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá Üëëçò åöáñìïãÞò: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "¢ãíùóôç ìïñöÞ óõìðéåóìÝíïõ áñ÷åßïõ" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "¼íïìá Áñ÷åßïõ" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "ÁðïôÝëåóìá Óõãêñßóåùò" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Çìåñïìçíßá Áñéóôåñïý" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Çìåñïìçíßá Äåîéïý" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "ÅðÝêôáóç" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "ÌÝãåèïò Áñéóôåñïý" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "ÌÝãåèïò Äåîéïý" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "ÌÝãåèïò Äåîéïý (Óýíôïìï)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "ÌÝãåèïò Áñéóôåñïý (Óýíôïìï)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Áñéóôåñïý" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Äåîéïý" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Íåþôåñï Áñ÷åßï" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "¸êäïóç Áñéóôåñïý Áñ÷åßïõ" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "¸êäïóç Äåîéïý Áñ÷åßïõ" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Óýíôïìï ÁðïôÝëåóìá" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Éäéüôçôåò Áñéóôåñïý" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Éäéüôçôåò Äåîéïý" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Áñéóôåñïý" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Äåîéïý" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Êùäéêïóåëßäá Áñéóôåñïý" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Êùäéêïóåëßäá Äåîéïý" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Áãíïçèåßóá ÄéáöïñÜ." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Ç óýãêñéóç ôùí áñ÷åßùí åßíáé áäýíáôç" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Ôï áíôéêåßìåíï ìáôáéþèçêå" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Ôï áñ÷åßï ðáñåëåßöèç" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Ï öÜêåëïò ðáñåëåßöèç" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "ÁñéóôåñÜ ìüíï: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "ÄåîéÜ ìüíï: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé ðáíïìïéüôõðá" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Ôá áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "ÁñéóôåñÜ ìüíï" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "ÄåîéÜ ìüíï" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "ÓöÜëìá" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ðáñåëèþí ÷ñüíïò: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 áíôéêåßìåíï åðéëåãìÝíï" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 áíôéêåßìåíá åðéëåãìÝíá" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "¼íïìá áñ÷åßïõ Þ üíïìá öáêÝëïõ." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¼íïìá õðïöáêÝëïõ üôáí ïé õðïöÜêåëïé ðåñéëáìâÜíïíôáé." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "ÁðïôÝëåóìá óõãêñßóåùò, ðëÞñçò áíÜðôõîç" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò äåîéÜò ðëåõñÜò." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "ÅðÝêôáóç áñ÷åßïõ." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óå byte." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óå byte." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "×ñüíïò äçìéïõñãßáò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "×ñüíïò äçìéïõñãßáò äåîéÜò ðëåõñÜò." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Ðëçñïöïñåß ðïéá ðëåõñÜ Ý÷åé ôçí ðëÝïí ðñüóöáôç çìåñïìçíßá ôñïðïðïéÞóåùò." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ áñéóôåñÞò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ äåîéÜò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Âñá÷ý áðïôÝëåóìá óõãêñßóåùò." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Éäéüôçôåò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Éäéüôçôåò äåîéÜò ðëåõñÜò." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý áñéóôåñÞò ðëåõñÜò" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý äåîéÜò ðëåõñÜò" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Êùäéêïóåëßäá áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Êùäéêïóåëßäá äåîéÜò ðëåõñÜò." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áñéèìüò áãíïçèåéóþí äéáöïñþí óôï áñ÷åßï. ÁõôÝò ïé äéáöïñÝò áãíïïýíôáé áðü ôï WinMerge êáé äåí åßíáé äõíáôüí íá óõã÷ùíåõèïýí." -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áñéèìüò äéáöïñþí óôï áñ÷åßï. Áõôüò ï áñéèìüò äåí ðåñéëáìâÜíåé áãíïçèåßóåò äéáöïñÝò." -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Åìöáíßæåé Ýíáí áóôåñßóêï (*) åÜí ôï áñ÷åßï åßíáé äõáäéêü." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Óýãêñéóç %1 ìå %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "ÊáôÜëïãïò ìå êüììá ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "ÊáôÜëïãïò ìå óôçëïèÝôç ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Áðëü HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Áðëü XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôï áñ÷åßï áíáöïñÜò áðïôåëåóìÜôùí õðÜñ÷åé Þäç. Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4456,32 +4381,32 @@ msgstr "" "ÓöÜëìá êáôÜ ôç äçìéïõñãßá ôçò áíáöïñÜò áðïôåëåóìÜôùí:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Ç áíáöïñÜ áðïôåëåóìÜôùí äçìéïõñãÞèçêå åðéôõ÷þò." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Ôï ßäéï áñ÷åßï áíïß÷èçêå óå áìöüôåñá ôá ðåäßá." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Ôá åðéëåãìÝíá áñ÷åßá åßíáé ðáíïìïéüôõðá." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôç óýãêñéóç ôùí áñ÷åßùí." -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ç äçìéïõñãßá ðñïóùñéíþí áñ÷åßùí äåí Þôáí äõíáôÞ. ÅëÝãîôå ôéò ñõèìßóåéò óáò ôéò ó÷åôéêÝò ìå ôçí ðñïóùñéíÞ äéáäñïìÞ." -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4496,17 +4421,17 @@ msgstr "" "\n" "Óçìåßùóç: ÅÜí åðéèõìåßôå ïé ÷áñáêôÞñåò ôåñìáôéóìïý íá èåùñïýíôáé ðÜíôïôå éóïäýíáìïé, åíåñãïðïéåßóôå ôçí åðéëïãÞ \"ÄéáöïñÝò ÷áñáêôÞñùí ôåñìáôéóìïý (Win/Unix/Mac) íá áãíïïýíôáé...\" óôçí êáñôÝëá Óýãêñéóç ôïõ äéáëüãïõ åðéëïãþí (åìöáíßæåôáé ìå ôçí åðéëïãÞ Åðåîåñãáóßá/ÅðéëïãÝò)." -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Ï åðéëåãìÝíïò öÜêåëïò äåí åßíáé Ýãêõñïò." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ôï Üíïéãìá äõáäéêïý áñ÷åßïõ óôï ðåäßï åðåîåñãáóßáò äåí åßíáé äõíáôüí." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4521,7 +4446,7 @@ msgstr "" "%1\n" "óôçí Üëëç ðëåõñÜ êáé íá áíïßîåôå áõôïýò ôïõò öáêÝëïõò;" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4532,152 +4457,152 @@ msgstr "" "Ç åìöÜíéóç êÜèå öáêÝëïõ ìå ôç äéêÞ ôïõ êùäéêïóåëßäá èá Ý÷åé åìöáíéóéáêÜ êáëýôåñá áðïôåëÝóìáôá áëëÜ ç óõã÷þíåõóç/áíôéãñáöÞ èá åßíáé åðéêßíäõíç.\n" "Åðéèõìåßôå íá èåùñçèåß üôé áìöüôåñá ôá áñ÷åßá ÷ñçóéìïðïéïýí ôçí ðñïêáèïñéóìÝíç êùäéêïóåëßäá ôïõ windows (óõíéóôÜôáé);" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Áðþëåéá ðëçñïöïñéþí ëüãù óöáëìÜôïò êùäéêïóåëßäáò: áìöüôåñá ôá áñ÷åßá" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "×ùñßò äéáöïñÜ" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "ÄéáöïñÜ ãñáììÞò" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "ÁíôéêáôáóôÜèçêáí %1 áêïëïõèßåò ÷áñáêôÞñùí." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ç áêïëïõèßá ÷áñáêôÞñùí \"%s\" äåí åßíáé äõíáôüí íá âñåèåß" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Ðåäßï Åíôïðéóìïý" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Ðåäßï Äéáöïñþí" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Ç åããñáöÞ ôïõ áñ÷åßïõ patch ïëïêëçñþèçêå åðéôõ÷þò." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ôï áñ÷åßï patch õðÜñ÷åé Þäç. Åðéèõìåßôå íá ôï áíôéêáôáóôÞóåôå;" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 åðéëåãìÝíá áñ÷åßá]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Êáíïíéêü" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Ìå ðåñéâÜëëïí êåßìåíï" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "ÅíïðïéçìÝíï" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Ç åããñáöÞ óôï áñ÷åßï %1 äåí Þôáí äõíáôÞ." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ç ïñéóèåßóá äéáäñïìÞ åîüäïõ äåí åßíáé áðüëõôç äéáäñïìÞ: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Ïñßóáôå Ýíá áñ÷åßï åîüäïõ" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü äõáäéêÜ áñ÷åßá äåí åßíáé äõíáôÞ." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü öáêÝëïõò äåí åßíáé äõíáôÞ." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4688,12 +4613,12 @@ msgstr "" "\n" "Ç äçìéïõñãßá patch áðáéôåß íá ìçí õðÜñ÷ïõí óå áñ÷åßá áëëáãÝò ïé ïðïßåò äåí Ý÷ïõí áðïèçêåõèåß." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Ï öÜêåëïò äåí õðÜñ÷åé." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4704,37 +4629,37 @@ msgstr "" "Äåí åßíáé äõíáôüí íá âñåèïýí üëá ôá áðáñáßôçôá óôïé÷åßá (ôï 7-zip êáé/Þ ôï Merge7z*.dll) ãéá ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí.\n" "Äåßôå óôï åã÷åéñßäéï ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí êáé ìå ôïí ôñüðï åíåñãïðïéÞóåùò áõôÞò." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åîáãùãÞ" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åéóáãùãÞ" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Ïé ñõèìßóåéò åéóÞ÷èçóáí áðü ôï áñ÷åßï." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Ïé ñõèìßóåéò åîÞ÷èçóáí óôï áñ÷åßï." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Áðïôõ÷ßá åéóáãùãÞò ñõèìßóåùí áðü ôï áñ÷åßï." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Áðïôõ÷ßá åããñáöÞò ñõèìßóåùí óôï áñ÷åßï." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4745,247 +4670,247 @@ msgstr "" "\n" "Åðéèõìåßôå íá óõíå÷ßóåôå;" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Ìéêôü" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Ôýðïò" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Áðïóõìðéåóôéêü" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "ÐñïåðåîåñãáóôÞò Äéáöïñþí" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "ÌáêñïåíôïëÝò ÅðåîåñãáóôÞ ÊåéìÝíïõ" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ôï óõíåñãáæüìåíï áðïóõìðéåóôéêü åíåñãåß óå áìöüôåñá ôá áñ÷åßá (ìüíï Ýíá áñ÷åßï ÷ñåéÜæåôáé íá Ý÷åé ôçí åðÝêôáóç)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí (ÊáíïíéêÞ Ëåéôïõñãßá)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Ðñïôåéíüìåíá Áñèñþìáôá" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "¢ëëá áñèñþìáôá" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "ÉäéùôéêÞ Ìåôáãëþôôéóç: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Ñõèìßóåéò ÁñèñùìÜôùí" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Ôï ÐåñéâÜëëïí Äéåñìçíåßáò Windows (WSH) äå âñÝèçêå - ç ÷ñÞóç áñ÷åßùí äÝóìçò åíåñãåéþí .sct åßíáé áðåíåñãïðïéçìÝíç" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<ÏõäÝí>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<Áõôüìáôï>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "ÌåôÜ&âáóç óôç ÃñáììÞ %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "ÁðåíåñãïðïéçìÝíç" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Áðü Áñ÷åéïóýóôçìá" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Áðü ÊáôÜëïãï ðñïóöÜôùò ÷ñçóéìïðïéçèÝíôùí" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "×ùñßò ×ñùìáôéóìü Êþäéêá" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 719c61a1f..dfefaa2a0 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Üres >" @@ -2475,7 +2475,7 @@ msgid "Files:" msgstr "Fájlok:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Különbözõ" @@ -2512,7 +2512,7 @@ msgid "Right:" msgstr "Jobb:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Egyezõ" @@ -2722,7 +2722,7 @@ msgid "A&ppend timestamp" msgstr "Idõpecsét hozzáfûzése" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Másolás megerõsítése" @@ -2800,7 +2800,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Könyvtár" @@ -2837,8 +2837,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Bináris" @@ -3072,7 +3072,7 @@ msgid "Version Control" msgstr "Verzió Kontroll" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Eltérések" @@ -3176,7 +3176,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Név" @@ -3197,7 +3197,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Leírás" @@ -3317,206 +3317,131 @@ msgstr "" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Fájlok vizsgálata..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Kijelölés megnyitása" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Másolás balról jobbra" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Másolás balról jobbra" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Másolás mindent balra" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Másolás mindent jobbra" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Fájlok másolása..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Fájlok törlése..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Fájlok áthelyezése..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Jelentés készítése..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Utolsó mûvelet visszavonása..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Elõzõ mûvelet újbóli alkalmazása..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Sor: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Olvasztás" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Ennyi különség: %1 ennyibõl: %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 különbséget találtam" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 különbséget találtam" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "%1 elem ennyibõl: %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "%1 elem" -#: Merge.rc:2218 +#: Merge.rc:2198 #, 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:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Könytár kiválasztás" -#: Merge.rc:2220 +#: Merge.rc:2200 #, 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:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "A bal oldali elérési út érvénytelen!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "A jobb oldali elérési út érvénytelen!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Mindkét elérési út érvénytelen!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, 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:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Nem lehet fájlt könyvtárral összehasonlítani!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Ez a fájl nem található: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "A fájl nincs kicsomagolva: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3529,37 +3454,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Hiba a konfliktusfájl értelmezésekor." -#: Merge.rc:2240 +#: Merge.rc:2220 #, 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:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Mentés másként" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Mentsem a változtatásokat %1 néven?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Hiba a fájl biztonsági másolatának készítésekor" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3572,7 +3497,7 @@ msgstr "" "\n" "Folytatni akarod?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3589,7 +3514,7 @@ msgstr "" "\t-másik fájlnév választása (Ok)\n" "\t-a jelenlegi folyamat megszakítása (Mégsem)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3604,7 +3529,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3619,7 +3544,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3634,7 +3559,7 @@ msgstr "" "\n" "Felülírjuk a megváltoztatott fájlt?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3643,32 +3568,32 @@ msgstr "" "%1\n" "csak olvasható. Szeretnéd ezt megváltoztatni?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Bal oldali fájl mentése más néven" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Jobb oldali fájl mentése más néven" -#: Merge.rc:2261 +#: Merge.rc:2241 #, 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:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3679,42 +3604,42 @@ msgstr "" "\n" "Frissítsd a dokumentumokat, mielõtt folytatnád." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Fájlok ellenõrzése VSS-bõl..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Hiba a Verzió Rendszer futtatása közben." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Nem található VSS adatbázis!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Hiba a VSS-bõl:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3722,134 +3647,134 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2281 +#: Merge.rc:2261 #, 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (régebbi mint 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 vagy újabb)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Megállás szóközöknél" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Megállás szóközöknél vagy írásjeleknél" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Jobbról balra (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Balról jobbra (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Jobbról balra (%1 of %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Balról jobbra (%1 of %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Balról... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Jobbról... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Balról... (%1 of %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Jobbról... (%1 of %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Bal (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Jobb (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Mindkettõ (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Bal (%1 ennyibõl: %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Jobb (%1 ennyibõl: %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Mindkettõ (%1 ennyibõl: %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Bal oldal - válassz úticél mappát:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Jobb oldal - válassz úticél mappát:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3860,17 +3785,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3882,502 +3807,502 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Mozgatás megerõsítése" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nem sikerült elindítani a külsõ szerkesztõt: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Ismeretlen archívum formátum" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Fájlnév" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Összehasonlítási eredmények" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Bal oldali dátum" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Jobb oldali dátum" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Kiterjesztés" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Bal oldali méret" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Jobb oldali méret" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Bal oldali létrehozási idõ" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Jobb oldali létrehozási idõ" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Újabb fájl" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Bal oldali fájl verzió" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Jobb oldali fájl verzió" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Rövid eredmények" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Bal oldali attribútumok" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Jobb oldali attribútumok" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Bal oldali kódolás" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Jobb oldali kódolás" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Nem lehett összehasonlítani a fájlokat" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "A fájl kihagyva" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "A könyvtár kihagyva" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Csak bal: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Csak jobb: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "A bináris fájlok megegyezõek" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "A bináris fájlok különbözõek" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "A fájlok különbözõek" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "A könyvtárak különböznek" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Csak bal oldal" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Csak jobb oldal" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Hiba" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "A szövegfájlok megegyeznek" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "A szövegfájlok különböznek" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Eltelt idõ: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 elem kiválasztva" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 elem kiválasztva" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "fájlnév vagy könyvtárnév." -#: Merge.rc:2445 +#: Merge.rc:2425 #, 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:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Összehasonlítási eredmény bõvebb formában." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Bal oldali módosítási dátum." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Jobb oldali módosítási dátum." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Fájlok kiterjesztése." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Bal oldali fájl mérete bájtokban." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Jobb oldali fájl mérete bájtokban." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Bal oldal létrehozási ideje." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Jobb oldal létrehozási ideje." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Megmutatja, melyik oldalnak újabb a létrehozási dátuma." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Rövid összehasonlítási eredmények." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Bal oldali attribútumok." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Jobb oldali attribútumok." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Bal oldali kódolás." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Jobb oldali kódolás." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "(*) látható, ha a fájl bináris." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "%1 összehasonlítása ezzel: %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Vesszõvel elválasztott lista" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Tabulált lista" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Egyszerû HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Egyszerû XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4386,32 +4311,32 @@ msgstr "" "Hiba a jelentés készítése közben:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "A jelentés sikeresen elkészült." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Ugyanaz a fájl van megnyitva mindkét panelen." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "A kijelölt fájlok ugyanazok." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Hiba történt a fájlok összehasonlításakor." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4426,22 +4351,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2493 #, 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:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4452,152 +4377,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Nincs eltérés" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Sor eltérés" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Cserélve lett %1 sztring." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nem található ez: \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "A Patch fájl sikeresen elkészült." -#: Merge.rc:2568 +#: Merge.rc:2548 #, 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:2569 +#: Merge.rc:2549 #, 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:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 kijelölt fájl]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normál" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Környezeti" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Egységesített" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Nem lehetett ebbe a fájlba írni: %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Adj meg egy kimeneti fájlt" -#: Merge.rc:2579 +#: Merge.rc:2559 #, 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:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nem lehet patch fájlt létrehozni könyvtárakból." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4608,12 +4533,12 @@ msgstr "" "\n" "A patch létrehozásához elengedhetetlen, hogy ne legyenek el nem mentett változtatások a fájlokban." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "A mappa nem létezik." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4624,37 +4549,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4665,247 +4590,247 @@ msgstr "" "\n" "Biztosan folytatja?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Nincs elõvizsgálat (normális)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Javasolt bõvítmények" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Egyéb bõvítmények" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Bõvítmény beállítások" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "A WSH nem található - Az .sct szkriptek le lesznek tiltva" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "&Ugrás a(z) %1. sorra" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index ba3946e0c..ef290fecd 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Vuoto >" @@ -2475,7 +2475,7 @@ msgid "Files:" msgstr "File:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Diversi" @@ -2512,7 +2512,7 @@ msgid "Right:" msgstr "Destra:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identici" @@ -2722,7 +2722,7 @@ msgid "A&ppend timestamp" msgstr "Aggiungi il ×tamp" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Conferma la copia" @@ -2800,7 +2800,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Cartella" @@ -2837,8 +2837,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binario" @@ -3097,7 +3097,7 @@ msgid "Version Control" msgstr "Controllo versioni" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Differenze" @@ -3204,7 +3204,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nome" @@ -3225,7 +3225,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Descrizione" @@ -3363,206 +3363,131 @@ msgstr "Miei file" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Scansione file in corso..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Apertura selezione" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Copia da sinistra a destra in corso" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Copia da destra a sinistra in corso" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Copia completa a sinistra in corso" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Copia completa a destra in corso" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Copia dei file in corso..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Eliminazione dei file in corso..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Spostamento dei file in corso..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Creazione del rapporto in corso..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Linea: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Unione" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Differenza %1 su %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 differenze trovate" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 differenza trovata" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 su %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Elementi: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleziona due cartelle o file esistenti da confrontare" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Selezione cartella" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleziona due cartelle o due file da confrontare." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Il percorso di sinistra non è valido!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Il percorso di destra non è valido!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Entrambi i percorsi non sono validi!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleziona due file per attivare la selezione dello scompattatore." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossibile confrontare file e cartelle!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "File non trovato: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "File non scompattato: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3575,12 +3500,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3591,27 +3516,27 @@ msgstr "" "%1\n" "non è un file di conflitto." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Salva con nome" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Vuoi salvare le modifiche in %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Errore durante il salvataggio di una copia di backup del file" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3624,7 +3549,7 @@ msgstr "" "\n" "Continuare comunque?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3641,7 +3566,7 @@ msgstr "" "\t-utilizzare un nome diverso per il file (Premi OK)\n" "\t-annullare l'operazione corrente (Premi Annulla)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3656,7 +3581,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3671,7 +3596,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3686,7 +3611,7 @@ msgstr "" "\n" "Sovrascrivere il file modificato?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3695,32 +3620,32 @@ msgstr "" "%1\n" "è marcato come di sola lettura. Desideri non tenere conto della voce di Sola lettura?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Salva il file di sinistra con nome" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Salva il file di destra con nome" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3731,42 +3656,42 @@ msgstr "" "\n" "Aggiorna i documenti prima di continuare." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Estrazione dei file da VSS in corso..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Errore nell'esecuzione di un comando del sistema di versioning." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Nessun database di VSS trovato!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Errore di VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3777,7 +3702,7 @@ msgstr "" " Controlla per favore la configurazione della vista utilizzata.\n" " Annullare l'operazione di estrazione?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3786,127 +3711,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Nessuno" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (precedente a 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiore)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Interrompi agli spazi bianchi" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Interrompi agli spazi bianchi o punteggiatura" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Da Destra a Sinistra (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Da Sinistra a Destra (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da Destra a Sinistra (%1 su %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da Sinistra a Destra (%1 su %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Sinistra in... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Destra in... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Sinistra in... (%1 su %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Destra in... (%1 su %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Sinistra (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Destra (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Entrambi (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Sinistra (%1 su %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Destra (%1 su %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Entrambi (%1 su %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Lato sinistro - scegli cartella di destinazione:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Lato destro - scegli cartella di destinazione:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 file coinvolti)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 file su %2 coinvolti)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3917,17 +3842,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Sei sicuro di voler copiare:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Sei sicuro di voler copiare %d elementi:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3946,502 +3871,502 @@ msgstr "" "\n" "Aggiorna per favore il confronto." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Impossibile lanciare l'editor esterno: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Formato dell'archivio sconosciuto" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nome del file" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Risultato del confronto" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Data file di sinistra" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Data file di destra" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Estensione" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Dimensioni file di sinistra" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Dimensioni file di destra" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Data creazione file sinistra" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Data creazione file destra" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "File più recente" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Versione file sinistra" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Versione file destra" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Risultato breve" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Attributi sinistra" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Attributi destra" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "EOL di sinistra" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "EOL di destra" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Codifica di sinistra" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Codifica di destra" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Diff. ignorate" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Impossibile confrontare i file" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Elemento annullato" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "File saltato" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Cartella saltata" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Solo sinistra: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Solo destra: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "I file binari sono identici" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "I file non di testo contengono delle differenze" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "I file contengono delle differenze" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Solo a sinistra" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Solo a destra" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Errore" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo trascorso: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 elemento selezionato" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 elementi selezionati" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nome del file o della cartella." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome della sottocartella quando le sottocartelle sono incluse." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Risultato del confronto nella forma completa." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Data ultima modifica del file di sinistra." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Data ultima modifica del file di destra." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Estensione del file." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Dimensioni del file di sinistra in byte." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Dimensioni del file di destra in byte." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Dimensioni abbreviate del file di sinistra." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Dimensioni abbreviate del file di destra." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Data e ora di creazione del file di sinistra." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Data e ora di creazione del file di destra." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Mostra quale file ha la data dell'ultima modifica più recente." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Risultato del confronto nella forma breve." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Attributi del file di sinistra." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Attributi del file di destra." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tipo di fine linea nel file di sinistra" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tipo di fine linea nel file di destra" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Codifica del file di sinistra." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Codifica del file di destra." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisco (*) se il file è binario." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Confronto di %1 con %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Lista separata da virgole" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Lista separata da Tab" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML semplice" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "XML semplice" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4450,32 +4375,32 @@ msgstr "" "Errore nella creazione del rapporto:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Il rapporto è stato creato con successo." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Lo stesso file è aperto in entrambi i pannelli." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "I file selezionati sono identici." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Si è verificato un errore durante il confronto dei file." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4490,17 +4415,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "La cartella selezionata non è valida." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossibile aprire il file binario nell'editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4515,7 +4440,7 @@ msgstr "" "%1\n" "dall'altro lato ed aprirle entrambe?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4526,152 +4451,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Nessuna differenza" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Differenza della linea" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 stringhe sostituite." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Impossibile trovare la stringa '%s'" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Pannello della locazione" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Pannello delle differenze" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "File di patch scritto con successo." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "Prima voce non trovata o è una cartella!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "Seconda voce non trovata o è una cartella!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 file selezionati]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normale" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Contesto" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unificato" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Impossibile scrivere nel file %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Specifica un file di output" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossibile creare un file di patch da file binari." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossibile creare un file di patch da cartelle." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4682,12 +4607,12 @@ msgstr "" "\n" "La creazione di una patch richiede che non ci siano cambiamenti non salvati nei file." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "La cartella non esiste." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4698,37 +4623,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Scegli file per l'esportazione" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Scegli file per l'importazione" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Opzioni importate dal file." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Opzioni esportate nel file." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Impossibile importare le opzioni dal file." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Impossibile esportare le opzioni nel file." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4739,247 +4664,247 @@ msgstr "" "\n" "Sei sicuro di voler proseguire?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mescolato" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "No prediffer (normale)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Plugin suggeriti" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Altri plugin" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Build privata: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Impostazioni plugin" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non trovato - script .sct disattivati" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Vai alla &linea %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Disattivato" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Dal file system" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Dalla lista dei file recenti" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Oggetto portabile" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Risorse" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index c684624b3..241f096db 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -247,7 +247,7 @@ msgstr " #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< ‚È‚µ >" @@ -2494,7 +2494,7 @@ msgid "Files:" msgstr "ƒtƒ@ƒCƒ‹:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "·ˆÙ" @@ -2531,7 +2531,7 @@ msgid "Right:" msgstr "‰E‘¤:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "“¯ˆê" @@ -2741,7 +2741,7 @@ msgid "A&ppend timestamp" msgstr "ƒ^ƒCƒ€ƒXƒ^ƒ“ƒv‚ð’ljÁ‚·‚é(&P)" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "ƒRƒs[‚ÌŠm”F" @@ -2819,7 +2819,7 @@ msgstr " #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "ƒtƒHƒ‹ƒ_" @@ -2856,8 +2856,8 @@ msgstr " #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "ƒoƒCƒiƒŠ" @@ -3151,7 +3151,7 @@ msgid "Version Control" msgstr "ƒo[ƒWƒ‡ƒ“ŠÇ—" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "·ˆÙ" @@ -3262,7 +3262,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ƒtƒ@ƒCƒ‹ (*.xml)|*.xml|All Files (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "–¼Ì" @@ -3283,7 +3283,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "à–¾" @@ -3429,206 +3429,131 @@ msgstr "Mine File" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "ƒtƒ@ƒCƒ‹‚ðƒXƒLƒƒƒ“‚µ‚Ä‚¢‚Ü‚·..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŠJ‚¢‚Ä‚¢‚Ü‚·" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "¶‚©‚ç‰E‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "‰E‚©‚獶‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "¶‚©‚çƒRƒs[‚µ‚Ä‚¢‚Ü‚·" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "‰E‚©‚çƒRƒs[‚µ‚Ä‚¢‚Ü‚·" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "‘S‚Ä‚ð¶‚ÉƒRƒs[‚µ‚Ä‚¢‚Ü‚·" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "‘S‚Ä‚ð‰E‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "ƒtƒ@ƒCƒ‹‚ðƒRƒs[‚µ‚Ä‚¢‚Ü‚·..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "ƒtƒ@ƒCƒ‹‚ðíœ‚µ‚Ä‚¢‚Ü‚·..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "ƒtƒ@ƒCƒ‹‚ðˆÚ“®‚µ‚Ä‚¢‚Ü‚·..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "ƒŒƒ|[ƒg‚𐶐¬‚µ‚Ä‚¢‚Ü‚·..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "ÅŒã‚Ì‘€ì‚ðŒ³‚É–ß‚µ‚Ä‚¢‚Ü‚·..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "‘O‚Ì‘€ì‚ð‚â‚è’¼‚µ‚Ä‚¢‚Ü‚·..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "Ž©“®ƒ}[ƒW’†‚Å‚·..." - -#: Merge.rc:2198 -#, 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:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "s: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, 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:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "ƒ}[ƒW" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "·ˆÙ %1/%2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "€–Ú %1/%2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "€–Ú: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "‘¶Ý‚·‚éƒtƒHƒ‹ƒ_‚Ü‚½‚́Aƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Folder Selection" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "2‚‚̃tƒHƒ‹ƒ_‚Ü‚½‚́A2‚‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "¶‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "’†‰›‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "‰E‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "—¼‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "¶‘¤‚Æ’†‰›‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "¶‘¤‚ƉE‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "’†‰›‚ƉE‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "‘S‚ẴpƒX‚ª•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‘I‘ð‚ð—LŒø‚É‚·‚é‚ɂ̓tƒ@ƒCƒ‹‚ð“ñ‚‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "ƒtƒ@ƒCƒ‹‚ƃtƒHƒ‹ƒ_‚Í”äŠr‚Å‚«‚Ü‚¹‚ñ!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "ƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "ƒtƒ@ƒCƒ‹‚ª“WŠJ‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3641,12 +3566,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "ƒRƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚̉ðÍ‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3657,19 +3582,19 @@ msgstr "" "%1\n" "‚̓Rƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚Å‚Í‚ ‚è‚Ü‚¹‚ñB" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "" "ƒtƒ@ƒCƒ‹ %1 ‚Ì“à—e‚͕ύX‚³‚ê‚Ä‚¢‚Ü‚·B\n" "•ÏX‚ð•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3678,12 +3603,12 @@ msgstr "" "%1‚Í“Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚Å‚·B “Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚©? (V‚µ‚¢" "ƒtƒ@ƒCƒ‹–¼‚Å‚Í•Û‘¶‚µ‚Ü‚¹‚ñB)" -#: Merge.rc:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "ƒtƒ@ƒCƒ‹ƒoƒbƒNƒAƒbƒvƒGƒ‰[" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3696,7 +3621,7 @@ msgstr "" "‚ðƒoƒbƒNƒAƒbƒv‚Å‚«‚Ü‚¹‚ñB\n" "–³Ž‹‚µ‚Ä‘±‚¯‚Ü‚·‚©?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3712,7 +3637,7 @@ msgstr "" "•Ê–¼‚Å•Û‘¶‚·‚éê‡‚ÍOk‚ðA\n" "’†Ž~‚·‚éê‡‚́AƒLƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3728,7 +3653,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3744,7 +3669,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3757,7 +3682,7 @@ msgstr "" "‚±‚̃tƒ@ƒCƒ‹‚Í WinMerge ˆÈŠO‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ŏC³‚³‚ê‚Ä‚¢‚Ü‚·BC³‚³‚ꂽ" "ƒtƒ@ƒCƒ‹‚ɏ㏑‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3766,7 +3691,7 @@ msgstr "" "%1\n" "‚́A“Ç‚ÝŽæ‚èê—p‚Å‚·B “Ç‚ÝŽæ‚èê—p‚̍€–Ú‚ðã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3780,22 +3705,22 @@ msgstr "" "‚ðXV‚µ‚Ü‚µ‚½B\n" "ƒtƒ@ƒCƒ‹‚ðŠJ‚«‚È‚¨‚µ‚Ü‚·‚©?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "–¼‘O‚ð•t‚¯‚趑¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "–¼‘O‚ð•t‚¯‚Ä’†‰›‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "–¼‘O‚ð•t‚¯‚ĉE‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3806,7 +3731,7 @@ msgstr "" "%1\n" "‚͏Á–Å‚µ‚Ü‚µ‚½B‘±s‚·‚邽‚߂Ƀtƒ@ƒCƒ‹‚̃Rƒs[‚ð•Û‘¶‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3817,7 +3742,7 @@ msgstr "" "\n" "‘±s‚·‚é‘O‚ɃhƒLƒ…ƒƒ“ƒg‚ðF5ƒL[‚ōŐV‚É‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3826,41 +3751,41 @@ msgstr "" "‘±s‚·‚邽‚߂ɂ́ASourceSafeƒvƒƒWƒFƒNƒgƒpƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B (—á: $/" "MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "VSS‚©‚çƒtƒ@ƒCƒ‹‚ðƒ`ƒFƒbƒNƒAƒEƒg‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "ƒo[ƒWƒ‡ƒ“ƒVƒXƒeƒ€ƒRƒ}ƒ“ƒh‚ÌŽÀsƒGƒ‰[B" -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "VSS‚̃f[ƒ^ƒx[ƒX‚ª‚݂‚©‚è‚Ü‚¹‚ñ!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "VSS‚©‚ç‚̃Gƒ‰[:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3872,7 +3797,7 @@ msgstr "" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B\n" " ƒ`ƒFƒbƒNƒAƒEƒg‚ðƒLƒƒƒ“ƒZƒ‹‚µ‚Ü‚·‚©?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3883,127 +3808,127 @@ msgstr "" "‚Ü‚µ‚½B\n" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B " -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "‚È‚µ" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 –¢–ž)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ˆÈã)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "‹ó”’‚Å‹æØ‚é" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "‹ó”’‚©‹å“Ç“_‚Å‹æØ‚é" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "‰E‚©‚獶 (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "¶‚©‚ç‰E (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "‰E‚ð¶‚É (%1 / %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¶‚ð‰E‚É (%1 / %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "¶‚ð... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "‰E‚ð... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "¶‚ð... (%1/%2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "‰E‚ð... (%1/%2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "¶ (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "‰E (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "—¼‘¤ (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "¶ (%1 / %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "‰E (%1 / %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "—¼‘¤ (%1 / %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "¶‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "‰E‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1/%2 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4015,17 +3940,17 @@ msgstr "" "%1\n" "‚ðíœ‚µ‚Ü‚·‚©?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "–{“–‚ɃRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "–{“–‚É%d€–Ú‚ðƒRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -4044,22 +3969,22 @@ msgstr "" "\n" "Ä“x”äŠr‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "€–Ú‚ðˆÚ“®‚µ‚Ü‚·‚©?: " -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "%dŒÂ‚̍€–Ú‚ðˆÚ“®‚µ‚Ü‚·‚©?: " -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "ˆÚ“®‚ÌŠm”F" -#: Merge.rc:2338 +#: Merge.rc:2318 #, c-format msgid "" "You are about to close the window that is comparing folders. Are you sure " @@ -4068,437 +3993,437 @@ msgstr "" "ƒtƒHƒ‹ƒ_”äŠr’†‚̃EƒCƒ“ƒhƒE‚ð•Â‚¶‚悤‚Æ‚µ‚Ä‚¢‚Ü‚·B–{“–‚ɃEƒCƒ“ƒhƒE‚ð•Â‚¶‚Ü‚·" "‚©?" -#: Merge.rc:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "ŠO•”ƒGƒfƒBƒ^‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "–¢’m‚̃A[ƒJƒCƒuŒ`Ž®‚Å‚·" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "ƒtƒ@ƒCƒ‹–¼" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "”äŠrŒ‹‰Ê" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "¶“ú•t" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "‰E“ú•t" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "’†“ú•t" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Šg’£Žq" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "¶ƒTƒCƒY" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "‰EƒTƒCƒY" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "’†ƒTƒCƒY" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "‰EƒTƒCƒY (’Zk)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "¶ƒTƒCƒY (’Zk)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "’†ƒTƒCƒY (’Zk)" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "¶ì¬“úŽž" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "‰Eì¬“úŽž" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "’†ì¬“úŽž" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "V‚µ‚¢ƒtƒ@ƒCƒ‹" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "¶ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "‰Eƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "’†ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "ŠÈˆÕŒ‹‰Ê•\Ž¦" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "¶‘®«" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "‰E‘®«" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "’†‘®«" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "¶EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "’†EOL" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "‰EEOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "¶ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "‰EƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "’†ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "–³Ž‹‚³‚ꂽ·ˆÙ”" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "ƒtƒ@ƒCƒ‹‚ð”äŠr‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "’†’f‚³‚ꂽ€–Ú" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒ@ƒCƒ‹" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒHƒ‹ƒ_" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "¶‘¤‚Ì‚Ý: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "’†‰›‚Ì‚Ý: %1" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "‰E‘¤‚Ì‚Ý: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "%1 “à‚Ì‚Ý‘¶Ý‚µ‚Ü‚¹‚ñ" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "ƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "ƒtƒHƒ‹ƒ_‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "¶‘¤‚Ì‚Ý" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "‰E‘¤‚Ì‚Ý" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "’†‰›‚Ì‚Ý" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "¶‘¤‚É‚È‚¢" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "‰E‘¤‚É‚È‚¢" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "’†‰›‚É‚È‚¢" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "ƒGƒ‰[" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚͈قȂè‚Ü‚·" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Œo‰ßŽžŠÔ: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "ƒtƒ@ƒCƒ‹–¼‚Ü‚½‚́AƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ƒTƒuƒtƒHƒ‹ƒ_‚ªŠÜ‚܂ꂽ‚Æ‚«‚̃TƒuƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "’·‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "¶‘¤‚̍XV“ú•t" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "‰E‘¤‚̍XV“ú•t" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "’†‰›‚̍XV“ú•t" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "ƒtƒ@ƒCƒ‹Šg’£Žq" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "¶‘¤‚̍쐬Žž" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "‰E‘¤‚̍쐬Žž" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "’†‰›‚̍쐬Žž" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "‚Ç‚¿‚炪ÅV‚̕ύX“ú•t‚©‚ðŽ¦‚µ‚Ü‚·B" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "’Z‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "¶‘¤‚Ì‘®«" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "‰E‘¤‚Ì‘®«" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "’†‰›‚Ì‘®«" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "¶‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "‰E‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "’†‰›‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "¶‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "‰E‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "’†‰›ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4507,50 +4432,50 @@ msgstr "" "ƒtƒ@ƒCƒ‹“à‚Å–³Ž‹‚³‚ꂽ·ˆÙ”B‚±‚̍·ˆÙ‚ÍWinMerge‚É‚æ‚Á‚Ä–³Ž‹‚³‚êAƒ}[ƒW‚³‚ê" "‚Ü‚¹‚ñB" -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "" "Number of differences in file. This number does not include ignored " "differences." msgstr "ƒtƒ@ƒCƒ‹“à·ˆÙ”B‚±‚̍·ˆÙ”‚Í–³Ž‹‚³‚ꂽ·ˆÙ”‚ðŠÜ‚Ý‚Ü‚¹‚ñB" -#: Merge.rc:2486 +#: Merge.rc:2466 #, 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:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "%1 ‚Æ %2 ‚Ì”äŠr" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "CSVŒ`Ž®" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "TAB‹æØ‚èŒ`Ž®" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "ƒVƒ“ƒvƒ‹HTMLŒ`Ž®" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "ƒVƒ“ƒvƒ‹XMLŒ`Ž®" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "ƒŒƒ|[ƒgƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ä‚¢‚Ü‚·B‘¶Ý‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚ª?" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4559,27 +4484,27 @@ msgstr "" "ƒŒƒ|[ƒg¶¬ƒGƒ‰[:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "ƒŒƒ|[ƒg¶¬‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "“¯‚¶ƒtƒ@ƒCƒ‹‚ª—¼‘¤‚̃pƒlƒ‹‚ÅŠJ‚©‚ê‚Ä‚¢‚Ü‚·B" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·B" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "ƒtƒ@ƒCƒ‹‚Ì”äŠrŽž‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B" -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4587,7 +4512,7 @@ msgstr "" "ƒeƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹‚ªì¬‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½Bƒeƒ“ƒ|ƒ‰ƒŠƒpƒXÝ’è‚ðŠm”F‚µ‚Ä‚­‚¾‚³" "‚¢B" -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4607,17 +4532,17 @@ msgstr "" "[•ÒW]¨[Ý’è]¨[”äŠr]‚Ì'‰üs•¶Žš‚̈Ⴂ‚𖳎‹‚·‚é'ƒIƒvƒVƒ‡ƒ“‚ð\n" "ƒZƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "‘I‘ð‚³‚ê‚½ƒtƒHƒ‹ƒ_‚Í–³Œø‚Å‚·B" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ðƒGƒfƒBƒ^‚ÅŠJ‚­‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4631,7 +4556,7 @@ msgstr "" "‘¼•û‚Ƀ}ƒbƒ`‚·‚éˆÈ‰º‚̃tƒHƒ‹ƒ_‚ðì¬‚µAƒtƒHƒ‹ƒ_‚ðŠJ‚«‚Ü‚·‚©?:\n" "%1" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4645,47 +4570,47 @@ msgstr "" "ƒRƒs[‚ªŠëŒ¯‚É‚È‚è‚Ü‚·B\n" "ƒR[ƒhƒy[ƒW‚ðƒfƒtƒHƒ‹ƒgƒR[ƒhƒy[ƒW‚Æ‚µ‚Ĉµ‚¢‚Ü‚·‚ªA‚æ‚낵‚¢‚Å‚·‚©(„§)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(—¼‘¤‚̃tƒ@ƒCƒ‹)" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(ˆê”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(“ñ”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(ŽO”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "·ˆÙ‚Í‚ ‚è‚Ü‚¹‚ñ" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "s‚̍·ˆÙ" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "%1ŒÂ‚Ì•¶Žš—ñ‚ð’uŠ·‚µ‚Ü‚µ‚½" -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "•¶Žš—ñ\"%s\"‚ªŒŸõ‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "" "You are now entering Merge Mode. If you want to turn off Merge Mode, press " @@ -4695,7 +4620,7 @@ msgstr "" "‚̍·ˆÙ‚Ɉړ®‚Å‚«‚郂[ƒh‚Å‚·Bƒ}[ƒWƒ‚[ƒh‚ðƒIƒt‚É‚µ‚½‚¢ê‡‚́AF9ƒL[‚ð‰Ÿ‚µ" "‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "" "The number of automatically merged changes: %1\n" @@ -4704,102 +4629,102 @@ msgstr "" "Ž©“®“I‚Ƀ}[ƒW‚³‚ꂽ•ÏX‚̐”: %1\n" "‰ðŒˆ‚³‚ê‚Ä‚¢‚È‚¢ƒRƒ“ƒtƒŠƒNƒg‚̐”: %2" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "ƒR[ƒhƒy[ƒW‚̕ύX‚ªƒ}[ƒW‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "ƒR[ƒhƒy[ƒW‚̕ύX‚ªƒRƒ“ƒtƒŠƒNƒg‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "‰üsƒR[ƒh‚̕ύX‚ªƒ}[ƒW‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "‰üsƒR[ƒh‚̕ύX‚ªƒRƒ“ƒtƒŠƒNƒg‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Location Pane" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Diff Pane" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "ƒpƒbƒ`ƒtƒ@ƒCƒ‹‚̏‘‚«ž‚݂ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "o—ÍŒ‹‰Êƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B ã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚·]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "ƒm[ƒ}ƒ‹" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "ƒRƒ“ƒeƒLƒXƒg" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "ƒ†ƒjƒtƒ@ƒCƒh" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "ƒtƒ@ƒCƒ‹ %1‚ɏ‘‚«ž‚ß‚Ü‚¹‚ñB" -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Žw’肵‚½o—̓pƒX‚́Aâ‘΃pƒX‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "o—̓pƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "ƒtƒHƒ‹ƒ_‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4810,12 +4735,12 @@ msgstr "" "\n" "ƒpƒbƒ`¶¬‚ɂ́A•ÏX‚ª‘S‚Ä•Û‘¶‚³‚ê‚Ä‚¢‚é•K—v‚ª‚ ‚è‚Ü‚·B" -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "ƒtƒHƒ‹ƒ_‚Í‘¶Ý‚µ‚Ü‚¹‚ñB" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4829,37 +4754,37 @@ msgstr "" "ƒA[ƒJƒCƒuƒTƒ|[ƒg‚Æ‚»‚ê‚ð—LŒø‚É‚·‚é•û–@‚ɂ‚¢‚Ă̏î•ñ‚́Aƒ}ƒjƒ…ƒAƒ‹‚ðŽQÆ‚µ" "‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "ƒGƒNƒXƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "ƒCƒ“ƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Ý’èî•ñ‚ªƒtƒ@ƒCƒ‹‚©‚çƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Ý’èî•ñ‚ðƒtƒ@ƒCƒ‹‚ɃGƒNƒXƒ|[ƒg‚µ‚Ü‚µ‚½B" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "ƒtƒ@ƒCƒ‹‚©‚çÝ’èî•ñ‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "ƒtƒ@ƒCƒ‹‚ւ̐ݒèî•ñ‚̏‘‚«ž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4870,32 +4795,32 @@ msgstr "" "\n" "‘±s‚µ‚Ü‚·‚©?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "ƒ^ƒCƒv" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "ƒGƒfƒBƒ^ƒXƒNƒŠƒvƒg" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "" "\n" @@ -4904,7 +4829,7 @@ msgstr "" "\n" "Œ»Ý‚̍s“à·ˆÙ" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "" "\n" @@ -4913,7 +4838,7 @@ msgstr "" "\n" "Ý’è" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "" "\n" @@ -4922,7 +4847,7 @@ msgstr "" "\n" "•\Ž¦XV (F5)" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "" "\n" @@ -4931,7 +4856,7 @@ msgstr "" "\n" "‘O‚̍·ˆÙ (Alt+Up)" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "" "\n" @@ -4940,7 +4865,7 @@ msgstr "" "\n" "ŽŸ‚̍·ˆÙ (Alt+Down)" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "" "\n" @@ -4949,7 +4874,7 @@ msgstr "" "\n" "‘O‚̃Rƒ“ƒtƒŠƒNƒg (Alt+Shift+Up)" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "" "\n" @@ -4958,7 +4883,7 @@ msgstr "" "\n" "ŽŸ‚̃Rƒ“ƒtƒŠƒNƒg (Alt+Shift+Down)" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "" "\n" @@ -4967,7 +4892,7 @@ msgstr "" "\n" "Å‰‚̍·ˆÙ (Alt+Home)" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "" "\n" @@ -4976,7 +4901,7 @@ msgstr "" "\n" "Œ»Ý‚̍·ˆÙ (Alt+Enter)" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "" "\n" @@ -4985,7 +4910,7 @@ msgstr "" "\n" "ÅŒã‚̍·ˆÙ (Alt+End)" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "" "\n" @@ -4994,7 +4919,7 @@ msgstr "" "\n" "‰E‚ÖƒRƒs[ (Alt+Right)" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "" "\n" @@ -5003,7 +4928,7 @@ msgstr "" "\n" "¶‚ÖƒRƒs[ (Alt+Left)" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "" "\n" @@ -5012,7 +4937,7 @@ msgstr "" "\n" "‰E‚ÖƒRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Right)" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "" "\n" @@ -5021,7 +4946,7 @@ msgstr "" "\n" "¶‚ÖƒRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Left)" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "" "\n" @@ -5030,7 +4955,7 @@ msgstr "" "\n" "‰E‚·‚ׂÄ" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "" "\n" @@ -5039,7 +4964,7 @@ msgstr "" "\n" "¶‚·‚ׂÄ" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "" "\n" @@ -5048,7 +4973,7 @@ msgstr "" "\n" "Ž©“®ƒ}[ƒW (Ctrl+Alt+M)" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -5057,32 +4982,32 @@ msgstr "" "Ž©“®“I‚É“WŠJƒvƒ‰ƒOƒCƒ“‚ð‘I‘ð‚µA—¼‘¤‚̃tƒ@ƒCƒ‹‚É“K—p‚µ‚Ü‚· (‚Ç‚¿‚ç‚©‚̃tƒ@ƒC" "ƒ‹‚ɂ́AŠg’£Žq‚ª•K—v‚Å‚·)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“‚ðŽg—p‚µ‚È‚¢ (•W€)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "ŠÖ˜A‚·‚éƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "‚»‚Ì‘¼‚̃vƒ‰ƒOƒCƒ“" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "‚¨Žg‚¢‚̃\ƒtƒgƒEƒFƒA‚͍ŐV”Å‚Å‚·" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "" "A new version of WinMerge is available.\n" @@ -5091,102 +5016,102 @@ msgstr "" "ÅV”Å‚ÌWinMerge‚ª“üŽè‰Â”\‚Å‚·B\n" "%1 ‚ªŒ»Ý‚̍ŐV”Å‚Å‚·(‚¨Žg‚¢‚̃o[ƒWƒ‡ƒ“‚Í %2) ƒ_ƒEƒ“ƒ[ƒh‚µ‚Ü‚·‚©?" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "ÅV”ŏî•ñ‚̃_ƒEƒ“ƒ[ƒh‚ÉŽ¸”s‚µ‚Ü‚µ‚½" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "ƒvƒ‰ƒOƒCƒ“Ý’è" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ‚ª‚݂‚©‚è‚Ü‚¹‚ñ - .sct ƒXƒNƒŠƒvƒg‚Í–³Œø‰»‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<‚È‚µ>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<Ž©“®>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "s%1‚Ɉړ®(&O)" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "–³Œø" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Å‹ßŽg‚Á‚½ƒŠƒXƒg" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "ƒnƒCƒ‰ƒCƒg‚È‚µ" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object(.po)" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "¶‘¤‚̃^ƒu‚ð‘S‚ĕ‚¶‚é(&L)" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "‰E‘¤‚̃^ƒu‚ð‘S‚ĕ‚¶‚é(&I)" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "‘¼‚Ì‘S‚Ẵ^ƒu‚ð•Â‚¶‚é(&O)" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "ƒ^ƒu•‚ÌŽ©“®’²®‚ð—LŒø‚É‚·‚é(&A)" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "‰æ‘œ(&I)" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 17085a24a..64d2b9077 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -247,7 +247,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< ºñ¾î ÀÖÀ½ >" @@ -2476,7 +2476,7 @@ msgid "Files:" msgstr "ÆÄÀÏ:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "´Ù¸§" @@ -2513,7 +2513,7 @@ msgid "Right:" msgstr "¿À¸¥ÂÊ:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "µ¿ÀÏ" @@ -2723,7 +2723,7 @@ msgid "A&ppend timestamp" msgstr "ÆÄÀÏ ½Ã°£ Ãß°¡(&P)" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "º¹»ç È®ÀÎ" @@ -2801,7 +2801,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "µð·ºÅ丮" @@ -2838,8 +2838,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "¹ÙÀ̳ʸ®" @@ -3105,7 +3105,7 @@ msgid "Version Control" msgstr "Çü»ó °ü¸®" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Â÷ÀÌÁ¡" @@ -3212,7 +3212,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÆÄÀÏ (*.xml)|*.xml|¸ðµç ÆÄÀÏ (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "À̸§" @@ -3233,7 +3233,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "¼³¸í" @@ -3370,206 +3370,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "´Ù½Ã ½ºÄµ ÁßÀÔ´Ï´Ù..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "¼±Åà ÆÄÀÏ ¿­±â" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î º¹»ç" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î º¹»ç" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "¿ÞÂÊÀ¸·Î ¸ðµÎ º¹»ç" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "¿À¸¥ÂÊÀ¸·Î ¸ðµÎ º¹»ç" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "ÆÄÀÏ º¹»ç Áß..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "ÆÄÀÏ »èÁ¦ Áß..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "ÆÄÀÏ À̵¿ Áß..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "º¸°í¼­ »ý¼º Áß..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "¶óÀÎ: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "º´ÇÕ" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "´Ù¸¥ ÆÄÀÏ(%1 of %2)" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Ç׸ñ %1 / %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Ç׸ñ: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "ºñ±³ÇÒ µð·ºÅ丮 ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "µð·ºÅ丮 ¼±ÅÃ" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "¿ÞÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "¿À¸¥ÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "¾çÂÊ ¸ðµÎ À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¾ðÆÑÄ¿ ¼±Åà Ȱ¼ºÈ­¸¦ À§ÇØ µÎ ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "µð·ºÅ丮/ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "ÇØ´çÇÏ´Â ÆÄÀÏÀÌ ¾ø½À´Ï´Ù : %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "unpack µÈ ÆÄÀÏ: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3582,12 +3507,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ÆÄ½Ì ½ÇÆÐ." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3598,27 +3523,27 @@ msgstr "" "%1 ÆÄÀÏÀº\n" "ºÒÀÏÄ¡ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇÒ±î¿ä?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "ÆÄÀÏ ¹é¾÷À» ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3631,7 +3556,7 @@ msgstr "" "\n" "°è¼Ó ÁøÇàÇÒ±î¿ä?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3647,7 +3572,7 @@ msgstr "" "\t- ´Ù¸¥ À̸§À¸·Î ÀúÀå(È®ÀÎ)\n" "\t- ÀúÀå Ãë¼Ò(Ãë¼Ò)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3657,7 +3582,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3667,7 +3592,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3681,7 +3606,7 @@ msgstr "" "\n" "µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3690,32 +3615,32 @@ msgstr "" "%1\n" "Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3726,42 +3651,42 @@ msgstr "" "\n" "°è¼ÓÇϱâ Àü¿¡ »õ·Î °íħÀ» ÇØ ÁÖ¼¼¿ä." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "°è¼ÓÇÏ·Á¸é ¼Ò½º¼¼ÀÌÇÁ ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù (¿¹: $/MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "VSS üũ¾Æ¿ô ÆÄÀÏ..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "üũ¾Æ¿ô ½ÇÇà Áß ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù. ´õ ÀÌ»ó ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "¹öÀü °ü¸®½Ã½ºÅÛ ¸í·É ½ÇÇà ½ÇÆÐ." -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¿öÅ· Æú´õ¿Í ÇöÀç ÆÄÀÏÀÇ °æ·Î°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù. °è¼ÓÇÏ°Ú½À´Ï±î?" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "VSS µ¥ÀÌÅͺ£À̽º°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "VSS ¿À·ù:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3769,134 +3694,134 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2281 +#: Merge.rc:2261 #, 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "»ç¿ë ¾È ÇÔ" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ÀÌÇÏ)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ÀÌ»ó)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "°ø¹é ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "°ø¹é ¶Ç´Â ±¸µÎÁ¡ ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "¿ÞÂÊÀ¸·Î (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "¿À¸¥ÂÊÀ¸·Î (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "¿ÞÂÊÀ¸·Î (%1 / %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¿À¸¥ÂÊÀ¸·Î (%1 / %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "¿ÞÂÊ (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "¿À¸¥ÂÊ (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "¸ðµÎ (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "¿ÞÂÊ (%1 / %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "¿À¸¥ÂÊ (%1 / %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "¸ðµÎ (%1 / %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "¿ÞÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "¿À¸¥ÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ÆÄÀÏ º¯°æµÊ)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 / %2 ÆÄÀÏ º¯°æµÊ)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3907,17 +3832,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Á¤¸» º¹»çÇϽðڽÀ´Ï±î:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Á¤¸» %d Ç׸ñÀ» º¹»çÇϽðڽÀ´Ï±î:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3929,502 +3854,502 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "¿ÜºÎ ÆíÁý±â ½ÇÇà ½ÇÆÐ: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "¾Ë ¼ö ¾ø´Â ¾ÐÃà Çü½Ä" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "À̸§" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "ºñ±³ °á°ú" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "¿ÞÂÊ ³¯Â¥" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "¿À¸¥ÂÊ ³¯Â¥" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "È®ÀåÀÚ" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "¿ÞÂÊ Å©±â" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "¿À¸¥ÂÊ Å©±â" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "¿À¸¥ÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "¿ÞÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "¿ÞÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "ÃֽŠÆÄÀÏ" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "¿ä¾à °á°ú" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "¿ÞÂÊ ¼Ó¼º" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "¿À¸¥ÂÊ ¼Ó¼º" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "¿ÞÂÊ ÀÎÄÚµù" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "¿À¸¥ÂÊ ÀÎÄÚµù" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "ºñ±³ÇÏÁö ¾ÊÀº Â÷ÀÌÁ¡" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "ºñ±³ ÁßÁöµÈ ÆÄÀÏ" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "ÇÊÅ͸µµÈ ÆÄÀÏ" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "ÇÊÅ͸µµÈ µð·ºÅ丮" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "¿ÞÂʸ¸: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "¿À¸¥Âʸ¸: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "µ¿ÀÏÇÑ ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "¿ÞÂʸ¸ Á¸Àç" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "¿À¸¥Âʸ¸ Á¸Àç" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "¿À·ù" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "¼Ò¿ä ½Ã°£: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "µð·ºÅ丮¸í ¶Ç´Â ÆÄÀϸí." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ÇÏÀ§ µð·ºÅ丮°¡ ÀÖÀ»¶§ ÇÏÀ§ µð·ºÅ丮 À̸§." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "ÀÚ¼¼ÇÑ ºñ±³ °á°ú." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "¿ÞÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "¿À¸¥ÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "ÆÄÀÏ È®ÀåÀÚ." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "¿ÞÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "¾î´À ÂÊÀÌ ´õ ÃÖ±Ù¿¡ ¼öÁ¤µÇ¾ú´ÂÁö ¾Ë·ÁÁÝ´Ï´Ù." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "°£·«ÇÑ ¿ä¾à °á°ú." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "¿ÞÂÊ ¼Ó¼º." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "¿À¸¥ÂÊ ¼Ó¼º." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "¿ÞÂÊ ÀÎÄÚµù." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "¿À¸¥ÂÊ ÀÎÄÚµù." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ÆÄÀÏ ³» ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö. Winmerg ¿¡¼­ ÀÌ ºÎºÐÀº ¹«½ÃµÇ¸ç, º´ÇÕµÇÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÆÄÀÏ ³» Â÷ÀÌÁ¡ÀÇ °³¼ö. ÀÌ´Â ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö¸¦ Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀ̸é * Ç¥½Ã." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "%1 & %2 ºñ±³" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "½°Ç¥·Î ºÐ¸®µÈ ¸ñ·Ï" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "ÅÇÀ¸·Î ºÐ¸®µÈ ¸ñ·Ï" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "´Ü¼ø HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "´Ü¼ø XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "º¸°í¼­ ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4433,32 +4358,32 @@ msgstr "" "º¸°í¼­ »ý¼º ½ÇÆÐ:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "º¸°í¼­ »ý¼º ¼º°ø" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "¾çÂÊ Ã¢¿¡ µ¿ÀÏÇÑ ÆÄÀÏÀÌ ¿­·Á ÀÖ½À´Ï´Ù." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "¼±ÅÃÇÑ ÆÄÀϵéÀº ³»¿ëÀÌ µ¿ÀÏÇÕ´Ï´Ù." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "ÆÄÀÏ ºñ±³ Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù." -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Àӽà ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. Àӽà ÆÄÀÏ ¼³Á¤À» È®ÀÎÇϼ¼¿ä." -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4473,17 +4398,17 @@ msgstr "" "\n" "Âü°í: ¸ðµç ij¸®Áö ¸®ÅÏÀ» Ç×»ó µ¿ÀÏÇÏ°Ô ÀÛ¾÷ÇÏ·Á¸é, ºñ±³ÅÇ¿¡¼­ 'ij¸®Áö ¸®ÅÏ ¹«½Ã' ¼³Á¤À» ¼±ÅÃÇÏ¸é µË´Ï´Ù (ÆíÁý/¼³Á¤¿¡¼­ ¼±Åà °¡´É)." -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "¼±Åà µð·ºÅ丮 °æ·Î ¿À·ùÀÔ´Ï´Ù." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4498,7 +4423,7 @@ msgstr "" "%1\n" "?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4509,152 +4434,152 @@ msgstr "" "°¢°¢ÀÇ ÄÚµåÆäÀÌÁö¸¦ À¯ÁöÇÏ´Â °ÍÀÌ ÀÛ¾÷½Ã º¸±â´Â ÁÁÀ¸³ª À§ÇèÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" "±âÁ¸ À©µµ¿ì ÄÚµåÆäÀÌÁö¸¦ »ç¿ëÇÒ±î¿ä(Ãßõ)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸ ¼Õ½Ç: ¾çÂÊ ÆÄÀÏ" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "µ¿ÀÏÇÔ" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "¶óÀÎ ºñ±³" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "¸ðµÎ %1 °³¸¦ ¹Ù²Ù¾ú½À´Ï´Ù." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÇØ´çÇÏ´Â ¹®ÀÚ¿­À» ãÀ» ¼ö ¾ø½À´Ï´Ù : \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "À§Ä¡Ã¢" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "ºñ±³Ã¢" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "ÆÐÄ¡ ÆÄÀÏÀÌ ÀÛ¼ºµÇ¾ú½À´Ï´Ù." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "°°Àº À̸§ÀÇ ÆÐÄ¡°¡ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 °³ÀÇ ÆÄÀÏ ¼±ÅõÊ]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Ç¥ÁØ" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "ÄÁÅؽºÆ®" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "ÅëÀϵÊ" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "%1 ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Àý´ë °æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Ãâ·Â ÆÄÀÏ ÁöÁ¤" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏ¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "µð·ºÅ丮¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4665,12 +4590,12 @@ msgstr "" "\n" "ÀúÀå ¾È µÈ ÆÄÀÏÀÌ ÀÖÀ¸¸é ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Á¸ÀçÇÏÁö ¾Ê´Â µð·ºÅ丮ÀÔ´Ï´Ù." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4682,37 +4607,37 @@ msgstr "" "¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï´Ù. \n" "¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶Çϼ¼¿ä." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "³»º¸³¾ ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "°¡Á®¿Ã ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "ÆÄÀϷκÎÅÍ °¡Á®¿Â ¼³Á¤." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "ÆÄÀÏ·Î ³»º¸³½ ¼³Á¤." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ °¡Á®¿À±â ½ÇÆÐÇÔ." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ ³»º¸³»±â ½ÇÆÐÇÔ." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4723,247 +4648,247 @@ msgstr "" "\n" "°è¼Ó ÇϽðڽÀ´Ï±î?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "È¥ÇÕµÊ" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¾çÂÊ ÆÄÀÏ ¸ðµÎ¿¡ ¾ðÆÑÄ¿°¡ Àû¿ëµË´Ï´Ù (ÇÑ ÆÄÀϸ¸ÀÌ È®ÀåÀÚ°¡ ÇÊ¿äÇÔ)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "prediffer »ç¿ë ¾È ÇÔ(Ç¥ÁØ)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "±ÇÀåÇÏ´Â Ç÷¯±×ÀÎ" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "´Ù¸¥ Ç÷¯±×ÀÎ" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "°³ÀÎ ºôµå: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Ç÷¯±×ÀÎ ¼¼ÆÃ" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH Á¸ÀçÇÏÁö ¾ÊÀ½ - .sct ½ºÅ©¸³Æ®¸¦ »ç¿ëÇÏÁö ¾ÊÀ½" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<»ç¿ë ¾È ÇÔ>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<ÀÚµ¿>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "%1 ÁÙ·Î À̵¿" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "»ç¿ë ¾È ÇÔ" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "ÆÄÀÏ ½Ã½ºÅÛ ÀÌ¿ë" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "ÃÖ±Ù ÆÄÀÏ ¸ñ·Ï(MRU) »ç¿ë" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "¹èÄ¡" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "À̵¿Çü °´Ã¼" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "ÀÚ¿ø" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "½©" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 262458989..93387992e 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Tom >" @@ -2479,7 +2479,7 @@ msgid "Files:" msgstr "Filer:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Forskjellig" @@ -2516,7 +2516,7 @@ msgid "Right:" msgstr "Høyre:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identiske" @@ -2726,7 +2726,7 @@ msgid "A&ppend timestamp" msgstr "L&egg til tidsstempel" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Bekreft kopiering" @@ -2804,7 +2804,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Mappe" @@ -2841,8 +2841,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binær" @@ -3108,7 +3108,7 @@ msgid "Version Control" msgstr "Versjonskontroll" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Forskjeller" @@ -3215,7 +3215,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alle filer (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Navn" @@ -3236,7 +3236,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Beskrivelse" @@ -3380,206 +3380,131 @@ msgstr "Min fil" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Skanner filer..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Åpner valgte" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopierer venstre til høyre" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopierer høyre til venstre" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopierer alt til venstre" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopierer alt til høyre" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopierer filer..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Sletter filer..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Flytter filer..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Oppretter rapporten..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Angrer den siste operasjonen..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Gjør om den forrige operasjonen..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Slå sammen" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Forskjell %1 av %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 forskjeller funnet" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 forskjell funnet" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "SB" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Objekter: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Velg to eksisterende mapper eller filer for å sammenligne" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Mappe-valg" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Velg to mapper eller filer for sammenligning." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Venstre bane er ugyldig!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Høyre bane er ugyldig!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Begge baner er ugyldig!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Velg to filer for å aktivere valg av utpakker." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne fil og mappe!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Fil ikke funnet: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke pakket ut: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3592,12 +3517,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Kunne ikke analysere konflikt-fil" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3608,27 +3533,27 @@ msgstr "" "%1\n" "er ikke en konfliktfil." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Lagre som" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Lagre endringer til %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Feil under sikkerhetskopiering av filen" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3641,7 +3566,7 @@ msgstr "" "\n" "Fortsette likevel?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3658,7 +3583,7 @@ msgstr "" "\t-bruk et annet filnavn (Klikk Ok)\n" "\t-avbryt den aktuelle operasjonen (Klikk Avbryt)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3673,7 +3598,7 @@ msgstr "" "\n" "Vil du lagre den utpakkede versjonen til en annen fil?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3688,7 +3613,7 @@ msgstr "" "\n" "Vil du lagre den upakkede versjonen fil en annen fil?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3703,7 +3628,7 @@ msgstr "" "\n" "Overskrive endret fil?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3712,7 +3637,7 @@ msgstr "" "%1\n" "er markert skrivebeskyttet. Vil du overskrive det skrivebeskyttede objekt?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3727,22 +3652,22 @@ msgstr "" "\n" "Vil du laste inn igjen filen?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Lagre venstre fil som" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Lagre høyre fil som" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3753,7 +3678,7 @@ msgstr "" "%1\n" "har forsvunnet. Lagre en kopi av filen for å fortsette." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3764,42 +3689,42 @@ msgstr "" "\n" "Gjenoppfrisk dokumenter før du fortsetter." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Sjekkut filer fra VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Feil under utførelse av versjonsstyringssystem-kommando." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) funnet!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Feil fra VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3810,7 +3735,7 @@ msgstr "" "Kontroller konfigurasjonsspesifikasjon på anvendt visning.\n" "Angre sjekke ut operasjon?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3819,127 +3744,127 @@ msgstr "" "Versionsstyrings-system returnerte en feil under forsøket på å angre å sjekke ut filen.\n" "Kontroller konfigurasjonsspesifikasjon på anvendt visning." -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (eldre enn 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og nyere)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Bryt ved blanktegn" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Bryt ved blanktegn eller tegnsetting" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Høyre til venstre (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til høyre (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Høyre til venstre (%1 av %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til høyre (%1 av %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Høyre til... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 av %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Høyre til... (%1 av %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Høyre (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 av %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Høyre (%1 av %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 av %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Venstre side - velg målmappe:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Høyre side - velg målmappe:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påvirket)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påvirket)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3950,17 +3875,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Er du sikker på at du vil kopiere:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, 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:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3979,502 +3904,502 @@ msgstr "" "\n" "Gjenoppfrisk sammenligning." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Er du sikker på at du vil flytte:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, 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:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Bekreft flytting" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Feilet i å kjøre eksternt redigeringsprogram: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Ukjent arkivformat" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultat av sammenligningen" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Høyre dato" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Filtype" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Høyre størrelse" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Høyre størrelse (kort)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Venstre opprettelsestid" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Høyre opprettelsestid" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Nyere fil" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Venstre filversjon" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Høyre filversjon" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Høyre attributter" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Venstre EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Høyre EOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Venstre koding" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Høyre koding" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ignorerte forskjeller" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Objekt avbrutt" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Fil hoppet over" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Mappe hoppet over" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Bare venstre: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Bare høyre: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskjellige" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Filer er forskjellige" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Mapper er forskjellige" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Bare venstre" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Bare høyre" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Feil" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Tekstfiler er identiske" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Tekstfiler er forskjellige" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Forløpt tid: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 objekt valgt" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 objekter valgt" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Fil eller mappe-navn." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkludert." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Sammenligningsresultat, lang form." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Venstre side endringsdato." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Høyre side endringsdato." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Filtype." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i byte." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Høyre filstørrelse i byte." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Venstre filstørrelse forkortet" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Høyre filstørrelse forkortet" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Venstre side opprettelsestid." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Høyre side opprettelsestid." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Forteller hvilken side som har en nyere endringsdato." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversjon, bare for noen filtyper." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Høyre side filversjon, bare for noen filetyper." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Kort sammenligningsresultat." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Høyre side attributter." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Venstre side fil EOL type" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Høyre side fil EOL type" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Venstre side koding." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Høyre side koding." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Viser asterisk (*) hvis filen er binær." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Sammenligning %1 med %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Komma-separert liste" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Tab-separarert liste" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4483,32 +4408,32 @@ msgstr "" "Feil ved oppretting av rapporten:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Rapporten er opprettet vellykket" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Samme filen er åpen i begge paneler." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "De valgte filene er identiske." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Det skjedde en feil under sammenligning av filene." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4523,17 +4448,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Valgte mappe er ugyldig" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan ikke åpne en binærfil til redigering" -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4548,7 +4473,7 @@ msgstr "" "%1\n" "på andre siden og åpne disse mapper?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4559,152 +4484,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informasjon tapt på grunn av kodings-feil: begge filer" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Ingen forskjell" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Linjeforskjell" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(er)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finne strengen \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Lokaliseringspanel" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Forskjellspanel" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Fil med rettelser vellykket skrevet." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. objekt ikke funnet eller er mappe!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. objekt ikke funnet eller er mappe!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Rettelsesfilen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Forenet" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Spesifiser en utdata-fil" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke opprette en patch-fil fra binære filer." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke opprette en patch-fil fra mapper." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4715,12 +4640,12 @@ msgstr "" "\n" "Opprettelse av en patch krever at det ikke er noen ulagrede endringer i filer." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Mappe eksisterer ikke." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4731,37 +4656,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Velg fil for eksport" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Velg fil for import" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Innstillinger importert fra filen." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Innstillinger eksportert til filen." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Feilet i å importere innstillinger fra filen." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Feilet i å skrive innstillinger til filen." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4772,247 +4697,247 @@ msgstr "" "\n" "Vil du fortsette?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Blandet" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Utpakker" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Redigeringsskript" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Foreslåtte programtillegg" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Andre programtillegg" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Privat Build: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Innstillinger for programtillegg" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke funnet - .sct skript ikke aktivert" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Deaktivert" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Fra filsystem" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Fra MRU-liste" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Ingen markering" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 1dcdc0a36..186f29a8d 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -245,7 +245,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "<ÎÇáí>" @@ -2478,7 +2478,7 @@ msgid "Files:" msgstr " ÑæäÏå åÇ : " #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr " ãÊãÇíÒ" @@ -2515,7 +2515,7 @@ msgid "Right:" msgstr " ÑÇÓÊ : " #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr " í˜ÓÇä " @@ -2725,7 +2725,7 @@ msgid "A&ppend timestamp" msgstr "&p íæäÏ ãåÑ ÒãÇä " #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr " ÊÇííÏ ÑæäæÔÊ ÈÑÏÇÑí " @@ -2803,7 +2803,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr " æÔå " @@ -2840,8 +2840,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr " ÏæÇäí/ ÈÇíäÇÑí " @@ -3107,7 +3107,7 @@ msgid "Version Control" msgstr " ÈÇÒÈíäí æíÑÇíÔ " #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr " ÊÝÇæÊåÇ " @@ -3213,7 +3213,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÑæäÏå åÇí (*.xml)|*.xml|åãå ÑæäÏå åÇ (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr " äÇã " @@ -3234,7 +3234,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr " ÔÑÍ " @@ -3377,206 +3377,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr " æíÔ ÑæäÏå åÇ ... " - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr " ÈÇҘÑÏä Òíäå " - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr " ÑæäæÔÊ ÈÑÏÇÑí  Èå ÑÇÓÊ " - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÑÇÓÊ Èå  " - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr " ÑæäæÔÊ ÈÑÏÇÑí åãí Èå  " - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr " ÑæäæÔÊ ÈÑÏÇÑí åãí Èå ÑÇÓÊ " - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÑæäÏå åÇ ... " - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr " ÍÐÝ ÑæäÏå åÇ ... " - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr " ÌÇÈÌÇíí ÑæäÏå åÇ ... " - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr " ÇíÌÇÏ ÒÇÑÔ ... " - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr " Èí ÇËÑ ˜ÑÏä ÂÎÑíä Úãá ... " - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr " ʘÑÇÑ Úãá ÞÈáí ... " - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr " ÎØ : %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr " íæäÏ ÒÏä " -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr " ÊÝÇæÊ %1 ÇÒ %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr " ÊÝÇæÊåÇí íÏÇ ÔÏå = %1" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr " í˜ ÊÝÇæÊ íÏÇ ÔÏ " #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr " ãæÑÏ %1 ÇÒ %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr " ãæÇÑÏ : %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr " ÇäÊÎÇÈ Ïæ æÔå íÇ ÑæäÏå ãæÌæÏ ÈÑÇí ãÞÇíÓå " -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr " ÇäÊÎÇÈ æÔå " -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr " ÇäÊÎÇÈ ˜ÑÏä Ïæ æÔå íÇ Ïæ ÑæäÏå ÈÑÇí ãÞÇíÓå " -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr " ãÓíÑ  æÌæÏ äÏÇÑÏ ! " -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr " ãÓíÑ ÑÇÓÊ æÌæÏ äÏÇÑÏ ! " -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr " åÑ Ïæ ãÓíÑ æÌæÏ äÏÇÑäÏ ! " -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr " Ïæ ÑæäÏå ÑÇ ÇäÊÎÇÈ äãÇííÏ ÊÇ ÇäÊÎÇÈ ÈÇҘääÏå ÈÓÊå ÝÚÇá ÑÏÏ " -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr " äãíÊæÇä æÔå æ ÑæäÏå ÑÇ ãÞÇíÓå ˜ÑÏ ! " -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr " ÑæäÏå ÑæÈÑæ íÏÇ äÔÏ : %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr " ÈÓÊå ÑæäÏå ÑæÈÑæ ÈÇÒ äÔÏ : %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3589,12 +3514,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr " äÇãæÝÞ ÈæÏä ÊÌÒíå æ ÊÍáíá ÑæäÏå ÊÚÇÑÖ " -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3605,27 +3530,27 @@ msgstr "" "%1\n" "í˜ ÑæäÏå ÊÚÇÑÖ¡ äãí ÈÇÔÏ " -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr " ÐÎíÑå ˜ÑÏä Èå ÕæÑÊ " -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr " ÂíÇ ÊÛííÑÇÊ ÏÑ %1 ÐÎíÑå ÔæÏ¿" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr " ÎØÇ ÏÑ Êåíå ÑæäÏå ÔÊíÈÇä " -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3638,7 +3563,7 @@ msgstr "" "\n" " Èå åÑ ÍÇá ˜ÇÑ ÇÏÇãå íÇÈÏ¿ " -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3655,7 +3580,7 @@ msgstr "" "\t- í˜ äÇ㠁ÑæäÏå ãÊÝÇæÊ ÇÓÊÝÇÏå ˜äíÏ - ÊÇííÏ ÑÇ ÈÝÔÇÑíÏ \n" "\t- Úãá ÌÇÑí áÛæ ÔæÏ - áÛæ ÑÇ ÈÝÔÇÑíÏ ¿" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3670,7 +3595,7 @@ msgstr "" "\n" " ÂíÇ ãí ÎæÇåíÏ ˜å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ ÑæäÏå ÏíÑí ÐÎíÑå ÔæÏ¿ " -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3685,7 +3610,7 @@ msgstr "" "\n" " ÂíÇ ãí ÎæÇåíÏ ˜å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ ÑæäÏå ÏíÑí ÐÎíÑå ÔæÏ¿ " -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3700,7 +3625,7 @@ msgstr "" "\n" " ÑæäÏå ÊÛííÑ íÇÝÊå ÏæÈÇÑå äæíÓí ÔæÏ¿" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3709,7 +3634,7 @@ msgstr "" "%1\n" " ÈÕæÑÊ ÝÞØ ÎæÇäÏäí ÚáÇãÊ ÏÇÑ ÔÏå ÇÓÊ. ÂíÇ ãÇíá åÓÊíÏ ˜å ãæÑÏ ÝÞØ ÎæÇäÏäí ÈÇØá ÑÏÏ¿ " -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3724,22 +3649,22 @@ msgstr "" "\n" " ÂíÇ ãÇíá åÓÊíÏ ˜å ÑæäÏå ÏæÈÇÑå ÈÇѐíÑí ÔæÏ¿" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr " ÐÎíÑå ÑæäÏå  Èå ÕæÑÊ " -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr " ÐÎíÑå ÑæäÏå ÑÇÓÊ Èå ÕæÑÊ " -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3750,7 +3675,7 @@ msgstr "" "%1\n" " äǁÏíÏ ÔÏå ÇÓÊ. áØÝÇ í˜ ÑæäæÔÊ ÇÒ ÑæäÏå ÑÇ ÐÎíÑå äãÇííÏ ÊÇ ˜ÇÑ ÇÏÇãå íÇÈÏ " -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3761,42 +3686,42 @@ msgstr "" "\n" " ÇÓäÇÏ ÞÈá ÇÒ ÇÏÇãå ˜ÇÑ ÈÇÒÓÇÒí / ÊÇÒå ÔæäÏ " -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr " $/MyProject ÔãÇ ÈÇíÓÊí í˜ ãÓíÑ ÈÑÇí ÑæŽå ÓæÑÓ ÓíÝ ãÔÎÕ äãÇííÏ ÊÇ ˜ÇÑ ÇÏÇãå íÇÈÏ - ÈØæÑãËÇá" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr " ... VSS æÇÑÓí ÑæäÏå åÇ ÇÒ " -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr " ÏÑ ÒãÇäí ˜å ãÈÇÏÑÊ Èå æÇÑÓí ÑæäÏå ÑÏíÏ¡ äÓÎå ÐÇÑí ÓíÓÊã ÈÇ ÎØÇ ãæÇÌå ÔÏ. ÚÇÌÒ ÇÒ ÇÏÇãå ˜ÇÑ ... " -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr " ÎØÇ ÏÑ ÇÌÑÇí ÝÑãÇä äÓÎå ÐÇÑí ÓíÓÊã " -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr " æÔå ˜ÇÑí æ ã˜Çä ÑæäÏå ÌÇÑí ÊØÈíÞ äÏÇÑäÏ. ˜ÇÑ ÇÏÇãå íÇÈÏ¿ VSS " -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "VSS ÇíÇå(åÇí) ÏÇÏå íÏÇ äÔÏ ! " -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr " : VSS ÎØÇ ÇÒ " -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3807,7 +3732,7 @@ msgstr "" " áØÝÇ ãÔÎÕÇÊ í˜ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n" " ÏÓÊæÑÇáÚãá æÇÑÓí Èí ÇËÑ ÑÏÏ ¿" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3817,127 +3742,127 @@ msgstr "" " áØÝÇ ãÔÎÕÇÊ í˜ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n" " " -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr " åíí˜ " -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr " æíŽæÇá ÓæÑÓ ÓíÝ - äÓÎå Çííä ÊÑ ÇÒ 5.0 " -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr " æíŽæÇá ÓæÑÓ ÓíÝ - äÓÎå 5.0 æ ÈÇáÇÊÑ " -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr " ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ íÇ äÞØå / äÔÇä ÐÇÑì " -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr " ÑÇÓÊ Èå  - %1" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "  Èå ÑÇÓÊ - %1" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr " ÑÇÓÊ Èå  - %1 ÇÒ %2 " -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "  Èå ÑÇÓÊ - %1 ÇÒ %2 " -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "  Èå ... - %1" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr " ÑÇÓÊ Èå ... - %1" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "  Èå ... - %1 ÇÒ %2 " -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr " ÑÇÓÊ Èå ... - %1 ÇÒ %2 " -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "  - %1" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr " ÑÇÓÊ - %1" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr " åÑ Ïæ ÓãÊ - %1" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "  - %1 ÇÒ %2" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr " ÑÇÓÊ - %1 ÇÒ %2" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr " åÑ Ïæ ÓãÊ - %1 ÇÒ %2" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr " ØÑÝ  - ÇäÊÎÇÈ æÔå ãÞÕÏ : " -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr " ØÑÝ ÑÇÓÊ - ÇäÊÎÇÈ æÔå ãÞÕÏ : " -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "{ ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå: %1 }" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "{ ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå: %1 ÇÒ %2 }" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3948,17 +3873,17 @@ msgstr "" "\n" " ÑÇ ÍÐÝ äãÇííÏ %1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr " ÂíÇ ãØãÆä åÓÊíÏ ˜å ãíÎæÇåíÏ ÑæäæÔÊ ÈÑÏÇÑí äãÇííÏ ÇÒ : " -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " ÝÞÑå ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ¿ %d ÂíÇ ãØãÆä åÓÊíÏ ˜å ãí ÎæÇåíÏ ÇÒ " -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3976,502 +3901,502 @@ msgstr "" " íÏÇ äÔÏ \n" " áØÝÇ ãÞÇíÓå ÑÇ ÊÌÏíÏ äãÇííÏ " -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr " ÂíÇ ãØãÆä åÓÊíÏ ˜å ãíÎæÇåíÏ Çíä ÑÇ ÌÇÈÌÇ äãÇííÏ: " -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr " ãæÑÏ ÌÇÈÌÇ ÔæÏ¿ %d" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr " ÊÇííÏ ÌÇÈÌÇíí " -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr " ÇÌÑÇí äÇãæÝÞ æíÑÇÓÊÇÑ ÎÇÑÌí : %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr " ÈÇíÇäí ÈÇ ÞÇáÈ ÈäÏí äÇÔäÇÓ " -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr " äÇ㠁ÑæäÏå " -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr " äÊíÌå ãÞÇíÓå " -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr " ÊÇÑíÎ  " -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr " ÊÇÑíÎ ÑÇÓÊ " -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr " ÊæÓÚå " -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr " ÇäÏÇÒå  " -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr " ÇäÏÇÒå ÑÇÓÊ " -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr " ÓãÊ ÑÇÓÊ - ãÎÊÕÑ " -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr " ÓãÊ  - ãÎÊÕÑ " -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr " ÒãÇä ÇíÌÇÏ í " -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr " ÒãÇä ÇíÌÇÏ ÑÇÓÊí " -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr " ÑæäÏå ÌÏíÏÊÑ " -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr " äÓÎå ÑæäÏå  " -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr " äÓÎå ÑæäÏå ÑÇÓÊ " -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr " äÊíÌå ˜æÊÇå " -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr " ÎÕíÕå åÇí í " -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr " ÎÕíÕå åÇí ÑÇÓÊí " -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "  EOL " -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr " ÑÇÓÊ EOL " -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr " ˜ÏÈäÏí  " -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr " ˜ÏÈäÏí ÑÇÓÊ " -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr " ÊÝÇæÊ Ô㠁æÔí ÔÏå " -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr " äÇÊæÇä ÇÒ åãÓäÌí ÑæäÏå åÇÓÊ" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr " ãæÑÏ ÇäÕÑÇÝí " -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr " ÑæäÏå ÇÒ Þáã ÇÝÊÇÏå " -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr " æÔå ÇÒ Þáã ÇÝÊÇÏå " -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr " ÝÞØ  : %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr " ÝÞØ ÑÇÓÊ : %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr " ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí åãÓÇä åÓÊäÏ " -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr " ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr " ÑæäÏå åÇ ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr " æÔå åÇ ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr " ÝÞØ  " -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr " ÝÞØ ÑÇÓÊ " -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr " ÎØÇ " -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr " ÑæäÏå åÇí ãÊäí åãÓÇä åÓÊäÏ " -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr " ÑæäÏå åÇí ãÊäí ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr " ÒãÇä ӁÑí ÔÏå - ãíáí ËÇäíå : %ld" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr " í˜ ãæÑÏ ÇäÊÎÇÈ ÔÏ " -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "ãæÇÑÏ ÇäÊÎÇÈ ÔÏå = %1" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr " äÇ㠁ÑæäÏå íÇ æÔå " -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr " äÇã ÒíсæÔå ãæÞÚí ˜å ÒíсæÔå åÇ ÔÇãá åÓÊäÏ " -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr " Ԙá ãÈÓæØ äÊÇíÌ åãÓäÌí / ãÞÇíÓå " -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ í " -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ ÑÇÓÊí " -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr " ÊæÓÚå ÑæäÏå " -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr " ÇäÏÇÒå ÑæäÏå  Èå ÈÇíÊ " -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr " ÇäÏÇÒå ÑæäÏå ÑÇÓÊ Èå ÈÇíÊ " -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr " ÇäÏÇÒå ÑæäÏå ÓãÊ  ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ " -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr " ÇäÏÇÒå ÑæäÏå ÓãÊ ÑÇÓÊ ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ " -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ  " -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ ÑÇÓÊ " -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr " ãí æíÏ ˜å ÊÇÑíÎ ÊÛííÑ ˜ÏÇã ÓãÊ ÌÏíÏÊÑ ÇÓÊ " -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr " äÇÑÔ ÑæäÏå ÓãÊ ¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ ÑæäÏå åÇ " -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr " äÇÑÔ ÑæäÏå ÓãÊ ÑÇÓÊ¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ ÑæäÏå åÇ " -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr " äÊíÌå åãÓäÌí ÈØæÑ ˜æÊÇå " -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr " ÎÕíÕå åÇí ÓãÊ  " -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr " ÎÕíÕå åÇí ÓãÊ ÑÇÓÊ " -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr " ÑæäÏå ÓãÊ  EOL äæÚ " -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr " ÑæäÏå ÓãÊ ÑÇÓÊ EOL äæÚ " -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr " ˜ÏÈäÏí ÓãÊ  " -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr " ˜ÏÈäÏí ÓãÊ ÑÇÓÊ " -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr " ÔãÇÑå ÊÝÇæÊåÇí Ô㠁æÔí ÔÏå ÏÑ ÑæäÏå. Çíä ÊÝÇæÊåÇ ÊæÓØ æíäãÑÌ Ô㠁æÔí ÔÏå ÇÓÊ æ ÞÇÈá íæäÏ ÒÏä äíÓÊ " -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr " ÔãÇÑå ÊÝÇæÊåÇ ÏÑ ÑæäÏå. Çíä ÔãÇÑå ÔÇãá ÊÝÇæÊåÇí Ô㠁æÔí ÔÏå äãí ÔæÏ " -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr " äãÇíÔ í˜ ÓÊÇÑå * ÏÑ ÕæÑÊí˜å ÑæäÏå ÏæÇäí / ÈÇíäÇÑí ÈÇÔÏ " -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr " åãÓäÌí %1 ÈÇ %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr " ÝåÑÓÊí ˜å ÈÇ ˜ÇãÇ ÌÏÇ ÔÏå ÈÇÔÏ " -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr " ÝåÑÓÊ ÌÏÇÔÏå ÈÇ ˜áíÏ ÌåÔ " -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr " ÓÇÏå HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr " ÓÇÏå XML " -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " íÔ ÇÒ Çíä¡ ÑæäÏå ÒÇÑÔ æÌæÏ ÏÇÔÊå ÇÓÊ. ÂíÇ ãÇíáíÏ ˜å ÑæäÏå ÌÇíÒíä ÔæÏ ¿ " -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4480,32 +4405,32 @@ msgstr "" " ÎØÇ ÏÑ ÇíÌÇÏ ÒÇÑÔ : \n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr " ÒÇÑÔ ÈÇ ãæÝÞíÊ ÇíÌÇÏ ÔÏå ÇÓÊ " -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr " í˜ ÑæäÏå ÏÑ åÑ Ïæ ÊÇÈáæ ÈÇÒ ÔÏå ÇÓÊ" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr " ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå åãÓÇä åÓÊäÏ " -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr " Èå åäÇã åãÓäÌí ÑæäÏå åÇ ÎØÇíí ÑÎ ÏÇÏ " -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr " ÑæäÏå åÇí ãæÞÊí ÑÇ äãí ÊæÇä ÇíÌÇÏ äãæÏ. ÊäÙíãÇÊ ãÓíÑ ãæÞÊ ÈÑÑÓí ÑÏÏ " -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4520,17 +4445,17 @@ msgstr "" "\n" "ÊæÌå: ÏÑ ÕæÑÊí˜å ãí ÎæÇåíÏ ÈÑÇí åãíÔå ÊãÇã ÇäæÇÚ ÚáÇãÊåÇí ÈÇҐÔÊ Èå ÓÑ ÓØÑ í˜ÓÇä ÏÑ äÙÑ ÑÝÊå ÔæäÏ¡ ÇäÊÎÇÈ \"äÇÏíÏå ÑÝÊä ÊÝÇæÊ ÚáÇãÊåÇí ÈÇҐÔÊ Èå ÓÑ ÓØÑ ...\" ÏÑ ÈÎÔ ãÞÇíÓå / åãÓäÌí äÌÑå ãÍÇæÑå ÎíÇÑÇÊ {ãæÌæÏ ÒíÑ æíÑÇíÔ>ÎíÇÑÇÊ} ÚáÇãÊ ÒÏå ÔæÏ " -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr " æÔå ÇäÊÎÇÈ ÔÏå æÌæÏ äÏÇÑÏ " -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr " äãí ÊæÇäÏ ÝÇíá ÏæÇäí / ÈÇíäÇÑí ÑÇ ÏÑ æíÑÇÓÊÇÑ ÈÇÒ äãÇíÏ " -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4545,7 +4470,7 @@ msgstr "" "%1\n" "Èå ÓãÊ ÏíÑ æ ÈÇÒÔÏä Çíä æÔå åÇ ¿ " -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4556,152 +4481,152 @@ msgstr "" " äãÇíÔ åÑ ÑæäÏå ÏÑ ÕÝÍå ˜Ï ÎæÏÔ Ìáæå ÈåÊÑí ÏÇÑÏ ÇãÇ ÑæäæÔÊ ÈÑÏÇÑí / íæäÏ Òäí ÎØÑäǘ ÎæÇåÏ ÈæÏ \n" " ÂíÇ ãÇíá åÓÊíÏ ÊÇ ÈÇ åÑ Ïæ ÑæäÏå Èå Ԙáí ˜å ÏÑ ÕÝÍå ˜Ï íÔ ÝÑÖ æíäÏæÒ ãí ÈÇÔÏ¡ ˜ÇÑ ÔæÏ - Çíäæäå ÊæÕíå ãíÔæÏ - ¿" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr " ÇØáÇÚÇÊ Èå Ïáíá ÎØÇåÇí ˜ÏÈäÏí ÇÒ ÏÓÊ ÑÝÊ : ÏÑ ÑæäÏå åÑ Ïæ ÓãÊ " -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr " ÈÏæä ÝÑÞ" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr " ÊÝÇæÊ ÎØ Èå ÎØ " -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr " ÑÔÊå {åÇí} ÌÇíÒíä ÔÏå : %1" -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr " äãí ÊæÇä ÑÔÊå ÑæÈÑæ ÑÇ íÏÇ ˜ÑÏ : \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr " åÇѐæÔ ã˜Çä " -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr " åÇѐæÔ ÊÝÇæÊ " -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr " ÑæäÏå æÕáå /˜Žäå ÈÇ ãæÝÞíÊ äæÔÊå ÔÏ " -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr " ãæÑÏ íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ ! -1" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr " ãæÑÏ íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ ! -2" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " ÑæäÏå æÕáå / ˜Žäå ÏÑ ÍÇá ÍÇÖÑ ãæÌæÏ ãí ÈÇÔÏ. ÂíÇ ãí ÎæÇåíÏ ÊÇ ÈÇÒäæíÓí ÔæÏ¿ " -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "{ ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå: %1 }" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr " ÚÇÏí " -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr " ãÊä " -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr " 혁Çэå ÔÏå " -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "äãí ÊæÇäÏ ÏÑ ÑæäÏå 1% ÈäæíÓÏ " -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " ãÓíÑ ÎÑæÌí ãÔÎÕ ÔÏå í˜ ãÓíÑ ãØáÞ äãí ÈÇÔÏ : %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr " í˜ ÑæäÏå ÎÑæÌí ÑÇ ãÔÎÕ äãÇííÏ " -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr " äãí ÊæÇä í˜ æÕáå / ˜Žäå ÑæäÏå ÇÒ ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí Êåíå äãæÏ " -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr " äãí ÊæÇä í˜ æÕáå / ˜Žäå ÑæäÏå ÇÒ ÝåÑÓÊåÇí ÑÇåäãÇ ÇíÌÇÏ äãæÏ " -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4712,12 +4637,12 @@ msgstr "" "\n" "ÇíÌÇÏ í˜ æÕáå / ˜Žäå äíÇÒãäÏ ÇíäÓÊ ˜å åí ÊÛííÑ ÐÎíÑå äÔÏå Çí ÏÑ ÑæäÏå åÇ æÌæÏ äÏÇÔÊå ÈÇÔÏ " -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr " æÔå æÌæÏ äÏÇÑÏ " -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4728,37 +4653,37 @@ msgstr "" " ÊãÇã ÇÌÒÇÁ ãæÑÏ äíÇÒ ÈÑÇí ÔÊíÈÇäí ÇÒ ÈÇíÇäí ÑÇ äãí ÊæÇä íÇÝÊ - Merge7z*.dll &/ 7-zip - \n" " ÈÑÇí ÇØáÇÚ ÈíÔÊÑ ÇÒ ÔÊíÈÇäí ÈÇíÇäí æ æäí ÝÚÇáÓÇÒí Âä¡ ˜ÊÇȍå ÑÇåäãÇ ÑÇ ÈÈíäíÏ" -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr " ÇäÊÎÇÈ ÑæäÏå ÈÑÇí ÕÏæÑ " -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr " ÇäÊÎÇÈ ÑæäÏå ÈÑÇí æÑæÏ " -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr " ÎíÇÑÇÊ ÇÒ ÑæäÏå æÇÑÏ ÔÏ " -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr " ÎíÇÑÇÊ Èå ÑæäÏå ÕÇÏÑ ÔÏ " -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr " æÑæÏ ÎíÇÑÇÊ ÇÒ ÑæäÏå äÇãæÝÞ ÈæÏ " -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr " äÇÑÔ ÎíÇÑÇÊ ÏÑ ÑæäÏå äÇãæÝÞ ÈæÏ " -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4769,247 +4694,247 @@ msgstr "" "\n" "ÂíÇ ãÇíá Èå ÇÏÇãå åÓÊíÏ ¿ " -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr " ãÎáæØ " -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr " äæÚ " -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr " ÈÇÒ ˜ääÏå ÈÓÊå " -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr " íÔ ÝÑÞ ÐÇÑ " -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "ÏÓÊ äæÔÊå ÈÑÇí æíÑÇÓÊÇÑ " -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ÈÇҘääÏå ÈÓÊå ÊØÈíÞ ÏÇÏå ÔÏå Ñæí åÑ Ïæ ÑæäÏå åÇ È˜ÇÑ ÈÓÊå ãí ÔæÏ " -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr " ÈÏæä íÔ ÝÑÞ ÐÇÑ - ÚÇÏí " -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr " æÕá ÔÏäíåÇí íÔäåÇÏí " -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr " ÓÇíÑ æÕá ÔÏäíåÇ " -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr " ÓÇÎÊ ÔÎÕí : %1 " -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr " ÞÑÇѐÇååÇí æÕá ÔÏäí åÇ" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr " .sct íÏÇ äÔÏ - ÏÓÊ äæÔÊå åÇ ÛíÑ ÝÚÇá ÔÏ WSH " -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<å퍘ÏÇã>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<ÎæϘÇÑ>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "&G ÈÑæ Èå ÎØ %1 " -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr " ÛíÑ ÝÚÇá " -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr " ÇÒ ÏÓʐÇå (ÓíÓÊã) ÑæäÏå åÇ " -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr " ÇÒ ÝåÑÓÊ ÂÎÑíä ÑæäÏå åÇ " -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr " ãÔÎÕ ä˜ÑÏä " -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr " ÏÓÊå " -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr " ÔíÆ Íãá ÔÏäí " -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr " ãäÇÈÚ " -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr " æÓÊå " -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index d6b508cd1..93bd9e661 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -247,7 +247,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< pusty >" @@ -2480,7 +2480,7 @@ msgid "Files:" msgstr "Pliki:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "ró¿nych" @@ -2517,7 +2517,7 @@ msgid "Right:" msgstr "Prawa:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identyczne" @@ -2727,7 +2727,7 @@ msgid "A&ppend timestamp" msgstr "Dodaj czas utworzenia kopii" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "PotwierdŸ kopiowanie" @@ -2805,7 +2805,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Folder" @@ -2842,8 +2842,8 @@ msgstr "Limit sz&ybkiego por #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binarne" @@ -3109,7 +3109,7 @@ msgid "Version Control" msgstr "Kontrola wersji" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Ró¿nice" @@ -3216,7 +3216,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nazwa" @@ -3237,7 +3237,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Opis" @@ -3381,206 +3381,131 @@ msgstr "M #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Skanowanie plików..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Otwieranie wybranych" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopiowanie lewej na praw¹" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopiowanie prawej na lew¹" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopiowanie wszystkich na lew¹" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopiowanie wszystkich na praw¹" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopiowanie plików..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Usuwanie plików..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Przenoszenie plików..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Tworzenie raportu..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Cofanie ostatniej operacji..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Przywracanie ostatniej operacji..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Linia: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Scal" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Ró¿nica %1 z %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "Znaleziono ró¿nic: %1" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "Znaleziono 1 ró¿nicê" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "Tylko odczyt" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Element %1 z %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Elementy: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wybierz dwa istniej¹ce foldery lub pliki do porównania" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Wybór katalogu" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Wybierz dwa foldery lub pliki do porównania." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Lewa œcie¿ka nieprawid³owa!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Prawa œcie¿ka nieprawid³owa!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Obie œcie¿ki nieprawid³owe!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Wybierz dwa pliki, aby umo¿liwiæ wybór programu rozpakowuj¹cego." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Nie mo¿na porównaæ pliku i folderu!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Nie znaleziono pliku: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Plik nie rozpakowany: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3593,12 +3518,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "B³¹d parsowania pliku konflitku" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3609,27 +3534,27 @@ msgstr "" "%1\n" "nie jest plikiem konfliktu" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Zapisz jako" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Zapisaæ zmiany w %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "B³¹d przy tworzeniu kopii zapasowej pliku" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3642,7 +3567,7 @@ msgstr "" "\n" "Kontynuowaæ ?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3659,7 +3584,7 @@ msgstr "" "\t-u¿yæ innej nazwy pliku (wybierz Ok)\n" "\t-anulowaæ operacjê (wybierz Anuluj)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3674,7 +3599,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3689,7 +3614,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3704,7 +3629,7 @@ msgstr "" "\n" "Nadpisaæ zmieniony plik?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3713,7 +3638,7 @@ msgstr "" "%1\n" "jest oznaczony jako tylko do odczytu. Czy zignorowaæ status tylko do odczytu?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3728,22 +3653,22 @@ msgstr "" "\n" "Czy prze³adowaæ plik?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Zapisz lewy plik jako" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Zapisz prawy plik jako" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3754,7 +3679,7 @@ msgstr "" "%1\n" "zosta³ usuniêty. Aby kontynuowaæ proszê zapisaæ jego kopiê" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3765,42 +3690,42 @@ msgstr "" "\n" "Przed kontynuacj¹ odœwie¿ dokumenty." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Pobie¿ pliki z VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "B³¹d wykonania polecenia systemu wersjonowania." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Nie znaleziono bazy VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "B³¹d VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3811,7 +3736,7 @@ msgstr "" " Proszê sprawdziæ config_spec u¿ywanego widoku.\n" " Cofn¹æ operacjê checkout?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3820,127 +3745,127 @@ msgstr "" "System œledzenia wersji zwróci³ b³¹d podczas operacji uncheckout.\n" " Proszê sprawdziæ config_spec u¿ywanego widoku." -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Brak" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "(Visual SourceSafe (poni¿ej 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i wy¿ej)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Zatrzymaj na przerwie" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Zatrzymaj na przerwie lub punktorze" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Prawa na lew¹ (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Lewa na praw¹ (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Prawa na lew¹ (%1 z %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lewa na praw¹ (%1 z %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Lewa na... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Prawa na... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lewa na... (%1 z %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Prawa na... (%1 z %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Lewa (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Prawa (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Obie (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Lewa (%1 z %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Prawa (%1 z %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Obie (%1 z %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Lewa strona - wybierz folder docelowy:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Prawa strona - wybierz folder docelowy:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 objêtych plików)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 z %2 objêtych plików)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3951,17 +3876,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Czy na pewno skopiowaæ:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Czy na pewno skopiowaæ %d elementów:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3980,502 +3905,502 @@ msgstr "" "\n" "Proszê odœwie¿yæ porównanie." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Czy na pewno przenieœæ:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Czy na pewno przenieœæ %d elementów:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Potwierdzenie przenoszenia" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nie mo¿na uruchomiæ zewnêtrznego edytora: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Nieznany format archiwum" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Plik" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Wynik porównania" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Data pliku po lewej" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Data pliku po prawej" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Rozszerzenie" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Rozmiar w lewym panelu" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Rozmiar w prawym panelu" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Rozmiar po prawej (krótki)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Rozmiar po lewej (krótki)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Czas utworzenia po lewej" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Czas utworzenia po prawej" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Nowszy plik" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Wersja pliku po lewej" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Wersja pliku po prawej" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Skrócony wynik" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atrybuty po lewej" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atrybuty pliku po prawej" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Lewe ZKL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Prawe ZKL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Lewe kodowanie" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Prawe kodowanie" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ignorowane ró¿n." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Nie mo¿na porównaæ plików" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Anulowany" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Plik pominiêty" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Folder pominiêty" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Tylko po lewej: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Tylko po prawej: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Pliki binarne s¹ identyczne" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Pliki binarne s¹ ró¿ne" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Pliki s¹ ró¿ne" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Foldery different" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Tylko po lewej" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Tylko po prawej" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "B³¹d" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Pliki tekstowe s¹ identyczne" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Pliki tekstowe s¹ ró¿ne" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Up³ynê³o: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "wybrano 1 element" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "wybrano %1 elementów" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Plik lub katalog." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazwa podkatalogu, gdy podkatalogi s¹ przetwarzane." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Wynik porównania – wersja pe³na." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Data modyfikacji lewej strony." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Data modyfikacji prawej strony." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Rozszerzenie pliku." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Rozmiar lewego pliku w bajtach." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Rozmiar prawego pliku w bajtach." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Lewa wielkoœæ pliku skrócona." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Prawa wielkoœæ pliku skrócona." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Czas utworzenia lewej strony." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Czas utworzenia prawej strony." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Pokazuje, która strona zosta³a póŸniej zmodyfikowana." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Wersja pliku z lewej - tylko dla niektórych typów." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Wersja pliku z prawej - tylko dla niektórych typów." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Skrócony wynik porównania." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atrybuty lewej strony." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atrybuty prawej strony." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Typ znaków koñca linii z lewej" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Typ znaków koñca linii z prawej" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Kodowanie lewej strony." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Kodowanie prawej strony." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Pokazuje gwiazdkê (*) jeœli plik binarny." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Porównaj %1 z %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Lista z przecinkami" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Lista z tabulatorami" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Prosty HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Prosty XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4484,32 +4409,32 @@ msgstr "" "B³¹d przy tworzeniu raportu:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Raport zosta³ pomyœlnie utworzony." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Ten sam plik otwierany w obu panelach." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Wybrane pliki s¹ identyczne." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "B³¹d podczas porównywania plików." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4524,17 +4449,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Wybrany folder jest nieprawid³owy." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nie mo¿na otworzyæ w edytorze pliku binarnego." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4549,7 +4474,7 @@ msgstr "" "%1\n" "na drugiej stronie i otworzyæ te foldery?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4560,152 +4485,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Utrata informacji z powodu b³êdów kodowania: oba pliki" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Brak ró¿nic" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Ró¿nice wierszy" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Zast¹piono %1 sekwencji znaków." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nie mo¿na znaleŸæ sekwencji znaków \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Okno lokacji" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Okno Diff" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Utworzono ³atkê.." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Plik patch ju¿ istnieje. Czy napisaæ plik?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[wybrano %1 plików]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normalny" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Zunifikowany" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Nie mo¿na zapisaæ do pliku %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Wybrana œcie¿ka docelowa nie jest absolutna: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Wybierz plik docelowy" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nie mo¿na utworzyæ patcha z plików binarnych." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nie mo¿na utworzyæ patcha z katalogów." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4716,12 +4641,12 @@ msgstr "" "\n" "Tworzenie patcha wymaga zapisania wszystkich zmian w plikach." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Folder nie istnieje." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4732,37 +4657,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Wybierz plik do eksportu" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Wybierz plik do importu" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Zaimportowano opcje z pliku." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Wyeksportowano opcje do pliku." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "B³¹d podczas importu opcji z pliku." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "B³¹d podczas eksportu opcji do pliku." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4773,247 +4698,247 @@ msgstr "" "\n" "Czy na pewno kontynuowaæ?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "£¹czone" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Program rozpakowuj¹cy" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Ró¿nicowanie wstêpne" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Skrypt edytora" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Bez ró¿nicowania wstêpnego (normalne)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Sugerowane wtyczki" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Inne wtyczki" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Kompilacja prywatna: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Ustawienia wtyczki" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nie znaleziono WSH – skrypty .sct wy³¹czone" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "&IdŸ do linii %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Wy³¹czone" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Z systemu plików" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Z listy MRU" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Bez podœwietlenia" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Zasoby" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index d7785a3b7..a47cd8360 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -245,7 +245,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -2474,7 +2474,7 @@ msgid "Files:" msgstr "Ficheiros:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Diferente" @@ -2511,7 +2511,7 @@ msgid "Right:" msgstr "Direita:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Idêntico" @@ -2721,7 +2721,7 @@ msgid "A&ppend timestamp" msgstr "" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "" @@ -2799,7 +2799,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Pasta" @@ -2836,8 +2836,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binário" @@ -3071,7 +3071,7 @@ msgid "Version Control" msgstr "Controlo de versão" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Diferenças" @@ -3172,7 +3172,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nome" @@ -3193,7 +3193,7 @@ msgid "[F] " msgstr "[F]" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Descrição" @@ -3295,1471 +3295,1396 @@ msgstr "" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Analisando ficheiros..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "A abrir selecção" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "A copiar da esquerda para a direita" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "A copiar da direita para a esquerda" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "A copiar tudo para a esquerda" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "A copiar tudo para a direita" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "A copiar ficheiros..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "A eliminar ficheiros..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "A mover ficheiros..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "A criar relatório..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenças encontradas" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 diferença encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Item %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dois arquivos ou ficheiros existentes para comparar" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Selecção de pasta" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dois arquivos ou ficheiros para comparar." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "A pasta de destino da esquerda é inválido!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "A pasta de destino da direita é inválida!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Ambas as pastas de destino são inválidas!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleccione dois ficheiros para activar a selecção de extractor." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossível comparar ficheiro ou arquivo!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Ficheiro não encontrado: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Ficheiro não extraído: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "Impossível abrir ficheiro\n%1\n\n%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Guardar como" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Guardar alterações em %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Erro ao criar cópia de segurança" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2232 #, 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:2253 +#: Merge.rc:2233 #, 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:2254 +#: Merge.rc:2234 #, 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:2255 +#: Merge.rc:2235 #, 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:2256 +#: Merge.rc:2236 #, 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:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Guardar ficheiro esquerdo como..." -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Guardar ficheiro direito como..." -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, 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:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger ficheiros de VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar comando do sistema de versões." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Base(s) de dados VSS não encontrada(s)!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Erro no VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, 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:2281 +#: Merge.rc:2261 #, 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior a 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superior)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Quebra de linha nos espaços" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebra de linha nos espaços ou pontuação" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Da direita para a esquerda (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Da esquerda para a direita (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da direita para a esquerda (%1 de %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da esquerda para a direita (%1 de %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Da esquerda para... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Da direita para... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Da esquerda para... (%1 de %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Da direita para... (%1 de %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de 2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Direita (%1 de 2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - seleccione pasta de destino:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - seleccione pasta de destino:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ficheiros afectados)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 ficheiros afectados)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "Tem certeza que deseja eliminar\n\n%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2313 #, 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:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Erro ao executar editor externo: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo desconhecido" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nome do ficheiro" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultado da comparação" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Data da esquerda" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Data da direita" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Lado esquerdo" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Lado direito" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Lado direito (Curto)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Lado esquerdo (Curto)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Data de criação - Esq" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Data de criação - Dta" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Ficheiro mais recente" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Versão do ficheiro esquerdo" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Versão do ficheiro direito" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Resultado resumido" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atributos esq" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atributos dta" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "EOL esq" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "EOL dta" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Codificação esq" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Codificação dta" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Diferença ignorada." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Impossível comparar ficheiros" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Ficheiro omitido" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Arquivo omitido" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Os ficheiros binários são idênticos" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Os ficheiros binários são diferentes" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Os ficheiros são diferentes" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Apenas esquerda" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Apenas direita" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %Id ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 item seleccionado" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 itens seleccionado" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nome do ficheiro ou pasta." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome de sub-ficheiro quando sub-ficheiros incluídos." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparação, forma extensa." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Data de modificação do lado esquerdo." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Data de modificação do lado direito." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Extensão do ficheiro." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do ficheiro em bytes." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do ficheiro direito em bytes." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do ficheiro esquerdo abreviado." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do ficheiro direito abreviado." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Data de criação do lado esquerdo." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Data de criação do lado direito." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica o lado com a data de modificação mais recente." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Resultado resumido da comparação." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tipo de ficheiro EOL do lado esquerdo" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tipo de ficheiro EOL do lado direito" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Codificação do lado esquerdo." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Codificação do lado direito." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Apresenta um asterisco (*) se ficheiro for binário." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 com %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vírgulas" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabulações" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML simples" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "HTML simples" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "Error creating the report:\n%1" msgstr "Erro ao criar relatório:\n%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "O relatório foi criado com sucesso." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo ficheiro está aberto em ambas as janelas." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Os ficheiros seleccionados são idênticos." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocorreu um ero ao comparar os ficheiros." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, 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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "O arquivo seleccionado é inválido." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossível abrir ficheiro binário no editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, 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:2519 +#: Merge.rc:2499 #, 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Sem diferenças" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Diferença de linha" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituída(s) %1 string(s)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposível localizar string \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Janela de localização" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Janela de diferenças" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Ficheiro patch escrito com sucesso." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. item não encontrado ou é uma directoria!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. item não encontrado ou é uma directoria!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 itens seleccionados]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Impossível escrever no ficheiro %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Especifique o ficheiro de destino" -#: Merge.rc:2579 +#: Merge.rc:2559 #, 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:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossível criar ficheiro patch a partir de directorias." -#: Merge.rc:2581 +#: Merge.rc:2561 #, 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:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "O arquivo não existe." -#: Merge.rc:2587 +#: Merge.rc:2567 #, 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Seleccione ficheiro a exportar" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Seleccione ficheiro a importar" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Opções importadas do ficheiro." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Opções exportadas para o ficheiro." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Importação de opções do ficheiro falhou." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Escrita de opções para o ficheiro falhou." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Não pré-diferenciar (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Compilação privada: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Definições de plugin" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH não encontrado - scripts .sct desactivados" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Ir para linha %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Do sistema de ficheiros" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Da lista MRU" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 4ce3001c2..ee9c37e9f 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Gol >" @@ -2475,7 +2475,7 @@ msgid "Files:" msgstr "Fiºiere:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Diferite" @@ -2512,7 +2512,7 @@ msgid "Right:" msgstr "Dreapta:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identice" @@ -2722,7 +2722,7 @@ msgid "A&ppend timestamp" msgstr "Adaugã timp" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Confirmã copierea" @@ -2800,7 +2800,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Director" @@ -2837,8 +2837,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binar" @@ -3104,7 +3104,7 @@ msgid "Version Control" msgstr "Control versiuni" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Diferenþe" @@ -3211,7 +3211,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fiºiere XML (*.xml)|*.xml|Toate fiºierele (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nume" @@ -3232,7 +3232,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Descriere" @@ -3370,206 +3370,131 @@ msgstr "Fi #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Scanare fiºiere..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Deschidere selecþie" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Copiere stânga cãtre dreapta" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Copiere dreapta cãtre stânga" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Copiere toate la stânga" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Copiere toate la dreapta" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Copiere fiºiere..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "ªtergere fiºiere..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Mutare fiºiere..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Creare raport..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Linie: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Fuziune" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Deferenþa %1 din %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenþe gãsite" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "O diferenþã gãsitã" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, fuzzy, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Element %1 din %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Elemente: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selectaþi douã directoare sau fiºiere existente pentru comparare" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Selectare directoare" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Selectaþi douã directoare sau douã fiºiere pentru comparare." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Calea din stânga este nevalidã!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Calea din dreapta este nevalidã!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Ambele cãi sunt nevalide!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, 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:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Nu se poate compara un fiºier cu un director!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Fiºier negãsit: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Fiºier nedezarhivat: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3582,12 +3507,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Analizarea fiºierului de conflicte a eºuat." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3598,27 +3523,27 @@ msgstr "" "%1\n" "nu e un fiºier de conflicte." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Salveazã ca" -#: Merge.rc:2247 +#: Merge.rc:2227 #, fuzzy, c-format msgid "Save changes to %1?" msgstr "Salveazã schimbãrile în %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, fuzzy, c-format msgid "Error backing up file" msgstr "Eroare la salvarea copiei de siguranþã a fiºierului" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3631,7 +3556,7 @@ msgstr "" "\n" "Continuaþi oricum?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3648,7 +3573,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:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3663,7 +3588,7 @@ msgstr "" "\n" "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3678,7 +3603,7 @@ msgstr "" "\n" "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3693,7 +3618,7 @@ msgstr "" "\n" "Suprascrieþi fiºierul modificat?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, fuzzy, c-format msgid "" "%1\n" @@ -3702,32 +3627,32 @@ msgstr "" "%1\n" "este marcat ca numai-citire. Doriþi sã suprascrieþi elementul numai-citire?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Salveazã fiºierul din stânga ca" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Salveazã fiºierul din dreapta ca" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, fuzzy, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3738,42 +3663,42 @@ msgstr "" "\n" "Reîmprospãtaþi documentele înainte de a continua." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Extrage fiºierele din VSS.." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Eroare la execuþia comenzii sistemului de versionare." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Nu s-a gãsit nicio bazã de date VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Eroare de la VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3784,7 +3709,7 @@ msgstr "" " Vã rugãm, verificaþi specificaþiile scopului folosit.\n" " Anuleazã operaþia de extragere?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3793,127 +3718,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Nici unul" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mai vechi de 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 sau mai nou)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, fuzzy, c-format msgid "Break at whitespace" msgstr "Întrerupe la blanc" -#: Merge.rc:2292 +#: Merge.rc:2272 #, fuzzy, c-format msgid "Break at whitespace or punctuation" msgstr "Întrerupe la blanc sau semn de punctuaþie" -#: Merge.rc:2298 +#: Merge.rc:2278 #, fuzzy, c-format msgid "Right to Left (%1)" msgstr "De la dreapta la stânga (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, fuzzy, c-format msgid "Left to Right (%1)" msgstr "De la stânga la dreapta (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "De la dreapta la stânga (%1 din %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "De la stânga la dreapta (%1 din %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Stânga la... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Dreapta la... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Stânga la... (%1 din %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Dreapta la... (%1 din %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Stânga (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Dreapta (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Ambele (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Stânga (%1 din %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Dreapta (%1 din %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Ambele (%1 din %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Partea stângã - selectare director destinaþie:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Partea dreaptã - selectare director destinaþie:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fiºiere afectate)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 din %2 fiºiere afectate)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3924,17 +3849,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Sunteþi sigur cã vreþi sã copiaþi:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, 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:2333 +#: Merge.rc:2313 #, fuzzy, c-format msgid "" "Operation aborted!\n" @@ -3953,502 +3878,502 @@ msgstr "" "\n" "Vã rugãm reîmprospãtaþi compararea." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Execuþia editorului extern a eºuat: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Format arhivã necunoscut" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nume fiºier" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Rezultat comparare" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Datã stânga" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Datã dreapta" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Mãrime stânga" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Mãrime dreapta" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Mãrime dreapta (scurt)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Mãrime stânga (scurt)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, fuzzy, c-format msgid "Left Creation Time" msgstr "Timp creare stânga" -#: Merge.rc:2375 +#: Merge.rc:2355 #, fuzzy, c-format msgid "Right Creation Time" msgstr "Timp creare dreapta" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Fiºier mai nou" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Versiune fiºier stânga" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Versiune fiºier dreapta" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, fuzzy, c-format msgid "Short Result" msgstr "Rezultat scurt" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atribute stânga" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atribute dreapta" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, fuzzy, c-format msgid "Left EOL" msgstr "SDL stânga" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, fuzzy, c-format msgid "Right EOL" msgstr "SDL dreapta" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Set de caractere stânga" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Set de caractere dreapta" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, fuzzy, c-format msgid "Ignored Diff." msgstr "Diferenþe ignorate" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Imposibil de comparat fiºierele" -#: Merge.rc:2405 +#: Merge.rc:2385 #, fuzzy, c-format msgid "Item aborted" msgstr "Element întrerupt" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Fiºier omis" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Director omis" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Numai stânga: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Numai dreapta: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Fiºierele binare sunt identice" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Fiºierele binare sunt diferite" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Fiºierele sunt diferite" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Numai stânga" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Numai dreapta" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Eroare" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Timp scurs: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "Un element selectat" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 elemente selectate" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nume de fiºier sau director." -#: Merge.rc:2445 +#: Merge.rc:2425 #, fuzzy, c-format msgid "Subfolder name when subfolders are included." msgstr "Nume de sub-director pentru când sub-directoarele sunt incluse." -#: Merge.rc:2446 +#: Merge.rc:2426 #, fuzzy, c-format msgid "Comparison result, long form." msgstr "Rezultate comparare, forma lungã." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Data modificãrii pãrþii stângi." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Data modificãrii pãrþii drepte." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Extensia fiºierului." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Dimensiune fiºier stânga în octeþi." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Dimensiune fiºier dreapta în octeþi." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Dimensiune fiºier stânga prescurtatã." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Dimensiune fiºier dreapta prescurtatã." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Timp creare stânga." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Timp creare dreapta." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Spune care parte are o datã a modificãrii mai recentã." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, fuzzy, c-format msgid "Short comparison result." msgstr "Rezultat comparare pe scurt." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atribute partea stângã." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atribute partea dreaptã." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tip SDL fiºier partea stângã." -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tip SDL fiºier partea dreaptã." -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Set de caractere partea stângã." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Set de caractere partea dreaptã." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Aratã un asterisc (*) dacã fiºierul este binar." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Comparã %1 cu %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, fuzzy, c-format msgid "Comma-separated list" msgstr "Listã separatã-de-virgule" -#: Merge.rc:2494 +#: Merge.rc:2474 #, fuzzy, c-format msgid "Tab-separated list" msgstr "Listã separatã-de-tab-uri" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML simplu" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "XML simplu" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4457,32 +4382,32 @@ msgstr "" "Eroare la creare raport:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Raportul a fost creat cu succes." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Acelaºi fiºier este deschis în ambele panouri." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Fiºierele selectate sunt identice." -#: Merge.rc:2508 +#: Merge.rc:2488 #, 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:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, fuzzy, c-format msgid "" "These files use different carriage return types.\n" @@ -4497,17 +4422,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Directorul selectat este invalid." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nu se poate deschide în editor un fiºier binar." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4522,7 +4447,7 @@ msgstr "" "%1\n" "în partea cealaltã ºi sã deschideþi ambele directoare?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4533,152 +4458,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Nicio diferenþã" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Diferenþã pe linie" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "S-a(u) înlocuit %1 ºir(uri)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nu s-a gãsit ºirul \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, fuzzy, c-format msgid "Location Pane" msgstr "Panou locaþie" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Panou diferenþe" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Fiºierul petic a fost scris cu succes." -#: Merge.rc:2568 +#: Merge.rc:2548 #, 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:2569 +#: Merge.rc:2549 #, 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:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, fuzzy, c-format msgid "[%1 files selected]" msgstr "[%1 fiºier(e) selectat(e)]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Nu s-a reuºit scrierea în fiºierul %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Specificaþi un fiºier destinaþie" -#: Merge.rc:2579 +#: Merge.rc:2559 #, 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:2580 +#: Merge.rc:2560 #, 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:2581 +#: Merge.rc:2561 #, fuzzy, c-format msgid "" "Please save all files first.\n" @@ -4689,12 +4614,12 @@ msgstr "" "\n" "Crearea unui petic necesitã ca fiºierele sã nu aibã conþinut nesalvat." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Directorul nu existã." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4705,37 +4630,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Selectaþi fiºierul pentru export" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Selectaþi fiºierul pentru import" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Opþiuni importate din fiºier." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Opþiuni exportate cãtre fiºier." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "A eºuat importul opþiunilor din fiºier." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "A eºuat scrierea opþiunilor cãtre fiºier." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4746,247 +4671,247 @@ msgstr "" "\n" "Doriþi sã continuaþi?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Amestecat" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Nu folosi prediferenþiatorul (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Plug-in-uri recomandate" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Alte plug-in-uri" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Numãr de asamblare privat: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Setãri pentru plug-in-uri" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nu s-a gãsit WSH - scripurile .sct sunt dezactivate" -#: Merge.rc:2672 +#: Merge.rc:2652 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "&Mergi la linia %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Inactiv" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Din sistemul de fiºiere" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Din lista de recent utilizate" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resurse" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index bcf3c883e..6f1665fc6 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -248,7 +248,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Íåò >" @@ -2481,7 +2481,7 @@ msgid "Files:" msgstr "Ôàéëû:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Îòëè÷àþòñÿ" @@ -2518,7 +2518,7 @@ msgid "Right:" msgstr "Ñïðàâà:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Îäèíàêîâûå" @@ -2728,7 +2728,7 @@ msgid "A&ppend timestamp" msgstr "Äîáàâèòü äàòó" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Ïîäòâåðæäåíèÿ" @@ -2806,7 +2806,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Êàòàëîã" @@ -2843,8 +2843,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Äâîè÷íûé" @@ -3110,7 +3110,7 @@ msgid "Version Control" msgstr "Êîíòðîëü âåðñèé" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Îòëè÷èÿ" @@ -3217,7 +3217,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Ôàéëû XML (*.xml)|*.xml|Âñå ôàéëû (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Èìÿ" @@ -3238,7 +3238,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Îïèñàíèå" @@ -3381,206 +3381,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Ñêàíèðîâàíèå ôàéëîâ..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Îòêðûâàþ âûáðàííîå" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Êîïèðîâàíèå Ñëåâà Íàïðàâî" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Êîïèðîâàíèå Ñïðàâà Íàëåâî" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàëåâî" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàïðàâî" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Êîïèðîâàíèå ôàéëîâ..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Óäàëåíèå ôàéëîâ..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Ïåðåìåùåíèå ôàéëîâ..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Ñîçäàåòñÿ îò÷åò..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Îòìåíà ïîñëåäíåé îïåðàöèè" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Ïîâòîðåíèå ïðåäûäóùåé îïåðàöèè" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Ñòðîêà: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Îáúåäèíåíèå" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Îòëè÷èå %1 èç %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 îòëè÷èé íàéäåíî" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "Íàéäåíî âñåãî îäíî îòëè÷èå" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Ýëåìåíò %1 èç %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Ýëåìåíòîâ: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Âûáåðèòå äâà ÑÓÙÅÑÒÂÓÞÙÈÕ êàòàëîãà èëè ôàéëà äëÿ ñðàâíåíèÿ" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Âûáîð êàòàëîãà" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Âûáåðèòå äëÿ ñðàâíåíèÿ äâà êàòàëîãà èëè ôàéëà" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Ïóòü ñëåâà óêàçàí íåâåðíî" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Ïóòü ñïðàâà óêàçàí íåâåðíî" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Îáà ïóòè óêàçàíû íåâåðíî" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Âûáåðèòå äâà ôàéëà, ÷òîáû âêëþ÷èòü âûáîð ðàñïàêîâùèêà" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Íåâîçìîæíî ñðàâíåíèå ôàéëà è êàòàëîãà!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Ôàéë íå íàéäåí: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Ôàéë íå ðàñïàêîâàí: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3593,12 +3518,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Îøèáêà ðàçáîðà ôàéëà êîíôëèêòîâ" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3609,27 +3534,27 @@ msgstr "" "%1\n" "íå ÿâëÿåòñÿ ôàéëîì êîíôëèêòîâ" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Ñîõðàíèòü êàê..." -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Ñîõðàíèòü èçìåíåíèÿ â %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Îøèáêà ñîçäàíèÿ ðåçåðâíîé êîïèè" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3642,7 +3567,7 @@ msgstr "" "\n" "Ïðîäîëæèòü â ëþáîì ñëó÷àå?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3659,7 +3584,7 @@ msgstr "" "\t-èñïîëüçîâàòü äðóãîå èìÿ ôàéëà (Íàæìèòå Ok)\n" "\t-îòìåíèòü òåêóùóþ îïåðàöèþ (Íàæìèòå Îòìåíà)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3674,7 +3599,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3689,7 +3614,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3704,14 +3629,14 @@ msgstr "" "\n" "Ïåðåçàïèñàòü èçìåíåííûé ôàéë?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3726,22 +3651,22 @@ msgstr "" "\n" "Âû õîòèòå ïåðåçàãðóçèòü ôàéë?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..." -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..." -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3752,7 +3677,7 @@ msgstr "" "%1\n" "óòðà÷åí. Ïîæàëóéñòà, ñîõðàíèòå êîïèþ ôàéëà, ÷òîáû ïðîäîëæèòü." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3763,42 +3688,42 @@ msgstr "" "\n" "Îáíîâèòå äîêóìåíòû ïåðåä ïðîäîëæåíèåì." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "×òîáû ïðîäîëæèòü, Âû äîëæíû óêàçàòü ïóòü ê ïðîåêòó SourceSafe (íàïðèìåð: $/MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Ïîëó÷àåì ôàéëû èç VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé âåðíóëà îøèáêó ïðè ïîïûòêå âçÿòü ôàéë ïîä êîíòðîëü. Íåò âîçìîæíîñòè ïðîäîëæàòü..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Îøèáêà âûïîëíåíèÿ ñèñòåìíîé êîìàíäû Ñèñòåìû êîíòðîëÿ âåðñèé." -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ðàáî÷àÿ ïàïêà VSS è ìåñòîïîëîæåíèå òåêóùåãî ôàéëà íå ñîâïàäàþò. Ïðîäîëæèòü ?" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Íå íàéäåíà áàçà äàííûõ VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Îøèáêà VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3809,7 +3734,7 @@ msgstr "" " Ïðîâåðüòå êîíôèãóðàöèþ.\n" " Ñäåëàòü îòêàò?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3818,127 +3743,127 @@ msgstr "" "VSS âåðíóëà îøèáêó ïðè ïîïûòêå îòêàòà èçìåíåíèé.\n" " Ïðîâåðüòå êîíôèãóðàöèþ. " -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Íåò" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìëàäøå, ÷åì 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 è âûøå)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Ðàçáèâàòü ïî íåâèäèìûì" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ðàçáèâàòü ïî íåâèäèìûì è çíàêàì ïóíêòóàöèè" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Ñêîïèðîâàòü íà ëåâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Ñêîïèðîâàòü íà ïðàâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Ñïðàâà íàëåâî (%1 èç %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ñëåâà íàïðàâî (%1 èç %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Ñëåâà íà... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Ñïðàâà íà... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ñëåâà íà... (%1 èç %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Ñïðàâà íà... (%1 èç %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Ñëåâà (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Óäàëèòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ ñ ïðàâîé ñòîðîíû" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Óäàëèòü ñ îáåèõ ñòîðîí %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Ñëåâà (%1 èç %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Ñïðàâà (%1 èç %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Âìåñòå (%1 èç %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Ëåâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Ïðàâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 èç %2 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3949,17 +3874,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü %d ýëåìåíòîâ:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3978,502 +3903,502 @@ msgstr "" "\n" "Îáíîâèòå ñðàâíåíèå." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü %d ýëåìåíòîâ:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Ïîäòâåðäèòå ïåðåìåùåíèå" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íåâîçìîæíî âûïîëíèòü %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Íåèçâåñòíûé ôîðìàò àðõèâà" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Èìÿ ôàéëà" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Ðåçóëüòàò ñðàâíåíèÿ" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Äàòà Ñëåâà" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Äàòà Ñïðàâà" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Ðàñøèðåíèå" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Ðàçìåð ñëåâà" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Ðàçìåð ñïðàâà" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð ñïðàâà (ñîêð.)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð ñëåâà (ñîêð.)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Áîëåå íîâûé ôàéë" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ ôàéëà ñëåâà" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ ôàéëà ñïðàâà" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Óïðîùåííûé ðåçóëüòàò" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Ëåâûé EOL" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Ïðàâûé EOL" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Èãíîð. îòëè÷èÿ" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Íåâîçìîæíî ñðàâíèòü ôàéëû" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Ñðàâíåíèå ïðåðâàíî" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Ôàéë ïðîïóùåí" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Êàòàëîã ïðîïóùåí" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Òîëüêî ñëåâà: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Òîëüêî ñïðàâà: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Áèíàðíûå ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Ïàïêè ðàçëè÷íû" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Òîëüêî ñëåâà" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Òîëüêî ñïðàâà" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Îøèáêà" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâûå ôàéëû èäåíòè÷íû" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Òåêñòîâûå ôàéëû ðàçëè÷íû" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîøëî âðåìåíè: %ld ìñ" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "Âûáðàí 1 ýëåìåíò" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "Âûáðàíî ýëåìåíòîâ: %1" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Èìÿ ôàéëà èëè êàòàëîãà" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìåíà ïîäïàïîê, åñëè ïîäïàïêè âêëþ÷åíû" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëüòàò ñðàâíåíèÿ, äëèííàÿ ôîðìà." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñëåâà" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Ðàñøèðåíèå ôàéëà" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð ôàéëà ñëåâà â áàéòàõ" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð ôàéëà ñïðàâà â áàéòàõ" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Ðàçìåð ëåâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Ðàçìåð ïðàâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçàòü ñ êàêîé èç ñòîðîí äàòà èçìåíåíèÿ ôàéëà íîâåå" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñëåâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñïðàâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Ðåçóëüòàò áûñòðîãî ñðàâíåíèÿ" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ëåâîãî ôàéëà" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ïðàâîãî ôàéëà" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Êîëè÷åñòâî èãíîðèðîâàííûõ îòëè÷èé â ôàéëå. Ýòè îòëè÷èÿ áûëè èãíîðèðîâàííû WinMerge è íå ìîãóò áûòü îáðàáîòàíû." -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Êîëè÷åñòâî îòëè÷èé â ôàéëå. Ýòî ÷èñëî íå âêëþ÷àåò â ñåáÿ èãíîðèðîâàííûå îòëè÷èÿ." -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàçàòü çâåçäî÷êó (*) åñëè ôàéë áèíàðíûé." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíèâàíèå %1 ñ %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè çàïÿòûìè" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè òàáóëÿòîðàìè" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Ïðîñòîé HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Ïðîñòîé XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéë îò÷åòà óæå ñóùåñòâóåò. Ïåðåçàïèñàòü??" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4482,32 +4407,32 @@ msgstr "" "Îøèáêà ïðè ñîçäàíèè îò÷åòà:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åò óñïåøíî ñîçäàí" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Íà îáîèõ ïàíåëÿõ îòêðûò îäèí è òîò æå ôàéë" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Âûáðàííûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïðè ñðàâíåíèè ôàéëîâ ïðîèçîøëà îøèáêà." -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Âðåìåííûå ôàéëû íå ìîãóò áûòü ñîçäàíû. Ïðîâåðüòå íàñòðîéêè ïóòåé äëÿ âðåìåííûõ ôàéëîâ" -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4522,17 +4447,17 @@ msgstr "" "\n" "Âíèìàíèå: Åñëè âàñ íå èíòåðåñóþò ðàçëè÷èÿ â EOL, óñòàíîâèòå îïöèþ 'Èãíîðèðîâàòü ðàçëè÷èÿ â EOL' íà âêëàäêå Ñðàâíåíèå â Íàñòðîéêàõ." -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Íåâîçìîæíî îòêðûòü âûáðàííóþ ïàïêó." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íåâîçìîæíî îòîáðàçèòü áèíàðíûé ôàéë â ðåäàêòîðå." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4547,7 +4472,7 @@ msgstr "" "%1\n" "íà äðóãîé ñòîðîíå è îáå îòêðûòü èõ?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4558,152 +4483,152 @@ msgstr "" "Êàæäûé èç ôàéëîâ ìîæåò áûòü îòîáðàæåí â ñâîåé êîäèðîâêå, íî èõ ñëèÿíèå èëè êîïèðîâàíèå ìîæåò ïîâðåäèòü èíôîðìàöèþ.\n" "Îòîáðàçèòü îáà ôàéëà â ñèñòåìíîé êîäèðîâêå (ðåêîìåíäóåòñÿ)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: îáà ôàéëà" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Íåò îòëè÷èé" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Ñòðîêà îòëè÷èé" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíî %1 ñòðîê." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íåâîçìîæíî íàéòè ñòðîêó \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèÿ" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Îòëè÷èÿ" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Ïàò÷ óñïåøíî çàïèñàí." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïàò÷ óæå ñóùåñòâóåò. Õîòèòå ïåðåçàïèñàòü åãî ?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 ôàéëîâ âûáðàíî]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Íîðìàëüíûé" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Óíèôèöèðîâàííûé" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Íåò âîçìîæíîñòè çàïèñàòü â ôàéë %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Óêàçàííûé ïóòü äëÿ âûâîäà íå ÿâëÿåòñÿ àáñîëþòíûì: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Óêàçàòü âûõîäíîé ôàéë" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç áèíàðíûõ ôàéëîâ" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç êàòàëîãîâ" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4714,12 +4639,12 @@ msgstr "" "\n" "Ñîçäàíèå ïàò÷à òðåáóåò ÷òîáû â ôàéëàõ íå áûëî íåñîõðàíåííûõ èçìåíåíèé" -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Ïàïêà íå ñóùåñòâóåò" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4731,37 +4656,37 @@ msgstr "" "Íå íàéäåíû âñå íåîáõîäèìûå êîìïîíåíòû (7-zip è/èëè Merge7z*.dll) . \n" "Ïîñìîòðèòå èíñòðóêöèþ, ÷òî áû óçíàòü áîëüøå ïðî ïîääåðæêó àðõèâîâ è êàê åå âêëþ÷èòü." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Âûáðàòü ôàéë äëÿ ýêñïîðòà" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Âûáðàòü ôàéë äëÿ èìïîðòà" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Îïöèè, èìïîðòèðîâàííûå èç ôàéëà." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Îïöèè, ýêñïîðòèðóåìûå â ôàéë." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Îøèáêà èìïîðòà îïöèé èç ôàéëà." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Îøèáêà ýêñïîðòà îïöèé â ôàéë." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4772,247 +4697,247 @@ msgstr "" "\n" "Ïðîäîëæèòü?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Ñìåøàííûé" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Òèï" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Ðàñïàêîâùèê" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Ïðåäñðàâíåíèå" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Ðåäàêòîð ñêðèïòîâ" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Àâòîìàòè÷åñêèé ïîäîáîð ðàñïàêîâùèêà (óêàæèòå ðàñøèðåíèå õîòÿ áû ó îäíîãî èç ôàéëîâ)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Áåç ïðåäñðàâíåíèÿ (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Ñîâåòóåìûå äîïîëíåíèÿ" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Äðóãèå äîïîëíåíèÿ" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "×àñòíûé áèëä: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè äîïîëíåíèÿ" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå íàéäåí - .sct ñêðèïòû îòêëþ÷åíû" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<Íåò>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<Àâòîìàòè÷åñêè>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Ïåðåéòè ê &ñòðîêå %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Îòêëþ÷åíî" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Êàê íà äèñêå" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Êàê â ñïèñêå íåäàâíèõ äîêóìåíòîâ" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Íåò âûäåëåííîãî" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Ðåñóðñû" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 156e747a0..53b5d446b 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -245,7 +245,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Ïðàçàí >" @@ -2478,7 +2478,7 @@ msgid "Files:" msgstr "Äàòîòåêå" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Ðàçëèêà" @@ -2515,7 +2515,7 @@ msgid "Right:" msgstr "Äåñíà:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Èñòå" @@ -2725,7 +2725,7 @@ msgid "A&ppend timestamp" msgstr "Äî&ä༠äàòóì/âðåìå" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Ïîòâðäè êîïèðàœå" @@ -2803,7 +2803,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Ôàñöèêëà" @@ -2840,8 +2840,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Áèíàðíè" @@ -3107,7 +3107,7 @@ msgid "Version Control" msgstr "Ïðîãðàìè" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Ðàçëèêå" @@ -3214,7 +3214,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML äàòîòåêå (*.xml)|*.xml|Ñâå äàòîòåêå (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Èìå" @@ -3235,7 +3235,7 @@ msgid "[F] " msgstr "[F]" #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Îïèñ" @@ -3379,206 +3379,131 @@ msgstr " #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Ïðåòðàæèâàœå äàòîòåêå" - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Îòâàðàœå îäàáðàíîã" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Óìíîæèòå ëåâó ó äåñíî" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Óìíîæèòå äåñíó ó ëåâî" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Óìíîæèòå ñâå ó ëåâî" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Óìíîæèòå ñâå ó äåñíî" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Óìíîæèòå äàòîòåêå" - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Áðèñàœå äàòîòåêå" - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Ïðåìåøòàœå äàòîòåêà" - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Ïðàâšåœå èçâåøòà¼à" - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Ïîíèøòàâàœå çàäœå ðàäœå..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Ïîíàâšàœå ïðåòõîäíå ðàäœå..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Ðåä: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Óïîðåäè" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Ðàçëèêå %1 îä %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "Íàåíî ðàçëèêà %1" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "Íàåíî ðàçëèêà 1" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Ñòàâêå %1 îä %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Ñòàâêå: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Îäàáåðè äâå ïîñòî¼åžå äàòîòåêå èëè ôàñöèêëå çà ïîðååœå" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Èçàáåðè ôàñöèêëó" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Îäàáåðè äâå ôàñöèêëå èëè äàòîòåêå çà ïîðååœå" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Ëåâà ïóòàœà ¼å íåâàæåžà!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Äåñíà ïóòàœà ¼å íåâàæåžà!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Îáå ïóòàœå ñó íåâàæåžå!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Îäàáåðèòå äâå äàòîòåêå êî¼å ïðèõâàòà àðõèâåð" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Íå ìîãó óïîðåäèòè äàòîòåêó è ôàñöèêëó!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Äàòîòåêà íè¼å ïðîíàåíà" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Äàòîòåêà íè¼å ðàñïàêîâàíà: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3591,12 +3516,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Íå ìîãó ðàø÷ëàíèòè ïðîáëåìàòè÷íó äàòîòåêó" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3607,27 +3532,27 @@ msgstr "" "%1\n" "íè¼å ïðîáëåìàòè÷íà" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Ñà÷óâ༠êàî" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Ñà÷óâ༠èçìåíå %1? " -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Ãðåøêà ïðè ïðàâšåœó ðåçåðâíå äàòîòåêå" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3640,7 +3565,7 @@ msgstr "" "\n" "Íàñòàâèòe?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3657,7 +3582,7 @@ msgstr "" "\t-je çàïàìòèòå ïîä äðóãèì èìåíîì, ïðèòèñíèòå /Ó ðåäó/\n" "\t- èëè ïðèòèñíèòå /Èçàè/çà ïðåêèä ïîñòóïêà?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3672,7 +3597,7 @@ msgstr "" "\n" "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäàœå êàî äàòîòåêó?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3687,7 +3612,7 @@ msgstr "" "\n" "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäàœå êàî äàòîòåêó?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3702,7 +3627,7 @@ msgstr "" "\n" "Çàìåíèòå èçìåœåíó äàòîòåêó?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3711,7 +3636,7 @@ msgstr "" "%1\n" "¼å îçíà÷åíà ñàìî çà ÷èòàœå.Æåëèòå ëè äà ¼å çàìåíèòå?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3724,22 +3649,22 @@ msgstr "" "%1\n" "îä çàäœåã ïðåãëåäà WinMerge-à.Æåëèòå ëè ïîíîâî ó÷èòàòè äàòîòåêó?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Ñà÷óâ༠ëåâó äàòîòåêó êàî" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Ñà÷óâ༠äåñíó äàòîòåêó êàî" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3750,7 +3675,7 @@ msgstr "" "%1\n" "¼å íåñòàëà.Ìîëèìî Âàñ äà ñà÷óâàòå óìíîæåíó äàòîòåêó äà áèñòå íàñòàâèëè" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3761,42 +3686,42 @@ msgstr "" "\n" "Îñâåæè äîêóìåíòå ïðå íàñòàâêà" -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Ìîðàòå îäðåäèòè ñèãóðíó èçâîðíó ïóòàœó àêî æåëèòå íàñòàâèòè (ie: $/MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Ïîâåðà äàòîòåêà íà VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåì ¼å ïîêàçàî ãðåøêó äîê ¼å ïîêóøàâàî äà ïðîâåðè äàòîòåêó.Íå ìîæå äà íàñòàâè..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Ãðåøêà ïðè èçâðøåœó ñèñòåìñêå íàðåäáå" -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ðàäíà ôàñöèêëa è ïîëîæ༠òðåíóòå äàòîòåêå ñå íå ïîêëàïà¼ó.Íàñòàâèòå?" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Íåìà VSS áàçå ïîäàòàêà" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Ãðåøêà èç VSS" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3807,7 +3732,7 @@ msgstr "" "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà.\n" "Îïîçîâè ïðîâåðó?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3816,127 +3741,127 @@ msgstr "" "Ñèñòåì ïðèêàçó¼å ãðåøêó äîê ïîêóøàâà äà îïîçîâå ïðîâåðó äàòîòåêå.\n" "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà" -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Íèøòà" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìàœè îä 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 è âèøè)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Ñòàíè íà ðàçìàêó" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ñòàíè íà ðàçìàêó èëè èíòåðïóêöè¼è" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Äåñíà ó ëåâî (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Ëåâà ó äåñíî (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåñíà ó ëåâî (%1 îä %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ëåâà ó äåñíî (%1 îä %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Ëåâà ó... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Äåñíà ó... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ëåâà ó... (%1 îä %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåñíà ó... (%1 îä %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Ëåâà (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Äåñíà (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Îáå (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Ëåâà (%1 îä %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Äåñíà (%1 îä %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Îáå(%1 îä %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Ëåâà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Äåñíà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 óñìåðåíèõ äàòîòåêà)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 îä %2 óñìåðåíèõ äàòîòåêà)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3947,17 +3872,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå %d ñòàâêè:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3976,502 +3901,502 @@ msgstr "" "\n" "Ìîëèì, îñâåæèòå ïîðååœå." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ¼å ïðåìåñòèòå:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ïðåìåñòèòå %d ñòàâêè:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Ïîòâðäè ïðåìåøòà¼" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íè¼å óñïåëî ïîêðåòàœå äðóãîã óðåèâà÷à: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Íåïîçíàò îáëèê àðõèâå" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Èìå äàòîòåêå" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Ðåçóëòàò ïîðååœà" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Äàòóì ëåâî" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Äàòóì äåñíî" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Íàñòàâàê" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Âåëè÷èíà ëåâî" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Âåëè÷èíà äåñíî" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Âåëè÷èíà äåñíî (ñêðàžåíî)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Âåëè÷èíà ëåâî (ñêðàžåíî)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Âðåìå ñòâàðàœà ëåâå" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Âðåìå ñòâàðàœà äåñíå" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Íîâè¼à äàòîòåêà" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Èçäàœå ëåâå äàòîòåêå" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Èçäàœå äåñíå äàòîòåêå" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Ñêðàžåíè èñõîä" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Îñîáèíå ëåâå" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Îñîáèíå äåñíå" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Çàâðøåòàê ðåäà ëåâå äàòîòåêå" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Çàâðøåòàê ðåäà äåñíå äàòîòåêå" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Êîäèðàœå ëåâå" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Êîäèðàœå äåñíå" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Çàíåìàðè ðàçëèêå" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Íå ìîãó óïîðåäèòè äàòîòåêå" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Îäáà÷åíà ñòàâêà" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Èçîñòàâšåíà äàòîòåêà" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Èçîñòàâšåíà ôàñöèêëà" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Ñàìî ëåâà: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Ñàìî äåñíà: %" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíå äàòîòåêå ñó èñòå" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Áèíàðíå äàòîòåêå ñó ðàçëè÷èòå" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Äàòîòåêå ñó ðàçëè÷èòå" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Ôàñöèêëå ñó ðàçëè÷èòå" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Ñàìî ëåâà" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Ñàìî äåñíà" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Ãðåøêà" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâè äàòîòåêà ñó èñòè" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Òåêñòîâè äàòîòåêà ñó ðàçëè÷èòè" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîòåêëî âðåìå: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 ñòàâêà ¼å îäàáðàíà" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 ñòàâêà ¼å îäàáðàíà" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Èìå äàòîòåêå èëè ôàñöèêëå" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìå ïîòôàñöèêëå êàä ñó ïîòôàñöèêëå óêšó÷åíå" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Èçõîä ïîðååœà,äóæè îáëèê" -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Äàòóì ïðîìåíå ëåâå ñòðàíå" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Äàòóì ïðîìåíå äåñíå ñòðàíå" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "/Íàñòàâàê/ äàòîòåêå" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Âåëè÷èíà ëåâå äàòîòåêå ó áà¼òèìà" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Âåëè÷èíà äåñíå äàòîòåêå ó áà¼òèìà" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Ñêðàžåíà ëåâà äàòîòåêà" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Ñêðàžåíà äåñíà äàòîòåêà" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Âðåìå ñòâàðàœà ëåâå ñòðàíå" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Âðåìå ñòâàðàœà äåñíå ñòðàíå" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Êî¼à ñòðàíà èìà íîâè¼è äàòóì ïðîìåíå" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Èçäàœå íà ëåâî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå" -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Èçäàœå íà äåñíî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå" -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Êðàžè ðåçóëòàò ïîðååœà" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Îñîáèíå ëåâå ñòðàíå" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Îñîáèíå äåñíå ñòðàíå" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Íà÷èí çàâðøåòêà ðåäà ëåâå äàòîòåêå" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Íà÷èí çàâðøåòêà ðåäà äåñíå äàòîòåêå" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Êîäèðàœå ëåâå ñòðàíå" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Êîäèðàœå äåñíå ñòðàíå" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áðî¼ çàíåìàðåíèõ ðàçëèêà ó äàòîòåöè.Îâå ðàçëèêå ¼å çàíåìàðèî WinMerge è íå ìîãó áèòè îá¼åäèœåíå" -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áðî¼ ðàçëèêà ó äàòîòåöè.Îâ༠áðî¼ íå óêšó÷ó¼å çàíåìàðåíå ðàçëèêå" -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïðèêàçó¼å çâåçäèöó (*), àêî ¼å äàòîòåêà áèíàðíà" -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Óïîðåäè %1 ñà %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Ñïèñàê ¼å îäâî¼åí çàðåçîì" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Ñïèñàê ¼å îäâî¼åí ¼åçè÷êîì" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "£åäíîñòàâíè HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "£åäíîñòàâíè XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Äàòîòåêà èçâåøòà¼à âåž ïîñòî¼è.Äà ëè æåëèòå çàìåíèòè ïîñòî¼åžó äàòîòåêó" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4480,32 +4405,32 @@ msgstr "" "Ãðåøêà ïðè ïðàâšåœó èçâåøòà¼à:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Èçâåøò༠¼å óñïåøíî íàïðàâšåí" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Èñòà äàòîòåêà ¼å îòâîðåíà ó îáå òàáëå" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Èçàáðàíå äàòîòåêå ñó èñòå" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Äîøëî ¼å äî ãðåøêå ïðè ïîðååœó" -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ïðèâðåìåíà äàòîòåêà íå ìîæå áèòè ñòâîðåíà.Ïðîâåðèòå è ïîäåñèòå ïðèâðåìåíó ïóòàœó" -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4520,17 +4445,17 @@ msgstr "" "\n" "Íàïîìåíà:Æåëèòå ëè óâåê çàäðæàòè ðàçëè÷èòå ïðåëàñêà ó äðóãè ðåä, îäàáåðèòå 'Çàíåìàðè ðàçëè÷èòå ïðåëàñêå ó äðóãè ðåä..' ó äè¼àëîøêî¼ êàðòèöè ïîðååœå ïðîçîðà (Óðåèâàœå/Ïîñòàâêå)" -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Îäàáðàíà ôàñöèêëà ¼å íåóïîòðåášèâà" -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íå ìîãó îòâîðèòè áèíàðíó äàòîòåêó ó óðåèâà÷ó" -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4545,7 +4470,7 @@ msgstr "" "%1\n" "íà äðóãî¼ ñòðàíè è îòâîðèòè ¼å?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4556,152 +4481,152 @@ msgstr "" "Ïðèêàç ñâàêå äàòîòåêå ó êîäíî¼ ñòðàíèöè ¼å áîšè àëè ñïà¼àœå/óìíîæàâàœå íîñè îïàñíîñò.\n" "Æåëèòå ëè äà óçìåòå îáå äàòîòåêå êàî ó ïîäðàçóìåâàíîì ïðîçîðó êîäíå ñòðàíèöå (ïðåïîðó÷åíî)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Ïîäàöè ñó èçãóášåíè çáîã ãðåøêå ïðè êîäèðàœó: îáå äàòîòåêå" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Íåìà ðàçëèêå" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Ðàçëè÷èòè ðåä" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåœåí %1 ïî¼àì(à)" -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå ìîãó íàžè ïî¼àì \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Ïîëîæ༠òàáëè" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Ðàçëè÷èòå òàáëå" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Äàòîòåêà ðàçëèêà ¼å óñïåøíî ñà÷óâàíà" -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíàåíà!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíàåíà!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Äàòîòåêà ðàçëèêà âåž ïîñòî¼è.Äà ëè æåëèòå äà je çàìåíèòå?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 îäàáðàíà äàòîòåêà" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Óîáè÷à¼åí" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Ó îêâèðó" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Îá¼åäèœåí" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Íå ìîãó ñà÷óâàòè ó äàòîòåöè %1" -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Íàâåäåíà èçëàçíà ïóòàœà íè¼å ïîòïóíà ïóòàœà: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Îäðåäèòå èçëàçíó äàòîòåêó" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íå ìîæå ñòâîðèòè äàòîòåêó ðàçëèêà èç áèíàðíèõ äàòîòåêà" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íå ìîæå ïîïðàâèòè äàòîòåêó èç ôàñöèêëè" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4712,12 +4637,12 @@ msgstr "" "\n" "Ñòâàðàœå äàòîòåêå ðàçëèêà çàõòåâà äà ïîñòî¼å ïðîìåíå êî¼å íèñó ñà÷óâàíå ó äàòîòåêàìà" -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Ôàñöèêëà íå ïîñòî¼è" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4728,37 +4653,37 @@ msgstr "" "Ñâå ïîòðåáíå êîìïîíåíòå (7-zip è/èëè Merge7z*.dll)çà àðõèâó íå ìîãó áèòè íàåíå.\n" "Ïîãëåäà¼òå óïóòñòâî êàêî îìîãóžèòè ðàä ñà àðõèâàìà" -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Îäàáåðè äàòîòåêó çà èçâîç" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Îäàáåðè äàòîòåêó çà óâîç" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Óâîç ïîñòàâêè ó äàòîòåêó" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Èçâîç ïîñòàâêè ó äàòîòåêó" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Íè¼å óñïåî äà óâåçå ïîñòàâêå èç äàòîòåêå" -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Íè¼å óñïåî äà çàïàìòè ïîñòàâêå ó äàòîòåöè" -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4769,247 +4694,247 @@ msgstr "" "\n" "Äà ëè æåëèòå íàñòàâèòè?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Âðñòà" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Ðàñïàêèâàœå" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Äåôèíèñàíî ïîðååœå" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Óðåèâà÷ ðóêîïèñà" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ïðèëàãîåíî ðàñïàêèâàœå žå ñå êîðèñòèòè çà îáå äàòîòåêå (¼åäíà äàòîòåêà òðåáà íàñòàâàê)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Íåìà äåôèíèñàíîã ïîðååœà (óîáè÷à¼åíî)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Ïðåïîðó÷åíè äîäàöè" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Îñòàëè äîäàöè" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Ëè÷íà èçðàäà: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Ïîäåøàâàœà äîäàòàêà" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íè¼å íàåí - .sct ñêðèïòå ñó îíåìîãóžåíå" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<Íèøòà>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<Àóòîìàòñêè>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "È&äè íà ðåä %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Îíåìîãóžè" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Îä ñèñòåìà" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Èç MRU ñïèñêà" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Íè¼å îçíà÷åíî" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Ïðåíîñíè îá¼åêàò" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 3c9f48b53..59d116875 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Prázdne >" @@ -2475,7 +2475,7 @@ msgid "Files:" msgstr "Súbory:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Odlišné" @@ -2512,7 +2512,7 @@ msgid "Right:" msgstr "Vpravo:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identické" @@ -2722,7 +2722,7 @@ msgid "A&ppend timestamp" msgstr "P&rida èasovú známku" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Potvrdi kopírovanie" @@ -2800,7 +2800,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Adresár" @@ -2837,8 +2837,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binárny" @@ -3086,7 +3086,7 @@ msgid "Version Control" msgstr "Kontrola verzií" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Rozdiely" @@ -3193,7 +3193,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML súbory (*.xml)|*.xml|Všetky súbory (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Názov" @@ -3214,7 +3214,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Popis" @@ -3352,206 +3352,131 @@ msgstr "M #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Preh¾adávam súbory..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Otváranie výberu" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopírujem ¾avý do pravého" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopírujem pravý do ¾avého" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopírujem všetko do ¾avého" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopírujem všetko do pravého" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopírujem súbory..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Mažem súbory..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Presúvam súbory..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Vytváram správu..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "" - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "" - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Riadok: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Zlúèi" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Rozdiel %1 z %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "nájdených %1 rozdielov" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "nájdený jeden rozdiel" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "na èítanie" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 of %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Položky: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, 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:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Výber adresára" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dva adresáre na porovnanie." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "¼avá cesta je neplatná!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je neplatná!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Obe cesty sú neplatné!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, 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:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Nemôžem porovna súbor a adresár!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Súbor nenájdený: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Súbor nerozbalený: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3564,12 +3489,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Nepodarilo sa spracova súbor konfliktov." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3580,27 +3505,27 @@ msgstr "" "%1\n" "nie je súbor konfliktov." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Uloži ako" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Uloži zmeny do %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Chyba pri zálohovaní súboru" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3613,7 +3538,7 @@ msgstr "" "\n" "Pokraèova napriek tomu?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3630,7 +3555,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:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3645,7 +3570,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3660,7 +3585,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3675,7 +3600,7 @@ msgstr "" "\n" "Prepísa zmenený súbor?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3684,32 +3609,32 @@ msgstr "" "%1\n" "je oznaèený len na èítanie. Želáte si prepísa položku len na èítanie?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, 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:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Uloži ¾avý súbor ako" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Uloži pravý súbor ako" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3720,42 +3645,42 @@ msgstr "" "\n" "Obnovte dokumenty, než budete pokraèova." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout súborov z VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Chyba pri spúšaní príkazu zo Systému Verzií (CVS a pod)." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Nebola nájdená databáza VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Chyba VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3766,7 +3691,7 @@ msgstr "" " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu.\n" " Vráti operáciu checkout?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3775,127 +3700,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Žiadny" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menšie ako 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyššie)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Preruši na netlaèite¾nom znaku" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Preruši na netlaèite¾nom znaku alebo vetnej diakritike" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Kopíruj do ¾avej strany %1 z %2 vybraných položiek" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Kopíruj do pravej strany %1 z %2 vybraných položiek" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Sprava do¾ava (%1 z %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Z¾ava doprava (%1 z %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Z¾ava... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Sprava... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Z¾ava... (%1 z %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Sprava... (%1 z %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "¼avý (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Zmaž %1 z %2 vybraných položiek z pravej strany" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Zmaza z oboch strán %1 z %2 vybraných položiek" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "¼avý (%1 z %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Pravý (%1 z %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Oba (%1 z %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "¼avá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Pravá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ovplyvnených súborov)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ovplyvnených súborov z %2)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3906,17 +3831,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Naozaj chcete skopírova:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Naozaj chcete skopírova %d položiek:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3935,502 +3860,502 @@ msgstr "" "\n" "Prosím, obnovte porovnanie." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nepodarilo sa spusti externý editor: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Neznámy formát archívu" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Názov súboru" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Výsledok porovnania" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Dátum v¾avo" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Dátum vpravo" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Prípona" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Ve¾kos v¾avo" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Ve¾kos vpravo" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Ve¾kos vpravo (krátka)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Ve¾kos v¾avo (krátka)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Èas vzniku v¾avo" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Èas vzniku vpravo" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Novší súbor" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Verzia súboru v¾avo" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Verzia súboru vpravo" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Krátky výsledok" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atribúty v¾avo" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atribúty vpravo" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Konce riadkov v¾avo" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Konce riadkov vpravo" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Kódovanie v¾avo" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Kódovanie vpravo" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ignorovaný rozdiel" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Nemožno porovna súbory" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Položka zrušená" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Súbor preskoèený" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Adresár preskoèený" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Iba v¾avo: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Iba vpravo: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binárne súbory sú identické" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binárne súbory sú rozdielne" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Súbory sú rozdielne" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Iba v¾avo" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Iba vpravo" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "jedna vybraná položka" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 vybraných položiek" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Názov súboru alebo adresára." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Názov podadresára, keï obsahuje aj podadresáre." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Výsledok porovnania, dlhý tvar." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Dátum poslednej zmeny na ¾avej strane." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Dátum poslednej zmeny na pravej strane." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Prípona súboru." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Ve¾kos súboru na ¾avej strane v bajtoch." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Ve¾kos súboru na pravej strane v bajtoch." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Ve¾kos súboru na ¾avej strane skrátená." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Ve¾kos súboru na pravej strane skrátená." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Dátum vytvorenia na ¾avej strane." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Dátum vytvorenia na pravej strane." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "ktorý zo súborov má novší èas poslednej zmeny." -#: Merge.rc:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Krátky výsledok porovnania." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atribúty na ¾avej strane." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atribúty na pravej strane." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Typ zakonèenia riadka súboru na ¾avej strane" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Typ zakonèenia riadka súboru na pravej strane" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Kódovanie na ¾avej strane." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Kódovanie na pravej strane." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zobrazí hviezdièku (*) ak je súbor binárny." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Porovna %1 s %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Zoznam oddelený èiarkami" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Zoznam oddelený tabulátormi" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Jednoduché HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Jednoduché XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4439,32 +4364,32 @@ msgstr "" "Chyba pri vytváraní správy:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Správa bola úspešne vytvorená." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Rovnaký súbor je otvorený v boch paneloch." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Vybrané súbory sú rovnaké." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Poèas porovnávania sa vyskytla chyba." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4479,17 +4404,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Zvolený adresár je neplatný." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nemôžem otvori binárny súbor v editore." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4504,7 +4429,7 @@ msgstr "" "%1\n" "na druhej strane a otvori tieto adresáre?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4515,152 +4440,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Bez rozdielu" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Rozdiely v riadkoch" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahradených %1 reazcov." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nemôžem nájs reazec \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Lokaèný panel" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Panel rozdielu" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Súbor so záplatou bol úspešne zapísaný." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nenájdená alebo je to adresár!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nenájdená alebo je to adresár!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 súbor zvolený]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normálny" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Kontextový" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Zjednotený" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Nedalo sa zapisova do súboru %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "uveïte výstupný súbor" -#: Merge.rc:2579 +#: Merge.rc:2559 #, 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:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nemohol som vytvori súbor so záplatou z adresárov." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4671,12 +4596,12 @@ msgstr "" "\n" "vytvorenie záplaty vyžaduje, aby v súboroch neboli neuložené zmeny." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Adresár neexistuje." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4687,37 +4612,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Vyberte súbor pre export" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Vyberte súbor pre import" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Nastavenia importované zo súboru." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Options exportované do súboru." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Nepodarilo sa importova nastavenia zo súboru." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Nepodarilo sa zapísa nastavenia do súboru." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4728,247 +4653,247 @@ msgstr "" "\n" "Chcete pokraèova?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Zmiešaný" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Bez predspracovania (bežné)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Odporúèané zásuvné moduly" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Iné zásuvné moduly" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Súkromné zostavenie: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Nastavenia zásuvných modulov" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nenájdené - .sct skripty vypnuté" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<Žiadny>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Ch&oï na riadok %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Vypnuté" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Zo súborového systému" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Zo zoznamu nedávno použitých" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Dávkový" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Zdroje" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 47a65029c..12f6d9dff 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -247,7 +247,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Prazno >" @@ -2482,7 +2482,7 @@ msgid "Files:" msgstr "Datoteke:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Razlika" @@ -2519,7 +2519,7 @@ msgid "Right:" msgstr "Desno:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Enako" @@ -2729,7 +2729,7 @@ msgid "A&ppend timestamp" msgstr "&Dodaj datum in èas " #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Potrdi kopiranje" @@ -2807,7 +2807,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Mapa" @@ -2844,8 +2844,8 @@ msgstr "Omejitev za &hitro primerjavo (MB):" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binarno" @@ -3111,7 +3111,7 @@ msgid "Version Control" msgstr "Nadzor razlièic" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Razlike" @@ -3219,7 +3219,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Ime" @@ -3240,7 +3240,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Opis" @@ -3384,206 +3384,131 @@ msgstr "Va #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Pregledovanje datoteko ..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Odpiranje izbora" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopiraj z leve na desno" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopiraj iz desne na levo" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopiraj vse na levo" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopiraj vse na desno" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopiranje datotek ..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Brisanje datotek ..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Premikanje datotek ..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Izdelava poroèila ..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Razveljavi zadnje dejanje ..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Ponovi zadnje dejanje ..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Vrstica: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Združi" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Razlika %1 od %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 najdenih razlik" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 najdena razlika" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "SZB" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Predmet %1 od %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Predmetov: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Izberite dve obstojeèi mapi ali datoteki za primerjavo" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Izbira map" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Izberite dve mapi ali dve datoteki za primerjavo." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Leva pot je neveljavna!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Desna pot je neveljavna!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Obe poti sta neveljavni!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Izberite dve datoteki, da boste omogoèili izbiro pretvornika." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne morem primerjati datoteke in mape!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Datoteka ni najdena: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka ni pretvorjena: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3596,12 +3521,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Ne morem razèleniti konfliktne datoteke." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3612,27 +3537,27 @@ msgstr "" "%1\n" "ni konfliktna datoteka." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Shrani kot" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Shrani spremembe v %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Napaka pri shranjevanju arhiva" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3645,7 +3570,7 @@ msgstr "" "\n" "Vseeno nadaljujem?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3662,7 +3587,7 @@ msgstr "" "\t- uporabiti drugaèno ime datoteke (pritisnite V redu)\n" "\t- preklicati trenutno operacijo (pritisnite Preklièi)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3677,7 +3602,7 @@ msgstr "" "\n" "Ali želite shraniti nezapakirano razlièico v drugo datoteko?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3692,7 +3617,7 @@ msgstr "" "\n" "Ali želite shraniti nezapakirano razlièico v drugo datoteko?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3707,7 +3632,7 @@ msgstr "" "\n" "Prepiši spremenjeno datoteko?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3716,7 +3641,7 @@ msgstr "" "%1\n" "je oznaèena samo za branje. Ali jo kljub temu želite prepisati?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3731,22 +3656,22 @@ msgstr "" "\n" "Ali želite posodobljeno ponovno naložiti?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Shrani levo datoteko kot" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Shrani desno datoteko kot" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3757,7 +3682,7 @@ msgstr "" "%1\n" "ne najdem veè. Prosim shranite kopijo datoteke za nadaljevanje." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3768,42 +3693,42 @@ msgstr "" "\n" "Prosim, osvežite dokumente pred nadaljujete." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "CheckOut datotek iz VSS ..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Napaka pri izvrševanju Versioning System ukaza." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Ne morem najti VSS podatkovne baze!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Napaka od VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3814,7 +3739,7 @@ msgstr "" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n" "Zavrzi pregledno operacijo?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3823,127 +3748,127 @@ msgstr "" "Sistem za verzije vraèa napako med preverjanjem datoteke.\n" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda" -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Brez" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (manjši od 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 in višji)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Prelom na praznem znaku" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Prelom na praznem znaku ali loèilu" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Z desne proti levi (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Z leve proti desni (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Z desne proti levi (%1 od %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Z leve proti desni (%1 od %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Leva do ... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Desna do ... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Leva do ... (%1 od%2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Desna do ... (%1 od%2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Leva (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Desna (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Obe (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Leva (%1 of %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Desna (%1 of %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Obe (%1 of %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Leva stran - izberite ciljno mapo:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Desna stran - izberite ciljno mapo:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 vpletenih datotek)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 of %2 vpletenih datotek)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3954,17 +3879,17 @@ msgstr "" "\n" "%1?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Ali ste preprièani da želite kopirati:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Ali ste preprièani, da želite kopirati %d predmetov:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3983,502 +3908,502 @@ msgstr "" "\n" "Prosim, osvežite primerjavo." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Ali ste preprièani, da želite premakniti:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Ali ste preprièani, da želite premakniti: %d predmetov" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Potrdi premik" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Ni bilo mogoèe zagnati zunanjega urejevalnika: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Nepoznan format arhiva" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Ime datoteke" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Rezultat primerjave" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Levi datum" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Desni datum" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Konènica" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Leva velikost" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Desna velikost" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Desna velikost (kratko)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Leva velikost (kratko)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Datum nastanka leve datoteke" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Datum nastanka desne datoteke" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Novejša datoteka" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Verzija leve datoteke" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Kratek rezultat" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Levi atributi" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Desni atributi" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Znake za konec vrstice (EOL) na levi datoteki" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Znake za konec vrstice (EOL) na desni datoteki" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Kodiranje levo" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Zanemarjene razlike." -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Nisem mogel primerjati datotek" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Pregled predmeta prekinjen" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Preskoèena datoteka" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Preskoèena mapa" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Samo leva: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Samo desna: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binarni datoteki sta enaki" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binarni datoteki sta razlièni" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Datoteki sta razlièni" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Mapi sta razlièni" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Samo leva" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Samo desna" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Napaka" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Tekstovni datoteki sta enaki" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Tekstovni datoteki sta razlièni" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Minilo je: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 predmet oznaèen" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 predmetov oznaèenih" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Ime datoteke ali mape" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Imena podmap ko so vkljuèene podmape." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Rezultat primerjave, dolga oblika." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Datum spremembe datoteke na levi strani." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Datum spremembe datoteke na desni strani." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Datoteèna konènica." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Velikost leve datoteke v bajtih." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Velikost desne datoteke v bajtih." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Skrajšana velikost leve datoteke." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Skrajšana velikost desne datoteke." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Datum nastanka na levi strani." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Datum nastanka na desni strani." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Pove katera stran ni še nikoli modificirala datuma" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija leve datoteke, samo za nekatere datoteène tipe." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija desne datoteke, samo za nekatere datoteène tipe." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Rezultat kratke primerjave." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Atributi leve strani." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Atributi desne strani." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Kodna stran leve strani." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Kodna stran desne strani." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaže zvezdico (*) èe je datoteka binarna" -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Primerjaj %1 z %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Seznam, loèen z vejicami" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Seznam, loèen s tabulatorji" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Enostavni HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Enostavni XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4487,32 +4412,32 @@ msgstr "" "Napaka med ustvarjanjem poroèila:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Poroèilo je bilo uspešno izdelano." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je odprta v obeh okvirih" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Izbrani datoteki sta enaki." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Prišlo je do napake med primerjanjem datotek" -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4527,17 +4452,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Izbrana mapa ni veljavna." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "V urejevalniku ne morem odpreti binarne datoteke." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4552,7 +4477,7 @@ msgstr "" "%1\n" "na drugi strani in jo odpreti?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4563,152 +4488,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informacija izgubljena pri kodiranju: Obe datatoteki" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Ni razlik" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Razlika v vrstici" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamenjan %1 niz(i)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne morem najti niza \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Položajni okvir" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Okvir razlik" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Datoteka s popravki je bila uspešno zapisana" -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. predmet ni najden ali pa je mapa" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. predmet ni najden ali pa je mapa" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 izbranih datotek]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normalno" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Pomen" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Poenoteno" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Ne morem pisati v datoteko %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Navedena izhodna pot ni absolutna pot: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Doloèite izhodno datoteko" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Iz map ne morem izdelati datoteke s popravki." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4719,12 +4644,12 @@ msgstr "" " \n" "Izdelava datoteke s popravki zahteva, da so vse datoteke predhodno shranjene." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Mapa ne obstaja" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4735,37 +4660,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Izberite datoteko za izvoz" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Izberite datoteko za uvoz" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Možnosti uvožene iz datoteke" -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Možnosti izvožene v datoteko" -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Uvažanje možnosti iz datoteke ni uspelo" -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Izvažanje možnosti v datoteko ni uspelo" -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4776,247 +4701,247 @@ msgstr "" "\n" "Ali želite nadaljevati?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mešano" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Tip" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Pretvornik" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Predpregled razlik" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Script urejevalnika" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Brez predpregleda razlik (obièajno)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Priporoèene razširitve" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Ostale razširitve" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Zasebna gradnja:%1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Nastavitve razširitev" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ni najden - .sct skripte onemogoèene" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Pojdi &na vrstico %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Onemogoèeno" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Iz datoteènega sistema" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "IZ MRU seznama" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Brez osvetljevanja" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Paket (Batch)" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Prenosni objekt" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Sredstva" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 754e33408..36b6070e1 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -248,7 +248,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Vacío >" @@ -2481,7 +2481,7 @@ msgid "Files:" msgstr "Archivos:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Diferentes" @@ -2518,7 +2518,7 @@ msgid "Right:" msgstr "Derecha:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Iguales" @@ -2728,7 +2728,7 @@ msgid "A&ppend timestamp" msgstr "Agregar &fecha" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" @@ -2806,7 +2806,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Carpeta" @@ -2843,8 +2843,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binario" @@ -3110,7 +3110,7 @@ msgid "Version Control" msgstr "Control de Versiones" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Diferencias" @@ -3217,7 +3217,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Nombre" @@ -3238,7 +3238,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Descripción" @@ -3382,206 +3382,131 @@ msgstr "Archivo interno" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Escaneando archivos..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Abriendo la selección" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Copiando lado Izquierdo a lado Derecho" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Copiando lado Derecho a lado Izquierdo" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Copiando todo al lado Izquierdo" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Copiando todo al lado Derecho" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Copiando archivos..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Eliminando archivos..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Moviendo archivos..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Creando el informe..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Deshaciendo la última operación..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Rehaciendo la operación anterior..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Línea: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Diferencia %1 de %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferencias encontradas" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 Diferencia encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Archivo %1 de %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dos carpetas o archivos existentes a comparar" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Selección de carpeta" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dos carpetas o archivos a comparar." -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "¡La ruta del lado Izquierdo no es válida!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "¡La ruta del lado Derecho no es válida!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "¡Ninguna ruta es válida!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Elija dos archivos para habilitar selección de desempaquetador." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "¡Imposible comparar un archivo y una carpeta!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Archivo no encontrado: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Archivo no desempaquetado: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3594,12 +3519,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Falló al corregir archivo conflictivo." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3610,27 +3535,27 @@ msgstr "" "%1\n" "no es conflictivo." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Guardar Como" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "¿Guardar los cambios a %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Error haciendo copia de seguridad del archivo" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3643,7 +3568,7 @@ msgstr "" "\n" "¿Continuar de todas formas?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3660,7 +3585,7 @@ msgstr "" "\t-usar un nombre diferente (Aceptar)\n" "\t-cancelar la operación (Cancelar)" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3675,7 +3600,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3690,7 +3615,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3705,7 +3630,7 @@ msgstr "" "\n" "¿Desea sobreescribir el archivo cambiado?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3714,7 +3639,7 @@ msgstr "" "%1\n" "es de sólo lectura. ¿Desea sobreescribirlo de todos modos?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3729,22 +3654,22 @@ msgstr "" "\n" "¿Desea recargar el archivo?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Guardar lado izquierdo como" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Guardar lado derecho como" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3755,7 +3680,7 @@ msgstr "" "%1\n" "ha desaparecido. Por favor, guarde una copia del archivo para continuar." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3766,42 +3691,42 @@ msgstr "" "\n" "Actualize los documentos antes de continuar." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger archivos de VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Error ejecutando el comando del sistema de versionado." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "¡No se encontraron base(s) de datos de VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Error de VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3812,7 +3737,7 @@ msgstr "" " Por favor, compruebe la configuración de la vista utilizada.\n" " ¿Desea deshacer la desprotección?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3821,127 +3746,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Ninguno" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor que 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 y superior)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Detener en espacio en blanco" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Detener en espacio en blanco o puntuación" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Lado derecho a lado izquierdo (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Lado izquierdo a lado derecho (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Lado derecho a lado izquierdo (%1 de %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lado izquierdo a lado derecho (%1 de %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Lado izquierdo a... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Lado derecho a... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lado izquierdo a... (%1 de %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Lado derecho a... (%1 de %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Lado izquierdo (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Lado derecho (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Ambos lados (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Lado izquierdo (%1 de %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Lado derecho (%1 de %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos lados (%1 de %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Izquierda - Seleccione carpeta destino:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Derecha - Seleccione carpeta destino:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Archivos Afectados)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Archivos Afectados)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3952,17 +3877,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Está seguro de copiar:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Está seguro de copiar %d elementos:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3981,502 +3906,502 @@ msgstr "" "\n" "Por favor actualice la comparación." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Está seguro de mover:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Está seguro de mover %d elementos:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Confirmar Movimiento" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Error al ejecutar editor externo: %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Formato de archivo desconocido" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Nombre" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultado" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Fecha izq." -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Fecha dcha." -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Tamaño izq." -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Tamaño dcha." -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dcha. (Corto)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Tamaño izq. (Corto)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Fecha de creacion izq." -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Fecha de creacion dcha." -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Archivo más reciente" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Versión archivo izq." -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Versión archivo dcha." -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Resultados abreviados" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Atributos izq." -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Atributos dcha." -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "EOL izq." -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "EOL dcha." -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Codificación izq." -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Codificación dcha." -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Difs. ignoradas" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "No se pueden comparar los archivos" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Elemento cancelado" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Archivo omitido" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Carpeta omitida" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Sólo Izquierda: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Sólo Derecha: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Los archivos binarios son iguales" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Los archivos binarios son diferentes" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Las carpetas son diferentes" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Sólo Izquierda" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Sólo Derecha" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Error" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Los archivos son iguales" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tiempo transcurrido: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Nombre de archivo o carpeta." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nombre de subcarpeta cuando se incluyen las subcarpetas." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Resultados de la comparacion, formato largo." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Fecha de modificación del archivo del lado izquierdo." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Fecha de modificación del archivo del lado derecho." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Extensión del archivo." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Tamaño del archivo del lado izquierdo en bytes." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Tamaño del archivo del lado derecho en bytes." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño del archivo del lado izquierdo abreviado." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño del archivo del lado derecho abreviado." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Fecha de creación del archivo del lado izquierdo." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Fecha de creación del archivo del lado derecho." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, 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:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Resultados de la comparación abreviados." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Attributos del archivo del lado izquierdo." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Attributos del archivo del lado derecho." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL del archivo del lado izquierdo." -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL del archivo del lado derecho." -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Codificación del lado izquierdo." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Codificación del lado derecho." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Muestra un asterisco (*) si el archivo es binario." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Lista separada por comas" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabuladores" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "HTML Simple" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "XML Simple " -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4485,32 +4410,32 @@ msgstr "" "Error al crear el informe:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "El informe se ha creado correctamente." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "El mismo archivo está abierto en ambos paneles." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Los archivos seleccionados son iguales" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocurrió un error cuando se estaban comparando los archivos" -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4525,17 +4450,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada no es válida." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "No se puede abrir un archivo binario en el editor." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4550,7 +4475,7 @@ msgstr "" "%1\n" "al otro lado y abrir éstas carpetas?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4561,152 +4486,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "No hay diferencia" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Diferencia de línea" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Reemplazada(s) %1 cadena(s)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposible encontrar la cadena \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Panel de ubicación" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Panel de diferencias" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Archivo de corrección escrito correctamente." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 archivo(s) selecionado(s)]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "No se pudo escibir en el archivo %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Especifique un archivo de salida" -#: Merge.rc:2579 +#: Merge.rc:2559 #, 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:2580 +#: Merge.rc:2560 #, 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:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4717,12 +4642,12 @@ msgstr "" "\n" "Crear una corrección requiere que no haya cambios pendientes de ser guardados." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existe." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4733,37 +4658,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Seleccione archivo a exportar" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Seleccione archivo a importar" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Configuración importada del archivo." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Configuración exportada al archivo." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Fallo al importar la configuración del archivo." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Fallo al exportar la configuración al archivo." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4774,247 +4699,247 @@ msgstr "" "\n" "¿Desea continuar?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Mezclado" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Descompactador" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Precomparación" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Editor de script" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Sin precomparación (normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Otros plugins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Compilación Privada: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Configuración de plugin" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH no encontrado - scripts .sct deshabilitados" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Ir a &línea %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Deshabilitado" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Del sistema de archivos" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "De la lista MRU" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "No Seleccionado" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 5563f2176..19c58d704 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Inga >" @@ -2479,7 +2479,7 @@ msgid "Files:" msgstr "Filer:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Olika" @@ -2516,7 +2516,7 @@ msgid "Right:" msgstr "Höger:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Identisk" @@ -2726,7 +2726,7 @@ msgid "A&ppend timestamp" msgstr "L&ägg till tidsmarkering" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Bekräfta kopiering" @@ -2804,7 +2804,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Katalog" @@ -2841,8 +2841,8 @@ msgstr "&Snabb maximal j #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binär" @@ -3108,7 +3108,7 @@ msgid "Version Control" msgstr "Versionskontroll" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Skillnader" @@ -3215,7 +3215,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Namn" @@ -3236,7 +3236,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Beskrivning" @@ -3380,206 +3380,131 @@ msgstr "Min fil" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Söker filer..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Öppnar val" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Kopiera vänster till höger" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Kopiera höger till vänster" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Kopiera allt till vänster" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Kopiera allt till höger" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Kopierar filer..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Tar bort filer..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Flyttar filer..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Skapar rapport..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Ångrar den sista åtgärden..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Gör om den tidigare åtgärden..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Rad: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Mergemod" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Skillnad %1 av %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 skillnader funna" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 skillnad funnen" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Objekt: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, 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:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Val av katalog" -#: Merge.rc:2220 +#: Merge.rc:2200 #, 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:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Vänster sökväg är felaktig!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Höger sökväg är felaktig!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Båda sökvägarna är felaktiga!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Välj två filer för att starta valet av uppackare." -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan inte jämföra en fil med en katalog!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Kan inte hitta: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Filen är inte uppackad: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3592,12 +3517,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Kunde inte tolka Konfliktfilen." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3608,27 +3533,27 @@ msgstr "" "%1\n" "är inte en Konfliktfil." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Spara som" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Spara ändringar i %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Fel vid backup av filen" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3641,7 +3566,7 @@ msgstr "" "\n" "Vill du fortsätta i alla fall?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3658,7 +3583,7 @@ msgstr "" "\t-använda ett annat filnamn (Tryck Ok)\n" "\t-avbryta sparande av fil (Tryck Avbryt)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3673,7 +3598,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3688,7 +3613,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3703,7 +3628,7 @@ msgstr "" "\n" "Vill du skriva över den förändrade filen?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3712,7 +3637,7 @@ msgstr "" "%1\n" "är markerad bara läsbar. Vill du ändå ändra i den?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3727,22 +3652,22 @@ msgstr "" "\n" "Vill du öppna filen igen?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Spara vänster fil som" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Spara höger fil som" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3753,7 +3678,7 @@ msgstr "" "%1\n" "finns inte nu. Var god och spara en kopia av filen för att fortsätta." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3764,42 +3689,42 @@ msgstr "" "\n" "Uppdatera filerna innan du fortsätter." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Hämtar filer från VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Fel vid utförande av kommando för versionshanteringssystem." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS databas hittad!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Fel från VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3810,7 +3735,7 @@ msgstr "" " Var god och, kontrollera konfigurationsspecifikation på använd markering.\n" " Ångra checka ut åtgärd?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3819,127 +3744,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Inget" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (lägre än 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 eller högre)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Radbryt på mellanslag" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Radbryt på mellanslag eller punkt" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Höger till vänster (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Vänster till höger (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Höger till vänster (%1 av %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Vänster till höger (%1 av %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Vänster till... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Höger till... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Vänster till... (%1 av %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Höger till... (%1 av %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Vänster (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Höger (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Båda (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Vänster (%1 av %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Höger (%1 av %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Båda (%1 av %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Vänster sida - välj destinationskatalog:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Höger sida - välj destinationskatalog:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påverkade)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påverkade)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3951,17 +3876,17 @@ msgstr "" "%1\n" "?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Är du säker på att du vill kopiera:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, 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:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3980,502 +3905,502 @@ msgstr "" "\n" "Var god och uppdatera jämförelsen." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Är du säker att du vill flytta:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Är du säker att du vill flytta % objekt:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Bekräfta flyttning" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunde inte starta den externa editorn %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Okänt arkivformat" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Filnamn" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Resultat av jämförelsen" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Vänster datum" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Höger datum" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Filsuffix" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Vänster storlek" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Höger storlek" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Höger Filstorlek (Förkortad)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Vänster Filstorlek (Förkortad)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Vänster skapaddatum" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Höger skapaddatum" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Nyare filer" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Filversion på vänster fil" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Filversion på höger fil" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Vänster attribut" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Höger attribut" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Vänster radslutstyp" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Höger radslutstyp" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Vänster kodning" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Höger kodning" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Ignorerade skillnader" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Kan inte jämföra filerna" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Objekt avbrutet" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Hoppat över filen" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Hoppat över katalogen" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Bara vänster: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Bara höger: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "De binära filerna är identiska" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "De binära filerna är olika" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Filerna är olika" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Katalogerna är olika" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Endast vänster" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Endast höger" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Fel" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Textfilerna är identiska" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Textfilerna är olika" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Förfluten tid: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 objekt valt" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 objekt valda" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Filnamn eller katalognamn." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Underkatalognamn när underkataloger inkluderas." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Jämförelseresultat, lång version." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Vänster sidas ändringsdatum." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Höger sidas ändringsdatum." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Filsuffix." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Vänster fils storlek i bytes." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Höger fils storlek i bytes." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Vänster filstorlek är förkortad." -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Höger filstorlek är förkortad." -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Vänster sidas skapelsetid." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Höger sidas skapelsetid." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Visar vilken sida som har ett nyare ändringsdatum." -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Vänster sidas filversion, bara för några filtyper." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Höger sidas filversion, bara för några filtyper." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Kortfattat jämförelseresultat." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Vänster sidas attribut." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Höger sidas attribut." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Vänster sidas filradslutstyp" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Höger sidas filradslutstyp" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Vänster sidas kodning." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Höger sidas kodning." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Visar stjärna (*) om filen är binär." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Jämför %1 med %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Komma-separerad lista" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Tabb-separerad lista" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4484,32 +4409,32 @@ msgstr "" "Fel vid skapande av rapport:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Rapporten har skapats." -#: Merge.rc:2506 +#: Merge.rc:2486 #, 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:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "De valda filerna är identiska." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Ett fel inträffade under jämförelsen av filerna." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4524,17 +4449,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Den valda katalogen är ogiltig." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan inte öppna en binär fil för att editera." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4549,7 +4474,7 @@ msgstr "" "%1\n" "på andra sidan och öppna dessa kataloger?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4560,152 +4485,152 @@ 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:2520 +#: Merge.rc:2500 #, 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:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Ingen skillnad" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Radskillnad" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Ersatt %1 sträng(ar)." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan inte hitta strängen \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Skillnadsfält" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Skillnadsbild" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Patchfilen sparad." -#: Merge.rc:2568 +#: Merge.rc:2548 #, 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:2569 +#: Merge.rc:2549 #, 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:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 fil(er) valda]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Sammanhang" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Förenad" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Kunde inte spara filen %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Välj ett filnamn för resultatet" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan inte skapa en patchfil från binära filer." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan inte skapa en patchfil från kataloger." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4716,12 +4641,12 @@ msgstr "" "\n" "Att skapa en patch kräver att det inte finns några osparade förändringar i filerna." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Katalogen finns inte." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4732,37 +4657,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Välj fil att exportera" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Välj fil att importera" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Inställningar importerades från filen." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Inställningar exporterades till filen." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Det gick inte att importera inställningar från filen." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Det gick inte att spara inställningar till filen." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4773,247 +4698,247 @@ msgstr "" "\n" "Vill du göra detta?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Blandad" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Uppackare" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Editorscript" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (standard)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Föreslagna plugins" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Andra plugins" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Privat Kompilering: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Plugin-inställningar" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host ('wscript.exe') hittades inte - .sct script är avstängda" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "G&å till rad %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Avstängd" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Från Filsystem" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Från Senast Använda filer" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Ingen markering" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portabelt Objekt" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resurser" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index cf4eaf3fe..00af246ae 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -246,7 +246,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Boþ >" @@ -2482,7 +2482,7 @@ msgid "Files:" msgstr "Dosyalar:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "Farklýlýk" @@ -2519,7 +2519,7 @@ msgid "Right:" msgstr "Sað:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Ayný" @@ -2729,7 +2729,7 @@ msgid "A&ppend timestamp" msgstr "Sonuna tarih da&mgasý ekle" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "Kopyayý Doðrula" @@ -2807,7 +2807,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Klasör" @@ -2844,8 +2844,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Binary" @@ -3111,7 +3111,7 @@ msgid "Version Control" msgstr "Sürüm Denetimi" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "Farklar" @@ -3218,7 +3218,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Dosyalarý (*.xml)|*.xml|Tüm Dosyalar (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "Ad" @@ -3239,7 +3239,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Açýklama" @@ -3383,206 +3383,131 @@ msgstr "Benim Dosyam" #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Dosyalar taranýyor..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "Sçim açýlýyor" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Soldaki saða kopyalanýyor" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Sað, sola kopyalanýyor" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Tümü sola kopyalanýyor" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Tümü saða kopyalanýyor" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Dosyalar kopyalanýyor..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Dosyalar siliniyor..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Dosyalar taþýnýyor..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Rapor oluþturuluyor..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Son iþlem geri alýnýyor..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Önceki iþlem yineleniyor..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Satýr: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Birleþtir" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "Fark %1 / %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 Fark Bulundu" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "1 Fark Bulundu" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "SO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Öge %1 / %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Ögeler: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, 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:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Klasör Seçimi" -#: Merge.rc:2220 +#: Merge.rc:2200 #, 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:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Sol yol geçersiz!" -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Sað yol geçersiz!" -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Ýki yolda geçersiz!" -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, 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:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Dosya ile klasör karþýlaþtýrýlamaz!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "%1 dosyasý bulunamadý" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "%1 dosyasý ayýklanamadý" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3595,12 +3520,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Fark dosyasý iþlenemedi." -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3611,27 +3536,27 @@ msgstr "" "dosyasý\n" "bir fark dosyasý deðil." -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Farklý Kaydet" -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "%1 içindeki deðiþiklikler kaydedilsin mi? " -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Dosya yedekleme hatasý" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3644,7 +3569,7 @@ msgstr "" "\n" "Gene de devam edilsin mi?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3661,7 +3586,7 @@ msgstr "" "\t-farklý bir ad kullan (Tamam Týklayýn)\n" "\t-bu iþlemi iptal et? (Ýptal Týklayýn)" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3676,7 +3601,7 @@ msgstr "" "\n" "Ayýklanmýþ sürümü baþka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3691,7 +3616,7 @@ msgstr "" "\n" "Ayýklanmýþ sürümü baþka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3706,7 +3631,7 @@ msgstr "" "\n" "deðiþtirilmiþ dosyanýn üzerine yazýlsýn mý?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" @@ -3715,7 +3640,7 @@ msgstr "" "%1\n" "salt okunur olarak iþaretli. Üzerine yazmak istediðinize emin misiniz?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3730,22 +3655,22 @@ msgstr "" "\n" "Dosyayý yeniden yüklemek istiyor musunuz?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Sol Dosyayý Farklý Kaydet" -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Sað Dosyayý Farklý Kaydet" -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3756,7 +3681,7 @@ msgstr "" "dosyasý\n" "yok oldu. Devam etmek için dosyanýn bir kopyasýný kaydedin." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3767,42 +3692,42 @@ msgstr "" "\n" "Devam etmeden önce belgeleri yenileyin." -#: Merge.rc:2273 +#: Merge.rc:2253 #, 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:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Dosyalarý VSS Projesinden Çýkart..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, 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:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Sürümleme sistemi komutu çalýþtýrýlýrken hata." -#: Merge.rc:2277 +#: Merge.rc:2257 #, 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:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "VSS veritabaný bulunamadý!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "VSS Kaynaklý Hata:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3813,7 +3738,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:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3822,127 +3747,127 @@ 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:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Yok" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0'dan önceki sürümler)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ve üstü)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Boþlukta dur" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Boþlukta veya noktalama iþaretinde dur" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Saðdakini Sola (%1)" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Soldakini Saða (%1)" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Saðdakini Sola (%1 / %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Soldakini Saða (%1 / %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Soldakini þuraya... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Saðdakini þuraya... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Soldakini þuraya... (%1 / %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Saðdakini þuraya... (%1 / %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "Soldakini (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Saðdakini (%1 tane)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Her ikisini de (%1 tane)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "Soldakini (%1 / %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Saðdakini (%1 / %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Her iki tarafta olaný da (%1 / %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "Sol tarafýn hedef klasörünü seç:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Sað tarafýn hedef klasörünü seç:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dosya Etkilendi)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Toplam %2 taneden %1 dosya etkilendi)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3953,17 +3878,17 @@ msgstr "" "\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Þunu kopyalamak istediðinizden emin misiniz:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "%d ögeyi kopyalamak istediðinize emin misiniz:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3982,502 +3907,502 @@ msgstr "" "\n" "Lütfen karþýlaþtýrmayý yenileyin." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Bunu taþýmak istediðinize emin misiniz:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "%d ögeyi taþýmak istediðinize emin misiniz:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "Taþýmayý Onayla" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "%1 dýþ düzenleyicisi çalýþtýrýlamadý" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Bilinmeyen sýkýþtýrma biçimi" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "Dosya Adý" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Karþýlaþtýrma sonucu" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Soldakinin Tarihi" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Saðdakinin Tarihi" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Uzantý" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Soldakinin Boyutu" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Saðdakinin Boyutu" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Saðdakinin Boyutu (Kýsa)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Soldakinin Boyutu (Kýsa)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "Soldakinin Oluþturulma Zamaný" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "Saðdakinin Oluþturulma Zamaný" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Daha Yeni Dosya" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Soldaki Dosya Sürümü" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Saðdaki Dosya Sürümü" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Özet Sonuç" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Soldakinin Öznitelikleri" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Saðdakinin Öznitelikleri" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "Sol Satýr Sonu" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Sað Satýr Sonu" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Soldaki Kodlama" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Saðdaki Kodlama" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Yok Sayýlan Farklýlýklar" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Dosyalar karþýlaþtýrýlamýyor" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Öge iptal edildi" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Dosya atlandý" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Klasör atlandý" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Yalnýz solda: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Yalnýz saðda: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Binary dosyalarý ayný" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Binary dosyalarý farklý" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Dosyalar farklý" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Klasörler farklý" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Yalnýz Soldaki" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Yalnýz Saðdaki" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Hata" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Metin dosyalarý ayný" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Metin dosyalarý farklý" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Geçen süre: %ld ms" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "1 öge seçildi" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "%1 öge seçildi" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "Dosya veya klasör adý." -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Alt klasörler katýldýðýnda alt klasör adý." -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Karþýlaþtýrma sonucu, uzun biçim." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "Soldakinin deðiþtirilme tarihi." -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "Saðdakinin deðiþtirilme tarihi." -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Dosya uzantýsý." -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Soldaki dosyanýn bayt olarak boyutu." -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Saðdaki dosyanýn bayt olarak boyutu." -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Soldaki dosyanýn kýsaca boyutu" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Saðdaki dosyanýn kýsaca boyutu" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "Sol tarafýn oluþturulma zamaný." -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "Sað tarafýn oluþturulma zamaný." -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, 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:2466 +#: Merge.rc:2446 #, 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:2467 +#: Merge.rc:2447 #, 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:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Kýsa karþýlaþtýrma sonucu." -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Soldaki dosyanýn öznitelikleri." -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Saðdaki dosyanýn öznitelikleri." -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Soldaki dosyanýn satýr sonu tipi" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Soldaki dosyanýn satýr sonu tipi" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Sol tarafýn kodlamasý." -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Sol tarafýn kodlamasý." -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, 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:2485 +#: Merge.rc:2465 #, 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:2486 +#: Merge.rc:2466 #, 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:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "%1 ile %2 ögesini karþýlaþtýr" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Virgül ile ayrýlmýþ liste" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Sekme ile ayrýlmýþ liste" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Basit HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Basit XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, 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:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4486,32 +4411,32 @@ msgstr "" "Rapor hazýrlanýrken hata oldu:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Rapor tamamlandý." -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Ýki panelde de ayný dosya açýldý." -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Seçili Dosyalar Birbiri Ýle Ayný." -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Dosyalar karþýlaþtýrýlýrken bir hata oluþtu." -#: Merge.rc:2509 +#: Merge.rc:2489 #, 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:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4526,17 +4451,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:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Seçilen klasör geçersiz." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Bir binary dosyasý düzenleyicide açýlamaz." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4551,7 +4476,7 @@ msgstr "" "%1\n" "ve bu klasörleri açmak istiyor musunuz?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4562,152 +4487,152 @@ 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:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Kodlama hatalarý yüzünden iki dosyada da bilgi kaybý" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Fark yok" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Satýr farký" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 metin deðiþtirildi." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Aradýðýnýz \"%s\" metni bulunamadý" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "Durum Penceresi" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "Fark Penceresi" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Yama dosyasý yazýldý." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. öge bulunamadý veya bir klasör" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. öge bulunamadý veya bir klasör" -#: Merge.rc:2570 +#: Merge.rc:2550 #, 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:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 dosya seçildi]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Baðlam" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Birleþik" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "%1 dosyasýna yazýlamadý." -#: Merge.rc:2577 +#: Merge.rc:2557 #, 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:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Bir çýktý dosyasý belirtin" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Binary dosyalarýndan, yama dosyasý hazýrlanamaz." -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Klasörlerden yama dosyasý hazýrlanamaz." -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4718,12 +4643,12 @@ msgstr "" "\n" "Bir yama hazýrlamak, dosyalardaki deðiþikliklerin kaydedilmiþ olmasýný gerektirir." -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Klasör bulunamadý." -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4734,37 +4659,37 @@ 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:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Verilecek dosyayý seçin" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "alýnacak dosyayý seçin" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Ayarlar dosyadan alýndý." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Ayarlar dosyaya kaydedildi." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Ayarlar dosyadan alýnamadý." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Ayarlar dosyaya yazýlamadý." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4775,247 +4700,247 @@ msgstr "" "\n" "Devam etmek istiyor musunuz?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "Karma" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Tür" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Ayýklayýcý" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Ön Fark" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Düzenleyici betiði" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, 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:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Ön fark yok (Normal)" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Önerilen eklentiler" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "Diðer eklentiler" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Özel Yapým: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Eklenti Ayarlarý" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host bulunamadý - .sct betikleri devre dýþý" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "%1. &Satýra Git" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Devre dýþý" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "Dosya sisteminden" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "Sýk Kullanýlanlar Listesinden" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Vurgulama Yok" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index 7b3bf32e3..d91d6d0fe 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -247,7 +247,7 @@ msgstr "" #: Merge.rc:251 #: Merge.rc:410 #: Merge.rc:570 -#: Merge.rc:2670 +#: Merge.rc:2650 #, c-format msgid "< Empty >" msgstr "< Íåìà >" @@ -2480,7 +2480,7 @@ msgid "Files:" msgstr "Ôàéëè:" #: Merge.rc:1631 -#: Merge.rc:2423 +#: Merge.rc:2403 #, c-format msgid "Different" msgstr "³äð³çíÿþòüñÿ" @@ -2517,7 +2517,7 @@ msgid "Right:" msgstr "Ïðàâîðó÷:" #: Merge.rc:1654 -#: Merge.rc:2413 +#: Merge.rc:2393 #, c-format msgid "Identical" msgstr "Îäíàêîâ³" @@ -2727,7 +2727,7 @@ msgid "A&ppend timestamp" msgstr "Äîäàòè äàòó" #: Merge.rc:1802 -#: Merge.rc:2336 +#: Merge.rc:2316 #, c-format msgid "Confirm Copy" msgstr "ϳäòâåðäæåííÿ" @@ -2805,7 +2805,7 @@ msgstr "" #: Merge.rc:1852 #: Merge.rc:2056 -#: Merge.rc:2357 +#: Merge.rc:2337 #, c-format msgid "Folder" msgstr "Òåêà" @@ -2842,8 +2842,8 @@ msgstr "" #: Merge.rc:1874 #: Merge.rc:2058 -#: Merge.rc:2398 -#: Merge.rc:2604 +#: Merge.rc:2378 +#: Merge.rc:2584 #, c-format msgid "Binary" msgstr "Á³íàðíèé" @@ -3109,7 +3109,7 @@ msgid "Version Control" msgstr "Êîíòðîëü âåðñ³é" #: Merge.rc:2054 -#: Merge.rc:2397 +#: Merge.rc:2377 #, c-format msgid "Differences" msgstr "³äì³ííîñò³" @@ -3216,7 +3216,7 @@ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Ôàéëè XML (*.xml)|*.xml|Âñ³ ôàéëè (*.*)|*.*||" #: Merge.rc:2122 -#: Merge.rc:2613 +#: Merge.rc:2593 #, c-format msgid "Name" msgstr "²ì'ÿ" @@ -3237,7 +3237,7 @@ msgid "[F] " msgstr "[F] " #: Merge.rc:2126 -#: Merge.rc:2615 +#: Merge.rc:2595 #, c-format msgid "Description" msgstr "Îïèñ" @@ -3381,206 +3381,131 @@ msgstr "̳ #: Merge.rc:2178 #, c-format -msgid "Scanning files..." -msgstr "Ñêàíóâàííÿ ôàéë³â..." - -#: Merge.rc:2179 -#, c-format -msgid "Opening selection" -msgstr "³äêðèâàþ âèáðàíå" - -#: Merge.rc:2180 -#, c-format -msgid "Copying Left to Right" -msgstr "Êîï³þâàííÿ çë³âà ïðàâîðó÷" - -#: Merge.rc:2181 -#, c-format -msgid "Copying Right to Left" -msgstr "Êîï³þâàííÿ ñïðàâà ë³âîðó÷" - -#: Merge.rc:2182 -#, c-format -msgid "Copying From Left" -msgstr "" - -#: Merge.rc:2183 -#, c-format -msgid "Copying From Right" -msgstr "" - -#: Merge.rc:2184 -#, c-format -msgid "Copying All to Left" -msgstr "Êîï³þâàííÿ âñ³õ ôàéë³â ë³âîðó÷" - -#: Merge.rc:2185 -#, c-format -msgid "Copying All to Right" -msgstr "Êîï³þâàííÿ âñ³õ ôàéë³â ïðàâîðó÷" - -#: Merge.rc:2186 -#, c-format -msgid "Copying files..." -msgstr "Êîï³þâàííÿ ôàéë³â..." - -#: Merge.rc:2187 -#, c-format -msgid "Deleting files..." -msgstr "Âèëó÷åííÿ ôàéë³â..." - -#: Merge.rc:2188 -#, c-format -msgid "Moving files..." -msgstr "Ïåðåì³ùåííÿ ôàéë³â..." - -#: Merge.rc:2189 -#, c-format -msgid "Creating the report..." -msgstr "Ñòâîðþºòüñÿ çâ³ò..." - -#: Merge.rc:2190 -#, c-format -msgid "Undoing the last operation..." -msgstr "Ñêàñóâàííÿ îñòàííüî¿ ä³¿..." - -#: Merge.rc:2191 -#, c-format -msgid "Redoing the previous operation..." -msgstr "Ïîâòîðåííÿ îñòàííüî¿ ä³¿..." - -#: Merge.rc:2192 -#, c-format -msgid "Doing Auto Merge..." -msgstr "" - -#: Merge.rc:2198 -#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2179 #, c-format msgid "Line: %s" msgstr "Ðÿäîê: %s" -#: Merge.rc:2200 +#: Merge.rc:2180 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2181 #, c-format msgid "Merge" msgstr "Îá'ºäíàííÿ" -#: Merge.rc:2202 +#: Merge.rc:2182 #, c-format msgid "Difference %1 of %2" msgstr "³äì³íí³ñòü %1 ç %2" -#: Merge.rc:2203 +#: Merge.rc:2183 #, c-format msgid "%1 Differences Found" msgstr "%1 â³äì³ííîñòåé çíàéøëîñÿ" -#: Merge.rc:2204 +#: Merge.rc:2184 #, c-format msgid "1 Difference Found" msgstr "Çíàéäåíà âñüîãî îäíà â³äì³íí³ñòü" #. Abbreviation from "Read Only" -#: Merge.rc:2205 +#: Merge.rc:2185 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2211 +#: Merge.rc:2191 #, c-format msgid "Item %1 of %2" msgstr "Åëåìåíò %1 ç %2" -#: Merge.rc:2212 +#: Merge.rc:2192 #, c-format msgid "Items: %1" msgstr "Åëåìåíò³â: %1" -#: Merge.rc:2218 +#: Merge.rc:2198 #, c-format msgid "Select two existing folders or files to compare" msgstr "Âèáåð³òü äâ³ ²ÑÍÓÞײ òåêè àáî ôàéëè äëÿ ïîð³âíÿííÿ" -#: Merge.rc:2219 +#: Merge.rc:2199 #, c-format msgid "Folder Selection" msgstr "Âèá³ð òåêè" -#: Merge.rc:2220 +#: Merge.rc:2200 #, c-format msgid "Select two folders or two files to compare." msgstr "Âèáåð³òü äëÿ ïîð³âíÿííÿ äâ³ òåêè àáî ôàéëè" -#: Merge.rc:2221 +#: Merge.rc:2201 #, c-format msgid "Left path is invalid!" msgstr "Øëÿõ çë³âà çàçíà÷åíèé íåïðàâèëüíî " -#: Merge.rc:2222 +#: Merge.rc:2202 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2203 #, c-format msgid "Right path is invalid!" msgstr "Øëÿõ ñïðàâà çàçíà÷åíèé íåïðàâèëüíî " -#: Merge.rc:2224 +#: Merge.rc:2204 #, c-format msgid "Both paths are invalid!" msgstr "Îáèäâà øëÿõè çàçíà÷åí³ íåïðàâèëüíî " -#: Merge.rc:2225 +#: Merge.rc:2205 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2206 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2207 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2208 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2209 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Âèáåð³òü äâà ôàéëè, ùîá ââ³ìêíóòè âèá³ð ðîçïàêóâàëüíèêà" -#: Merge.rc:2230 +#: Merge.rc:2210 #, c-format msgid "Cannot compare file and folder!" msgstr "Íåìîæëèâå ïîð³âíÿííÿ ôàéëó ³ òåêè!" -#: Merge.rc:2236 +#: Merge.rc:2216 #, c-format msgid "File not found: %1" msgstr "Ôàéë íå çíàéäåíèé: %1" -#: Merge.rc:2237 +#: Merge.rc:2217 #, c-format msgid "File not unpacked: %1" msgstr "Ôàéë íå ðîçïàêîâàíèé: %1" -#: Merge.rc:2238 +#: Merge.rc:2218 #, c-format msgid "" "Cannot open file\n" @@ -3593,12 +3518,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2239 +#: Merge.rc:2219 #, c-format msgid "Failed to parse conflict file." msgstr "Ïîìèëêà ðîçáèðàííÿ ôàéëó êîíôë³êò³â" -#: Merge.rc:2240 +#: Merge.rc:2220 #, c-format msgid "" "The file\n" @@ -3609,27 +3534,27 @@ msgstr "" "%1\n" "íå º ôàéëîì êîíôë³êò³â" -#: Merge.rc:2246 +#: Merge.rc:2226 #, c-format msgid "Save As" msgstr "Çáåðåãòè ÿê..." -#: Merge.rc:2247 +#: Merge.rc:2227 #, c-format msgid "Save changes to %1?" msgstr "Çáåðåãòè çì³íè â %1?" -#: Merge.rc:2248 +#: Merge.rc:2228 #, 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:2249 +#: Merge.rc:2229 #, c-format msgid "Error backing up file" msgstr "Ïîìèëêà ñòâîðåííÿ ðåçåðâíî¿ êîﳿ" -#: Merge.rc:2251 +#: Merge.rc:2231 #, c-format msgid "" "Unable to backup original file:\n" @@ -3642,7 +3567,7 @@ msgstr "" "\n" "Ïðîäîâæèòè â áóäü-ÿêîìó âèïàäêó?" -#: Merge.rc:2252 +#: Merge.rc:2232 #, c-format msgid "" "Saving file failed.\n" @@ -3659,7 +3584,7 @@ msgstr "" "\t-âèêîðèñòàòè ³íøå ³ì'ÿ ôàéëó (Íàòèñí³òü OÊ)\n" "\t-ñêàñóâàòè ïîòî÷íó îïåðàö³þ (Íàòèñí³òü Ñêàñóâàòè)?" -#: Merge.rc:2253 +#: Merge.rc:2233 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3674,7 +3599,7 @@ msgstr "" "\n" "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?" -#: Merge.rc:2254 +#: Merge.rc:2234 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3689,7 +3614,7 @@ msgstr "" "\n" "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?" -#: Merge.rc:2255 +#: Merge.rc:2235 #, c-format msgid "" "Another application has updated file\n" @@ -3704,14 +3629,14 @@ msgstr "" "\n" "Ïåðåçàïèñàòè çì³íåíèé ôàéë?" -#: Merge.rc:2256 +#: Merge.rc:2236 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 ïîçíà÷åíèé ÿê ëèøå äëÿ ÷èòàííÿ. ×è çãîäí³ âè çàì³íèòè öåé ôàéë?" -#: Merge.rc:2257 +#: Merge.rc:2237 #, c-format msgid "" "Another application has updated file\n" @@ -3726,22 +3651,22 @@ msgstr "" "\n" "Âè õî÷åòå ïåðåçàâàíòàæèòè ôàéë?" -#: Merge.rc:2258 +#: Merge.rc:2238 #, c-format msgid "Save Left File As" msgstr "Çáåðåãòè ôàéë ë³âîðó÷ ÿê..." -#: Merge.rc:2259 +#: Merge.rc:2239 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2240 #, c-format msgid "Save Right File As" msgstr "Çáåðåãòè ôàéë ïðàâîðó÷ ÿê..." -#: Merge.rc:2261 +#: Merge.rc:2241 #, c-format msgid "" "The file\n" @@ -3752,7 +3677,7 @@ msgstr "" "%1\n" "âèëó÷àºòüñÿ. Çáåðåæ³òü êîï³þ ôàéëó äëÿ ïðîäîâæåííÿ." -#: Merge.rc:2267 +#: Merge.rc:2247 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3763,42 +3688,42 @@ msgstr "" "\n" "Îíîâ³òü äîêóìåíòè ïåðåä ïðîäîâæåííÿì." -#: Merge.rc:2273 +#: Merge.rc:2253 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Ùîá ïðîäîâæèòè, Âè ìàºòå âêàçàòè øëÿõ äî ïðîåêòó SourceSafe (íàïðèêëàä: $/MyProject)" -#: Merge.rc:2274 +#: Merge.rc:2254 #, c-format msgid "Checkout files from VSS..." msgstr "Îòðèìóºìî ôàéëè ç VSS..." -#: Merge.rc:2275 +#: Merge.rc:2255 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåìà êîíòðîëþ âåðñ³é âèÿâèëà ïîìèëêó ïðè ñïðîá³ âçÿòè ôàéë ï³ä êîíòðîëü. Íåìà ìîæëèâîñò³ ïðîäîâæóâàòè..." -#: Merge.rc:2276 +#: Merge.rc:2256 #, c-format msgid "Error executing versioning system command." msgstr "Ïîìèëêà âèêîíàííÿ ñèñòåìíî¿ êîìàíäè Ñèñòåìè êîíòðîëþ âåðñ³é." -#: Merge.rc:2277 +#: Merge.rc:2257 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ðîáî÷à òåêà VSS ³ ðîçòàøóâàííÿ ì³ñöå ïîòî÷íîãî ôàéëó íå ñï³âïàäàþòü. Ïðîäîâæèòè ?" -#: Merge.rc:2278 +#: Merge.rc:2258 #, c-format msgid "No VSS database(s) found!" msgstr "Íå çíàéäåíà áàçà äàíèõ VSS!" -#: Merge.rc:2279 +#: Merge.rc:2259 #, c-format msgid "Error from VSS:" msgstr "Ïîìèëêà VSS:" -#: Merge.rc:2280 +#: Merge.rc:2260 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3809,7 +3734,7 @@ msgstr "" " Ïåðåâ³ðòå íàëàøòóâàííÿ.\n" " Ñêàñóâàòè ä³þ?" -#: Merge.rc:2281 +#: Merge.rc:2261 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3818,127 +3743,127 @@ msgstr "" "VSS çíàéøëà ïîìèëêó ïðè ñïðîá³ ñêàñóâàííÿ 䳿.\n" "Ïåðåâ³ðòå íàëàøòóâàííÿ. " -#: Merge.rc:2287 -#: Merge.rc:2608 +#: Merge.rc:2267 +#: Merge.rc:2588 #, c-format msgid "None" msgstr "Íåìà" -#: Merge.rc:2288 +#: Merge.rc:2268 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìåíøå, í³æ 5.0)" -#: Merge.rc:2289 +#: Merge.rc:2269 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ³ âèùå)" -#: Merge.rc:2291 +#: Merge.rc:2271 #, c-format msgid "Break at whitespace" msgstr "Ðîçáèâàòè çà ïðîïóñêàìè" -#: Merge.rc:2292 +#: Merge.rc:2272 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ðîçáèâàòè çà ïðîïóñêàìè ³ ñèìâîëàìè ïóíêòóàö³¿" -#: Merge.rc:2298 +#: Merge.rc:2278 #, c-format msgid "Right to Left (%1)" msgstr "Ñêîï³þâàòè íà ë³âó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â" -#: Merge.rc:2299 +#: Merge.rc:2279 #, c-format msgid "Left to Right (%1)" msgstr "Ñêîï³þâàòè íà ïðàâó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â" -#: Merge.rc:2300 +#: Merge.rc:2280 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Ñïðàâà ë³âîðó÷ (%1 ç %2)" -#: Merge.rc:2301 +#: Merge.rc:2281 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Çë³âà ïðàâîðó÷ (%1 ç %2)" -#: Merge.rc:2302 -#: Merge.rc:2317 +#: Merge.rc:2282 +#: Merge.rc:2297 #, c-format msgid "Left to... (%1)" msgstr "Çë³âà... (%1)" -#: Merge.rc:2303 -#: Merge.rc:2318 +#: Merge.rc:2283 +#: Merge.rc:2298 #, c-format msgid "Right to... (%1)" msgstr "Ñïðàâà... (%1)" -#: Merge.rc:2304 -#: Merge.rc:2319 +#: Merge.rc:2284 +#: Merge.rc:2299 #, c-format msgid "Left to... (%1 of %2)" msgstr "Çë³âà... (%1 ç %2)" -#: Merge.rc:2305 -#: Merge.rc:2320 +#: Merge.rc:2285 +#: Merge.rc:2300 #, c-format msgid "Right to... (%1 of %2)" msgstr "Ñïðàâà... (%1 ç %2)" -#: Merge.rc:2311 +#: Merge.rc:2291 #, c-format msgid "Left (%1)" msgstr "˳âîðó÷ (%1)" -#: Merge.rc:2312 +#: Merge.rc:2292 #, c-format msgid "Right (%1)" msgstr "Ïðàâîðó÷ (%1)" -#: Merge.rc:2313 +#: Merge.rc:2293 #, c-format msgid "Both (%1)" msgstr "Îáèäâà (%1)" -#: Merge.rc:2314 +#: Merge.rc:2294 #, c-format msgid "Left (%1 of %2)" msgstr "˳âîðó÷ (%1 ç %2)" -#: Merge.rc:2315 +#: Merge.rc:2295 #, c-format msgid "Right (%1 of %2)" msgstr "Ïðàâîðó÷ (%1 ç %2)" -#: Merge.rc:2316 +#: Merge.rc:2296 #, c-format msgid "Both (%1 of %2)" msgstr "Ðàçîì (%1 ç %2)" -#: Merge.rc:2321 +#: Merge.rc:2301 #, c-format msgid "Left side - select destination folder:" msgstr "˳âà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:" -#: Merge.rc:2322 +#: Merge.rc:2302 #, c-format msgid "Right side - select destination folder:" msgstr "Ïðàâà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:" -#: Merge.rc:2323 +#: Merge.rc:2303 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ôàéë³â îïðàöüîâàí³)" -#: Merge.rc:2324 +#: Merge.rc:2304 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ç %2 ôàéë³â îïðàöüîâàí³)" -#: Merge.rc:2330 +#: Merge.rc:2310 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3949,17 +3874,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2331 +#: Merge.rc:2311 #, c-format msgid "Are you sure you want to copy:" msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè:" -#: Merge.rc:2332 +#: Merge.rc:2312 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè %d åëåìåíò³â:" -#: Merge.rc:2333 +#: Merge.rc:2313 #, c-format msgid "" "Operation aborted!\n" @@ -3978,502 +3903,502 @@ msgstr "" "\n" "Îíîâ³òü ïîð³âíÿííÿ." -#: Merge.rc:2334 +#: Merge.rc:2314 #, c-format msgid "Are you sure you want to move:" msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè:" -#: Merge.rc:2335 +#: Merge.rc:2315 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè %d åëåìåíò³â:" -#: Merge.rc:2337 +#: Merge.rc:2317 #, c-format msgid "Confirm Move" msgstr "ϳäòâåðäæåííÿ ïåðåì³ùåííÿ" -#: Merge.rc:2338 +#: Merge.rc:2318 #, 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:2344 +#: Merge.rc:2324 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íåìîæëèâî âèêîíàòè %1" -#: Merge.rc:2350 +#: Merge.rc:2330 #, c-format msgid "Unknown archive format" msgstr "Íåâ³äîìèé ôîðìàò àðõ³âó" -#: Merge.rc:2356 +#: Merge.rc:2336 #, c-format msgid "Filename" msgstr "²ì'ÿ ôàéëó" -#: Merge.rc:2358 +#: Merge.rc:2338 #, c-format msgid "Comparison result" msgstr "Ðåçóëüòàò ïîð³âíÿííÿ" -#: Merge.rc:2359 +#: Merge.rc:2339 #, c-format msgid "Left Date" msgstr "Äàòà ë³âîðó÷" -#: Merge.rc:2360 +#: Merge.rc:2340 #, c-format msgid "Right Date" msgstr "Äàòà ïðàâîðó÷" -#: Merge.rc:2361 +#: Merge.rc:2341 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2342 #, c-format msgid "Extension" msgstr "Ðîçøèðåííÿ" -#: Merge.rc:2363 +#: Merge.rc:2343 #, c-format msgid "Left Size" msgstr "Ðîçì³ð ë³âîðó÷" -#: Merge.rc:2364 +#: Merge.rc:2344 #, c-format msgid "Right Size" msgstr "Ðîçì³ð ïðàâîðó÷" -#: Merge.rc:2365 +#: Merge.rc:2345 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2346 #, c-format msgid "Right Size (Short)" msgstr "Ðîçì³ð ïðàâîðó÷ (ñêîð.)" -#: Merge.rc:2367 +#: Merge.rc:2347 #, c-format msgid "Left Size (Short)" msgstr "Ðîçì³ð ë³âîðó÷ (ñêîð.)" -#: Merge.rc:2368 +#: Merge.rc:2348 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2354 #, c-format msgid "Left Creation Time" msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2375 +#: Merge.rc:2355 #, c-format msgid "Right Creation Time" msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2376 +#: Merge.rc:2356 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2357 #, c-format msgid "Newer File" msgstr "Íîâ³øèé ôàéë" -#: Merge.rc:2378 +#: Merge.rc:2358 #, c-format msgid "Left File Version" msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2379 +#: Merge.rc:2359 #, c-format msgid "Right File Version" msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2380 +#: Merge.rc:2360 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2361 #, c-format msgid "Short Result" msgstr "Ñïðîùåíèé ðåçóëüòàò" -#: Merge.rc:2382 +#: Merge.rc:2362 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòè ôàéëó ë³âîðó÷" -#: Merge.rc:2383 +#: Merge.rc:2363 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷" -#: Merge.rc:2384 +#: Merge.rc:2364 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2365 #, c-format msgid "Left EOL" msgstr "˳âå çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:2386 +#: Merge.rc:2366 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2367 #, c-format msgid "Right EOL" msgstr "Ïðàâå çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:2393 +#: Merge.rc:2373 #, c-format msgid "Left Encoding" msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2394 +#: Merge.rc:2374 #, c-format msgid "Right Encoding" msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2395 +#: Merge.rc:2375 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2376 #, c-format msgid "Ignored Diff." msgstr "Çíåõ. â³äì³ííîñò³" -#: Merge.rc:2404 +#: Merge.rc:2384 #, c-format msgid "Unable to compare files" msgstr "Íåìîæëèâî ïîð³âíÿòè ôàéëè" -#: Merge.rc:2405 +#: Merge.rc:2385 #, c-format msgid "Item aborted" msgstr "Ïîð³âíÿííÿ ïåðåðâàíå" -#: Merge.rc:2406 +#: Merge.rc:2386 #, c-format msgid "File skipped" msgstr "Ôàéë ïðîïóùåíèé" -#: Merge.rc:2407 +#: Merge.rc:2387 #, c-format msgid "Folder skipped" msgstr "Òåêà ïðîïóùåíà" -#: Merge.rc:2408 +#: Merge.rc:2388 #, c-format msgid "Left only: %1" msgstr "Ëèøå ë³âîðó÷: %1" -#: Merge.rc:2409 +#: Merge.rc:2389 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2390 #, c-format msgid "Right only: %1" msgstr "Ëèøå ïðàâîðó÷: %1" -#: Merge.rc:2411 +#: Merge.rc:2391 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2392 #, c-format msgid "Binary files are identical" msgstr "Á³íàðí³ ôàéëè íå ìàþòü â³äì³ííîñòåé" -#: Merge.rc:2414 +#: Merge.rc:2394 #, c-format msgid "Binary files are different" msgstr "Á³íàðí³ ôàéëè â³äð³çíÿþòüñÿ" -#: Merge.rc:2415 +#: Merge.rc:2395 #, c-format msgid "Files are different" msgstr "Ôàéëè â³äð³çíÿþòüñÿ" -#: Merge.rc:2416 +#: Merge.rc:2396 #, c-format msgid "Folders are different" msgstr "Òåêè ð³çí³" -#: Merge.rc:2417 +#: Merge.rc:2397 #, c-format msgid "Left Only" msgstr "Ëèøå ë³âîðó÷" -#: Merge.rc:2418 +#: Merge.rc:2398 #, c-format msgid "Right Only" msgstr "Ëèøå ïðàâîðó÷" -#: Merge.rc:2419 +#: Merge.rc:2399 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2400 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2401 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2402 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2404 #, c-format msgid "Error" msgstr "Ïîìèëêà" -#: Merge.rc:2425 +#: Merge.rc:2405 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâ³ ôàéëè îäíàêîâ³" -#: Merge.rc:2430 +#: Merge.rc:2410 #, c-format msgid "Text files are different" msgstr "Òåêñòîâ³ ôàéëè ð³çí³" -#: Merge.rc:2436 +#: Merge.rc:2416 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîéøëî ÷àñó: %ld ìñ" -#: Merge.rc:2437 +#: Merge.rc:2417 #, c-format msgid "1 item selected" msgstr "Âèáðàíèé 1 åëåìåíò" -#: Merge.rc:2438 +#: Merge.rc:2418 #, c-format msgid "%1 items selected" msgstr "Âèáðàí³ åëåìåíòè: %1" -#: Merge.rc:2444 +#: Merge.rc:2424 #, c-format msgid "Filename or folder name." msgstr "²ì'ÿ ôàéëó àáî òåêè" -#: Merge.rc:2445 +#: Merge.rc:2425 #, c-format msgid "Subfolder name when subfolders are included." msgstr "²ìåíà ï³äòåê, ÿêùî ï³äòåêè âêëþ÷åí³" -#: Merge.rc:2446 +#: Merge.rc:2426 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëüòàò ïîð³âíÿííÿ, äîâãà ôîðìà." -#: Merge.rc:2447 +#: Merge.rc:2427 #, c-format msgid "Left side modification date." msgstr "×àñ çì³íè ôàéëó ë³âîðó÷" -#: Merge.rc:2448 +#: Merge.rc:2428 #, c-format msgid "Right side modification date." msgstr "×àñ çì³íè ôàéëó ïðàâîðó÷" -#: Merge.rc:2449 +#: Merge.rc:2429 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2430 #, c-format msgid "File's extension." msgstr "Ðîçøèðåííÿ ôàéëó" -#: Merge.rc:2451 +#: Merge.rc:2431 #, c-format msgid "Left file size in bytes." msgstr "Ðîçì³ð ôàéëó ë³âîðó÷ ó áàéòàõ" -#: Merge.rc:2452 +#: Merge.rc:2432 #, c-format msgid "Right file size in bytes." msgstr "Ðîçì³ð ôàéëó ïðàâîðó÷ ó áàéòàõ" -#: Merge.rc:2453 +#: Merge.rc:2433 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2434 #, c-format msgid "Left file size abbreviated." msgstr "Ðîçì³ð ë³âîãî ôàéëó (ñêîð.)" -#: Merge.rc:2455 +#: Merge.rc:2435 #, c-format msgid "Right file size abbreviated." msgstr "Ðîçì³ð ïðàâîãî ôàéëó (ñêîð.)" -#: Merge.rc:2456 +#: Merge.rc:2436 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2442 #, c-format msgid "Left side creation time." msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2463 +#: Merge.rc:2443 #, c-format msgid "Right side creation time." msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2464 +#: Merge.rc:2444 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2445 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçàòè, ç ÿêî¿ ç³ ñòîð³í äàòà çì³íè ôàéëó íîâ³øà" -#: Merge.rc:2466 +#: Merge.rc:2446 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â." -#: Merge.rc:2467 +#: Merge.rc:2447 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â." -#: Merge.rc:2468 +#: Merge.rc:2448 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2449 #, c-format msgid "Short comparison result." msgstr "Ðåçóëüòàò øâèäêîãî ïîð³âíÿííÿ" -#: Merge.rc:2470 +#: Merge.rc:2450 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòè ôàéëó ë³âîðó÷" -#: Merge.rc:2471 +#: Merge.rc:2451 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷" -#: Merge.rc:2472 +#: Merge.rc:2452 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2453 #, c-format msgid "Left side file EOL type" msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ë³âîãî ôàéëó" -#: Merge.rc:2474 +#: Merge.rc:2454 #, c-format msgid "Right side file EOL type" msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ïðàâîãî ôàéëó" -#: Merge.rc:2475 +#: Merge.rc:2455 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2461 #, c-format msgid "Left side encoding." msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2482 +#: Merge.rc:2462 #, c-format msgid "Right side encoding." msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2483 +#: Merge.rc:2463 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2464 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ʳëüê³ñòü ³ãíîðîâàíèõ â³äì³ííîñòåé ó ôàéë³. Ö³ â³äì³ííîñò³ áóëè ³ãíîðîâàí³ WinMerge ³ íå ìîæóòü áóòè îïðàöüîâàí³." -#: Merge.rc:2485 +#: Merge.rc:2465 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ʳëüê³ñòü â³äì³ííîñòåé ó ôàéë³. ²ãíîðîâàí³ â³äì³ííîñò³ íå âðàõîâàí³." -#: Merge.rc:2486 +#: Merge.rc:2466 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàçàòè ç³ðî÷êó (*) ÿêùî ôàéë á³íàðíèé." -#: Merge.rc:2492 +#: Merge.rc:2472 #, c-format msgid "Compare %1 with %2" msgstr "Ïîð³âíÿííÿ %1 ç %2" -#: Merge.rc:2493 +#: Merge.rc:2473 #, c-format msgid "Comma-separated list" msgstr "Ñïèñîê, ðîçä³ëåíèé êîìàìè" -#: Merge.rc:2494 +#: Merge.rc:2474 #, c-format msgid "Tab-separated list" msgstr "Ñïèñîê, ðîçä³ëåíèé òàáóëÿòîðàìè" -#: Merge.rc:2495 +#: Merge.rc:2475 #, c-format msgid "Simple HTML" msgstr "Ïðîñòèé HTML" -#: Merge.rc:2496 +#: Merge.rc:2476 #, c-format msgid "Simple XML" msgstr "Ïðîñòèé XML" -#: Merge.rc:2498 +#: Merge.rc:2478 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéë çâ³òó âæå ³ñíóº. Ïåðåçàïèñàòè??" -#: Merge.rc:2499 +#: Merge.rc:2479 #, c-format msgid "" "Error creating the report:\n" @@ -4482,32 +4407,32 @@ msgstr "" "Ïîìèëêà ïðè ñòâîðåíí³ çâ³òó:\n" "%1" -#: Merge.rc:2500 +#: Merge.rc:2480 #, c-format msgid "The report has been created successfully." msgstr "Çâ³ò óñï³øíî ñòâîðåíèé" -#: Merge.rc:2506 +#: Merge.rc:2486 #, c-format msgid "The same file is opened in both panels." msgstr "Íà îáîõ ïàíåëÿõ â³äêðèòèé òîé ñàìèé ôàéë" -#: Merge.rc:2507 +#: Merge.rc:2487 #, c-format msgid "The selected files are identical." msgstr "Âèáðàí³ ôàéëè íå ìàþòü â³äì³ííîñòåé" -#: Merge.rc:2508 +#: Merge.rc:2488 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïðè ïîð³âíÿíí³ ôàéë³â âèíèêëà ïîìèëêà." -#: Merge.rc:2509 +#: Merge.rc:2489 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Òèì÷àñîâ³ ôàéëè íå ìîæóòü áóòè ñòâîðåí³. Ïåðåâ³ðòå íàëàøòóâàííÿ øëÿõ³â äëÿ òèì÷àñîâèõ ôàéë³â" -#: Merge.rc:2510 +#: Merge.rc:2490 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4522,17 +4447,17 @@ msgstr "" "\n" "Óâàãà: ßêùî âàñ íå ö³êàâëÿòü ðîçõîäæåííÿ â çàê³í÷åííÿõ ðÿäêà, íàëàøòóéòå îïö³þ 'Íåõòóâàòè ð³çíèöåþ â çàê³í÷åííÿõ ðÿäê³â' íà âêëàäö³ Ïîð³âíÿííÿ â Íàëàøòóâàííÿõ." -#: Merge.rc:2511 +#: Merge.rc:2491 #, c-format msgid "The selected folder is invalid." msgstr "Íåìîæëèâî â³äêðèòè âèáðàíó òåêó." -#: Merge.rc:2512 +#: Merge.rc:2492 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íåìîæëèâî â³äêðèòè á³íàðíèé ôàéë ó ðåäàêòîð³." -#: Merge.rc:2513 +#: Merge.rc:2493 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4547,7 +4472,7 @@ msgstr "" "%1\n" "ç ³íøî¿ ñòîðîíè ³ â³äêðèòè îáèäâ³?" -#: Merge.rc:2519 +#: Merge.rc:2499 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4558,152 +4483,152 @@ msgstr "" "Êîæíèé ç ôàéë³â ìîæå áóòè ïîêàçàíèé â ñâîºìó êîäóâàíí³, àëå ¿õíº çëèòòÿ àáî êîï³þâàííÿ ìîæå ïîøêîäèòè ³íôîðìàö³þ.\n" "Ïîêàçàòè îáèäâà ôàéëè â ñèñòåìíîìó êîäóâàíí³ (ðåêîìåíäóºòüñÿ)?" -#: Merge.rc:2520 +#: Merge.rc:2500 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "²íôîðìàö³ÿ âòðà÷åíà ÷åðåç ïîìèëêîâå êîäóâàííÿ: îáèäâà ôàéëè" -#: Merge.rc:2521 +#: Merge.rc:2501 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2502 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2503 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2509 #, c-format msgid "No difference" msgstr "Íåìà â³äì³ííîñòåé" -#: Merge.rc:2530 +#: Merge.rc:2510 #, c-format msgid "Line difference" msgstr "Ðÿäîê â³äì³ííîñòåé" -#: Merge.rc:2536 +#: Merge.rc:2516 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàì³íåíî %1 ðÿäê³â." -#: Merge.rc:2537 +#: Merge.rc:2517 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå âäàëîñÿ çíàéòè ðÿäîê \"%s\"" -#: Merge.rc:2543 +#: Merge.rc:2523 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2530 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2531 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2532 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2533 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2534 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2540 #, c-format msgid "Location Pane" msgstr "̳ñöÿ ðîçòàøóâàííÿ" -#: Merge.rc:2561 +#: Merge.rc:2541 #, c-format msgid "Diff Pane" msgstr "³äì³ííîñò³" -#: Merge.rc:2567 +#: Merge.rc:2547 #, c-format msgid "Patch file successfully written." msgstr "Ëàòêà óñï³øíî çàïèñàíà." -#: Merge.rc:2568 +#: Merge.rc:2548 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Åëåìåíò íå çíàéäåíèé àáî öå òåêà" -#: Merge.rc:2569 +#: Merge.rc:2549 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Åëåìåíò íå çíàéäåíèé àáî öå òåêà" -#: Merge.rc:2570 +#: Merge.rc:2550 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ëàòêà âæå ³ñíóº. Õî÷åòå ïåðåçàïèñàòè ¿¿?" -#: Merge.rc:2571 +#: Merge.rc:2551 #, c-format msgid "[%1 files selected]" msgstr "[%1 ôàéë³â âèáðàí³]" -#: Merge.rc:2572 +#: Merge.rc:2552 #, c-format msgid "Normal" msgstr "Íîðìàëüíèé" -#: Merge.rc:2573 +#: Merge.rc:2553 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2574 +#: Merge.rc:2554 #, c-format msgid "Unified" msgstr "Óí³ô³êîâàíèé" -#: Merge.rc:2576 +#: Merge.rc:2556 #, c-format msgid "Could not write to file %1." msgstr "Íåìà ìîæëèâîñò³ çàïèñàòè ó ôàéë %1." -#: Merge.rc:2577 +#: Merge.rc:2557 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Çàçíà÷åíèé øëÿõ äëÿ ê³íöåâîãî ôàéëó íå º àáñîëþòíèì: %1" -#: Merge.rc:2578 +#: Merge.rc:2558 #, c-format msgid "Specify an output file" msgstr "Âêàçàòè ê³íöåâèé ôàéë" -#: Merge.rc:2579 +#: Merge.rc:2559 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç á³íàðíèõ ôàéë³â" -#: Merge.rc:2580 +#: Merge.rc:2560 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç òåê" -#: Merge.rc:2581 +#: Merge.rc:2561 #, c-format msgid "" "Please save all files first.\n" @@ -4714,12 +4639,12 @@ msgstr "" "\n" "Ñòâîðåííÿ ëàòêè âèìàãàº, ùîá â ôàéëàõ íå áóëî íå çáåðåæåíèõ çì³í" -#: Merge.rc:2582 +#: Merge.rc:2562 #, c-format msgid "Folder does not exist." msgstr "Òåêà íå ³ñíóº" -#: Merge.rc:2587 +#: Merge.rc:2567 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4731,37 +4656,37 @@ msgstr "" "Íå çíàéäåí³ âñ³ íåîáõ³äí³ êîìïîíåíòè (7-zip ³/àáî Merge7z*.dll) . \n" "Ïîäèâ³òüñÿ ³íñòðóêö³þ, ùîá äîâ³äàòèñÿ á³ëüøå ïðî ï³äòðèìêó àðõ³â³â ³ ÿê ¿¿ ââ³ìêíóòè." -#: Merge.rc:2588 +#: Merge.rc:2568 #, c-format msgid "Select file for export" msgstr "Âèáðàòè ôàéë äëÿ åêñïîðòó" -#: Merge.rc:2589 +#: Merge.rc:2569 #, c-format msgid "Select file for import" msgstr "Âèáðàòè ôàéë äëÿ ³ìïîðòó" -#: Merge.rc:2590 +#: Merge.rc:2570 #, c-format msgid "Options imported from the file." msgstr "Îïö³¿, ³ìïîðòîâàí³ ç ôàéëó." -#: Merge.rc:2591 +#: Merge.rc:2571 #, c-format msgid "Options exported to the file." msgstr "Îïö³¿, åêñïîðòîâàí³ â ôàéë." -#: Merge.rc:2592 +#: Merge.rc:2572 #, c-format msgid "Failed to import options from the file." msgstr "Ïîìèëêà ³ìïîðòó îïö³é ç ôàéëó." -#: Merge.rc:2593 +#: Merge.rc:2573 #, c-format msgid "Failed to write options to the file." msgstr "Ïîìèëêà åêñïîðòó îïö³é â ôàéë." -#: Merge.rc:2594 +#: Merge.rc:2574 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4772,247 +4697,247 @@ msgstr "" "\n" "Ïðîäîâæèòè?" -#: Merge.rc:2603 +#: Merge.rc:2583 #, c-format msgid "Mixed" msgstr "̳øàíèé" -#: Merge.rc:2614 +#: Merge.rc:2594 #, c-format msgid "Type" msgstr "Òèï" -#: Merge.rc:2616 +#: Merge.rc:2596 #, c-format msgid "Unpacker" msgstr "Ðîçïàêóâàëüíèê" -#: Merge.rc:2617 +#: Merge.rc:2597 #, c-format msgid "Prediffer" msgstr "Íåõòóâà÷" -#: Merge.rc:2618 +#: Merge.rc:2598 #, c-format msgid "Editor script" msgstr "Ñöåíàð³é ðåäàêòîðà" -#: Merge.rc:2624 +#: Merge.rc:2604 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2605 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2606 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2612 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2613 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2614 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2615 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2616 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2617 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2618 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2619 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2620 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2621 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2622 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2623 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2624 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2625 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2631 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Àâòîìàòè÷íèé ï³äá³ð ðîçïàêóâàëüíèêà (âêàæ³òü ðîçøèðåííÿ õî÷à á îäíîãî ç ôàéë³â)" -#: Merge.rc:2652 +#: Merge.rc:2632 #, c-format msgid "No prediffer (normal)" msgstr "Áåç ïîïåðåäíüîãî ïîð³âíÿííÿ" -#: Merge.rc:2653 +#: Merge.rc:2633 #, c-format msgid "Suggested plugins" msgstr "Ðåêîìåíäîâàí³ äîïîâíåííÿ" -#: Merge.rc:2654 +#: Merge.rc:2634 #, c-format msgid "Other plugins" msgstr "²íø³ äîïîâíåííÿ" -#: Merge.rc:2660 +#: Merge.rc:2640 #, c-format msgid "Private Build: %1" msgstr "Ïðèâàòíèé á³ëä: %1" -#: Merge.rc:2661 +#: Merge.rc:2641 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2642 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2643 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2649 #, c-format msgid "Plugin Settings" msgstr "Íàëàøòóâàííÿ äîïîâíåííÿ" -#: Merge.rc:2671 +#: Merge.rc:2651 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå çíàéäåíèé - .sct ñöåíà𳿠âèìêíóò³" -#: Merge.rc:2672 +#: Merge.rc:2652 #, c-format msgid "" msgstr "<Íåìà>" -#: Merge.rc:2673 +#: Merge.rc:2653 #, c-format msgid "" msgstr "<Àâòîìàòè÷íî>" -#: Merge.rc:2679 +#: Merge.rc:2659 #, c-format msgid "G&oto Line %1" msgstr "Ïåðåéòè äî &ðÿäêà %1" -#: Merge.rc:2685 +#: Merge.rc:2665 #, c-format msgid "Disabled" msgstr "Âèìêíóòèé" -#: Merge.rc:2686 +#: Merge.rc:2666 #, c-format msgid "From file system" msgstr "ßê íà äèñêó" -#: Merge.rc:2687 +#: Merge.rc:2667 #, c-format msgid "From MRU list" msgstr "ßê â ñïèñêó íåùîäàâí³õ äîêóìåíò³â" -#: Merge.rc:2693 +#: Merge.rc:2673 #, c-format msgid "No Highlighting" msgstr "Íå ï³äñâ³÷óâàòè" -#: Merge.rc:2696 +#: Merge.rc:2676 #, c-format msgid "Batch" msgstr "Áåò÷" -#: Merge.rc:2712 +#: Merge.rc:2692 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2716 +#: Merge.rc:2696 #, c-format msgid "Resources" msgstr "Ðåñóðñè" -#: Merge.rc:2719 +#: Merge.rc:2699 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2730 +#: Merge.rc:2710 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2711 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2712 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2713 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2718 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2723 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" -- 2.11.0