diff options
Diffstat (limited to 'po/et.po')
| -rw-r--r-- | po/et.po | 1249 |
1 files changed, 675 insertions, 574 deletions
@@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-12-07 00:29+0300\n" "Last-Translator: Marek Laane <bald@starman.ee>\n" "Language-Team: Estonian <kde-et@linux.ee>\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Marek Laane" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "bald@starman.ee" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Lõikepuhvri andmete kirjutamine ajutisse faili ebaõnnestus." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Lõikepuhvrist" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -48,7 +49,7 @@ msgstr "" "\n" "Praegu lülitatakse eeltöötluse käsu rakendamine välja." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -62,7 +63,7 @@ msgstr "" "\n" "Praegu lülitatakse reasobivuse eeltöötluse käsu rakendamine välja." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -70,15 +71,15 @@ msgstr "" "Andmekaotuse viga:\n" "Kui see on korratav, võta palun ühendust autoriga.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Tõsine seesmine viga" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Ülarida" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Lõpp" @@ -94,244 +95,248 @@ msgstr "Viit: " msgid "Size. " msgstr "Suurus. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Kuupäev ja suurus: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "%1 ajutise koopia loomine ebaõnnestus-" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "%1 avamine ebaõnnestus." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Faili võrdlemine..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Viga %1 lugemisel" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nimi" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operatsioon" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Staatus" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Lahendamata" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Lahendatud" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Mitte-tühimärk" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Tühimärk" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine katkestada " -"ja kataloog uuesti läbi uurida?" +"Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine " +"katkestada ja kataloog uuesti läbi uurida?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 +#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 +msgid "Warning" +msgstr "" + +#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Uuri uuesti läbi" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Jätka ühendamist" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Kataloogide avamine ebaõnnestus:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Kataloogi A \"%1\" ei ole olemas või ei ole see kataloog.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Kataloogi A \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Kataloogi B \"%1\" ei ole olemas või ei ole see kataloog.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Kataloogi B \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Kataloogi C \"%1\" ei ole olemas või ei ole see kataloog.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Kataloogi C \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Kataloogi avamise viga" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Sihtkataloog ei saa kolme kataloogi ühendamisel olla sama, mis A või B.\n" "Kontrolli seda asja enne jätkamist." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameetri hoiatus" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Kataloogide läbiuurimine..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Kataloogi A lugemine" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Kataloogi B lugemine" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Kataloogi C lugemine" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Mõned alamkataloogid ei olnud loetavad:" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Kontrolli alamkataloogide õigusi." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Valmis." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Kataloogi võrdlemise olek" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Alamkataloogide arv:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Võrdsete failide arv:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Erinevate failide arv:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Käsitsiühendamiste arv:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "See mõjutab kõiki ühendamisoperatsioone." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Kõigi ühendamisoperatsioonide muutmine" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Jätka" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Töödeldakse " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Veel tegemata." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopeeri A->B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopeeri B->A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Kustuta A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Kustuta B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Ühenda A-sse" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Ühenda B-sse" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Ühenda A-sse ja B-sse" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Kustuta (kui on olemas)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Ühenda" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Ühenda (käsitsi)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Viga: failitüüpide vastuolu" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Viga: kuupäevad on samad, aga mitte failid." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "See operatsioon ei ole praegu võimalik." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operatsioon ei ole võimalik" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -345,42 +350,47 @@ msgstr "" "\n" "Kui sa tead, kuidas seda korrata, anna sellest teada rakenduse autorile." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Rakenduse viga" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Kopeerimisel tekkis viga.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Kopeerimisel tekkis viga.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 +#, fuzzy +msgid "Error" +msgstr "Viga." + +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Ühendamise viga" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Viga." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Tehtud." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Ei salvestatud." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Tundmatu ühendamisoperatsioon. (Seda ei peaks kunagi ette tulema!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Tundmatu ühendamisoperatsioon." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -393,333 +403,337 @@ msgid "" msgstr "" "Kohe algab ühendamine.\n" "\n" -"Vali \"Tee seda\", kui oled lugenud juhiseid ja tead täpselt, mida ette võtad.\n" +"Vali \"Tee seda\", kui oled lugenud juhiseid ja tead täpselt, mida ette " +"võtad.\n" "Vali \"Simuleeri\", kui soovid näha, mis juhtub.\n" "\n" "Arvesta, et rakendus on endiselt arendusjärgus ja pole MINGIT GARANTIID, et " "üldse midagi juhtub või et kõik õigesti juhtub! Tee kindlasti tähtsatest " "andmetest varukoopia!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Ühendamise alustamine" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Tee ära" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuleeri" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Esiletõstetud element on erinevates kataloogides erineva tüübiga. Otsusta, mida " -"teha." +"Esiletõstetud element on erinevates kataloogides erineva tüübiga. Otsusta, " +"mida teha." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Failide muutmise aeg on sama, aga failid ise mitte. Otsusta, mida teha." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "See operatsioon ei ole praegu võimalik, sest käib kataloogide ühendamine." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Viimasel sammul tekkis viga.\n" "Kas soovid jätkata elemendiga, mis vea põhjustas, või selle vahele jätta?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Jätka ühendamist pärast viga" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Jätka viimase elemendiga" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Jäta vahele" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Vahele jäetud." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Töös..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Ühendamisoperatsioon lõpetatud." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Ühendamine lõpetatud" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Ühendamise simulatsioon lõpetatud: märgi, kui oled pakutavate operatsioonidega " -"nõus." +"Ühendamise simulatsioon lõpetatud: märgi, kui oled pakutavate " +"operatsioonidega nõus." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Tekkis viga. Lähema info saamiseks klõpsa 'OK'.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Tekkis viga. Lähema info saamiseks klõpsa 'OK'.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Viga %1 kustutamisel: varukoopia loomine ebaõnnestus." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "kustuta kataloog rekursiivselt( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "kustuta( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Viga: kataloogi kustutamine ebaõnnestus juba kataloogi lugemise katsel." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Viga: operatsioon rmdir( %1 ) ebaõnnestus." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Viga: kustutamisoperatsioon ebaõnnestus." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "käsitsi ühendamine( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Märkus: pärast käsitsi ühendamist tuleks jätkata klahviga F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Viga: kopeeri( %1 -> %2) ebaõnnestus, sest olemasoleva sihtkoha kustutamine " "ebaõnnestus." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "kopeeri viit( %1 -> %2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Viga: viida kopeerimine ebaõnnestus, sest kaugviidad ei ole veel toetatud." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Viga: viida kopeerimine ebaõnnestus." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopeeri( %1 -> %2)" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Viga operatsioonil 'nimeta ümber( %1 -> %2)': olemasoleva sihtkoha kustutamine " -"ebaõnnestus." +"Viga operatsioonil 'nimeta ümber( %1 -> %2)': olemasoleva sihtkoha " +"kustutamine ebaõnnestus." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "nimeta ümber( %1 -> %2)" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Viga: ümbernimetamine ebaõnnestus." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Viga kataloogi %1 loomisel: olemasoleva faili kustutamine ebaõnnestus." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "loo kataloog( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Viga kataloogi loomisel." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Sihtkoht" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Kataloog" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tüüp" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Suurus" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atribuut" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Viimase muutmise aeg" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Viit-sihtkoht" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fail..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "pole kättesaadav" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (sihtkoht): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (baas): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (sihtkoht): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (sihtkoht): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Sihtkoht: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Kataloogi ühendamisoleku salvestamine..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Alusta/jätka kataloogi ühendamist" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Käivita operatsioon käesoleva elemendiga" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Võrdle valitud faili" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Ühenda praegune fail" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Ava kõik alamkataloogid" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Sule kõik alamkataloogid" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Vali A kõigile elementidele" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Vali B kõigile elementidele" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Vali C kõigile elementidele" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Automaatne valik kõigile elementidele" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Ei ühtki operatsiooni kõigile elementidele" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Näita identseid faile" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Näita erinevaid faile" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Näita ainult A faile" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Näita ainult B faile" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Näita ainult C faile" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Võrdle valitud faile" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Ühenda valitud failid" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ära tee midagi" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Ühenda A-sse ja B-sse" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -727,7 +741,7 @@ msgstr "" "Varukoopia tegemisel ebaõnnestus vanema varukoopia kustutamine. \n" "Faili nimi: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -735,427 +749,441 @@ msgstr "" "Varukoopia tegemisel ebaõnnestus ümbernimetamine. \n" "Failide nimed: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Faili staatuse hankimine: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Faili lugemine: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Faili kirjutamine: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Mälu napib" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Kataloogi loomine: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Kataloogi eemaldamine: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Faili eemaldamine: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Nimeviida loomine: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Faili ümbernimetamine: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Faili kopeerimine: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Viga faili kopeerimise operatsioonil: faili avamine lugemiseks ebaõnnestus. " "Failinimi: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Viga faili kopeerimise operatsioonil: faili avamine kirjutamiseks ebaõnnestus. " -"Failinimi: %1" +"Viga faili kopeerimise operatsioonil: faili avamine kirjutamiseks " +"ebaõnnestus. Failinimi: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Viga faili kopeerimise operatsioonil: lugemine ebaõnnestus. Failinimi: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Viga faili kopeerimise operatsioonil: kirjutamine ebaõnnestus. Failinimi: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Kataloogi lugemine: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Kataloogi uurimine: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Aktiivne seadistus:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Seadistusvõtme viga:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Kasutati võtit --atuo, kuid väljundfail pole määratud." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Kataloogide võrdlemisel ignoreeriti võtit --auto." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Salvestamine ebaõnnestus." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Nende failide avamine ebaõnnestus:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Viga faili avamisel" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Avab dokumendid võrdlemiseks..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salvestab ühendamise tulemuse. Kõik konfliktid peavad olema lahendatud!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Salvestab käesoleva dokumendi nimega..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Trükib erinevused" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Väljub rakendusest" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Valitud teksti lõikamine ja asetamine lõikepuhvrisse" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopeerib valitud lõigu lõikepuhvrisse" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Lõikepuhvri sisu asetamine praegusesse asukohta" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Kogu aktiivse akna sisu valimine" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Otsib stringi" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Otsib uuesti stringi" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Lülitab tööriistariba sisse/välja" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Lülitab staatusriba sisse/välja" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3 seadistamine..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Liigu praegusele erinevusele" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Liigu esimesele erinevusele" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Liigu viimasele erinevusele" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Jätab tühimärkide erinevused vahele, kui \"Tühimärkide näitamine\" ei ole " "sees.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(Tühimärkide erinevusi näidatakse isegi siis, kui \"Tühimärkide näitamine\" ei " -"ole sees.)" +"(Tühimärkide erinevusi näidatakse isegi siis, kui \"Tühimärkide näitamine\" " +"ei ole sees.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Liigu eelmisele erinevusele" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Liigu järgmisele erinevusele" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Liigu eelmisele konfliktile" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Liigu järgmisele konfliktile" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Liigu eelmisele lahendamata konfliktile" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Liigu järgmisele lahendamata konfliktile" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Vali rida/read A-st" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Vali rida/read B-st" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Vali rida/read C-st" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Pärast allikavalikut liigu automaatselt järgmisele lahendamata konfliktile" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Näita erinevusi tühiku- ja tabeldusmärkides" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Näita tühimärke" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Näita reanumbreid" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Vali A kõikjal" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Vali B kõikjal" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Vali C kõikjal" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Vali A kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Vali B kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Vali C kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Vali A kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Vali B kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Vali C kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Lahenda automaatselt lihtsad konfliktid" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Määra erinevused konfliktideks" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Käivita regulaaravaldis automaatühendamisel" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Lahenda automaatselt ajalookonfliktid" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Jaga erinevused valiku juures" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Ühenda valitud erinevused" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Näita akent A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Näita akent B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Näita akent C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokuseeri järgmisele aknale" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normaalne ülevaade" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A-B ülevaade" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A-C ülevaade" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B-C ülevaade" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Reamurdmine võrdlusakendes" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Lisa käsitsi samasus" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Eemalda kõik käsitsi määratud samasused" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokuseeri eelmisele aknale" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Lülita poolitamissuund" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Kataloogi ja teksti poolitamisvaade" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Lülita kataloogi- ja tekstivaadet" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Ühendamise tulemust pole salvestatud." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Salvesta ja välju" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Välju salvestamata" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Ühendamise tulemuse salvestamine ebaõnnestus." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Sul on parajasti käsil kataloogide ühendamine. Kas tõesti katkestada?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Faili salvestamine..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Faili salvestamine uue nimega..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Trükkimine..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Trükkimine katkestati" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Valik" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Trükkimine lõpetatud." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Väljumine..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Tööriistariba lülitamine..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Olekuriba lülitamine..." @@ -1170,11 +1198,12 @@ msgstr "KDiff3 komponent" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "KDiff3 komponenti ei õnnestunud leida!\n" -"Tavaliselt tähendab see paigaldusprobleemi. Palun loe lähtepaketi faili README." +"Tavaliselt tähendab see paigaldusprobleemi. Palun loe lähtepaketi faili " +"README." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1253,20 +1282,20 @@ msgstr "avatav fail3" msgid "Ignored. (User defined.)" msgstr "Ignoreeritakse (kasutaja määratud)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -"+ palju tänu kõigile, kes andsid teada vigadest ja pakkusid välja uusi mõtteid!" +"+ palju tänu kõigile, kes andsid teada vigadest ja pakkusid välja uusi " +"mõtteid!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Lahendamata konfliktide arv: %1 (neist %2 on tühimärgierinevused)" @@ -1278,55 +1307,30 @@ msgstr "" "Väljundit on muudetud.\n" "Kui jätkad, lähevad sinu muudatused kaotsi." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Kõik sisendfailid on binaarselt võrdsed." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Kõik sisendfailid sisaldavad ühesugust teksti." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Failid A ja B on binaarselt võrdsed.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Failid A ja B on ühesuguse tekstiga. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Failid A ja C on binaarselt võrdsed.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Failid A ja C on ühesuguse tekstiga. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Failid %1 ja %2 on binaarselt võrdsed.\n" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Failid B ja C on binaarselt võrdsed.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Failid A ja B on ühesuguse tekstiga. \n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Failid B ja C on ühesuguse tekstiga. \n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Konfliktide koguarv: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1334,7 +1338,7 @@ msgstr "" "\n" "Automaatselt lahendatud konfliktide arv: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1342,23 +1346,23 @@ msgstr "" "\n" "Lahendamata konfliktide arv: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konfliktid" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "<No src line>" msgstr "<Lähterida puudub>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "<Merge Conflict (Whitespace only)>" msgstr "<Ühendamise konflikt (ainult tühimärgid)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "<Merge Conflict>" msgstr "<Ühendamise konflikt>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1366,11 +1370,11 @@ msgstr "" "Kõik konfliktid pole veel lahendatud.\n" "Faili ei salvestatud.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Järelejäänud konfliktid" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1380,28 +1384,28 @@ msgstr "" "\n" "Varukoopia loomine ebaõnnestus. Faili ei salvestatud." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Faili salvestamise viga" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Kirjutamise viga." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Väljund" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Muudetud]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Kodeering salvestamisel" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Koodek" @@ -1421,6 +1425,15 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Muuda, kui mitte-ASCII sümboleid ei näidata korrektselt." +#: optiondialog.cpp:455 +#, fuzzy +msgid "Configure" +msgstr "Seadista..." + +#: optiondialog.cpp:510 +msgid "Font" +msgstr "" + #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Redaktori ja erinevuse väljundi font" @@ -1502,7 +1515,8 @@ msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -"Seda värvi muudetakse alles siis, kui alustad järgmist kataloogide võrdlemist." +"Seda värvi muudetakse alles siis, kui alustad järgmist kataloogide " +"võrdlemist." #: optiondialog.cpp:644 msgid "Oldest file color:" @@ -1545,10 +1559,8 @@ msgid "Auto indentation" msgstr "Automaatne taandus" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Sees: uuel real kasutatakse eelmise rea taandust.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Sees: uuel real kasutatakse eelmise rea taandust.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1582,61 +1594,54 @@ msgstr "ERinevused" msgid "Diff Settings" msgstr "Erinevuse seadistused" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Säilitatakse reavahetus" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Näidatakse kelgutagastusmärke '\\r', kui neid on.\n" -"See on abiks erinevatest operatsioonisüsteemidest pärit failide võrdlemisel." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ kommentaare käsitletakse tühimärkidena." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Numbreid ignoreeritakse" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Reasobivuse juures ignoreeritakse numbreid (sarnane tühimärkide " "ignoreerimisega).\n" "Võib olla abiks numbrilisi andmeid sisaldavate failide võrdlemisel." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "C/C++ kommentaare ignoreeritakse" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ kommentaare käsitletakse tühimärkidena." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Tõstu ignoreeritakse" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tõstuerinevusi käsitletakse tühimärgimuutustena. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Eeltöötluse käsk" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "Kasutaja määratud eeltöötlus (vaata lähemalt käsiraamatust)." -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Ridade sobivuse eeltöötluse käsk:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1644,11 +1649,11 @@ msgstr "" "Seda eeltöötlusvahendit kasutatakse ainult ridade sobivuse leidmisel\n" "(vaata lähemalt käsiraamatust)." -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Karm uurimine (aeglane)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1656,11 +1661,15 @@ msgstr "" "Lubab välise diff-rakenduse korral võtme --minimal.\n" "Suurte failide analüüs muutub palju aeglasemaks." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Ühendamise seadistused" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Automaatse edasiliikumise viivitus (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1668,39 +1677,35 @@ msgstr "" "Automaatse edasiliikumise režiimis näidatakse tulemust määratud aeg ning \n" "siis hüpatakse järgmisele konfliktile. Vahemik: 0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Ühendamise seadistused" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Tühimärkide käsitlemine kahe faili ühendamisel:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Käsitsivalik" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Lubab ühendamisalgoritmil ainult tühimärkides seisneva erinevuse korral " "automaatselt valida sisendi." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Tühimärkide käsitlemine kolme faili ühendamisel:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Automaatühendamise regulaaravaldis" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Automaatühendamise regulaaravaldis:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1711,12 +1716,12 @@ msgstr "" "Kui konflikti sisaldav rida sobib regulaaravaldisega, siis\n" "valitakse - kui võimalik - C, vastasel juhul B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Regulaarühendusega automaatühendamise käivitamine ühendamise alustamisel" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1724,15 +1729,15 @@ msgstr "" "Regulaarühendusega automaatühendamine käivitatakse\n" "kohe ühendamise alustamisel.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Versioonikonrolli ajaloo ühendamine" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Ajaloo alguse regulaaravaldis:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1742,39 +1747,41 @@ msgstr "" "Tavaliselt leidub seal real võtmesõna \"$Log$\".\n" "Vaikimisi: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Ajaloo kirje alguse regulaaravaldis:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Versioonikontrolli ajaloo kirje koosneb mitmest reast.\n" "Siin saab määrata esimese rea (ilma alustava kommentaarita) tuvastamiseks " "mõeldud regulaaravaldise.\n" "Sulgudega saab rühmitada võtmeid, mida tahad kasutada sortimiseks.\n" -"Kui see tühjaks jätta, eeldab KDiff3, et ajaloo kirjeid eraldavad tühjad read.\n" +"Kui see tühjaks jätta, eeldab KDiff3, et ajaloo kirjeid eraldavad tühjad " +"read.\n" "Täpsemalt räägib sellest käsiraamat." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Ajaloo ühendamise sortimine" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Versioonikontrolli ajaloo sortimine võtmete järgi." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Ajaloo sortimisvõtmete järjekord:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1790,25 +1797,34 @@ msgstr "" "Kui see tühjaks jätta, siis midagi ei sordita.\n" "Täpsemalt räägib sellest käsiraamat." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Versioonikontrolli ajaloo ühendamine ühendamise alustamisel" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" "Versioonikontrolli ajaloo automaatühendamise käivitamine kohe ühendamise " "alustamisel." -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Alamkataloogide arv:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Regulaaravaldiste test" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Ebaolulise ühendamise käsk:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1818,23 +1834,35 @@ msgstr "" "pärast automaatühendamist, kui muid muudatusi ei avastada.\n" "See kutsutakse välja parameetritega: failinimi1 failinimi2 failinimi3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Kataloogi ühendamine" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursiivsed kataloogid" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Kas analüüsida alamkatalooge või mitte." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Failimustrid:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1844,11 +1872,11 @@ msgstr "" "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Anti-failimustrid:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1858,11 +1886,11 @@ msgstr "" "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Anti-kataloogimustrid:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1872,11 +1900,11 @@ msgstr "" "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore kasutamine" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1884,23 +1912,23 @@ msgstr "" "Laiendab antimustrit kõigele, mida eiraks CVS.\n" "Kohalike \".cvsignore\" failide abil võib see olla kataloogipõhine." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Peidetud failide ja kataloogide otsimine" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Otsitakse peidetud faile ja katalooge." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Failide ja kataloogide otsimine, mille alguses seisab '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Failiviitade järgimine" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1908,11 +1936,11 @@ msgstr "" "Sees: võrreldakse faili, mille viit osutab.\n" "Väljas: võrreldakse viitu." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Kataloogiviitade järgimine" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1920,11 +1948,11 @@ msgstr "" "Sees: võrreldakse kataloogi, mille viit osutab.\n" "Väljas: võrreldakse viitu." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Tõstutundlik failinimede võrdlemine" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1935,23 +1963,23 @@ msgstr "" "Selle valiku sisselülitamisel peab sobima ka nimede tähesuurus (Windowsis on " "see vaikimisi välja lülitatud, muidu sees)." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Faili võrdlemise režiim" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binaarvõrdlus" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Iga faili binaarvõrdlus. (vaikimisi)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Täielik analüüs" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1959,25 +1987,47 @@ msgstr "" "Tehakse täielik analüüs, statistikat näidatakse lisaveergudes.\n" "(Aeglasem kui binaarvõrdlus ja eriti aeglane binaarfailide korral.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Muutmiskuupäeva usaldamine (ebaturvaline)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Eeldatakse, et failid on võrdsed, kui muutmiskuupäev ja failipikkus on " "võrdsed.\n" "Mõttekas suurte kataloogide või aeglase võrgu korral." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Eeldatakse, et failid on võrdsed, kui muutmiskuupäev ja failipikkus on " +"võrdsed.\n" +"Mõttekas suurte kataloogide või aeglase võrgu korral." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Suuruse usaldamine (ebaturvaline)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1987,11 +2037,11 @@ msgstr "" "Mõttekas suurte kataloogide või aeglase võrgu korral, kui kuupäev võib " "allalaadimise käigus olla muutunud." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Kataloogide sünkroniseerimine" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2001,11 +2051,11 @@ msgstr "" "nii et need näevad pärast seda välja ühesugused.\n" "Toimib ainult kahe kataloogi võrdlemisel ilma sihtkohta määramata." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Tühimärkide erinevust ei arvestata" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2013,11 +2063,11 @@ msgstr "" "Kui failid erinevad ainult tühimärkide poolest, peetakse neid võrdseks.\n" "See valik on aktiivne ainult täieliku analüüsi korral." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Ühendamise asemel kopeeritakse uuem (ebaturvaline)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2027,11 +2077,11 @@ msgstr "" "(Kasuta ainult siis, kui tead, mida teed!)\n" "Toimib ainult kahe kataloogi võrdlemisel." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Failidest tehakse varukoopia (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2039,15 +2089,15 @@ msgstr "" "Kui fail salvestatakse vana faili asemele, ei kustutata vana faili,\n" "vaid sellele antakse uus nimi laiendiga '.orig'." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Lokaale seadistused" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Keel (vajalik taaskäivitus)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2055,11 +2105,11 @@ msgstr "" "Vali GUI stringide keel või \"Auto\".\n" "Keele tegelikuks muutmiseks tuleb KDiff3 sulgeda ja uuesti käivitada." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Kõikjal kasutatakse kodeeringut:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2067,21 +2117,21 @@ msgstr "" "Lubab muuta kõiki kodeeringuid ainult esimest kodeeringut muutes.\n" "Kui vaja on erinevaid määratlusi, lülita välja." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Märkus: kohalik kodeering on " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "A kodeering:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Sisselülitamisel tuvastatakse Unicode (UTF-16 või UTF-8) kodeering.\n" "Kui faili kodeeringut ei tuvastata, kasutatakse selle asemel valitud " @@ -2089,27 +2139,27 @@ msgstr "" "(Unicode tuvastamine sõltub faili esimestest baitidest - baidijärjrekorra " "tähisest \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Unicode automaatne tuvastamine" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "B kodeering:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "C kodeering:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Kodeering ühendamisväljundil ja salvestamisel:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Automaatne valik" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2119,15 +2169,15 @@ msgstr "" "Kahtluse korral ilmub dialoog, mis laseb kasutajal valida salvestamisel " "kasutatava kodeeringu." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Eelprotsessori failide kodeering:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Paremalt-vasakule keeled" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2135,19 +2185,19 @@ msgstr "" "Mõningaid keeli loetakse ja kirjutatakse paremalt vasakule.\n" "Selle valikuga saab vastavalt muuta näitajat ja redaktorit." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integreerimine" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Integreerimisseadistused" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Ignoreeritavad käsurea võtmed:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2159,7 +2209,27 @@ msgstr "" "Mitme väärtuse andmisel tuleb need eraldada semikooloniga (;).\n" "See väldib vigu \"Tundmatu võti\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2175,19 +2245,19 @@ msgstr "" "\n" "Kas soovid jätkata või valid uue fondi?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Sobimatu font" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Jätkan oma riskil" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Valin uue fondi" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "See lähtestab kõik valikud, mitte ainult praeguse teema omad." @@ -2196,10 +2266,8 @@ msgid "PreprocessorCmd: " msgstr "Eeltöötluse käsk: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Järgmised valitud võimalused võivad muuta andmeid:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Järgmised valitud võimalused võivad muuta andmeid:\n" #: pdiff.cpp:264 msgid "" @@ -2264,15 +2332,8 @@ msgid "All input files contain the same text, but are not binary equal." msgstr "" "Kõik sisendfailid sisaldavad ühesugust teksti, aga pole binaarselt võrdsed." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Failid %1 ja %2 on binaarselt võrdsed.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Failid %1 ja %2 sisaldavad ühesugust teksti, aga pole binaarselt võrdsed. \n" @@ -2286,108 +2347,54 @@ msgstr "" "Arvesta, et KDiff3 ühendamine ei ole mõeldud binaarfailidele.\n" "Jätka oma riskil." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Katkesta" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Failide avamine..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Viga faili avamisel" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Valitud teksti lõikamine..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Valitud teksti kopeerimine lõikepuhvrisse..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Lõikepuhvri sisu sisestamine..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Salvesta ja jätka" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Jätka salvestamata" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Otsing lõpetatud." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Otsing lõpetatud" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Erinevuste sisendakendes pole midagi valitud." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Viga käsitsi määratud samasuse vahemiku lisamisel" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "KDiff&3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "KDiff3 seadistamine" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Kataloog" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Käesoleva elemendi ühendamisoperatsioon" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Käesoleva elemendi sünkroniseerimisoperatsioon" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Liikumine" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Võrdlus&evaade" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Ü&hendamine" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "Ake&n" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (baas):" @@ -2430,6 +2437,10 @@ msgstr "Väljund (lisavõimalus):" msgid "Configure..." msgstr "Seadista..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Otsitav tekst:" @@ -2506,6 +2517,14 @@ msgstr "" msgid "Sort key result:" msgstr "Sorteerimisvõtme tulemus:" +#: smalldialogs.cpp:493 +msgid "OK" +msgstr "" + +#: smalldialogs.cpp:497 +msgid "Cancel" +msgstr "" + #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Leiti sobivus." @@ -2517,3 +2536,85 @@ msgstr "Sobivust ei leitud." #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "Regulaaravaldises ei sobi alustavad ja lõpetavad sulud." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "KDiff&3" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "KDiff3 seadistamine" + +#: kdiff3_shell.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Fail..." + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "&Kataloog" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Käesoleva elemendi ühendamisoperatsioon" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Käesoleva elemendi sünkroniseerimisoperatsioon" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Liikumine" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Võrdlus&evaade" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Ü&hendamine" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "Ake&n" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Failid A ja B on binaarselt võrdsed.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Failid A ja C on binaarselt võrdsed.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Failid A ja C on ühesuguse tekstiga. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Failid B ja C on binaarselt võrdsed.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Failid B ja C on ühesuguse tekstiga. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Säilitatakse reavahetus" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Näidatakse kelgutagastusmärke '\\r', kui neid on.\n" +#~ "See on abiks erinevatest operatsioonisüsteemidest pärit failide " +#~ "võrdlemisel." |