diff options
Diffstat (limited to 'tde-i18n-sl/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-sl/messages/tdesdk/kompare.po | 1040 |
1 files changed, 520 insertions, 520 deletions
diff --git a/tde-i18n-sl/messages/tdesdk/kompare.po b/tde-i18n-sl/messages/tdesdk/kompare.po index 2b917beb4aa..3ff3218f8d1 100644 --- a/tde-i18n-sl/messages/tdesdk/kompare.po +++ b/tde-i18n-sl/messages/tdesdk/kompare.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" -"POT-Creation-Date: 2014-09-29 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\n" "PO-Revision-Date: 2006-05-18 20:17+0200\n" "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -23,121 +23,6 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " "n%100==4 ? 2 : 3);\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "Gregor Rakar,Andrej Vernekar,Jure Repinc" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "gregor.rakar@kiss.si,andrej.vernekar@moj.net,jlp@holodeck1.com" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "Izvorna mapa" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "Ciljna mapa" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "Izvorna datoteka" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -msgid "Destination File" -msgstr "Ciljna datoteka" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -msgid "Source Line" -msgstr "Izvorna vrstica" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -msgid "Destination Line" -msgstr "Ciljna vrstica" - -#: 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 "" -"Uveljavljeno: spremembe narejene v %n vrsticah so razveljavljene\n" -"Uveljavljeno: spremembe narejene v %n vrstici so razveljavljene\n" -"Uveljavljeno: spremembe narejene v %n vrsticah so razveljavljene\n" -"Uveljavljeno: spremembe narejene v %n vrsticah so razveljavljene" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "" -"Spremenjenih %n vrstic\n" -"Spremenjena %n vrstica\n" -"Spremenjeni %n vrstici\n" -"Spremenjene %n vrstice" - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr "" -"Uveljavljeno: razveljavljena je vstavitev %n vrstic\n" -"Uveljavljeno: razveljavljena je vstavitev %n vrstice\n" -"Uveljavljeno: razveljavljena je vstavitev %n vrstic\n" -"Uveljavljeno: razveljavljena je vstavitev %n vrstic" - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "" -"Vstavljenih %n vrstic\n" -"Vstavljena %n vrstica\n" -"Vstavljeni %n vrstici\n" -"Vstavljene %n vrstice" - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "" -"Uveljavljeno: razveljavljena je izbris %n vrstic\n" -"Uveljavljeno: razveljavljena je izbris %n vrstice\n" -"Uveljavljeno: razveljavljena je izbris %n vrstic\n" -"Uveljavljeno: razveljavljena je izbris %n vrstic" - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"Izbrisane %n vrstic\n" -"Izbrisana %n vrstica\n" -"Izbrisani %n vrstici\n" -"Izbrisane %n vrstice" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Neznan" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" - #: libdiff2/komparemodellist.cpp:61 msgid "&Apply Difference" msgstr "&Uveljavi razliko" @@ -231,175 +116,6 @@ msgstr "Datoteki sta enaki." msgid "Could not write to the temporary file." msgstr "Ni bilo moč pisati v začasno datoteko." -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." -msgstr "Ni bilo moč najti KompareViewPart." - -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." -msgstr "Ni bilo moč naložiti KompareViewPart." - -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." -msgstr "Ni bilo moč najti KompareNavigationPart." - -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." -msgstr "Ni bilo moč naložiti KompareNavigationPart." - -#: kompare_shell.cpp:233 -msgid "&Open Diff..." -msgstr "&Odpri diff ..." - -#: kompare_shell.cpp:234 -msgid "&Compare Files..." -msgstr "P&rimerjaj datoteki ..." - -#: kompare_shell.cpp:237 -msgid "&Blend URL with Diff..." -msgstr "Z&mešaj URL z diff ..." - -#: kompare_shell.cpp:246 -msgid "Show T&ext View" -msgstr "Pokaži b&esedilni prikaz" - -#: kompare_shell.cpp:248 -msgid "Hide T&ext View" -msgstr "Skrij &besedilni prikaz" - -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr " 0 od 0 razlik " - -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr " 0 od 0 datotek" - -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -"%1 od %n datotek\n" -"%1 od %n datoteke\n" -"%1 od %n datotek\n" -"%1 od %n datotek" - -#: kompare_shell.cpp:275 -#, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -" %n datotek \n" -" %n datoteka \n" -" %n datoteki \n" -" %n datoteke " - -#: kompare_shell.cpp:278 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -"%1 od %n razlik, %2 uveljavljenih\n" -"%1 od %n razlike, %2 uveljavljenih\n" -"%1 od %n razlik, %2 uveljavljenih\n" -"%1 od %n razlik, %2 uveljavljenih" - -#: kompare_shell.cpp:281 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -" %n razlik \n" -" %n razlika \n" -" %n razliki \n" -" %n razlike " - -#: kompare_shell.cpp:369 -msgid "Blend File/Folder with diff Output" -msgstr "Zmešaj datoteko ali mapo z izpisom diff" - -#: kompare_shell.cpp:370 -msgid "File/Folder" -msgstr "Datoteka/Mapa" - -#: kompare_shell.cpp:371 -msgid "Diff Output" -msgstr "Izhod diff" - -#: kompare_shell.cpp:373 -msgid "Blend" -msgstr "Zmešaj" - -#: kompare_shell.cpp:373 -msgid "Blend this file or folder with the diff output" -msgstr "Zmešaj to datoteko ali mapo z izpisom diff" - -#: kompare_shell.cpp:373 -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 "" -"Če ste vnesli ime datoteke ali mape in ime datoteke, ki vsebuje izhod diff-a, " -"bo ta gumb omogočen in po kliku nanj bo Kompare prikazal združen izhod vnesene " -"datoteke ali datotek iz map in izhoda diff-a. Na ta način lahko uveljavite " -"spremembe za želene datoteke." - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Primerjaj datoteki ali mapi" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Vir" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cilj" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Primerjaj" - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Primerjaj te datoteke ali mape" - -#: kompare_shell.cpp:402 main.cpp:189 -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 "" -"Če ste vnesli 2 datoteki ali 2 mapi v polja tega pogovornega okna, potem bo ta " -"gumb omogočen in pritisk nanj bo pričelo s primerjanjem vnešenih datotek ali " -"map." - -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Besedilni prikaz" - -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Tukaj lahko vnesete datoteke ki jih želite primerjati." - -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Diff" - -#: kompareurldialog.cpp:47 -msgid "Here you can change the options for comparing the files." -msgstr "Tukaj lahko spremenite možnosti za primerjavo datotek." - -#: kompareurldialog.cpp:53 -msgid "Here you can change the options for the view." -msgstr "Tu lahko spremenite možnosti pogleda." - #. i18n: file komparepart/komparepartui.rc line 13 #: rc.cpp:15 #, no-c-format @@ -526,231 +242,366 @@ msgstr "Drug poleg drugega" msgid "Number of context lines:" msgstr "Število vrstic konteksta:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Lastnosti" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "" +"Program za ogled razlik med datotekama in možno ustvarjanje datoteke sprememb " +"(diff)" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Nastavitve prikaza" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "To bo primerjalo URL1 z URL2" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Nastavitve Diff" +#: main.cpp:40 +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 "" +"To bo odprlo URL1, za katerega se pričakuje, da je izhod diff-a. URL1 je lahko " +"tudi »-«, kar pomeni branje iz standardnega vhoda. Lahko se uporabi tako: cvs " +"diff | kompare -o -. Kompare bo poskušal najti originalne datoteke in združiti " +"originale z izhodom diff-a ter prikazati to v pregledovalniku. Možnost -n " +"onemogoči iskanje originalov." -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Shrani &vse" +#: main.cpp:41 +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 "" +"To bo zmešalo URL2 v URL1. Pričakuje se, da je URL2 izpis diff in URL1 datoteka " +"ali mapa, v katero se zmeša izpis diff." -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Shrani .&diff ..." +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"Onemogoči preverjanje samodejnega iskanja prvotne datoteke, ko se uporablja »-« " +"kot URL z možnostjo -o." -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Zamenjaj vir s ciljem" +#: 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 "" +"Uporabite to za določitev kodiranja ko ga kličete iz ukazne vrstice. Če ni " +"določeno, bo privzeto uporabljeno krajevno kodiranje." -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Prikaži statistiko" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>URL <b>%1</b> ne more biti naložen.</qt>" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh in Otto Bruggeman" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "<qt>URL <b>%1</b> ne obstaja na tem sistemu.</qt>" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Avtor" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Možnosti diff" +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Umetnik, ki je ustvaril ikone za Kompare" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Datoteke vrste Patch" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Mnogo dobrih nasvetov" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Shrani .diff" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Pregledovalnik diff za Cervisio" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Primerjaj datoteki ali mapi" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Vir" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cilj" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Primerjaj" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Primerjaj ti datoteki ali mapi" + +#: kompare_shell.cpp:402 main.cpp:189 +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 "" -"Datoteka obstaja ali pa je zaščitena pred pisanjem; jo želite nadomestiti?" +"Če ste vnesli 2 datoteki ali 2 mapi v polja tega pogovornega okna, potem bo ta " +"gumb omogočen in pritisk nanj bo pričelo s primerjanjem vnešenih datotek ali " +"map." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Datoteka obstaja" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Gregor Rakar,Andrej Vernekar,Jure Repinc" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Nadomesti" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "gregor.rakar@kiss.si,andrej.vernekar@moj.net,jlp@holodeck1.com" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ne nadomesti" +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." +msgstr "Ni bilo moč najti KompareViewPart." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." +msgstr "Ni bilo moč naložiti KompareViewPart." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Poganjanje diff ...." +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." +msgstr "Ni bilo moč najti KompareNavigationPart." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Razčlenjevanje izhoda diff ..." +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." +msgstr "Ni bilo moč naložiti KompareNavigationPart." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Primerjanje datoteke %1 z datoteko %2" +#: kompare_shell.cpp:233 +msgid "&Open Diff..." +msgstr "&Odpri diff ..." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Primerjanje datotek v %1 z datotekami v %2" +#: kompare_shell.cpp:234 +msgid "&Compare Files..." +msgstr "P&rimerjaj datoteki ..." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Prikazovanje izhoda diff iz %1" +#: kompare_shell.cpp:237 +msgid "&Blend URL with Diff..." +msgstr "Z&mešaj URL z diff ..." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Mešanje izpisa diff iz %1 v datoteko %2" +#: kompare_shell.cpp:246 +msgid "Show T&ext View" +msgstr "Pokaži b&esedilni prikaz" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Mešanje izpisa diff iz %1 v mapo %2" +#: kompare_shell.cpp:248 +msgid "Hide T&ext View" +msgstr "Skrij &besedilni prikaz" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr " 0 od 0 razlik " + +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr " 0 od 0 datotek" + +#: kompare_shell.cpp:273 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -"Spremenili ste ciljne datoteke.\n" -"Bi jih radi shranili?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Shranim spremembe?" +"%1 od %n datotek\n" +"%1 od %n datoteke\n" +"%1 od %n datotek\n" +"%1 od %n datotek" -#: komparepart/kompare_part.cpp:667 +#: kompare_shell.cpp:275 +#, c-format msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"_n: %n file \n" +" %n files " msgstr "" -"Ni datoteke diff ali pa nista bili primerjani dve datoteki. Statistika zaradi " -"tegani na voljo." +" %n datotek \n" +" %n datoteka \n" +" %n datoteki \n" +" %n datoteke " -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistika diff" +#: kompare_shell.cpp:278 +msgid "" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr "" +"%1 od %n razlik, %2 uveljavljenih\n" +"%1 od %n razlike, %2 uveljavljenih\n" +"%1 od %n razlik, %2 uveljavljenih\n" +"%1 od %n razlik, %2 uveljavljenih" -#: komparepart/kompare_part.cpp:673 +#: kompare_shell.cpp:281 +#, c-format 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" +"_n: %n difference \n" +" %n differences " msgstr "" -"Statistika:\n" -"\n" -"Stara datoteka: %1\n" -"Nova datoteka: %2\n" -"\n" -"Oblika: %3\n" -"Število kosov: %4\n" -"Število razlik: %5" +" %n razlik \n" +" %n razlika \n" +" %n razliki \n" +" %n razlike " -#: komparepart/kompare_part.cpp:686 +#: kompare_shell.cpp:369 +msgid "Blend File/Folder with diff Output" +msgstr "Zmešaj datoteko ali mapo z izpisom diff" + +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "Datoteka/Mapa" + +#: kompare_shell.cpp:371 +msgid "Diff Output" +msgstr "Izhod diff" + +#: kompare_shell.cpp:373 +msgid "Blend" +msgstr "Zmešaj" + +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" +msgstr "Zmešaj to datoteko ali mapo z izpisom diff" + +#: kompare_shell.cpp:373 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" -"Število datotek v datoteki diff: %1\n" -"Oblika: %2\n" -"\n" -"Trenutna stara datoteka: %3\n" -"Trenutna nova datoteka: %4\n" -"\n" -"Število kosov: %5\n" -"Število razlik: %6" +"Če ste vnesli ime datoteke ali mape in ime datoteke, ki vsebuje izhod diff-a, " +"bo ta gumb omogočen in po kliku nanj bo Kompare prikazal združen izhod vnesene " +"datoteke ali datotek iz map in izhoda diff-a. Na ta način lahko uveljavite " +"spremembe za želene datoteke." -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "Kodiranje" +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Primerjaj te datoteke ali mape" -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "&Datoteke" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Besedilni prikaz" -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "Barve" +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "Izvorna mapa" -#: libdialogpages/viewpage.cpp:56 -msgid "Removed color:" -msgstr "Barva odstranjenega:" +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "Ciljna mapa" -#: libdialogpages/viewpage.cpp:61 -msgid "Changed color:" -msgstr "Barva spremenjenega:" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "Izvorna datoteka" -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" -msgstr "Barva dodanega:" +#: komparenavtreepart/komparenavtreepart.cpp:72 +msgid "Destination File" +msgstr "Ciljna datoteka" -#: libdialogpages/viewpage.cpp:71 -msgid "Applied color:" -msgstr "Barva uveljavljenega:" +#: komparenavtreepart/komparenavtreepart.cpp:78 +msgid "Source Line" +msgstr "Izvorna vrstica" -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "Miškin kolešček" +#: komparenavtreepart/komparenavtreepart.cpp:79 +msgid "Destination Line" +msgstr "Ciljna vrstica" -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Število vrstic:" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Razlika" -#: libdialogpages/viewpage.cpp:86 -msgid "Tabs to Spaces" -msgstr "Tabulatorji v presledke" +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr "" +"Uveljavljeno: spremembe narejene v %n vrsticah so razveljavljene\n" +"Uveljavljeno: spremembe narejene v %n vrstici so razveljavljene\n" +"Uveljavljeno: spremembe narejene v %n vrsticah so razveljavljene\n" +"Uveljavljeno: spremembe narejene v %n vrsticah so razveljavljene" -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" -msgstr "Število presledkov, v katere naj se pretvori tabulator:" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" +"Spremenjenih %n vrstic\n" +"Spremenjena %n vrstica\n" +"Spremenjeni %n vrstici\n" +"Spremenjene %n vrstice" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "&Videz" +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "" +"Uveljavljeno: razveljavljena je vstavitev %n vrstic\n" +"Uveljavljeno: razveljavljena je vstavitev %n vrstice\n" +"Uveljavljeno: razveljavljena je vstavitev %n vrstic\n" +"Uveljavljeno: razveljavljena je vstavitev %n vrstic" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" -msgstr "Pisava besedila" +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "" +"Vstavljenih %n vrstic\n" +"Vstavljena %n vrstica\n" +"Vstavljeni %n vrstici\n" +"Vstavljene %n vrstice" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "Pisava:" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr "" +"Uveljavljeno: razveljavljena je izbris %n vrstic\n" +"Uveljavljeno: razveljavljena je izbris %n vrstice\n" +"Uveljavljeno: razveljavljena je izbris %n vrstic\n" +"Uveljavljeno: razveljavljena je izbris %n vrstic" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "Velikost:" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" +"Izbrisane %n vrstic\n" +"Izbrisana %n vrstica\n" +"Izbrisani %n vrstici\n" +"Izbrisane %n vrstice" + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Neznan" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Tukaj lahko vnesete datoteke ki jih želite primerjati." + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Diff" + +#: kompareurldialog.cpp:47 +msgid "Here you can change the options for comparing the files." +msgstr "Tukaj lahko spremenite možnosti za primerjavo datotek." + +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." +msgstr "Tu lahko spremenite možnosti pogleda." #: libdialogpages/diffpage.cpp:211 msgid "Diff Program" @@ -956,79 +807,228 @@ msgstr "" msgid "&Exclude" msgstr "Iz&ključi" -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "Kodiranje" + +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "&Datoteke" + +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Barve" + +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" +msgstr "Barva odstranjenega:" + +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" +msgstr "Barva spremenjenega:" + +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "Barva dodanega:" + +#: libdialogpages/viewpage.cpp:71 +msgid "Applied color:" +msgstr "Barva uveljavljenega:" + +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "Miškin kolešček" + +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Število vrstic:" + +#: libdialogpages/viewpage.cpp:86 +msgid "Tabs to Spaces" +msgstr "Tabulatorji v presledke" + +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" +msgstr "Število presledkov, v katere naj se pretvori tabulator:" + +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "&Videz" + +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" +msgstr "Pisava besedila" + +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "Pisava:" + +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +msgstr "Velikost:" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Lastnosti" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Nastavitve prikaza" + +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Nastavitve Diff" + +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Shrani &vse" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Shrani .&diff ..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Zamenjaj vir s ciljem" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Prikaži statistiko" + +#: komparepart/kompare_part.cpp:269 +msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +msgstr "<qt>URL <b>%1</b> ne more biti naložen.</qt>" + +#: komparepart/kompare_part.cpp:281 +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +msgstr "<qt>URL <b>%1</b> ne obstaja na tem sistemu.</qt>" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Možnosti diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Datoteke vrste Patch" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Shrani .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" msgstr "" -"Program za ogled razlik med datotekama in možno ustvarjanje datoteke sprememb " -"(diff)" +"Datoteka obstaja ali pa je zaščitena pred pisanjem; jo želite nadomestiti?" -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "To bo primerjalo URL1 z URL2" +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Datoteka obstaja" -#: main.cpp:40 +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Nadomesti" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ne nadomesti" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Poganjanje diff ...." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Razčlenjevanje izhoda diff ..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Primerjanje datoteke %1 z datoteko %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Primerjanje datotek v %1 z datotekami v %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Prikazovanje izhoda diff iz %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Mešanje izpisa diff iz %1 v datoteko %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Mešanje izpisa diff iz %1 v mapo %2" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 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." +"You have made changes to the destination file(s).\n" +"Would you like to save them?" msgstr "" -"To bo odprlo URL1, za katerega se pričakuje, da je izhod diff-a. URL1 je lahko " -"tudi »-«, kar pomeni branje iz standardnega vhoda. Lahko se uporabi tako: cvs " -"diff | kompare -o -. Kompare bo poskušal najti originalne datoteke in združiti " -"originale z izhodom diff-a ter prikazati to v pregledovalniku. Možnost -n " -"onemogoči iskanje originalov." +"Spremenili ste ciljne datoteke.\n" +"Bi jih radi shranili?" -#: main.cpp:41 +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Shranim spremembe?" + +#: komparepart/kompare_part.cpp:667 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. " +"No diff file, or no 2 files have been diffed. Therefore no stats are available." msgstr "" -"To bo zmešalo URL2 v URL1. Pričakuje se, da je URL2 izpis diff in URL1 datoteka " -"ali mapa, v katero se zmeša izpis diff." +"Ni datoteke diff ali pa nista bili primerjani dve datoteki. Statistika zaradi " +"tegani na voljo." -#: main.cpp:42 +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statistika diff" + +#: komparepart/kompare_part.cpp:673 msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +"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 "" -"Onemogoči preverjanje samodejnega iskanja prvotne datoteke, ko se uporablja »-« " -"kot URL z možnostjo -o." +"Statistika:\n" +"\n" +"Stara datoteka: %1\n" +"Nova datoteka: %2\n" +"\n" +"Oblika: %3\n" +"Število kosov: %4\n" +"Število razlik: %5" -#: main.cpp:43 +#: komparepart/kompare_part.cpp:686 msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." +"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 "" -"Uporabite to za določitev kodiranja ko ga kličete iz ukazne vrstice. Če ni " -"določeno, bo privzeto uporabljeno krajevno kodiranje." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh in Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Avtor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Umetnik, ki je ustvaril ikone za Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Mnogo dobrih nasvetov" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Pregledovalnik diff za Cervisio" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Primerjaj ti datoteki ali mapi" +"Statistika:\n" +"\n" +"Število datotek v datoteki diff: %1\n" +"Oblika: %2\n" +"\n" +"Trenutna stara datoteka: %3\n" +"Trenutna nova datoteka: %4\n" +"\n" +"Število kosov: %5\n" +"Število razlik: %6" |