|
|
|
|
# translation of kdiff3.po to Estonian
|
|
|
|
|
# Copyright (C) 2003 Free Software Foundation, Inc.
|
|
|
|
|
# Marek Laane <bald@starman.ee>, 2003-2006.
|
|
|
|
|
#
|
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: kdiff3\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:1
|
|
|
|
|
msgid ""
|
|
|
|
|
"_: NAME OF TRANSLATORS\n"
|
|
|
|
|
"Your names"
|
|
|
|
|
msgstr "Marek Laane"
|
|
|
|
|
|
|
|
|
|
#: _translatorinfo:2
|
|
|
|
|
msgid ""
|
|
|
|
|
"_: EMAIL OF TRANSLATORS\n"
|
|
|
|
|
"Your emails"
|
|
|
|
|
msgstr "bald@starman.ee"
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:247
|
|
|
|
|
msgid "Writing clipboard data to temp file failed."
|
|
|
|
|
msgstr "Lõikepuhvri andmete kirjutamine ajutisse faili ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:251
|
|
|
|
|
msgid "From Clipboard"
|
|
|
|
|
msgstr "Lõikepuhvrist"
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:493
|
|
|
|
|
msgid ""
|
|
|
|
|
"Preprocessing possibly failed. Check this command:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" %1\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The preprocessing command will be disabled now."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Eeltöötlus ilmselt ebaõnnestus. Kontrolli käsku:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" %1\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Praegu lülitatakse eeltöötluse käsu rakendamine välja."
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:528
|
|
|
|
|
msgid ""
|
|
|
|
|
"The line-matching-preprocessing possibly failed. Check this command:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" %1\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The line-matching-preprocessing command will be disabled now."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Reasobivuse eeltöötlus ilmselt ebaõnnestus. Kontrolli käsku:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" %1\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Praegu lülitatakse reasobivuse eeltöötluse käsu rakendamine välja."
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:1633 diff.cpp:1647
|
|
|
|
|
msgid ""
|
|
|
|
|
"Data loss error:\n"
|
|
|
|
|
"If it is reproducable please contact the author.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Andmekaotuse viga:\n"
|
|
|
|
|
"Kui see on korratav, võta palun ühendust autoriga.\n"
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:1635 diff.cpp:1649
|
|
|
|
|
msgid "Severe Internal Error"
|
|
|
|
|
msgstr "Tõsine seesmine viga"
|
|
|
|
|
|
|
|
|
|
#: difftextwindow.cpp:1644 kdiff3.cpp:772
|
|
|
|
|
msgid "Top line"
|
|
|
|
|
msgstr "Ülarida"
|
|
|
|
|
|
|
|
|
|
#: difftextwindow.cpp:1654
|
|
|
|
|
msgid "End"
|
|
|
|
|
msgstr "Lõpp"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:142
|
|
|
|
|
msgid "Mix of links and normal files."
|
|
|
|
|
msgstr "Viitade ja tavafailide segu."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:149
|
|
|
|
|
msgid "Link: "
|
|
|
|
|
msgstr "Viit: "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:157
|
|
|
|
|
msgid "Size. "
|
|
|
|
|
msgstr "Suurus. "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:170 directorymergewindow.cpp:180
|
|
|
|
|
msgid "Date & Size: "
|
|
|
|
|
msgstr "Kuupäev ja suurus: "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:190 directorymergewindow.cpp:196
|
|
|
|
|
msgid "Creating temp copy of %1 failed."
|
|
|
|
|
msgstr "%1 ajutise koopia loomine ebaõnnestus-"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:207 directorymergewindow.cpp:215
|
|
|
|
|
msgid "Opening %1 failed."
|
|
|
|
|
msgstr "%1 avamine ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:219
|
|
|
|
|
msgid "Comparing file..."
|
|
|
|
|
msgstr "Faili võrdlemine..."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:233 directorymergewindow.cpp:239
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Error reading from %1"
|
|
|
|
|
msgstr "Viga %1 lugemisel"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:297
|
|
|
|
|
msgid "Name"
|
|
|
|
|
msgstr "Nimi"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:301
|
|
|
|
|
msgid "Operation"
|
|
|
|
|
msgstr "Operatsioon"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:302
|
|
|
|
|
msgid "Status"
|
|
|
|
|
msgstr "Staatus"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:303
|
|
|
|
|
msgid "Unsolved"
|
|
|
|
|
msgstr "Lahendamata"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:304
|
|
|
|
|
msgid "Solved"
|
|
|
|
|
msgstr "Lahendatud"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:305
|
|
|
|
|
msgid "Nonwhite"
|
|
|
|
|
msgstr "Mitte-tühimärk"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:306
|
|
|
|
|
msgid "White"
|
|
|
|
|
msgstr "Tühimärk"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:334
|
|
|
|
|
msgid ""
|
|
|
|
|
"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?"
|
|
|
|
|
|
|
|
|
|
#: 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:335 kdiff3.cpp:622 pdiff.cpp:981
|
|
|
|
|
msgid "Continue Merging"
|
|
|
|
|
msgstr "Jätka ühendamist"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:507
|
|
|
|
|
msgid "Opening of directories failed:"
|
|
|
|
|
msgstr "Kataloogide avamine ebaõnnestus:"
|
|
|
|
|
|
|
|
|
|
#: 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: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: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:518
|
|
|
|
|
msgid "Directory Open Error"
|
|
|
|
|
msgstr "Kataloogi avamise viga"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:526
|
|
|
|
|
msgid ""
|
|
|
|
|
"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:528
|
|
|
|
|
msgid "Parameter Warning"
|
|
|
|
|
msgstr "Parameetri hoiatus"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:533
|
|
|
|
|
msgid "Scanning directories..."
|
|
|
|
|
msgstr "Kataloogide läbiuurimine..."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:582
|
|
|
|
|
msgid "Reading Directory A"
|
|
|
|
|
msgstr "Kataloogi A lugemine"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:604
|
|
|
|
|
msgid "Reading Directory B"
|
|
|
|
|
msgstr "Kataloogi B lugemine"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:626
|
|
|
|
|
msgid "Reading Directory C"
|
|
|
|
|
msgstr "Kataloogi C lugemine"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:652
|
|
|
|
|
msgid "Some subdirectories were not readable in"
|
|
|
|
|
msgstr "Mõned alamkataloogid ei olnud loetavad:"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:657
|
|
|
|
|
msgid "Check the permissions of the subdirectories."
|
|
|
|
|
msgstr "Kontrolli alamkataloogide õigusi."
|
|
|
|
|
|
|
|
|
|
#: 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:705
|
|
|
|
|
msgid "Directory Comparison Status"
|
|
|
|
|
msgstr "Kataloogi võrdlemise olek"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:706
|
|
|
|
|
msgid "Number of subdirectories:"
|
|
|
|
|
msgstr "Alamkataloogide arv:"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:707
|
|
|
|
|
msgid "Number of equal files:"
|
|
|
|
|
msgstr "Võrdsete failide arv:"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:708
|
|
|
|
|
msgid "Number of different files:"
|
|
|
|
|
msgstr "Erinevate failide arv:"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:711
|
|
|
|
|
msgid "Number of manual merges:"
|
|
|
|
|
msgstr "Käsitsiühendamiste arv:"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:867
|
|
|
|
|
msgid "This affects all merge operations."
|
|
|
|
|
msgstr "See mõjutab kõiki ühendamisoperatsioone."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:868
|
|
|
|
|
msgid "Changing All Merge Operations"
|
|
|
|
|
msgstr "Kõigi ühendamisoperatsioonide muutmine"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287
|
|
|
|
|
msgid "C&ontinue"
|
|
|
|
|
msgstr "&Jätka"
|
|
|
|
|
|
|
|
|
|
#: 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:1710 directorymergewindow.cpp:1716
|
|
|
|
|
msgid "To do."
|
|
|
|
|
msgstr "Veel tegemata."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961
|
|
|
|
|
msgid "Copy A to B"
|
|
|
|
|
msgstr "Kopeeri A->B"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962
|
|
|
|
|
msgid "Copy B to A"
|
|
|
|
|
msgstr "Kopeeri B->A"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963
|
|
|
|
|
msgid "Delete A"
|
|
|
|
|
msgstr "Kustuta A"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964
|
|
|
|
|
msgid "Delete B"
|
|
|
|
|
msgstr "Kustuta B"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1823
|
|
|
|
|
msgid "Delete A & B"
|
|
|
|
|
msgstr "Kustuta A ja B"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966
|
|
|
|
|
msgid "Merge to A"
|
|
|
|
|
msgstr "Ühenda A-sse"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967
|
|
|
|
|
msgid "Merge to B"
|
|
|
|
|
msgstr "Ühenda B-sse"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1826
|
|
|
|
|
msgid "Merge to A & B"
|
|
|
|
|
msgstr "Ühenda A-sse ja B-sse"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958
|
|
|
|
|
msgid "Delete (if exists)"
|
|
|
|
|
msgstr "Kustuta (kui on olemas)"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832
|
|
|
|
|
#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102
|
|
|
|
|
msgid "Merge"
|
|
|
|
|
msgstr "Ühenda"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832
|
|
|
|
|
msgid "Merge (manual)"
|
|
|
|
|
msgstr "Ühenda (käsitsi)"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1833
|
|
|
|
|
msgid "Error: Conflicting File Types"
|
|
|
|
|
msgstr "Viga: failitüüpide vastuolu"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1834
|
|
|
|
|
msgid "Error: Dates are equal but files are not."
|
|
|
|
|
msgstr "Viga: kuupäevad on samad, aga mitte failid."
|
|
|
|
|
|
|
|
|
|
#: 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:1861 directorymergewindow.cpp:1890
|
|
|
|
|
#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172
|
|
|
|
|
msgid "Operation Not Possible"
|
|
|
|
|
msgstr "Operatsioon ei ole võimalik"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1954
|
|
|
|
|
msgid ""
|
|
|
|
|
"This should never happen: \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"mergeResultSaved: m_pMFI=0\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If you know how to reproduce this, please contact the program author."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Seda ei peaks kunagi juhtuma: \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"mergeResultSaved: m_pMFI=0\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Kui sa tead, kuidas seda korrata, anna sellest teada rakenduse autorile."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1954
|
|
|
|
|
msgid "Program Error"
|
|
|
|
|
msgstr "Rakenduse viga"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1965
|
|
|
|
|
msgid "An error occurred while copying.\n"
|
|
|
|
|
msgstr "Kopeerimisel tekkis viga.\n"
|
|
|
|
|
|
|
|
|
|
#: 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:1971 directorymergewindow.cpp:2377
|
|
|
|
|
msgid "Error."
|
|
|
|
|
msgstr "Viga."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268
|
|
|
|
|
#: directorymergewindow.cpp:2308
|
|
|
|
|
msgid "Done."
|
|
|
|
|
msgstr "Tehtud."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1999
|
|
|
|
|
msgid "Not saved."
|
|
|
|
|
msgstr "Ei salvestatud."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2034
|
|
|
|
|
msgid "Unknown merge operation. (This must never happen!)"
|
|
|
|
|
msgstr "Tundmatu ühendamisoperatsioon. (Seda ei peaks kunagi ette tulema!)"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2066
|
|
|
|
|
msgid "Unknown merge operation."
|
|
|
|
|
msgstr "Tundmatu ühendamisoperatsioon."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2081
|
|
|
|
|
msgid ""
|
|
|
|
|
"The merge is about to begin.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Choose \"Do it\" if you have read the instructions and know what you are "
|
|
|
|
|
"doing.\n"
|
|
|
|
|
"Choosing \"Simulate it\" will tell you what would happen.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Be aware that this program still has beta status and there is NO WARRANTY "
|
|
|
|
|
"whatsoever! Make backups of your vital data!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kohe algab ühendamine.\n"
|
|
|
|
|
"\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:2086
|
|
|
|
|
msgid "Starting Merge"
|
|
|
|
|
msgstr "Ühendamise alustamine"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2086
|
|
|
|
|
msgid "Do It"
|
|
|
|
|
msgstr "Tee ära"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2086
|
|
|
|
|
msgid "Simulate It"
|
|
|
|
|
msgstr "Simuleeri"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2112
|
|
|
|
|
msgid ""
|
|
|
|
|
"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."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2121
|
|
|
|
|
msgid ""
|
|
|
|
|
"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:2172
|
|
|
|
|
msgid ""
|
|
|
|
|
"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: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?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Viimasel sammul tekkis viga.\n"
|
|
|
|
|
"Kas soovid jätkata elemendiga, mis vea põhjustas, või selle vahele jätta?"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2234
|
|
|
|
|
msgid "Continue merge after an error"
|
|
|
|
|
msgstr "Jätka ühendamist pärast viga"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2234
|
|
|
|
|
msgid "Continue With Last Item"
|
|
|
|
|
msgstr "Jätka viimase elemendiga"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2234
|
|
|
|
|
msgid "Skip Item"
|
|
|
|
|
msgstr "Jäta vahele"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2268
|
|
|
|
|
msgid "Skipped."
|
|
|
|
|
msgstr "Vahele jäetud."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501
|
|
|
|
|
msgid "In progress..."
|
|
|
|
|
msgstr "Töös..."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2323
|
|
|
|
|
msgid "Merge operation complete."
|
|
|
|
|
msgstr "Ühendamisoperatsioon lõpetatud."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326
|
|
|
|
|
msgid "Merge Complete"
|
|
|
|
|
msgstr "Ühendamine lõpetatud"
|
|
|
|
|
|
|
|
|
|
#: 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."
|
|
|
|
|
|
|
|
|
|
#: 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:2414
|
|
|
|
|
msgid "Error: While deleting %1: Creating backup failed."
|
|
|
|
|
msgstr "Viga %1 kustutamisel: varukoopia loomine ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2421
|
|
|
|
|
msgid "delete directory recursively( %1 )"
|
|
|
|
|
msgstr "kustuta kataloog rekursiivselt( %1 )"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2423
|
|
|
|
|
msgid "delete( %1 )"
|
|
|
|
|
msgstr "kustuta( %1 )"
|
|
|
|
|
|
|
|
|
|
#: 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:2457
|
|
|
|
|
msgid "Error: rmdir( %1 ) operation failed."
|
|
|
|
|
msgstr "Viga: operatsioon rmdir( %1 ) ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2467
|
|
|
|
|
msgid "Error: delete operation failed."
|
|
|
|
|
msgstr "Viga: kustutamisoperatsioon ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2493
|
|
|
|
|
msgid "manual merge( %1, %2, %3 -> %4)"
|
|
|
|
|
msgstr "käsitsi ühendamine( %1, %2, %3 -> %4)"
|
|
|
|
|
|
|
|
|
|
#: 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: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:2529
|
|
|
|
|
msgid "copyLink( %1 -> %2 )"
|
|
|
|
|
msgstr "kopeeri viit( %1 -> %2)"
|
|
|
|
|
|
|
|
|
|
#: 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:2546
|
|
|
|
|
msgid "Error: copyLink failed."
|
|
|
|
|
msgstr "Viga: viida kopeerimine ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2566
|
|
|
|
|
msgid "copy( %1 -> %2 )"
|
|
|
|
|
msgstr "kopeeri( %1 -> %2)"
|
|
|
|
|
|
|
|
|
|
#: 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."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2598
|
|
|
|
|
msgid "rename( %1 -> %2 )"
|
|
|
|
|
msgstr "nimeta ümber( %1 -> %2)"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2607
|
|
|
|
|
msgid "Error: Rename failed."
|
|
|
|
|
msgstr "Viga: ümbernimetamine ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: 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:2641
|
|
|
|
|
msgid "makeDir( %1 )"
|
|
|
|
|
msgstr "loo kataloog( %1 )"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2651
|
|
|
|
|
msgid "Error while creating directory."
|
|
|
|
|
msgstr "Viga kataloogi loomisel."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787
|
|
|
|
|
msgid "Dest"
|
|
|
|
|
msgstr "Sihtkoht"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712
|
|
|
|
|
msgid "Dir"
|
|
|
|
|
msgstr "Kataloog"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2679
|
|
|
|
|
msgid "Type"
|
|
|
|
|
msgstr "Tüüp"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2680
|
|
|
|
|
msgid "Size"
|
|
|
|
|
msgstr "Suurus"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2681
|
|
|
|
|
msgid "Attr"
|
|
|
|
|
msgstr "Atribuut"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2682
|
|
|
|
|
msgid "Last Modification"
|
|
|
|
|
msgstr "Viimase muutmise aeg"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2683
|
|
|
|
|
msgid "Link-Destination"
|
|
|
|
|
msgstr "Viit-sihtkoht"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2712
|
|
|
|
|
#, fuzzy
|
|
|
|
|
msgid "File"
|
|
|
|
|
msgstr "Fail..."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2729
|
|
|
|
|
msgid "not available"
|
|
|
|
|
msgstr "pole kättesaadav"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2749
|
|
|
|
|
msgid "A (Dest): "
|
|
|
|
|
msgstr "A (sihtkoht): "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2752
|
|
|
|
|
msgid "A (Base): "
|
|
|
|
|
msgstr "A (baas): "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2758
|
|
|
|
|
msgid "B (Dest): "
|
|
|
|
|
msgstr "B (sihtkoht): "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2766
|
|
|
|
|
msgid "C (Dest): "
|
|
|
|
|
msgstr "C (sihtkoht): "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2772
|
|
|
|
|
msgid "Dest: "
|
|
|
|
|
msgstr "Sihtkoht: "
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2837
|
|
|
|
|
msgid "Save Directory Merge State As..."
|
|
|
|
|
msgstr "Kataloogi ühendamisoleku salvestamine..."
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2924
|
|
|
|
|
msgid "Start/Continue Directory Merge"
|
|
|
|
|
msgstr "Alusta/jätka kataloogi ühendamist"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2925
|
|
|
|
|
msgid "Run Operation for Current Item"
|
|
|
|
|
msgstr "Käivita operatsioon käesoleva elemendiga"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2926
|
|
|
|
|
msgid "Compare Selected File"
|
|
|
|
|
msgstr "Võrdle valitud faili"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2927
|
|
|
|
|
msgid "Merge Current File"
|
|
|
|
|
msgstr "Ühenda praegune fail"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2928
|
|
|
|
|
msgid "Fold All Subdirs"
|
|
|
|
|
msgstr "Ava kõik alamkataloogid"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2929
|
|
|
|
|
msgid "Unfold All Subdirs"
|
|
|
|
|
msgstr "Sule kõik alamkataloogid"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2933
|
|
|
|
|
msgid "Choose A for All Items"
|
|
|
|
|
msgstr "Vali A kõigile elementidele"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2934
|
|
|
|
|
msgid "Choose B for All Items"
|
|
|
|
|
msgstr "Vali B kõigile elementidele"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2935
|
|
|
|
|
msgid "Choose C for All Items"
|
|
|
|
|
msgstr "Vali C kõigile elementidele"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2936
|
|
|
|
|
msgid "Auto-Choose Operation for All Items"
|
|
|
|
|
msgstr "Automaatne valik kõigile elementidele"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2937
|
|
|
|
|
msgid "No Operation for All Items"
|
|
|
|
|
msgstr "Ei ühtki operatsiooni kõigile elementidele"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2942
|
|
|
|
|
msgid "Show Identical Files"
|
|
|
|
|
msgstr "Näita identseid faile"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2943
|
|
|
|
|
msgid "Show Different Files"
|
|
|
|
|
msgstr "Näita erinevaid faile"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2944
|
|
|
|
|
msgid "Show Files only in A"
|
|
|
|
|
msgstr "Näita ainult A faile"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2945
|
|
|
|
|
msgid "Show Files only in B"
|
|
|
|
|
msgstr "Näita ainult B faile"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2946
|
|
|
|
|
msgid "Show Files only in C"
|
|
|
|
|
msgstr "Näita ainult C faile"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2950
|
|
|
|
|
msgid "Compare Explicitly Selected Files"
|
|
|
|
|
msgstr "Võrdle valitud faile"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2951
|
|
|
|
|
msgid "Merge Explicitly Selected Files"
|
|
|
|
|
msgstr "Ühenda valitud failid"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960
|
|
|
|
|
msgid "Do Nothing"
|
|
|
|
|
msgstr "Ära tee midagi"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2954
|
|
|
|
|
msgid "A"
|
|
|
|
|
msgstr "A"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2955
|
|
|
|
|
msgid "B"
|
|
|
|
|
msgstr "B"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2956
|
|
|
|
|
msgid "C"
|
|
|
|
|
msgstr "C"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2965
|
|
|
|
|
msgid "Delete A && B"
|
|
|
|
|
msgstr "Kustuta A ja B"
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2968
|
|
|
|
|
msgid "Merge to A && B"
|
|
|
|
|
msgstr "Ühenda A-sse ja B-sse"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:599
|
|
|
|
|
msgid ""
|
|
|
|
|
"While trying to make a backup, deleting an older backup failed. \n"
|
|
|
|
|
"Filename: "
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Varukoopia tegemisel ebaõnnestus vanema varukoopia kustutamine. \n"
|
|
|
|
|
"Faili nimi: "
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:606
|
|
|
|
|
msgid ""
|
|
|
|
|
"While trying to make a backup, renaming failed. \n"
|
|
|
|
|
"Filenames: "
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Varukoopia tegemisel ebaõnnestus ümbernimetamine. \n"
|
|
|
|
|
"Failide nimed: "
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:628
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Getting file status: %1"
|
|
|
|
|
msgstr "Faili staatuse hankimine: %1"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:671
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Reading file: %1"
|
|
|
|
|
msgstr "Faili lugemine: %1"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:707
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Writing file: %1"
|
|
|
|
|
msgstr "Faili kirjutamine: %1"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:735
|
|
|
|
|
msgid "Out of memory"
|
|
|
|
|
msgstr "Mälu napib"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:770
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Making directory: %1"
|
|
|
|
|
msgstr "Kataloogi loomine: %1"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:790
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing directory: %1"
|
|
|
|
|
msgstr "Kataloogi eemaldamine: %1"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:805
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing file: %1"
|
|
|
|
|
msgstr "Faili eemaldamine: %1"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:821
|
|
|
|
|
msgid "Creating symbolic link: %1 -> %2"
|
|
|
|
|
msgstr "Nimeviida loomine: %1 -> %2"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:851
|
|
|
|
|
msgid "Renaming file: %1 -> %2"
|
|
|
|
|
msgstr "Faili ümbernimetamine: %1 -> %2"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:887
|
|
|
|
|
msgid "Copying file: %1 -> %2"
|
|
|
|
|
msgstr "Faili kopeerimine: %1 -> %2"
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:901
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"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:907
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Error during file copy operation: Opening file for writing failed. Filename: "
|
|
|
|
|
"%1"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Viga faili kopeerimise operatsioonil: faili avamine kirjutamiseks "
|
|
|
|
|
"ebaõnnestus. Failinimi: %1"
|
|
|
|
|
|
|
|
|
|
#: 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: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:1218
|
|
|
|
|
msgid "Reading directory: "
|
|
|
|
|
msgstr "Kataloogi lugemine: "
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:1347
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Listing directory: %1"
|
|
|
|
|
msgstr "Kataloogi uurimine: %1"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:145
|
|
|
|
|
msgid "Current Configuration:"
|
|
|
|
|
msgstr "Aktiivne seadistus:"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:150
|
|
|
|
|
msgid "Config Option Error:"
|
|
|
|
|
msgstr "Seadistusvõtme viga:"
|
|
|
|
|
|
|
|
|
|
#: 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:331
|
|
|
|
|
msgid "Option --auto ignored for directory comparison."
|
|
|
|
|
msgstr "Kataloogide võrdlemisel ignoreeriti võtit --auto."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:367
|
|
|
|
|
msgid "Saving failed."
|
|
|
|
|
msgstr "Salvestamine ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123
|
|
|
|
|
msgid "Opening of these files failed:"
|
|
|
|
|
msgstr "Nende failide avamine ebaõnnestus:"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:411
|
|
|
|
|
msgid "File Open Error"
|
|
|
|
|
msgstr "Viga faili avamisel"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:434
|
|
|
|
|
msgid "Opens documents for comparison..."
|
|
|
|
|
msgstr "Avab dokumendid võrdlemiseks..."
|
|
|
|
|
|
|
|
|
|
#: 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:441
|
|
|
|
|
msgid "Saves the current document as..."
|
|
|
|
|
msgstr "Salvestab käesoleva dokumendi nimega..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:443
|
|
|
|
|
msgid "Print the differences"
|
|
|
|
|
msgstr "Trükib erinevused"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:445
|
|
|
|
|
msgid "Quits the application"
|
|
|
|
|
msgstr "Väljub rakendusest"
|
|
|
|
|
|
|
|
|
|
#: 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:449
|
|
|
|
|
msgid "Copies the selected section to the clipboard"
|
|
|
|
|
msgstr "Kopeerib valitud lõigu lõikepuhvrisse"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:451
|
|
|
|
|
msgid "Pastes the clipboard contents to actual position"
|
|
|
|
|
msgstr "Lõikepuhvri sisu asetamine praegusesse asukohta"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:453
|
|
|
|
|
msgid "Select everything in current window"
|
|
|
|
|
msgstr "Kogu aktiivse akna sisu valimine"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:455
|
|
|
|
|
msgid "Search for a string"
|
|
|
|
|
msgstr "Otsib stringi"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:457
|
|
|
|
|
msgid "Search again for the string"
|
|
|
|
|
msgstr "Otsib uuesti stringi"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:459
|
|
|
|
|
msgid "Enables/disables the toolbar"
|
|
|
|
|
msgstr "Lülitab tööriistariba sisse/välja"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:461
|
|
|
|
|
msgid "Enables/disables the statusbar"
|
|
|
|
|
msgstr "Lülitab staatusriba sisse/välja"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:465
|
|
|
|
|
msgid "Configure KDiff3..."
|
|
|
|
|
msgstr "KDiff3 seadistamine..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:486
|
|
|
|
|
msgid "Go to Current Delta"
|
|
|
|
|
msgstr "Liigu praegusele erinevusele"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:487
|
|
|
|
|
msgid "Go to First Delta"
|
|
|
|
|
msgstr "Liigu esimesele erinevusele"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:488
|
|
|
|
|
msgid "Go to Last Delta"
|
|
|
|
|
msgstr "Liigu viimasele erinevusele"
|
|
|
|
|
|
|
|
|
|
#: 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: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.)"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:491
|
|
|
|
|
msgid "Go to Previous Delta"
|
|
|
|
|
msgstr "Liigu eelmisele erinevusele"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:493
|
|
|
|
|
msgid "Go to Next Delta"
|
|
|
|
|
msgstr "Liigu järgmisele erinevusele"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:495
|
|
|
|
|
msgid "Go to Previous Conflict"
|
|
|
|
|
msgstr "Liigu eelmisele konfliktile"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:497
|
|
|
|
|
msgid "Go to Next Conflict"
|
|
|
|
|
msgstr "Liigu järgmisele konfliktile"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:499
|
|
|
|
|
msgid "Go to Previous Unsolved Conflict"
|
|
|
|
|
msgstr "Liigu eelmisele lahendamata konfliktile"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:501
|
|
|
|
|
msgid "Go to Next Unsolved Conflict"
|
|
|
|
|
msgstr "Liigu järgmisele lahendamata konfliktile"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:503
|
|
|
|
|
msgid "Select Line(s) From A"
|
|
|
|
|
msgstr "Vali rida/read A-st"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:504
|
|
|
|
|
msgid "Select Line(s) From B"
|
|
|
|
|
msgstr "Vali rida/read B-st"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:505
|
|
|
|
|
msgid "Select Line(s) From C"
|
|
|
|
|
msgstr "Vali rida/read C-st"
|
|
|
|
|
|
|
|
|
|
#: 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:508
|
|
|
|
|
msgid "Show Space && Tabulator Characters for Differences"
|
|
|
|
|
msgstr "Näita erinevusi tühiku- ja tabeldusmärkides"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:509
|
|
|
|
|
msgid "Show White Space"
|
|
|
|
|
msgstr "Näita tühimärke"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:511
|
|
|
|
|
msgid "Show Line Numbers"
|
|
|
|
|
msgstr "Näita reanumbreid"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:512
|
|
|
|
|
msgid "Choose A Everywhere"
|
|
|
|
|
msgstr "Vali A kõikjal"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:513
|
|
|
|
|
msgid "Choose B Everywhere"
|
|
|
|
|
msgstr "Vali B kõikjal"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:514
|
|
|
|
|
msgid "Choose C Everywhere"
|
|
|
|
|
msgstr "Vali C kõikjal"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:515
|
|
|
|
|
msgid "Choose A for All Unsolved Conflicts"
|
|
|
|
|
msgstr "Vali A kõigi lahendamata konfliktide korral"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:516
|
|
|
|
|
msgid "Choose B for All Unsolved Conflicts"
|
|
|
|
|
msgstr "Vali B kõigi lahendamata konfliktide korral"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:517
|
|
|
|
|
msgid "Choose C for All Unsolved Conflicts"
|
|
|
|
|
msgstr "Vali C kõigi lahendamata konfliktide korral"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:518
|
|
|
|
|
msgid "Choose A for All Unsolved Whitespace Conflicts"
|
|
|
|
|
msgstr "Vali A kõigi lahendamata tühimärgikonkfliktide korral"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:519
|
|
|
|
|
msgid "Choose B for All Unsolved Whitespace Conflicts"
|
|
|
|
|
msgstr "Vali B kõigi lahendamata tühimärgikonkfliktide korral"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:520
|
|
|
|
|
msgid "Choose C for All Unsolved Whitespace Conflicts"
|
|
|
|
|
msgstr "Vali C kõigi lahendamata tühimärgikonkfliktide korral"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:521
|
|
|
|
|
msgid "Automatically Solve Simple Conflicts"
|
|
|
|
|
msgstr "Lahenda automaatselt lihtsad konfliktid"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:522
|
|
|
|
|
msgid "Set Deltas to Conflicts"
|
|
|
|
|
msgstr "Määra erinevused konfliktideks"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:523
|
|
|
|
|
msgid "Run Regular Expression Auto Merge"
|
|
|
|
|
msgstr "Käivita regulaaravaldis automaatühendamisel"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:524
|
|
|
|
|
msgid "Automatically Solve History Conflicts"
|
|
|
|
|
msgstr "Lahenda automaatselt ajalookonfliktid"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:525
|
|
|
|
|
msgid "Split Diff At Selection"
|
|
|
|
|
msgstr "Jaga erinevused valiku juures"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:526
|
|
|
|
|
msgid "Join Selected Diffs"
|
|
|
|
|
msgstr "Ühenda valitud erinevused"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:528
|
|
|
|
|
msgid "Show Window A"
|
|
|
|
|
msgstr "Näita akent A"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:529
|
|
|
|
|
msgid "Show Window B"
|
|
|
|
|
msgstr "Näita akent B"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:530
|
|
|
|
|
msgid "Show Window C"
|
|
|
|
|
msgstr "Näita akent C"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:531 kdiff3.cpp:542
|
|
|
|
|
msgid "Focus Next Window"
|
|
|
|
|
msgstr "Fokuseeri järgmisele aknale"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:533
|
|
|
|
|
msgid "Normal Overview"
|
|
|
|
|
msgstr "Normaalne ülevaade"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:534
|
|
|
|
|
msgid "A vs. B Overview"
|
|
|
|
|
msgstr "A-B ülevaade"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:535
|
|
|
|
|
msgid "A vs. C Overview"
|
|
|
|
|
msgstr "A-C ülevaade"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:536
|
|
|
|
|
msgid "B vs. C Overview"
|
|
|
|
|
msgstr "B-C ülevaade"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:537
|
|
|
|
|
msgid "Word Wrap Diff Windows"
|
|
|
|
|
msgstr "Reamurdmine võrdlusakendes"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:538
|
|
|
|
|
msgid "Add Manual Diff Alignment"
|
|
|
|
|
msgstr "Lisa käsitsi samasus"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:539
|
|
|
|
|
msgid "Clear All Manual Diff Alignments"
|
|
|
|
|
msgstr "Eemalda kõik käsitsi määratud samasused"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:544
|
|
|
|
|
msgid "Focus Prev Window"
|
|
|
|
|
msgstr "Fokuseeri eelmisele aknale"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:545
|
|
|
|
|
msgid "Toggle Split Orientation"
|
|
|
|
|
msgstr "Lülita poolitamissuund"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:547
|
|
|
|
|
msgid "Dir && Text Split Screen View"
|
|
|
|
|
msgstr "Kataloogi ja teksti poolitamisvaade"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:549
|
|
|
|
|
msgid "Toggle Between Dir && Text View"
|
|
|
|
|
msgstr "Lülita kataloogi- ja tekstivaadet"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:601 pdiff.cpp:1723
|
|
|
|
|
msgid "The merge result hasn't been saved."
|
|
|
|
|
msgstr "Ühendamise tulemust pole salvestatud."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:602
|
|
|
|
|
msgid "Save && Quit"
|
|
|
|
|
msgstr "Salvesta ja välju"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:602
|
|
|
|
|
msgid "Quit Without Saving"
|
|
|
|
|
msgstr "Välju salvestamata"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:610 pdiff.cpp:1732
|
|
|
|
|
msgid "Saving the merge result failed."
|
|
|
|
|
msgstr "Ühendamise tulemuse salvestamine ebaõnnestus."
|
|
|
|
|
|
|
|
|
|
#: 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:622
|
|
|
|
|
msgid "Quit"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:644
|
|
|
|
|
msgid "Saving file..."
|
|
|
|
|
msgstr "Faili salvestamine..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:661
|
|
|
|
|
msgid "Saving file with a new filename..."
|
|
|
|
|
msgstr "Faili salvestamine uue nimega..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:663
|
|
|
|
|
msgid "Save As..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:751
|
|
|
|
|
msgid "Printing..."
|
|
|
|
|
msgstr "Trükkimine..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:757 kdiff3.cpp:919
|
|
|
|
|
msgid "Printing aborted."
|
|
|
|
|
msgstr "Trükkimine katkestati"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:889
|
|
|
|
|
msgid "Selection"
|
|
|
|
|
msgstr "Valik"
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:915
|
|
|
|
|
msgid "Printing completed."
|
|
|
|
|
msgstr "Trükkimine lõpetatud."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:925
|
|
|
|
|
msgid "Exiting..."
|
|
|
|
|
msgstr "Väljumine..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:937
|
|
|
|
|
msgid "Toggling toolbar..."
|
|
|
|
|
msgstr "Tööriistariba lülitamine..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:958
|
|
|
|
|
msgid "Toggle the statusbar..."
|
|
|
|
|
msgstr "Olekuriba lülitamine..."
|
|
|
|
|
|
|
|
|
|
#: kdiff3_part.cpp:155 kdiff3_part.cpp:224
|
|
|
|
|
msgid "Couldn't find files for comparison."
|
|
|
|
|
msgstr "Faile võrdlemiseks ei leitud."
|
|
|
|
|
|
|
|
|
|
#: kdiff3_part.cpp:291
|
|
|
|
|
msgid "KDiff3Part"
|
|
|
|
|
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."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"KDiff3 komponenti ei õnnestunud leida!\n"
|
|
|
|
|
"Tavaliselt tähendab see paigaldusprobleemi. Palun loe lähtepaketi faili "
|
|
|
|
|
"README."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:35
|
|
|
|
|
msgid "Tool for Comparison and Merge of Files and Directories"
|
|
|
|
|
msgstr "Failide ja kataloogide võrdlemise ning ühendamise vahend"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:40
|
|
|
|
|
msgid "Merge the input."
|
|
|
|
|
msgstr "Liidab sisendi."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:42
|
|
|
|
|
msgid "Explicit base file. For compatibility with certain tools."
|
|
|
|
|
msgstr "Konkreetne põhifail (ühilduvuseks teatud tööriistadega)."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:44
|
|
|
|
|
msgid "Output file. Implies -m. E.g.: -o newfile.txt"
|
|
|
|
|
msgstr "Väljundfail. Eeldab -m. Nt. -o usfail.txt"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:45
|
|
|
|
|
msgid "Output file, again. (For compatibility with certain tools.)"
|
|
|
|
|
msgstr "Taas väljundfail (ühilduvuseks teatud tööriistadega)"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:46
|
|
|
|
|
msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)"
|
|
|
|
|
msgstr "GUI puudub, kui kõik konfliktid lahenevad ise (vajalik on -o fail)"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:47
|
|
|
|
|
msgid "Don't solve conflicts automatically. (For compatibility...)"
|
|
|
|
|
msgstr "Konflikte ei lahendata automaatselt (jälle ühilduvuse nimel...)"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:48
|
|
|
|
|
msgid "Visible name replacement for input file 1 (base)."
|
|
|
|
|
msgstr "Nähtava nime asendus sisendfailile 1 (baas)."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:49
|
|
|
|
|
msgid "Visible name replacement for input file 2."
|
|
|
|
|
msgstr "Nähtava nime asendus sisendfailile 2."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:50
|
|
|
|
|
msgid "Visible name replacement for input file 3."
|
|
|
|
|
msgstr "Nähtava nime asendus sisendfailile 3."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:52
|
|
|
|
|
msgid "Alternative visible name replacement. Supply this once for every input."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Nähtava nime alternatiivne asendus. See tuleb anda kord iga sisendi jaoks."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:53
|
|
|
|
|
msgid ""
|
|
|
|
|
"Override a config setting. Use once for every setting. E.g.: --cs "
|
|
|
|
|
"\"AutoAdvance=1\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Seadistusvõtme tühistamine. Tuleb kasutada iga võtme jaoks eraldi, nt. --cs "
|
|
|
|
|
"\"AutoAdvance=1\""
|
|
|
|
|
|
|
|
|
|
#: main.cpp:54
|
|
|
|
|
msgid "Show list of config settings and current values."
|
|
|
|
|
msgstr "Seadistuste nimekirja ja võtmete kehtivate väärtuste näitamine."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:55
|
|
|
|
|
msgid "Use a different config file."
|
|
|
|
|
msgstr "Muu seadistustefaili kasutamine."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:59
|
|
|
|
|
msgid "file1 to open (base, if not specified via --base)"
|
|
|
|
|
msgstr "avatav fail1 (põhifail, kui --base teisiti ei määra)"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:60
|
|
|
|
|
msgid "file2 to open"
|
|
|
|
|
msgstr "avatav fail2"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:61
|
|
|
|
|
msgid "file3 to open"
|
|
|
|
|
msgstr "avatav fail3"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:93
|
|
|
|
|
msgid "Ignored. (User defined.)"
|
|
|
|
|
msgstr "Ignoreeritakse (kasutaja määratud)"
|
|
|
|
|
|
|
|
|
|
#: kdiff3_part.rc:16 main.cpp:173
|
|
|
|
|
#, no-c-format
|
|
|
|
|
msgid "KDiff3"
|
|
|
|
|
msgstr "KDiff3"
|
|
|
|
|
|
|
|
|
|
#: 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!"
|
|
|
|
|
|
|
|
|
|
#: 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)"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:285
|
|
|
|
|
msgid ""
|
|
|
|
|
"The output has been modified.\n"
|
|
|
|
|
"If you continue your changes will be lost."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Väljundit on muudetud.\n"
|
|
|
|
|
"Kui jätkad, lähevad sinu muudatused kaotsi."
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:808 pdiff.cpp:511
|
|
|
|
|
msgid "All input files are binary equal."
|
|
|
|
|
msgstr "Kõik sisendfailid on binaarselt võrdsed."
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:810
|
|
|
|
|
msgid "All input files contain the same text."
|
|
|
|
|
msgstr "Kõik sisendfailid sisaldavad ühesugust teksti."
|
|
|
|
|
|
|
|
|
|
#: 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: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:823
|
|
|
|
|
msgid "Total number of conflicts: "
|
|
|
|
|
msgstr "Konfliktide koguarv: "
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:824
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Nr of automatically solved conflicts: "
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Automaatselt lahendatud konfliktide arv: "
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:825
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Nr of unsolved conflicts: "
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Lahendamata konfliktide arv: "
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:827
|
|
|
|
|
msgid "Conflicts"
|
|
|
|
|
msgstr "Konfliktid"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:1691
|
|
|
|
|
msgid "<No src line>"
|
|
|
|
|
msgstr "<Lähterida puudub>"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:1699
|
|
|
|
|
msgid "<Merge Conflict (Whitespace only)>"
|
|
|
|
|
msgstr "<Ühendamise konflikt (ainult tühimärgid)>"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
|
|
|
|
|
msgid "<Merge Conflict>"
|
|
|
|
|
msgstr "<Ühendamise konflikt>"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2677
|
|
|
|
|
msgid ""
|
|
|
|
|
"Not all conflicts are solved yet.\n"
|
|
|
|
|
"File not saved.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kõik konfliktid pole veel lahendatud.\n"
|
|
|
|
|
"Faili ei salvestatud.\n"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2679
|
|
|
|
|
msgid "Conflicts Left"
|
|
|
|
|
msgstr "Järelejäänud konfliktid"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2691
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Creating backup failed. File not saved."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Varukoopia loomine ebaõnnestus. Faili ei salvestatud."
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730
|
|
|
|
|
msgid "File Save Error"
|
|
|
|
|
msgstr "Faili salvestamise viga"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2730
|
|
|
|
|
msgid "Error while writing."
|
|
|
|
|
msgstr "Kirjutamise viga."
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3061
|
|
|
|
|
msgid "Output"
|
|
|
|
|
msgstr "Väljund"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180
|
|
|
|
|
msgid "[Modified]"
|
|
|
|
|
msgstr "[Muudetud]"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3080
|
|
|
|
|
msgid "Encoding for saving"
|
|
|
|
|
msgstr "Kodeering salvestamisel"
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122
|
|
|
|
|
#: mergeresultwindow.cpp:3128
|
|
|
|
|
msgid "Codec from"
|
|
|
|
|
msgstr "Koodek"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:362
|
|
|
|
|
msgid "Unicode, 8 bit"
|
|
|
|
|
msgstr "Unicode (8-bitine)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:363
|
|
|
|
|
msgid "Unicode"
|
|
|
|
|
msgstr "Unicode"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:364
|
|
|
|
|
msgid "Latin1"
|
|
|
|
|
msgstr "Latin1"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:383
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:531
|
|
|
|
|
msgid "Italic font for deltas"
|
|
|
|
|
msgstr "Kaldkiri erinevustele"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:534
|
|
|
|
|
msgid ""
|
|
|
|
|
"Selects the italic version of the font for differences.\n"
|
|
|
|
|
"If the font doesn't support italic characters, then this does nothing."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Valib fondi kaldkirjaversiooni erinevuste näitamiseks.\n"
|
|
|
|
|
"Kui font ei toeta kaldkirja, ei tee midagi."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:542
|
|
|
|
|
msgid "Color"
|
|
|
|
|
msgstr "Värv"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:542
|
|
|
|
|
msgid "Colors Settings"
|
|
|
|
|
msgstr "Värviseadistused"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:556
|
|
|
|
|
msgid "Editor and Diff Views:"
|
|
|
|
|
msgstr "Redaktori ja erinevuse vaated:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:564
|
|
|
|
|
msgid "Foreground color:"
|
|
|
|
|
msgstr "Esiplaani värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:570
|
|
|
|
|
msgid "Background color:"
|
|
|
|
|
msgstr "Tausta värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:578
|
|
|
|
|
msgid "Diff background color:"
|
|
|
|
|
msgstr "Erinevuse tausta värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:585
|
|
|
|
|
msgid "Color A:"
|
|
|
|
|
msgstr "Värv A:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:592
|
|
|
|
|
msgid "Color B:"
|
|
|
|
|
msgstr "Värv B:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:599
|
|
|
|
|
msgid "Color C:"
|
|
|
|
|
msgstr "Värv C:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:605
|
|
|
|
|
msgid "Conflict color:"
|
|
|
|
|
msgstr "Konflikti värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:612
|
|
|
|
|
msgid "Current range background color:"
|
|
|
|
|
msgstr "Praeguse vahemiku tausta värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:619
|
|
|
|
|
msgid "Current range diff background color:"
|
|
|
|
|
msgstr "Praeguse vahemiku erinevuse tausta värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:625
|
|
|
|
|
msgid "Color for manually aligned difference ranges:"
|
|
|
|
|
msgstr "Käsitsi määratud samasuse vahemiku värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:630
|
|
|
|
|
msgid "Directory Comparison View:"
|
|
|
|
|
msgstr "Kataloogi võrdlemise vaade:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:636
|
|
|
|
|
msgid "Newest file color:"
|
|
|
|
|
msgstr "Uusima faili värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:639
|
|
|
|
|
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."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:644
|
|
|
|
|
msgid "Oldest file color:"
|
|
|
|
|
msgstr "Vanima faili värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:651
|
|
|
|
|
msgid "Middle age file color:"
|
|
|
|
|
msgstr "Keskmise vanusega faili värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:658
|
|
|
|
|
msgid "Color for missing files:"
|
|
|
|
|
msgstr "Puuduvate failide värv:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:670
|
|
|
|
|
msgid "Editor"
|
|
|
|
|
msgstr "Redaktor"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:670
|
|
|
|
|
msgid "Editor Behavior"
|
|
|
|
|
msgstr "Redaktori käitumine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:680
|
|
|
|
|
msgid "Tab inserts spaces"
|
|
|
|
|
msgstr "TAB lisab tühikud"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:683
|
|
|
|
|
msgid ""
|
|
|
|
|
"On: Pressing tab generates the appropriate number of spaces.\n"
|
|
|
|
|
"Off: A Tab-character will be inserted."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Sees: TAB klahvi vajutamine tekitab sobiva hulga tühikuid.\n"
|
|
|
|
|
"Väljas: lisatakse tabeldusmärk."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:689
|
|
|
|
|
msgid "Tab size:"
|
|
|
|
|
msgstr "TABi suurus:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:694
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:701
|
|
|
|
|
msgid "Auto copy selection"
|
|
|
|
|
msgstr "Valiku automaatne kopeerimine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:704
|
|
|
|
|
msgid ""
|
|
|
|
|
"On: Any selection is immediately written to the clipboard.\n"
|
|
|
|
|
"Off: You must explicitely copy e.g. via Ctrl-C."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Sees: iga valik asetatakse otsekohe lõikepuhvrisse.\n"
|
|
|
|
|
"Väljas: kopeerimiseks tuleb anda selge käsk, nt. CTRL+C."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:709
|
|
|
|
|
msgid "Line end style:"
|
|
|
|
|
msgstr "Realõpu stiil:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:721
|
|
|
|
|
msgid ""
|
|
|
|
|
"Sets the line endings for when an edited file is saved.\n"
|
|
|
|
|
"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Määrab realõpu stiili redigeeritud faili salvestamisel.\n"
|
|
|
|
|
"DOS/Windows: CR+LF; Unix: LF; sealjuures CR=0D, LF=0A"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:732
|
|
|
|
|
msgid "Diff"
|
|
|
|
|
msgstr "ERinevused"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:732
|
|
|
|
|
msgid "Diff Settings"
|
|
|
|
|
msgstr "Erinevuse seadistused"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:750
|
|
|
|
|
#, fuzzy
|
|
|
|
|
msgid "Treat as white space."
|
|
|
|
|
msgstr "C/C++ kommentaare käsitletakse tühimärkidena."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:752
|
|
|
|
|
msgid "Ignore numbers"
|
|
|
|
|
msgstr "Numbreid ignoreeritakse"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:755
|
|
|
|
|
msgid ""
|
|
|
|
|
"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:760
|
|
|
|
|
msgid "Ignore C/C++ comments"
|
|
|
|
|
msgstr "C/C++ kommentaare ignoreeritakse"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:762
|
|
|
|
|
msgid "Treat C/C++ comments like white space."
|
|
|
|
|
msgstr "C/C++ kommentaare käsitletakse tühimärkidena."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:766
|
|
|
|
|
msgid "Ignore case"
|
|
|
|
|
msgstr "Tõstu ignoreeritakse"
|
|
|
|
|
|
|
|
|
|
#: 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:773
|
|
|
|
|
msgid "Preprocessor command:"
|
|
|
|
|
msgstr "Eeltöötluse käsk"
|
|
|
|
|
|
|
|
|
|
#: 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:780
|
|
|
|
|
msgid "Line-matching preprocessor command:"
|
|
|
|
|
msgstr "Ridade sobivuse eeltöötluse käsk:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:784
|
|
|
|
|
msgid ""
|
|
|
|
|
"This pre-processor is only used during line matching.\n"
|
|
|
|
|
"(See the docs for details.)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Seda eeltöötlusvahendit kasutatakse ainult ridade sobivuse leidmisel\n"
|
|
|
|
|
"(vaata lähemalt käsiraamatust)."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:787
|
|
|
|
|
msgid "Try hard (slower)"
|
|
|
|
|
msgstr "Karm uurimine (aeglane)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:790
|
|
|
|
|
msgid ""
|
|
|
|
|
"Enables the --minimal option for the external diff.\n"
|
|
|
|
|
"The analysis of big files will be much slower."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Lubab välise diff-rakenduse korral võtme --minimal.\n"
|
|
|
|
|
"Suurte failide analüüs muutub palju aeglasemaks."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:800
|
|
|
|
|
msgid "Merge Settings"
|
|
|
|
|
msgstr "Ühendamise seadistused"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:813
|
|
|
|
|
msgid "Auto advance delay (ms):"
|
|
|
|
|
msgstr "Automaatse edasiliikumise viivitus (ms):"
|
|
|
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
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:823
|
|
|
|
|
msgid "White space 2-file merge default:"
|
|
|
|
|
msgstr "Tühimärkide käsitlemine kahe faili ühendamisel:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:827 optiondialog.cpp:840
|
|
|
|
|
msgid "Manual Choice"
|
|
|
|
|
msgstr "Käsitsivalik"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:831 optiondialog.cpp:845
|
|
|
|
|
msgid ""
|
|
|
|
|
"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:836
|
|
|
|
|
msgid "White space 3-file merge default:"
|
|
|
|
|
msgstr "Tühimärkide käsitlemine kolme faili ühendamisel:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:850
|
|
|
|
|
msgid "Automatic Merge Regular Expression"
|
|
|
|
|
msgstr "Automaatühendamise regulaaravaldis"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:859 smalldialogs.cpp:397
|
|
|
|
|
msgid "Auto merge regular expression:"
|
|
|
|
|
msgstr "Automaatühendamise regulaaravaldis:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:863
|
|
|
|
|
msgid ""
|
|
|
|
|
"Regular expression for lines where KDiff3 should automatically choose one "
|
|
|
|
|
"source.\n"
|
|
|
|
|
"When a line with a conflict matches the regular expression then\n"
|
|
|
|
|
"- if available - C, otherwise B will be chosen."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Regulaaravaldis ridadele, kus KDiff3 peab automaatselt valima ühe allika.\n"
|
|
|
|
|
"Kui konflikti sisaldav rida sobib regulaaravaldisega, siis\n"
|
|
|
|
|
"valitakse - kui võimalik - C, vastasel juhul B."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:869
|
|
|
|
|
msgid "Run regular expression auto merge on merge start"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Regulaarühendusega automaatühendamise käivitamine ühendamise alustamisel"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:871
|
|
|
|
|
msgid ""
|
|
|
|
|
"Run the merge for auto merge regular expressions\n"
|
|
|
|
|
"immediately when a merge starts.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Regulaarühendusega automaatühendamine käivitatakse\n"
|
|
|
|
|
"kohe ühendamise alustamisel.\n"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:876
|
|
|
|
|
msgid "Version Control History Merging"
|
|
|
|
|
msgstr "Versioonikonrolli ajaloo ühendamine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:885 smalldialogs.cpp:424
|
|
|
|
|
msgid "History start regular expression:"
|
|
|
|
|
msgstr "Ajaloo alguse regulaaravaldis:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:889
|
|
|
|
|
msgid ""
|
|
|
|
|
"Regular expression for the start of the version control history entry.\n"
|
|
|
|
|
"Usually this line contains the \"$Log$\"-keyword.\n"
|
|
|
|
|
"Default value: \".*\\$Log.*\\$.*\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Regulaaravaldis versioonikontrolli ajaloo kirje alguse jaoks.\n"
|
|
|
|
|
"Tavaliselt leidub seal real võtmesõna \"$Log$\".\n"
|
|
|
|
|
"Vaikimisi: \".*\\$Log.*\\$.*\""
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:895 smalldialogs.cpp:453
|
|
|
|
|
msgid "History entry start regular expression:"
|
|
|
|
|
msgstr "Ajaloo kirje alguse regulaaravaldis:"
|
|
|
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
"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"
|
|
|
|
|
"Täpsemalt räägib sellest käsiraamat."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:915
|
|
|
|
|
msgid "History merge sorting"
|
|
|
|
|
msgstr "Ajaloo ühendamise sortimine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:917
|
|
|
|
|
msgid "Sort version control history by a key."
|
|
|
|
|
msgstr "Versioonikontrolli ajaloo sortimine võtmete järgi."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:927
|
|
|
|
|
msgid "History entry start sort key order:"
|
|
|
|
|
msgstr "Ajaloo sortimisvõtmete järjekord:"
|
|
|
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
"Specify the list of keys (that are numbered in order of occurrence\n"
|
|
|
|
|
"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
|
|
|
|
|
"If left empty, then no sorting will be done.\n"
|
|
|
|
|
"See the documentation for details."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kõik ajalookirjete alguse määramiseks mõeldud regulaaravaldistes\n"
|
|
|
|
|
"kasutatud sulud rühmitavad võtmed, mida saab tarvitada sortimiseks.\n"
|
|
|
|
|
"Määra siin võtmete järjekord (need on siin järjekorras alates 1),\n"
|
|
|
|
|
"kasutades eraldajana koma ',' (nt. \"4,5,6,1,2,3,7\").\n"
|
|
|
|
|
"Kui see tühjaks jätta, siis midagi ei sordita.\n"
|
|
|
|
|
"Täpsemalt räägib sellest käsiraamat."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:942
|
|
|
|
|
msgid "Merge version control history on merge start"
|
|
|
|
|
msgstr "Versioonikontrolli ajaloo ühendamine ühendamise alustamisel"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:944
|
|
|
|
|
msgid "Run version control history automerge on merge start."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Versioonikontrolli ajaloo automaatühendamise käivitamine kohe ühendamise "
|
|
|
|
|
"alustamisel."
|
|
|
|
|
|
|
|
|
|
#: 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:960
|
|
|
|
|
msgid "Irrelevant merge command:"
|
|
|
|
|
msgstr "Ebaolulise ühendamise käsk:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:964
|
|
|
|
|
msgid ""
|
|
|
|
|
"If specified this script is run after automerge\n"
|
|
|
|
|
"when no other relevant changes were detected.\n"
|
|
|
|
|
"Called with the parameters: filename1 filename2 filename3"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Määramise korral käivitatakse see skript\n"
|
|
|
|
|
"pärast automaatühendamist, kui muid muudatusi ei avastada.\n"
|
|
|
|
|
"See kutsutakse välja parameetritega: failinimi1 failinimi2 failinimi3"
|
|
|
|
|
|
|
|
|
|
#: 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:992
|
|
|
|
|
msgid "Recursive directories"
|
|
|
|
|
msgstr "Rekursiivsed kataloogid"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:994
|
|
|
|
|
msgid "Whether to analyze subdirectories or not."
|
|
|
|
|
msgstr "Kas analüüsida alamkatalooge või mitte."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:996
|
|
|
|
|
msgid "File pattern(s):"
|
|
|
|
|
msgstr "Failimustrid:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1001
|
|
|
|
|
msgid ""
|
|
|
|
|
"Pattern(s) of files to be analyzed. \n"
|
|
|
|
|
"Wildcards: '*' and '?'\n"
|
|
|
|
|
"Several Patterns can be specified by using the separator: ';'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Failide mustrid, mida analüüsida. \n"
|
|
|
|
|
"Metamärgid: '*' ja '?'\n"
|
|
|
|
|
"Mitme mustri määramisel kasuta eraldajana semikoolonit (;)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1007
|
|
|
|
|
msgid "File-anti-pattern(s):"
|
|
|
|
|
msgstr "Anti-failimustrid:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1012
|
|
|
|
|
msgid ""
|
|
|
|
|
"Pattern(s) of files to be excluded from analysis. \n"
|
|
|
|
|
"Wildcards: '*' and '?'\n"
|
|
|
|
|
"Several Patterns can be specified by using the separator: ';'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Failide mustrid, mida analüüsil välja jätta. \n"
|
|
|
|
|
"Metamärgid: '*' ja '?'\n"
|
|
|
|
|
"Mitme mustri määramisel kasuta eraldajana semikoolonit (;)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1018
|
|
|
|
|
msgid "Dir-anti-pattern(s):"
|
|
|
|
|
msgstr "Anti-kataloogimustrid:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1023
|
|
|
|
|
msgid ""
|
|
|
|
|
"Pattern(s) of directories to be excluded from analysis. \n"
|
|
|
|
|
"Wildcards: '*' and '?'\n"
|
|
|
|
|
"Several Patterns can be specified by using the separator: ';'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kataloogide mustrid, mida analüüsil välja jätta. \n"
|
|
|
|
|
"Metamärgid: '*' ja '?'\n"
|
|
|
|
|
"Mitme mustri määramisel kasuta eraldajana semikoolonit (;)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1029
|
|
|
|
|
msgid "Use .cvsignore"
|
|
|
|
|
msgstr ".cvsignore kasutamine"
|
|
|
|
|
|
|
|
|
|
#: 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."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Laiendab antimustrit kõigele, mida eiraks CVS.\n"
|
|
|
|
|
"Kohalike \".cvsignore\" failide abil võib see olla kataloogipõhine."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1037
|
|
|
|
|
msgid "Find hidden files and directories"
|
|
|
|
|
msgstr "Peidetud failide ja kataloogide otsimine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1040
|
|
|
|
|
msgid "Finds files and directories with the hidden attribute."
|
|
|
|
|
msgstr "Otsitakse peidetud faile ja katalooge."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1042
|
|
|
|
|
msgid "Finds files and directories starting with '.'."
|
|
|
|
|
msgstr "Failide ja kataloogide otsimine, mille alguses seisab '.'."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1046
|
|
|
|
|
msgid "Follow file links"
|
|
|
|
|
msgstr "Failiviitade järgimine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1049
|
|
|
|
|
msgid ""
|
|
|
|
|
"On: Compare the file the link points to.\n"
|
|
|
|
|
"Off: Compare the links."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Sees: võrreldakse faili, mille viit osutab.\n"
|
|
|
|
|
"Väljas: võrreldakse viitu."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1054
|
|
|
|
|
msgid "Follow directory links"
|
|
|
|
|
msgstr "Kataloogiviitade järgimine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1057
|
|
|
|
|
msgid ""
|
|
|
|
|
"On: Compare the directory the link points to.\n"
|
|
|
|
|
"Off: Compare the links."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Sees: võrreldakse kataloogi, mille viit osutab.\n"
|
|
|
|
|
"Väljas: võrreldakse viitu."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1073
|
|
|
|
|
msgid "Case sensitive filename comparison"
|
|
|
|
|
msgstr "Tõstutundlik failinimede võrdlemine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1076
|
|
|
|
|
msgid ""
|
|
|
|
|
"The directory comparison will compare files or directories when their names "
|
|
|
|
|
"match.\n"
|
|
|
|
|
"Set this option if the case of the names must match. (Default for Windows is "
|
|
|
|
|
"off, otherwise on.)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kataloogide võrdlemisel võrreldakse failide või kataloogide nimesid.\n"
|
|
|
|
|
"Selle valiku sisselülitamisel peab sobima ka nimede tähesuurus (Windowsis on "
|
|
|
|
|
"see vaikimisi välja lülitatud, muidu sees)."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1080
|
|
|
|
|
msgid "File Comparison Mode"
|
|
|
|
|
msgstr "Faili võrdlemise režiim"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1084
|
|
|
|
|
msgid "Binary comparison"
|
|
|
|
|
msgstr "Binaarvõrdlus"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1085
|
|
|
|
|
msgid "Binary comparison of each file. (Default)"
|
|
|
|
|
msgstr "Iga faili binaarvõrdlus. (vaikimisi)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1087
|
|
|
|
|
msgid "Full analysis"
|
|
|
|
|
msgstr "Täielik analüüs"
|
|
|
|
|
|
|
|
|
|
#: 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.)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Tehakse täielik analüüs, statistikat näidatakse lisaveergudes.\n"
|
|
|
|
|
"(Aeglasem kui binaarvõrdlus ja eriti aeglane binaarfailide korral.)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1091
|
|
|
|
|
#, fuzzy
|
|
|
|
|
msgid "Trust the size and modification date (unsafe)"
|
|
|
|
|
msgstr "Muutmiskuupäeva usaldamine (ebaturvaline)"
|
|
|
|
|
|
|
|
|
|
#: 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: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: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 "
|
|
|
|
|
"download."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Eeldatakse, et failid on võrdsed, kui failipikkus on võrdne.\n"
|
|
|
|
|
"Mõttekas suurte kataloogide või aeglase võrgu korral, kui kuupäev võib "
|
|
|
|
|
"allalaadimise käigus olla muutunud."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1106
|
|
|
|
|
msgid "Synchronize directories"
|
|
|
|
|
msgstr "Kataloogide sünkroniseerimine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1109
|
|
|
|
|
msgid ""
|
|
|
|
|
"Offers to store files in both directories so that\n"
|
|
|
|
|
"both directories are the same afterwards.\n"
|
|
|
|
|
"Works only when comparing two directories without specifying a destination."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Võimaldab salvestada failid mõlemasse kataloogi,\n"
|
|
|
|
|
"nii et need näevad pärast seda välja ühesugused.\n"
|
|
|
|
|
"Toimib ainult kahe kataloogi võrdlemisel ilma sihtkohta määramata."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1115
|
|
|
|
|
msgid "White space differences considered equal"
|
|
|
|
|
msgstr "Tühimärkide erinevust ei arvestata"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1118
|
|
|
|
|
msgid ""
|
|
|
|
|
"If files differ only by white space consider them equal.\n"
|
|
|
|
|
"This is only active when full analysis is chosen."
|
|
|
|
|
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:1124
|
|
|
|
|
msgid "Copy newer instead of merging (unsafe)"
|
|
|
|
|
msgstr "Ühendamise asemel kopeeritakse uuem (ebaturvaline)"
|
|
|
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
"Only effective when comparing two directories."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Sisse ei vaadata, võetakse lihtsalt uuem fail.\n"
|
|
|
|
|
"(Kasuta ainult siis, kui tead, mida teed!)\n"
|
|
|
|
|
"Toimib ainult kahe kataloogi võrdlemisel."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1132
|
|
|
|
|
msgid "Backup files (.orig)"
|
|
|
|
|
msgstr "Failidest tehakse varukoopia (.orig)"
|
|
|
|
|
|
|
|
|
|
#: 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."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kui fail salvestatakse vana faili asemele, ei kustutata vana faili,\n"
|
|
|
|
|
"vaid sellele antakse uus nimi laiendiga '.orig'."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1213
|
|
|
|
|
msgid "Regional Settings"
|
|
|
|
|
msgstr "Lokaale seadistused"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1309
|
|
|
|
|
msgid "Language (restart required)"
|
|
|
|
|
msgstr "Keel (vajalik taaskäivitus)"
|
|
|
|
|
|
|
|
|
|
#: 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."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Vali GUI stringide keel või \"Auto\".\n"
|
|
|
|
|
"Keele tegelikuks muutmiseks tuleb KDiff3 sulgeda ja uuesti käivitada."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1359
|
|
|
|
|
msgid "Use the same encoding for everything:"
|
|
|
|
|
msgstr "Kõikjal kasutatakse kodeeringut:"
|
|
|
|
|
|
|
|
|
|
#: 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."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Lubab muuta kõiki kodeeringuid ainult esimest kodeeringut muutes.\n"
|
|
|
|
|
"Kui vaja on erinevaid määratlusi, lülita välja."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1367
|
|
|
|
|
msgid "Note: Local Encoding is "
|
|
|
|
|
msgstr "Märkus: kohalik kodeering on "
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1371
|
|
|
|
|
msgid "File Encoding for A:"
|
|
|
|
|
msgstr "A kodeering:"
|
|
|
|
|
|
|
|
|
|
#: 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\".)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Sisselülitamisel tuvastatakse Unicode (UTF-16 või UTF-8) kodeering.\n"
|
|
|
|
|
"Kui faili kodeeringut ei tuvastata, kasutatakse selle asemel valitud "
|
|
|
|
|
"kodeeringut.\n"
|
|
|
|
|
"(Unicode tuvastamine sõltub faili esimestest baitidest - baidijärjrekorra "
|
|
|
|
|
"tähisest \"BOM\".)"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399
|
|
|
|
|
msgid "Auto Detect Unicode"
|
|
|
|
|
msgstr "Unicode automaatne tuvastamine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1386
|
|
|
|
|
msgid "File Encoding for B:"
|
|
|
|
|
msgstr "B kodeering:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1395
|
|
|
|
|
msgid "File Encoding for C:"
|
|
|
|
|
msgstr "C kodeering:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1404
|
|
|
|
|
msgid "File Encoding for Merge Output and Saving:"
|
|
|
|
|
msgstr "Kodeering ühendamisväljundil ja salvestamisel:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1408
|
|
|
|
|
msgid "Auto Select"
|
|
|
|
|
msgstr "Automaatne valik"
|
|
|
|
|
|
|
|
|
|
#: 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 "
|
|
|
|
|
"saving."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Sisselülitamisel kasutatakse sisendfailide kodeeringut.\n"
|
|
|
|
|
"Kahtluse korral ilmub dialoog, mis laseb kasutajal valida salvestamisel "
|
|
|
|
|
"kasutatava kodeeringu."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1415
|
|
|
|
|
msgid "File Encoding for Preprocessor Files:"
|
|
|
|
|
msgstr "Eelprotsessori failide kodeering:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1426
|
|
|
|
|
msgid "Right To Left Language"
|
|
|
|
|
msgstr "Paremalt-vasakule keeled"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1429
|
|
|
|
|
msgid ""
|
|
|
|
|
"Some languages are read from right to left.\n"
|
|
|
|
|
"This setting will change the viewer and editor accordingly."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Mõningaid keeli loetakse ja kirjutatakse paremalt vasakule.\n"
|
|
|
|
|
"Selle valikuga saab vastavalt muuta näitajat ja redaktorit."
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1443
|
|
|
|
|
msgid "Integration"
|
|
|
|
|
msgstr "Integreerimine"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1443
|
|
|
|
|
msgid "Integration Settings"
|
|
|
|
|
msgstr "Integreerimisseadistused"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1453
|
|
|
|
|
msgid "Command line options to ignore:"
|
|
|
|
|
msgstr "Ignoreeritavad käsurea võtmed:"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1458
|
|
|
|
|
msgid ""
|
|
|
|
|
"List of command line options that should be ignored when KDiff3 is used by "
|
|
|
|
|
"other tools.\n"
|
|
|
|
|
"Several values can be specified if separated via ';'\n"
|
|
|
|
|
"This will suppress the \"Unknown option\"-error."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Käsurea võtmete nimekiri, mida ignoreeritakse, kui KDiff3 kasutavad teised "
|
|
|
|
|
"tööriistad.\n"
|
|
|
|
|
"Mitme väärtuse andmisel tuleb need eraldada semikooloniga (;).\n"
|
|
|
|
|
"See väldib vigu \"Tundmatu võti\"."
|
|
|
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
"Because this program doesn't handle variable width fonts\n"
|
|
|
|
|
"correctly, you might experience problems while editing.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Do you want to continue or do you want to select another font."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Valisid muutuva laiusega fondi.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Kuna see rakendus ei käitle muutuva laiusega fonte\n"
|
|
|
|
|
"korrektselt, võib redigeerimisel esineda probleeme.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Kas soovid jätkata või valid uue fondi?"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1562
|
|
|
|
|
msgid "Incompatible Font"
|
|
|
|
|
msgstr "Sobimatu font"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1563
|
|
|
|
|
msgid "Continue at Own Risk"
|
|
|
|
|
msgstr "Jätkan oma riskil"
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1563
|
|
|
|
|
msgid "Select Another Font"
|
|
|
|
|
msgstr "Valin uue fondi"
|
|
|
|
|
|
|
|
|
|
#: 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."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:258
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:264
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Most likely this is not wanted during a merge.\n"
|
|
|
|
|
"Do you want to disable these settings or continue with these settings active?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Peaaegu kindlasti ei ole see ühendamisel soovitav.\n"
|
|
|
|
|
"Kas soovid need seadistused tühistada või siiski nendega jätkata?"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:266
|
|
|
|
|
msgid "Option Unsafe for Merging"
|
|
|
|
|
msgstr "Ebaturvaline valik ühendamisel"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:267
|
|
|
|
|
msgid "Use These Options During Merge"
|
|
|
|
|
msgstr "Kasuta neid valikuid ühendamisel"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:267
|
|
|
|
|
msgid "Disable Unsafe Options"
|
|
|
|
|
msgstr "Keela ebaturvalised valikud"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:297
|
|
|
|
|
msgid "Loading A"
|
|
|
|
|
msgstr "A laadimine"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:301
|
|
|
|
|
msgid "Loading B"
|
|
|
|
|
msgstr "B laadimine"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:318 pdiff.cpp:344
|
|
|
|
|
msgid "Diff: A <-> B"
|
|
|
|
|
msgstr "Erinevus: A <-> B"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:324 pdiff.cpp:366
|
|
|
|
|
msgid "Linediff: A <-> B"
|
|
|
|
|
msgstr "Reaerinevus: A <-> B"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:335
|
|
|
|
|
msgid "Loading C"
|
|
|
|
|
msgstr "C laadimine"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:347
|
|
|
|
|
msgid "Diff: B <-> C"
|
|
|
|
|
msgstr "Erinevus: B <-> C"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:350
|
|
|
|
|
msgid "Diff: A <-> C"
|
|
|
|
|
msgstr "Erinevus: A <-> C"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:369
|
|
|
|
|
msgid "Linediff: B <-> C"
|
|
|
|
|
msgstr "Reaerinevus: B <-> C"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:372
|
|
|
|
|
msgid "Linediff: A <-> C"
|
|
|
|
|
msgstr "Reaerinevus: A <-> C"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:513
|
|
|
|
|
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:516 pdiff.cpp:518 pdiff.cpp:520
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:530
|
|
|
|
|
msgid ""
|
|
|
|
|
"Some inputfiles don't seem to be pure textfiles.\n"
|
|
|
|
|
"Note that the KDiff3-merge was not meant for binary data.\n"
|
|
|
|
|
"Continue at your own risk."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Paistab, et mõned sisendfailid ei ole puhtad tekstifailid.\n"
|
|
|
|
|
"Arvesta, et KDiff3 ühendamine ei ole mõeldud binaarfailidele.\n"
|
|
|
|
|
"Jätka oma riskil."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:981
|
|
|
|
|
msgid "Abort"
|
|
|
|
|
msgstr "Katkesta"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:987 pdiff.cpp:1084
|
|
|
|
|
msgid "Opening files..."
|
|
|
|
|
msgstr "Failide avamine..."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1061 pdiff.cpp:1132
|
|
|
|
|
msgid "File open error"
|
|
|
|
|
msgstr "Viga faili avamisel"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1164
|
|
|
|
|
msgid "Cutting selection..."
|
|
|
|
|
msgstr "Valitud teksti lõikamine..."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1185
|
|
|
|
|
msgid "Copying selection to clipboard..."
|
|
|
|
|
msgstr "Valitud teksti kopeerimine lõikepuhvrisse..."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1201
|
|
|
|
|
msgid "Inserting clipboard contents..."
|
|
|
|
|
msgstr "Lõikepuhvri sisu sisestamine..."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1724
|
|
|
|
|
msgid "Save && Continue"
|
|
|
|
|
msgstr "Salvesta ja jätka"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1724
|
|
|
|
|
msgid "Continue Without Saving"
|
|
|
|
|
msgstr "Jätka salvestamata"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1931
|
|
|
|
|
msgid "Search complete."
|
|
|
|
|
msgstr "Otsing lõpetatud."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1931
|
|
|
|
|
msgid "Search Complete"
|
|
|
|
|
msgstr "Otsing lõpetatud"
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:2155
|
|
|
|
|
msgid "Nothing is selected in either diff input window."
|
|
|
|
|
msgstr "Erinevuste sisendakendes pole midagi valitud."
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:2155
|
|
|
|
|
msgid "Error while adding manual diff range"
|
|
|
|
|
msgstr "Viga käsitsi määratud samasuse vahemiku lisamisel"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:53
|
|
|
|
|
msgid "A (Base):"
|
|
|
|
|
msgstr "A (baas):"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:59 smalldialogs.cpp:75 smalldialogs.cpp:91
|
|
|
|
|
#: smalldialogs.cpp:134
|
|
|
|
|
msgid "File..."
|
|
|
|
|
msgstr "Fail..."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:61 smalldialogs.cpp:77 smalldialogs.cpp:93
|
|
|
|
|
#: smalldialogs.cpp:136
|
|
|
|
|
msgid "Dir..."
|
|
|
|
|
msgstr "Kataloog..."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:86
|
|
|
|
|
msgid "C (Optional):"
|
|
|
|
|
msgstr "C (lisavõimalus):"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:108
|
|
|
|
|
msgid "Swap/Copy Names ..."
|
|
|
|
|
msgstr "Vaheta/kopeeri nimed..."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:114 smalldialogs.cpp:115 smalldialogs.cpp:116
|
|
|
|
|
msgid "Swap %1<->%2"
|
|
|
|
|
msgstr "Vaheta %1<->%2"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:117 smalldialogs.cpp:118 smalldialogs.cpp:119
|
|
|
|
|
msgid "Copy %1->Output"
|
|
|
|
|
msgstr "Kopeeri %1->väljund"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:120 smalldialogs.cpp:121 smalldialogs.cpp:122
|
|
|
|
|
msgid "Swap %1<->Output"
|
|
|
|
|
msgstr "Vaheta %1<->väljund"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:129
|
|
|
|
|
msgid "Output (optional):"
|
|
|
|
|
msgstr "Väljund (lisavõimalus):"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:158
|
|
|
|
|
msgid "Configure..."
|
|
|
|
|
msgstr "Seadista..."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:164
|
|
|
|
|
msgid "&OK"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:347
|
|
|
|
|
msgid "Search text:"
|
|
|
|
|
msgstr "Otsitav tekst:"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:354
|
|
|
|
|
msgid "Case sensitive"
|
|
|
|
|
msgstr "Tõstutundlik"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:357
|
|
|
|
|
msgid "Search A"
|
|
|
|
|
msgstr "Otsi A"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:362
|
|
|
|
|
msgid "Search B"
|
|
|
|
|
msgstr "Otsi B"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:367
|
|
|
|
|
msgid "Search C"
|
|
|
|
|
msgstr "Otsi C"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:372
|
|
|
|
|
msgid "Search output"
|
|
|
|
|
msgstr "Otsingu väljund"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:377
|
|
|
|
|
msgid "&Search"
|
|
|
|
|
msgstr "&Otsi"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:394
|
|
|
|
|
msgid "Regular Expression Tester"
|
|
|
|
|
msgstr "Regulaaravaldise test"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:405
|
|
|
|
|
msgid "Example auto merge line:"
|
|
|
|
|
msgstr "Automaatühendamise näidisrida:"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:407
|
|
|
|
|
msgid "For auto merge test copy a line as used in your files."
|
|
|
|
|
msgstr "Kopeeri automaatühendamise testimiseks rida oma failist."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:413 smalldialogs.cpp:442 smalldialogs.cpp:479
|
|
|
|
|
msgid "Match result:"
|
|
|
|
|
msgstr "Sobivuse tulemus:"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:432
|
|
|
|
|
msgid "Example history start line (with leading comment):"
|
|
|
|
|
msgstr "Ajaloo alguse näidisrida (alustava kommentaariga):"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:435
|
|
|
|
|
msgid ""
|
|
|
|
|
"Copy a history start line as used in your files,\n"
|
|
|
|
|
"including the leading comment."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kopeeri oma failist ajaloo alguse rida,\n"
|
|
|
|
|
"kaasa arvatud alustav kommentaar."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:461
|
|
|
|
|
msgid "History sort key order:"
|
|
|
|
|
msgstr "Ajaloo sortimisvõtme järjekord:"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:469
|
|
|
|
|
msgid "Example history entry start line (without leading comment):"
|
|
|
|
|
msgstr "Ajalookirje alguse näidisrida (alustava kommentaarita):"
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:471
|
|
|
|
|
msgid ""
|
|
|
|
|
"Copy a history entry start line as used in your files,\n"
|
|
|
|
|
"but omit the leading comment."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Kopeeri oma failist ajalookirje alguse rida,\n"
|
|
|
|
|
"kuid ilma alustava kommentaarita."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:486
|
|
|
|
|
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."
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:541 smalldialogs.cpp:551 smalldialogs.cpp:574
|
|
|
|
|
msgid "Match failed."
|
|
|
|
|
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."
|
