diff options
Diffstat (limited to 'tde-i18n-hr/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-hr/messages/tdesdk/kompare.po | 1020 |
1 files changed, 510 insertions, 510 deletions
diff --git a/tde-i18n-hr/messages/tdesdk/kompare.po b/tde-i18n-hr/messages/tdesdk/kompare.po index a0068393085..b16cf4b6d92 100644 --- a/tde-i18n-hr/messages/tdesdk/kompare.po +++ b/tde-i18n-hr/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare 0\n" -"POT-Creation-Date: 2014-09-29 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\n" "PO-Revision-Date: 2004-04-20 13:26+CEST\n" "Last-Translator: auto\n" "Language-Team: Croatian <[email protected]>\n" @@ -16,112 +16,6 @@ msgstr "" "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n" "X-Generator: TransDict server\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "Diana Ćorluka, Robert Pezer" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "[email protected]" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -#, fuzzy -msgid "Source Folder" -msgstr "Izvorni direktorij" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -#, fuzzy -msgid "Destination Folder" -msgstr "Odredišni direktorij" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "Izvorna datoteka" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -#, fuzzy -msgid "Destination File" -msgstr "Odredišni datoteka" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -#, fuzzy -msgid "Source Line" -msgstr "Izvorna linija" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -#, fuzzy -msgid "Destination Line" -msgstr "Odredišna linija" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Razlika" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, fuzzy, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "" -"Promijenjena je %n linija\n" -"Promijenjene su %n linije\n" -"Promijenjeno je %n linija" - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, fuzzy, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "" -"Ubačena je %n linija\n" -"Ubačene su %n linije\n" -"Ubačeno je %n linija" - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, fuzzy, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"Obrisana je %n linija\n" -"Obrisane su %n linije\n" -"Obrisano je %n linija" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Napoznato" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -#, fuzzy -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" - #: libdiff2/komparemodellist.cpp:61 #, fuzzy msgid "&Apply Difference" @@ -218,186 +112,6 @@ msgstr "Datoteke su identični." msgid "Could not write to the temporary file." msgstr "Nisam mogao da pišem u privreizbornik datoteka." -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." -msgstr "" - -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." -msgstr "" - -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." -msgstr "" - -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." -msgstr "" - -#: kompare_shell.cpp:233 -#, fuzzy -msgid "&Open Diff..." -msgstr "&Otvori diff..." - -#: kompare_shell.cpp:234 -#, fuzzy -msgid "&Compare Files..." -msgstr "&Uporedi datotekaove..." - -#: kompare_shell.cpp:237 -#, fuzzy -msgid "&Blend URL with Diff..." -msgstr "&Stopi URL sa diff-om..." - -#: kompare_shell.cpp:246 -#, fuzzy -msgid "Show T&ext View" -msgstr "Pokaži te&kstualni pogled" - -#: kompare_shell.cpp:248 -#, fuzzy -msgid "Hide T&ext View" -msgstr "Pogled teksta" - -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr "0 od 0 razlike" - -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr "0 od 0 datoteke" - -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -" %1 od %n datoteka \n" -" %1 od %n datotekaa \n" -" %1 od %n datotekaova " - -#: kompare_shell.cpp:275 -#, fuzzy, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -" %n datoteka \n" -" %n datotekaa \n" -" %n datotekaova " - -#: kompare_shell.cpp:278 -#, fuzzy -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -" %1 od %n razlika, %2 primenjena \n" -" %1 od %n razlike, %2 primenjene \n" -" %1 od %n razlika, %2 primenjeno " - -#: kompare_shell.cpp:281 -#, fuzzy, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -" %n razlika \n" -" %n razlike \n" -" %n razlika " - -#: kompare_shell.cpp:369 -#, fuzzy -msgid "Blend File/Folder with diff Output" -msgstr "Stopi datoteka/direktorij sa diff izlazom" - -#: kompare_shell.cpp:370 -#, fuzzy -msgid "File/Folder" -msgstr "Datoteka/direktorij" - -#: kompare_shell.cpp:371 -#, fuzzy -msgid "Diff Output" -msgstr "Diff izlaz" - -#: kompare_shell.cpp:373 -msgid "Blend" -msgstr "Miješanje" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend this file or folder with the diff output" -msgstr "Stopi ovaj datoteka ili direktorij sa diff izlazom" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " -msgstr "" -"Ako ste unijeli ime datotekaa ili direktorija i datoteka koji sadrži diff izlaz " -"u poljima u ovom prozoru onda će ovo gumb biti omogućeno i njegovim " -"pritiskanjem će se otvoriti glavni pogled kompare-a gdje su izlazi unetog " -"datotekaa ili datotekaova iz direktorija pomešani sa diff izlazom tako da " -"možete priizbornikti razlike na datoteka ili datotekaove." - -#: kompare_shell.cpp:398 main.cpp:185 -#, fuzzy -msgid "Compare Files or Folders" -msgstr "Uporedi datotekaove ili direktorije" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Izvor" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Odredište" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Usporedba" - -#: kompare_shell.cpp:402 -#, fuzzy -msgid "Compare these files or folders" -msgstr "Uporedi ove datotekaove ili direktorije" - -#: kompare_shell.cpp:402 main.cpp:189 -#, fuzzy -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" -"Ako ste unijeli 2 imena datotekaa ili 2 direktorija u poljima u ovom prozoru, " -"ovo gumb će biti uključeno i njegovim pritiskanjem će započeti upoređivanje " -"unijetih datotekaova ili direktorija. " - -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Pogled teksta" - -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "" - -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Razlika" - -#: kompareurldialog.cpp:47 -msgid "Here you can change the options for comparing the files." -msgstr "" - -#: kompareurldialog.cpp:53 -msgid "Here you can change the options for the view." -msgstr "" - #. i18n: file komparepart/komparepartui.rc line 13 #: rc.cpp:15 #, no-c-format @@ -524,247 +238,371 @@ msgstr "Jedno uz drugo" msgid "Number of context lines:" msgstr "Broj linija konteksta:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Podešenja" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Postavke pogleda" - -#: komparepart/kompareprefdlg.cpp:43 +#: main.cpp:33 #, fuzzy -msgid "Diff Settings" -msgstr "Diff podešavanja" +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "" +"Program za pregledanje razlika među datotekema i opciono pravljenje diff-a." -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "&Spremi sve" +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "Ovo će uporediti URL1 sa URL2." -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: main.cpp:40 +#, fuzzy +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " +"then it will read from standard input. Can be used for instance for cvs diff | " +"kompare -o -. Kompare will do a check to see if it can find the original " +"file(s) and then blend the original file(s) into the diffoutput and show that " +"in the viewer. -n disables the check." msgstr "" +"Ovo će otvoriti URL1 u očekivanju da je to diff izlaz. URL1 također može biti " +"„-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primjer " +"koristiti za cvs diff | kompare -o -. Kompare će izvršiti provjeru da vidi da " +"li može da nađe originalne datotekaove i onda će stopiti originalne datotekaove " +"u diff izlaz i to prikazati u dijelu za pregled. -n isključuje provjeru." -#: komparepart/kompare_part.cpp:171 +#: main.cpp:41 #, fuzzy -msgid "Swap Source with Destination" -msgstr "Zaizbornik izvor odredištem" +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " +"file or folder that the diffoutput needs to be blended into. " +msgstr "" +"Ovo će stopiti URL2 u URL1, gdje se očekuje da je URL2 diff izlaz, a URL1 " +"datoteka ili direktorij u koji treba stopiti diff izlaz." -#: komparepart/kompare_part.cpp:174 +#: main.cpp:42 #, fuzzy -msgid "Show Statistics" -msgstr "Pokaži statistiku" +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"Isključuje provjeru za automatsko pronalaženje originalnih datotekaova kada se " +"sa opcijom -o koristi „-“ kao URL." -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +#: main.cpp:43 +msgid "" +"Use this to specify the encoding when calling it from the command line. It will " +"default to the local encoding if not specified." msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -#: komparepart/kompare_part.cpp:425 +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Mnoštvo dobrih savjeta" + +#: main.cpp:59 #, fuzzy -msgid "Diff Options" -msgstr "Diff opcije" +msgid "Cervisia diff viewer" +msgstr "Cervisia-in dio za pregeled diff-ova" -#: komparepart/kompare_part.cpp:443 +#: kompare_shell.cpp:398 main.cpp:185 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Datoteke zakrpe" +msgid "Compare Files or Folders" +msgstr "Uporedi datotekaove ili direktorije" -#: komparepart/kompare_part.cpp:443 +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Izvor" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Odredište" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Usporedba" + +#: main.cpp:189 #, fuzzy -msgid "Save .diff" -msgstr "Snimi .diff" +msgid "Compare these files or folder" +msgstr "Uporedi ove datotekaove ili direktorije" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog then " +"this button will be enabled and pressing it will start a comparison of the " +"entered files or folders. " msgstr "" +"Ako ste unijeli 2 imena datotekaa ili 2 direktorija u poljima u ovom prozoru, " +"ovo gumb će biti uključeno i njegovim pritiskanjem će započeti upoređivanje " +"unijetih datotekaova ili direktorija. " -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Diana Ćorluka, Robert Pezer" + +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "[email protected]" + +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." msgstr "" -#: komparepart/kompare_part.cpp:481 +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." +msgstr "" + +#: kompare_shell.cpp:233 #, fuzzy -msgid "KomparePart" -msgstr "KomparePart" +msgid "&Open Diff..." +msgstr "&Otvori diff..." -#: komparepart/kompare_part.cpp:493 +#: kompare_shell.cpp:234 #, fuzzy -msgid "Running diff..." -msgstr "Pokrećem diff..." +msgid "&Compare Files..." +msgstr "&Uporedi datotekaove..." -#: komparepart/kompare_part.cpp:496 +#: kompare_shell.cpp:237 #, fuzzy -msgid "Parsing diff output..." -msgstr "Raščlanjujem diff izlaz..." +msgid "&Blend URL with Diff..." +msgstr "&Stopi URL sa diff-om..." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Upoređujem datoteka %1 sa datotekaom %2" +#: kompare_shell.cpp:246 +#, fuzzy +msgid "Show T&ext View" +msgstr "Pokaži te&kstualni pogled" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Upoređujem datotekaove u %1 sa datotekema u %2" +#: kompare_shell.cpp:248 +#, fuzzy +msgid "Hide T&ext View" +msgstr "Pogled teksta" -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Prikazujem diff izlaz iz %1" +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr "0 od 0 razlike" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Stapam diff izlaz iz %1 u datoteka %2" +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr "0 od 0 datoteke" -#: komparepart/kompare_part.cpp:563 -#, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Stapam diff izlaz iz %1 u direktorij %2" +#: kompare_shell.cpp:273 +msgid "" +"_n: %1 of %n file \n" +" %1 of %n files " +msgstr "" +" %1 od %n datoteka \n" +" %1 od %n datotekaa \n" +" %1 od %n datotekaova " -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: kompare_shell.cpp:275 +#, fuzzy, c-format msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"_n: %n file \n" +" %n files " msgstr "" +" %n datoteka \n" +" %n datotekaa \n" +" %n datotekaova " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +#: kompare_shell.cpp:278 #, fuzzy -msgid "Save Changes?" -msgstr "Da li da snimim izmjene?" +msgid "" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr "" +" %1 od %n razlika, %2 primenjena \n" +" %1 od %n razlike, %2 primenjene \n" +" %1 od %n razlika, %2 primenjeno " -#: komparepart/kompare_part.cpp:667 -#, fuzzy +#: kompare_shell.cpp:281 +#, fuzzy, c-format msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"_n: %n difference \n" +" %n differences " msgstr "" -"Nema diff datotekaa, ili nikoja dva datotekaa nisu diff-ovana. Stoga, nije " -"dostupna statistika." +" %n razlika \n" +" %n razlike \n" +" %n razlika " -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 +#: kompare_shell.cpp:369 #, fuzzy -msgid "Diff Statistics" -msgstr "Diff statistika" +msgid "Blend File/Folder with diff Output" +msgstr "Stopi datoteka/direktorij sa diff izlazom" -#: komparepart/kompare_part.cpp:673 +#: kompare_shell.cpp:370 #, fuzzy -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" -msgstr "" -"Statistika:\n" -"\n" -"Stari datoteka: %1\n" -"Novi datoteka: %2\n" -"\n" -"Format: %3\n" -"Broj komada: %4\n" -"Broj razlika: %5" +msgid "File/Folder" +msgstr "Datoteka/direktorij" -#: komparepart/kompare_part.cpp:686 +#: kompare_shell.cpp:371 +#, fuzzy +msgid "Diff Output" +msgstr "Diff izlaz" + +#: kompare_shell.cpp:373 +msgid "Blend" +msgstr "Miješanje" + +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend this file or folder with the diff output" +msgstr "Stopi ovaj datoteka ili direktorij sa diff izlazom" + +#: kompare_shell.cpp:373 #, fuzzy msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +"If you have entered a file or folder name and a file that contains diff output " +"in the fields in this dialog then this button will be enabled and pressing it " +"will open kompare's main view where the output of the entered file or files " +"from the folder are mixed with the diff output so you can then apply the " +"difference(s) to a file or to the files. " msgstr "" -"Statistika:\n" -"\n" -"Broj datotekaova u diff datoteku: %1\n" -"Format: %2\n" -"\n" -"Trenutni stari datoteka: %3\n" -"Trenutni novi datoteka: %4\n" -"\n" -"Broj komada: %5\n" -"Broj razlika: %6" +"Ako ste unijeli ime datotekaa ili direktorija i datoteka koji sadrži diff izlaz " +"u poljima u ovom prozoru onda će ovo gumb biti omogućeno i njegovim " +"pritiskanjem će se otvoriti glavni pogled kompare-a gdje su izlazi unetog " +"datotekaa ili datotekaova iz direktorija pomešani sa diff izlazom tako da " +"možete priizbornikti razlike na datoteka ili datotekaove." -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "" +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Uporedi ove datotekaove ili direktorije" -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Pogled teksta" -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "Boje" +#: komparenavtreepart/komparenavtreepart.cpp:61 +#, fuzzy +msgid "Source Folder" +msgstr "Izvorni direktorij" -#: libdialogpages/viewpage.cpp:56 +#: komparenavtreepart/komparenavtreepart.cpp:66 #, fuzzy -msgid "Removed color:" -msgstr "Uklonjena boja:" +msgid "Destination Folder" +msgstr "Odredišni direktorij" -#: libdialogpages/viewpage.cpp:61 +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "Izvorna datoteka" + +#: komparenavtreepart/komparenavtreepart.cpp:72 #, fuzzy -msgid "Changed color:" -msgstr "Izmjenjena boja:" +msgid "Destination File" +msgstr "Odredišni datoteka" -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" -msgstr "Dodana boja:" +#: komparenavtreepart/komparenavtreepart.cpp:78 +#, fuzzy +msgid "Source Line" +msgstr "Izvorna linija" -#: libdialogpages/viewpage.cpp:71 +#: komparenavtreepart/komparenavtreepart.cpp:79 #, fuzzy -msgid "Applied color:" -msgstr "Primenjena boja:" +msgid "Destination Line" +msgstr "Odredišna linija" -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "Kotačić na mišu" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Razlika" -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Broj redaka:" +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr "" -#: libdialogpages/viewpage.cpp:86 -#, fuzzy -msgid "Tabs to Spaces" -msgstr "Tabulatori u razmake" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, fuzzy, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" +"Promijenjena je %n linija\n" +"Promijenjene su %n linije\n" +"Promijenjeno je %n linija" -#: libdialogpages/viewpage.cpp:90 -#, fuzzy -msgid "Number of spaces to convert a tab character to:" -msgstr "Broj razmaka u koje se pretvara znaka tabulatora:" +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "&Izgled" +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, fuzzy, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "" +"Ubačena je %n linija\n" +"Ubačene su %n linije\n" +"Ubačeno je %n linija" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" msgstr "" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, fuzzy, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" msgstr "" +"Obrisana je %n linija\n" +"Obrisane su %n linije\n" +"Obrisano je %n linija" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Napoznato" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +#, fuzzy +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Razlika" + +#: kompareurldialog.cpp:47 +msgid "Here you can change the options for comparing the files." +msgstr "" + +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." msgstr "" #: libdialogpages/diffpage.cpp:211 @@ -958,83 +796,245 @@ msgstr "" msgid "&Exclude" msgstr "" -#: main.cpp:33 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" msgstr "" -"Program za pregledanje razlika među datotekema i opciono pravljenje diff-a." -#: main.cpp:39 +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "" + +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Boje" + +#: libdialogpages/viewpage.cpp:56 #, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Ovo će uporediti URL1 sa URL2." +msgid "Removed color:" +msgstr "Uklonjena boja:" -#: main.cpp:40 +#: libdialogpages/viewpage.cpp:61 #, fuzzy -msgid "" -"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " -"then it will read from standard input. Can be used for instance for cvs diff | " -"kompare -o -. Kompare will do a check to see if it can find the original " -"file(s) and then blend the original file(s) into the diffoutput and show that " -"in the viewer. -n disables the check." +msgid "Changed color:" +msgstr "Izmjenjena boja:" + +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "Dodana boja:" + +#: libdialogpages/viewpage.cpp:71 +#, fuzzy +msgid "Applied color:" +msgstr "Primenjena boja:" + +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "Kotačić na mišu" + +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Broj redaka:" + +#: libdialogpages/viewpage.cpp:86 +#, fuzzy +msgid "Tabs to Spaces" +msgstr "Tabulatori u razmake" + +#: libdialogpages/viewpage.cpp:90 +#, fuzzy +msgid "Number of spaces to convert a tab character to:" +msgstr "Broj razmaka u koje se pretvara znaka tabulatora:" + +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "&Izgled" + +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" msgstr "" -"Ovo će otvoriti URL1 u očekivanju da je to diff izlaz. URL1 također može biti " -"„-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primjer " -"koristiti za cvs diff | kompare -o -. Kompare će izvršiti provjeru da vidi da " -"li može da nađe originalne datotekaove i onda će stopiti originalne datotekaove " -"u diff izlaz i to prikazati u dijelu za pregled. -n isključuje provjeru." -#: main.cpp:41 +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "" + +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +msgstr "" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Podešenja" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Postavke pogleda" + +#: komparepart/kompareprefdlg.cpp:43 #, fuzzy -msgid "" -"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " -"file or folder that the diffoutput needs to be blended into. " +msgid "Diff Settings" +msgstr "Diff podešavanja" + +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "&Spremi sve" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." msgstr "" -"Ovo će stopiti URL2 u URL1, gdje se očekuje da je URL2 diff izlaz, a URL1 " -"datoteka ili direktorij u koji treba stopiti diff izlaz." -#: main.cpp:42 +#: komparepart/kompare_part.cpp:171 #, fuzzy -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +msgid "Swap Source with Destination" +msgstr "Zaizbornik izvor odredištem" + +#: komparepart/kompare_part.cpp:174 +#, fuzzy +msgid "Show Statistics" +msgstr "Pokaži statistiku" + +#: komparepart/kompare_part.cpp:269 +msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgstr "" -"Isključuje provjeru za automatsko pronalaženje originalnih datotekaova kada se " -"sa opcijom -o koristi „-“ kao URL." -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." +#: komparepart/kompare_part.cpp:281 +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" msgstr "" -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" +#: komparepart/kompare_part.cpp:425 +#, fuzzy +msgid "Diff Options" +msgstr "Diff opcije" -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Datoteke zakrpe" + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "Save .diff" +msgstr "Snimi .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" msgstr "" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "" -#: main.cpp:57 -msgid "Kompare icon artist" +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" msgstr "" -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Mnoštvo dobrih savjeta" +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "" -#: main.cpp:59 +#: komparepart/kompare_part.cpp:481 #, fuzzy -msgid "Cervisia diff viewer" -msgstr "Cervisia-in dio za pregeled diff-ova" +msgid "KomparePart" +msgstr "KomparePart" -#: main.cpp:189 +#: komparepart/kompare_part.cpp:493 #, fuzzy -msgid "Compare these files or folder" -msgstr "Uporedi ove datotekaove ili direktorije" +msgid "Running diff..." +msgstr "Pokrećem diff..." + +#: komparepart/kompare_part.cpp:496 +#, fuzzy +msgid "Parsing diff output..." +msgstr "Raščlanjujem diff izlaz..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Upoređujem datoteka %1 sa datotekaom %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Upoređujem datotekaove u %1 sa datotekema u %2" + +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "Prikazujem diff izlaz iz %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Stapam diff izlaz iz %1 u datoteka %2" + +#: komparepart/kompare_part.cpp:563 +#, fuzzy +msgid "Blending diff output from %1 into folder %2" +msgstr "Stapam diff izlaz iz %1 u direktorij %2" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +#, fuzzy +msgid "Save Changes?" +msgstr "Da li da snimim izmjene?" + +#: komparepart/kompare_part.cpp:667 +#, fuzzy +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are available." +msgstr "" +"Nema diff datotekaa, ili nikoja dva datotekaa nisu diff-ovana. Stoga, nije " +"dostupna statistika." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +#, fuzzy +msgid "Diff Statistics" +msgstr "Diff statistika" + +#: komparepart/kompare_part.cpp:673 +#, fuzzy +msgid "" +"Statistics:\n" +"\n" +"Old file: %1\n" +"New file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" +msgstr "" +"Statistika:\n" +"\n" +"Stari datoteka: %1\n" +"Novi datoteka: %2\n" +"\n" +"Format: %3\n" +"Broj komada: %4\n" +"Broj razlika: %5" + +#: komparepart/kompare_part.cpp:686 +#, fuzzy +msgid "" +"Statistics:\n" +"\n" +"Number of files in diff file: %1\n" +"Format: %2\n" +"\n" +"Current old file: %3\n" +"Current new file: %4\n" +"\n" +"Number of hunks: %5\n" +"Number of differences: %6" +msgstr "" +"Statistika:\n" +"\n" +"Broj datotekaova u diff datoteku: %1\n" +"Format: %2\n" +"\n" +"Trenutni stari datoteka: %3\n" +"Trenutni novi datoteka: %4\n" +"\n" +"Broj komada: %5\n" +"Broj razlika: %6" |