diff options
Diffstat (limited to 'po/[email protected]')
| -rw-r--r-- | po/[email protected] | 1264 |
1 files changed, 685 insertions, 579 deletions
diff --git a/po/[email protected] b/po/[email protected] index 18a7807..7bf2e54 100644 --- a/po/[email protected] +++ b/po/[email protected] @@ -6,36 +6,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-26 19:41+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Časlav Ilić, Slobodan Simić" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "[email protected],[email protected]" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Upisivanje podataka iz klipborda u privremeni fajl nije uspelo." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Iz klipborda" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -49,7 +50,7 @@ msgstr "" "\n" "Naredba predobrade će sada biti isključena." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -63,7 +64,7 @@ msgstr "" "\n" "Predobrada poklapanja linija će sada biti isključena." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,16 +72,16 @@ msgstr "" "Greška, gubitak podataka:\n" "Ako je možete ponoviti, kontaktirajte autora.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Ozbiljna unutrašnja greška" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Najviša linija %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Kraj" @@ -96,245 +97,249 @@ msgstr "Veza: " msgid "Size. " msgstr "Veličina: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Datum i veličina: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Pravljenje privremene kopije fajla %1 nije uspelo." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Otvaranje fajla %1 nije uspelo." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Upoređujem fajl..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Greška pri čitanju iz %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Ime" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Nerešen" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Rešen" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Ne-belo" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Belo" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Trenutno stapate direktorijume. Želite li zaista da prekinete stapanje i ponovo " -"skenirate direktorijum?" +"Trenutno stapate direktorijume. Želite li zaista da prekinete stapanje i " +"ponovo skenirate direktorijum?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 +#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 +msgid "Warning" +msgstr "" + +#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Ponovo skeniraj" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Nastavi stapanje" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Otvaranje direktorijuma nije uspelo:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir. A „%1“ ne postoji ili nije direktorijum.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir. A „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir. B „%1“ ne postoji ili nije direktorijum.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir. B „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir. C „%1“ ne postoji ili nije direktorijum.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir. C „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Greška pri otvaranju direktorijuma" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Odredišni direktorijum ne sme biti isti kao A ili B kada se stapaju tri " "direktorijuma.\n" "Proverite ponovo pre nego nastavite." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Upozorenje o parametrima" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Pregledam direktorijume..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Čitam direktorijum A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Čitam direktorijum B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Čitam direktorijum C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Neki poddirektorijumi nisu bili čitljivi u" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Proverite dozvole poddirektorijuma." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Spreman." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status poređenja direktorijuma" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Broj poddirektorijuma:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Broj jednakih fajlova:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Broj različitih fajlova:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Broj ručnih stapanja:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Ovo utiče na sve operacije stapanja." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Menjam sve operacije stapanja" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Nastavi" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Obrađujem " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Uraditi." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopiraj A u B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopiraj B u A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Obriši A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Obriši B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Stopi u A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Stopi u B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Stopi A i B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Obriši (ako postoji)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Stopi" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Stopi (ručno)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Greška: Sukobljeni tipovi fajlova" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Greška: Datumi su jednaki ali fajlovi nisu." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Ova operacija trenutno nije moguća." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operacija nije moguća" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -346,42 +351,47 @@ msgstr "" "\n" "Ako znate kako ovo da ponovite, kontaktirajte autora programa." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programska greška" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Došlo je do greške u toku kopiranja.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Došlo je do greške u toku kopiranja.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 +#, fuzzy +msgid "Error" +msgstr "Greška." + +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Greška stapanja" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Greška." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Gotovo." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Nije snimljeno." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Nepoznata operacija stapanja. (Ovo nikad ne sme da se desi!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Nepoznata operacija stapanja." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -400,342 +410,349 @@ msgstr "" "Pazite da program još uvek ima beta status i nema NIKAKVIH GARANCIJA uopšte! " "Napravite rezervu svojih najvažnijih podataka!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Počinjem stapanje" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Uradi" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuliraj" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Istaknuta stavka ima različit tip u različitim direktorijumima. Izaberite šta " -"je činiti." +"Istaknuta stavka ima različit tip u različitim direktorijumima. Izaberite " +"šta je činiti." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Datumi izmene fajla su jednaki ali fajlovi nisu. Izaberite šta je činiti." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Ova operacija trenutno nije moguća zato što je stapanje direktorijuma u toku." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Došlo je do greške u poslednjem koraku.\n" "Želite li da nastavite sa stavkom koja je izazvala grešku ili želite da je " "preskočite?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Nastavi stapanje posle greške" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Nastavi sa poslednjom stavkom" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Preskoči stavku" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Preskočeno." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "U toku..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Operacija stapanja je završena." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Stapanje je završeno" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulirano stapanje je završeno: Proverite da li se slažete sa predloženim " "operacijama." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -"Došlo je do greške. Pritisnite „U redu“ da biste videli detaljne informacije.\n" +"Došlo je do greške. Pritisnite „U redu“ da biste videli detaljne " +"informacije.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Greška: U toku brisanja %1: Pravljenje rezerve nije uspelo." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "obriši direktorijum rekurzivno( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "obriši( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Greška: Operacija brisanja direktorijuma nije uspela u toku pokušaja da se " "direktorijum pročita." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Greška: Operacija rmdir( %1 ) nije uspela." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Greška: Operacija brisanja nije uspela." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručno stapanje( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Napomena: Posle ručnog stapanja korisnik bi trebalo da nastavi pomoću F7." +" Napomena: Posle ručnog stapanja korisnik bi trebalo da nastavi pomoću " +"F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -"Greška: Kopiranje( %1 -> %2 ) nije uspelo. Brisanje postojećeg odredišta nije " -"uspelo." +"Greška: Kopiranje( %1 -> %2 ) nije uspelo. Brisanje postojećeg odredišta " +"nije uspelo." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "kopiranje veze( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Greška: Kopiranje veze nije uspelo: Udaljene veze još uvek nisu podržane." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Greška: Kopiranje veze nije uspelo." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopiraj( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Greška u toku preimenovanja( %1 -> %2 ): Ne mogu da obrišem postojeće " "odredište." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "preimenuj( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Greška: Preimenovanje nije uspelo." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Greška u toku pravljenja direktorijuma %1. Ne mogu da obrišem postojeći fajl." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "napravi direktorijum( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Greška u toku pravljenja direktorijuma." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Odr." -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir." -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tip" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Vel." -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atr." -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Poslednja izmena" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Veza-odredište" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fajl..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "nije dostupno" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (odr.): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (baza): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (odr.): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (odr.): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Odr.: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Stapanje direktorijuma" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Pokreni/nastavi stapanje direktorijuma" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Pokreni operaciju za tekuću stavku" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Stopi tekući fajl" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Sažmi sve poddirektorijume" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Raširi sve poddirektorijume" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Izaberi A za sve stavke" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Izaberi B za sve stavke" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Izaberi C za sve stavke" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Automatski izaberi operaciju za sve stavke" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Nema operacije za sve stavke" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Broj različitih fajlova:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ne radi ništa" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Stopi u A i B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"U toku pokušaja da se napravi rezerva, brisanje starije rezerve nije uspelo.\n" +"U toku pokušaja da se napravi rezerva, brisanje starije rezerve nije " +"uspelo.\n" "Ime fajla: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -743,193 +760,200 @@ msgstr "" "U toku pokušaja da se napravi rezerva, preimenovanje nije uspelo.\n" "Imena fajlova: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Dobavljam status fajla: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Čitam fajl: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Pišem fajl: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Nema memorije" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Pravim direktorijum: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Uklanjam direktorijum: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Uklanjam fajl: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Pravim simboličku vezu: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Uklanjam fajl: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Kopiram fajl: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Greška tokom operacije kopiranja fajlova: Otvaranje fajla za čitanje nije " "uspelo. Ime fajla: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Greška tokom operacije kopiranja fajlova: Otvaranje fajla za pisanje nije " "uspelo. Ime fajla: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Greška tokom operacije kopiranja fajlova: Čitanje nije uspelo. Ime fajla: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Greška tokom operacije kopiranja fajlova: Pisanje nije uspelo. Ime fajla: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Čitam direktorijum: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listam direktorijum: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Operacija sinh. tekuće stavke" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Greška pri otvaranju fajla" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Opcija --auto je upotrebljena, ali nije naveden izlazni fajl." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Opcija --auto se ignoriše za poređenje direktorijuma." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Snimanje nije uspelo." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Otvaranje ovih fajlova nije uspelo:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Greška pri otvaranju fajla" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Otvara dokumente za poređenje..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Snima rezultat stapanja. Svi sukobi moraju biti razrešeni!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Snima tekuće dokumente kao..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Izlazi iz programa" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Iseca izabranu sekciju i stavlja je u klipbord" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopira izabranu sekciju u klipbord" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Prenosi sadržaj klipborda na tekuću poziciju" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Potraži znakovni niz" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Ponovo potraži znakovni niz" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Uključuje/isključuje traku sa alatima" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Uključuje/isključuje statusnu traku" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Podesi KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Idi na tekuću deltu" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Idi na prvu deltu" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Idi na poslednju deltu" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(preskače razlike u belim razmacima kada je „Prikaži bele razmake“ isključeno.)" +"(preskače razlike u belim razmacima kada je „Prikaži bele razmake“ " +"isključeno.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -937,236 +961,244 @@ msgstr "" "(ne preskače razlike u belim razmacima čak i kada je „Prikaži bele razmake“ " "isključeno.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Idi na prethodnu deltu" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Idi na sledeću deltu" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Idi na prethodni sukob" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Idi na sledeći sukob" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Idi na prethodni nerešeni sukob" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Idi na sledeći nerešeni sukob" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Izaberite linije iz A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Izaberite linije iz B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Izaberite linije iz C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatski idi na sledeći nerešeni sukob posle izbora izvora" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Prikaži znakove razmaka i tabulatora za razlike" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Prikaži bele razmake" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Prikaži brojeve linija" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Svuda izaberi A" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Svuda izaberi B" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Svuda izaberi C" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Izaberi A za sve nerešene sukobe" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Izaberi B za sve nerešene sukobe" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Izaberi C za sve nerešene sukobe" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Izaberi A za sve nerešene sukobe belih razmaka" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Izaberi B za sve nerešene sukobe belih razmaka" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Izaberi C za sve nerešene sukobe belih razmaka" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Automatski reši jednostavne sukobe" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Postavi delte na sukobe" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Automatski reši jednostavne sukobe" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Uporedi izabrani fajl" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Prikaži prozor A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Prikaži prozor B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Prikaži prozor C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokusiraj sledeći prozor" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normalan pregled" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Pregled A prema B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Pregled A prema C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Pregled B prema C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Diff prozori preloma reči" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokusiraj prethodni prozor" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Promeni orijentaciju razdvajanja" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Podeljeni prikaz ekrana za dir. i tekst" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Promeni između dir. i tekst. prikaza" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Rezultat stapanja nije snimljen." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Snimi i izađi" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Izađi bez snimanja" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Snimanje rezultata stapanja nije uspelo." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Trenutno stapate direktorijume. Želite li zaista da prekinete?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Snimam fajl..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Snimam fajl pod novim imenom..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Izlazim..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Operacija stapanja je završena." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Izlazim..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Uključujem/isključujem traku sa alatom..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Uključi/isključi statusnu traku..." @@ -1181,8 +1213,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Nisam mogao da nađem naš deo!\n" "Ovo se obično dešava zbog instalacionog problema. Pročitajte fajl README u " @@ -1263,20 +1295,19 @@ msgstr "fajl3 za otvoranje" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "+ Mnogo hvala onima koji su prijavljivali greške i doprineli svojim idejama!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Broj preostalih nerešenih sukoba: %1 (od kojih su %2 beli razmaci)" @@ -1288,55 +1319,31 @@ msgstr "" "Izlaz je izmenjen.\n" "Ako nastavite, vaše izmene će biti izgubljene." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Svi ulazni fajlovi su binarno jednaki." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Svi ulazni fajlovi sadrže isti tekst." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Fajlovi A i B su binarno jednaki.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Fajlovi A i B imaju jednak tekst.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Fajlovi A i C su binarno jednaki.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Fajlovi A i C imaju jednak tekst.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Fajlovi B i C su binarno jednaki.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Fajlovi B i C su binarno jednaki.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Fajlovi B i C imaju jednak tekst.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Fajlovi A i B imaju jednak tekst.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Ukupan broj sukoba: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1344,7 +1351,7 @@ msgstr "" "\n" "Broj automatski rešenih sukoba: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1352,23 +1359,23 @@ msgstr "" "\n" "Broj nerešenih sukoba: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Sukobi" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "<No src line>" msgstr "<Nema izv. linije>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "<Merge Conflict (Whitespace only)>" msgstr "<Sukob u stapanju (samo beli razmaci)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "<Merge Conflict>" msgstr "<Sukob u stapanju>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1376,11 +1383,11 @@ msgstr "" "Još uvek nisu rešeni svi sukobi.\n" "Fajl nije snimljen.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Preostali sukobi" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1390,29 +1397,29 @@ msgstr "" "\n" "Pravljenje rezerve nije uspelo. Fajl nije snimljen." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Greška u snimanju fajla" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Greška prilikom pisanja." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Izlaz" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Izmenjen]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Kodiranje fajla za C:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1432,6 +1439,15 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Izmenite ovo ake se znakovi koji nisu ASCII ne prikazuju ispravno." +#: optiondialog.cpp:455 +#, fuzzy +msgid "Configure" +msgstr "Podesi..." + +#: optiondialog.cpp:510 +msgid "Font" +msgstr "" + #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Font uređivača i raz. izlaza" @@ -1557,10 +1573,8 @@ msgid "Auto indentation" msgstr "Automatsko uvlačenje" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Uključeno: Uvlačenje prethodne linije koristi se za novu liniju.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Uključeno: Uvlačenje prethodne linije koristi se za novu liniju.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1596,63 +1610,55 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Postavke razlike i stapanja" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Očuvaj CR" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Prikaži CR znakove „\\r“ ako postoje.\n" -"Pomaže da se uporede fajlovi koji su menjani pod različitim operativnim " -"sistemima." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Tretiraj C/C++ komentare kao bele razmake." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignoriši brojeve" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignoriši brojevne znakove tokom faze poklapanja linija. (Slično ignorisanju " "belih razmaka.)\n" "Može vam pomoći pri upoređivanju fajlova sa numeričkim podacima." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignoriši C/C++ komentare" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Tretiraj C/C++ komentare kao bele razmake." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Zanemari veličinu slova" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tretira razliku u veličini kao promene belog prostora. („a“<=>„A“)" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Predobradna naredba:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Korisnički definisana predobrada. (Pogledajte dokumentaciju za detalje.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Predobradna naredba za poklapanje linija:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1660,11 +1666,11 @@ msgstr "" "Predobrada se koristi samo tokom poklapanja linija.\n" "(Pogledajte dokumentaciju za detalje.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Potrudi se (sporije)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1672,11 +1678,16 @@ msgstr "" "Uključuje opciju --minimal za spoljašnje razlikovanje.\n" "Analiza velikih fajlova će biti mnogo sporija." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Postavke razlike i stapanja" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Zastoj automatskog napredovanja (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1684,40 +1695,35 @@ msgstr "" "U režimu automatskog napredovanja rezultat tekućeg izbora prikazuje se \n" "navedeno vreme, pre skoka na sledeći sukob. Opseg: 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Postavke razlike i stapanja" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Podrazumevano stapanje belih razmaka dva fajla:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Ručni izbor" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Dozvoljava algoritmu stapanja da automatski izabere ulaz za izmene samo u belim " -"razmacima." +"Dozvoljava algoritmu stapanja da automatski izabere ulaz za izmene samo u " +"belim razmacima." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Podrazumevano stapanje belih razmaka tri fajla:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1725,58 +1731,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1786,46 +1793,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Broj poddirektorijuma:" + +#: 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 "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: 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 "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Stapanje direktorijuma" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekurzivni direktorijumi" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Da li da se analiziraju poddirektorijumi." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Oblici fajlova:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1835,11 +1863,11 @@ msgstr "" "Džokeri: „*“ i „?“\n" "Više oblika možete navesti koristeći razdvajač: „;“" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Antioblici fajlova:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1849,11 +1877,11 @@ msgstr "" "Džokeri: „*“ i „?“\n" "Više oblika možete navesti koristeći razdvajač: „;“" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Antioblici direktorijuma:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1863,11 +1891,11 @@ msgstr "" "Džokeri: „*“ i „?“\n" "Više oblika možete navesti koristeći razdvajač: „;“" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Koristi fajl .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1875,23 +1903,23 @@ msgstr "" "Proširuje antioblik na sve što bi CVS ignorisao.\n" "Preko lokalnih fajlova „.cvsignore“ ovo može biti posebno po direktorijumu." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Pronađi skrivene fajlove i direktorijume" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Nalazi fajlove i direktorijume sa atributom skrivenih." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Nalazi fajlove i direktorijume koji počinju sa „.“" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Prati veze fajlova" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1899,11 +1927,11 @@ msgstr "" "Uključeno: Poredi fajlove na koje pokazuju veze.\n" "Isključeno: Poredi veze." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Prati veze direktorijuma" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1911,11 +1939,11 @@ msgstr "" "Uključeno: Poredi direktorijume na koje pokazuju veze.\n" "Isključeno: Poredi veze." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1923,23 +1951,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Režim poređenja fajlova" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binarno poređenje" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binarno poređenje za svaki fajl. (Podrazumevano)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Puna analiza" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1947,24 +1975,47 @@ msgstr "" "Radi punu analizu i prikazuje statističke podatke u dodatnim kolonama.\n" "(Sporije nego binarno poređenje, mnogo sporije za binarne fajlove.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Veruj datumu izmene (nije bezbedno)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -"Pretpostavi da su fajlovi jednaki ako su datum izmene i dužina fajla jednaki.\n" +"Pretpostavi da su fajlovi jednaki ako su datum izmene i dužina fajla " +"jednaki.\n" "Korisno za velike direktorijume ili spore mreže." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Pretpostavi da su fajlovi jednaki ako su datum izmene i dužina fajla " +"jednaki.\n" +"Korisno za velike direktorijume ili spore mreže." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Veruj veličini (nije bezbedno)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1974,11 +2025,11 @@ msgstr "" "Korisno za velike direktorijume ili spore mreže kada se datum izmene u toku " "preuzimanja." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Sinhronizuj direktorijume" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1988,11 +2039,11 @@ msgstr "" "da su oba direktorijuma posle toga ista.\n" "Radi samo kada se porede dva direktorijuma bez navođenja odredišta." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Razlike u belim razmacima smatraju se jednakim" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2000,11 +2051,11 @@ msgstr "" "Ako se fajlovi razlikuju samo u belim razmacima, smatraju se jednakim.\n" "Ovo je aktivno samo kada se izabere puna analiza." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiraj noviji umesto stapanja (nije bezbedno)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2014,11 +2065,11 @@ msgstr "" "(Koristite ovo samo ako znate šta radite!)\n" "Ima efekta samo kada se porede dva direktorijuma." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Rezerviši fajlove (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2026,15 +2077,15 @@ msgstr "" "Kada treba snimiti fajl preko starog fajla, stari fajl će biti\n" "preimenovan sa nastavkom „.orig“ umesto da bude obrisan." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regionalna podešavanja" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Jezik (potrebno ponovno pokretanje)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2042,11 +2093,11 @@ msgstr "" "Izaberite jezik za ispise u programu ili „Auto“.\n" "Da bi izmena jezika bila primenjena, zatvorite i ponovo pokrenite KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Koristi isto kodiranje za sve:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2054,60 +2105,60 @@ msgstr "" "Uključivanjem ovog možete promeniti sva kodiranja promenom samo prvog.\n" "Isključite ovo ako su potrebna različita pojedina podešavanja." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Napomna: Lokalno kodiranje je " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Kodiranje fajla za A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Kodiranje fajla za B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Kodiranje fajla za C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Kodiranje fajla za stopljeni izlaz i snimanje:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Automatsko kopiranje izbora" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Kodiranje fajla za preprocesorke fajlove:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Jezici s desna u levo" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2115,21 +2166,21 @@ msgstr "" "Neki jezici se čitaju s desna u levo.\n" "Ovo podešavanje će prilagoditi tome prikazivač i uređivač." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Operacija" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Regionalna podešavanja" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2137,7 +2188,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2153,19 +2224,19 @@ msgstr "" "\n" "Želite li da nastavite ili ćete izabrati drugi font?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Nekompatibilan font" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Nastavite na sopstveni rizik" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Izaberite drugi font" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Ovo resetuje sve opcije. Ne samo one u tekućoj temi." @@ -2174,10 +2245,8 @@ msgid "PreprocessorCmd: " msgstr "Preprocesorka naredba: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Sledeće opcije koje ste izabrali mogu izmeniti podatke:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Sledeće opcije koje ste izabrali mogu izmeniti podatke:\n" #: pdiff.cpp:264 msgid "" @@ -2242,19 +2311,10 @@ msgstr "Raz.lin.: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Svi ulazni fajlovi sadrže isti tekst." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Fajlovi B i C su binarno jednaki.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Fajlovi A i B su binarno jednaki.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Fajlovi A i B su binarno jednaki.\n" #: pdiff.cpp:530 msgid "" @@ -2266,109 +2326,55 @@ msgstr "" "Imajte na umu da KDiff3 stapanje nije namenjeno binarnim podacima.\n" "Nastavite na sopstveni rizik." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Prekini" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Otvaram fajlove..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Greška pri otvaranju fajla" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Isecam izabrano..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopiram izabrano u klipbord..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Ubacujem sadržaj klipborda..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Snimi i nastavi" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Nastavi bez snimanja" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Pretraga je završena." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Pretraga je gotova" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Greška u toku pravljenja direktorijuma." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Podesi KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Direktorijum" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Operacija stapanja tekuće stavke" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Operacija sinh. tekuće stavke" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Kretanje" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iff prikaz" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Stopi" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "P&rozor" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (baza):" @@ -2411,6 +2417,10 @@ msgstr "Izlaz (opciono):" msgid "Configure..." msgstr "Podesi..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Tekst za pretragu:" @@ -2483,6 +2493,14 @@ msgstr "" msgid "Sort key result:" msgstr "" +#: 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 "" @@ -2496,6 +2514,88 @@ msgstr "Snimanje nije uspelo." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "Podesi KDiff3" + +#: kdiff3_shell.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Fajl..." + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "&Direktorijum" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Operacija stapanja tekuće stavke" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Operacija sinh. tekuće stavke" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Kretanje" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iff prikaz" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Stopi" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "P&rozor" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Fajlovi A i B su binarno jednaki.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Fajlovi A i C su binarno jednaki.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Fajlovi A i C imaju jednak tekst.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Fajlovi B i C su binarno jednaki.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Fajlovi B i C imaju jednak tekst.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Očuvaj CR" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Prikaži CR znakove „\\r“ ako postoje.\n" +#~ "Pomaže da se uporede fajlovi koji su menjani pod različitim operativnim " +#~ "sistemima." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Razlika i stapanje" @@ -2570,8 +2670,10 @@ msgstr "" #~ msgid "Convert to upper case" #~ msgstr "Pretvori u velika slova" -#~ msgid "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" -#~ msgstr "Pretvori sve znakove malih slova u velika pri čitanju. (npr.: „a“->„A“)" +#~ msgid "" +#~ "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" +#~ msgstr "" +#~ "Pretvori sve znakove malih slova u velika pri čitanju. (npr.: „a“->„A“)" #, fuzzy #~ msgid "Convert to upper case\n" @@ -2579,9 +2681,13 @@ msgstr "" #~ msgid "" #~ "Running the external diff failed.\n" -#~ "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n" -#~ "The external diff option will be disabled now and the internal diff will be used." +#~ "Check if the diff works, if the program can write in the temp folder or " +#~ "if the disk is full.\n" +#~ "The external diff option will be disabled now and the internal diff will " +#~ "be used." #~ msgstr "" #~ "Pokretanje spoljašnjeg razlikovanja nije uspelo.\n" -#~ "Proverite da li to razlikovanje radi, da li program može da piše u privremeni direktorijum i da li ima prostora na disku.\n" -#~ "Opcija spoljašnjeg razlikovanja će sada biti isključena i koristiće se unutrašnje." +#~ "Proverite da li to razlikovanje radi, da li program može da piše u " +#~ "privremeni direktorijum i da li ima prostora na disku.\n" +#~ "Opcija spoljašnjeg razlikovanja će sada biti isključena i koristiće se " +#~ "unutrašnje." |