diff options
Diffstat (limited to 'tde-i18n-sl/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-sl/messages/tdesdk/kompare.po | 995 |
1 files changed, 512 insertions, 483 deletions
diff --git a/tde-i18n-sl/messages/tdesdk/kompare.po b/tde-i18n-sl/messages/tdesdk/kompare.po index 3ff3218f8d1..72ba62a4e8b 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 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\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,335 +23,13 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " "n%100==4 ? 2 : 3);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Uveljavi razliko" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "R&azveljavi razlike" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Uve&ljavi vse" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Razveljavi vse" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "P&rejšnja datoteka" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "N&aslednja datoteka" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Prejšnja razlika" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Naslednja razlika" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"<qt>No models or no differences, this file: <b>%1</b>" -", is not a valid diff file.</qt>" -msgstr "" -"<qt>Ni modelov ali ni razlik. Ta datoteka, <b>%1</b>" -", ni veljavna datoteka diff.</qt>" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" -msgstr "" -"<qt>Prišlo je do težav pri uveljavljanju diff <b>%1</b> v datoteko <b>%2</b>" -".</qt>" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>" -".</qt>" -msgstr "" -"<qt>Prišlo je do težav pri uveljavljanju diff <b>%1</b> v mapo <b>%2</b>.</qt>" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Ni bilo moč odpreti začasne datoteke." - -#: libdiff2/komparemodellist.cpp:350 -msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -msgstr "" -"<qt>Ni bilo moč pisati v začasno datoteko <b>%1</b>, zato se briše.</qt>" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"<qt>Could not create destination directory <b>%1</b>.\n" -"The file has not been saved.</qt>" -msgstr "" -"<qt>Ni bilo moč ustvariti ciljnega imenika <b>%1</b>.\n" -"Datoteka ni bila shranjena.</qt>" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"<qt>Could not upload the temporary file to the destination location <b>%1</b>" -". The temporary file is still available under: <b>%2</b>" -". You can manually copy it to the right place.</qt>" -msgstr "" -"<qt>Ni moč prenesti začasne datoteke na ciljno lokacijo <b>%1</b>" -". Začasna datoteka je še vedno na voljo v: <b>%2</b>" -". Lahko jo ročno skopirate na pravo mesto.</qt>" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Ni bilo moč razčleniti izhoda diffa." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Datoteki sta enaki." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Ni bilo moč pisati v začasno datoteko." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Razlika" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Poženi diff v" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Ukazna vrstica" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd imenik && diff -udHprNa -- vir cilj" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Išči manjše spremembe" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Prilagodi za velike datoteke" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Prezri spremembe med velikimi/malimi črkami" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Razširi tabulatorje v presledke" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Prezri dodane ali odstranjene prazne vrstice" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Prezri spremembe v praznem prostoru" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Prikaži imena funkcij" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Primerjaj mape rekurzivno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Obravnavaj nove datoteke kot prazne" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Oblika" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 244 -#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63 -#, no-c-format -msgid "Context" -msgstr "Kontekst" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, no-c-format -msgid "Ed" -msgstr "Ed" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 260 -#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69 -#, no-c-format -msgid "Normal" -msgstr "Običajno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 -#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 -#, no-c-format -msgid "RCS" -msgstr "RCS" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 -#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 -#, no-c-format -msgid "Unified" -msgstr "Enotno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Drug poleg drugega" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Število vrstic konteksta:" - -#: 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)" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "To bo primerjalo URL1 z URL2" - -#: 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." - -#: 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." - -#: 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." - -#: 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." - -#: 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" - -#: 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 "" -"Č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." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Gregor Rakar,Andrej Vernekar,Jure Repinc" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -465,21 +143,47 @@ 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. " +"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." +"Č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" @@ -587,19 +291,231 @@ msgstr "Neznan" 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/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 "" +"Datoteka obstaja ali pa je zaščitena pred pisanjem; jo želite nadomestiti?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Datoteka obstaja" + +#: 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 "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +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?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Enotno" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekst" + +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, no-c-format +msgid "RCS" +msgstr "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Običajno" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Ni datoteke diff ali pa nista bili primerjani dve datoteki. Statistika " +"zaradi tegani na voljo." + +#: 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 "" +"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" +"Stara datoteka: %1\n" +"Nova datoteka: %2\n" +"\n" +"Oblika: %3\n" +"Število kosov: %4\n" +"Število razlik: %5" + +#: komparepart/kompare_part.cpp:686 +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" +"Š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" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Lastnosti" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Besedilni prikaz" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Nastavitve prikaza" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Nastavitve Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Datoteke" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Tukaj lahko vnesete datoteke ki jih želite primerjati." + #: 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 +#, fuzzy +msgid "Appearance" +msgstr "&Videz" + +#: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Tu lahko spremenite možnosti pogleda." @@ -613,8 +529,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Tu lahko izberete drug diff program. Na Solarisu običajen diff ne podpira vseh " -"možnosti, ki jih podpira različica GNU. Na to način lahko izberete to " +"Tu lahko izberete drug diff program. Na Solarisu običajen diff ne podpira " +"vseh možnosti, ki jih podpira različica GNU. Na to način lahko izberete to " "različico." #: libdialogpages/diffpage.cpp:221 @@ -627,9 +543,9 @@ msgstr "Vrsta izhoda" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Izberite obliko, ki ga bo ustvaril diff. »Enotna« je oblika, ki se uporablja " "najpogosteje ker je dobro berljiva. Razvijalci TDE imajo najraje prav to " @@ -639,6 +555,11 @@ msgstr "" msgid "Lines of Context" msgstr "Vrstice konteksta" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Število vrstic konteksta:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -646,7 +567,8 @@ msgid "" "unnecessarily." msgstr "" "Število kontekstnih vrstic je običajno 2 ali 3. Tako je diff berljiv in " -"uporaben v večini primerov. Več kot 3 vrstice bodo diff brez potrebe napihnile." +"uporaben v večini primerov. Več kot 3 vrstice bodo diff brez potrebe " +"napihnile." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -762,16 +684,16 @@ msgstr "Vzorec datotek, ki naj se izključi" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Če je označena ta možnost, lahko vnesete vzorec za ukazno lupino v besedilno " "polje na desni ali pa izberete vnose s seznama." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Tu lahko vnesete ali odstranite lupinski vzorec ali izberete enega ali več " "vnosov s seznama." @@ -789,16 +711,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Tu lahko vnesete URL ali datoteko z lupinskimi vzorci, ki jih prezreze med " "primerjanjem map." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Katerokoli datoteko, ki jo izberete v oknu, ki se pojavi ob kliku nanj, bo " "postavljena v okno na levi strani tega gumba." @@ -867,168 +789,275 @@ msgstr "Pisava:" 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" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Pisava:" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Shrani .&diff ..." +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Uveljavi razliko" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Zamenjaj vir s ciljem" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "R&azveljavi razlike" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Prikaži statistiko" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Uve&ljavi vse" -#: 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>" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Razveljavi vse" -#: 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>" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "P&rejšnja datoteka" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Možnosti diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "N&aslednja datoteka" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Datoteke vrste Patch" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Prejšnja razlika" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Shrani .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Naslednja razlika" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " +"file.</qt>" msgstr "" -"Datoteka obstaja ali pa je zaščitena pred pisanjem; jo želite nadomestiti?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Datoteka obstaja" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Nadomesti" +"<qt>Ni modelov ali ni razlik. Ta datoteka, <b>%1</b>, ni veljavna datoteka " +"diff.</qt>" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ne nadomesti" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" +"qt>" +msgstr "" +"<qt>Prišlo je do težav pri uveljavljanju diff <b>%1</b> v datoteko <b>%2</b>." +"</qt>" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." +"</qt>" +msgstr "" +"<qt>Prišlo je do težav pri uveljavljanju diff <b>%1</b> v mapo <b>%2</b>.</" +"qt>" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Poganjanje diff ...." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Ni bilo moč odpreti začasne datoteke." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Razčlenjevanje izhoda diff ..." +#: libdiff2/komparemodellist.cpp:350 +msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" +msgstr "" +"<qt>Ni bilo moč pisati v začasno datoteko <b>%1</b>, zato se briše.</qt>" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Primerjanje datoteke %1 z datoteko %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"<qt>Could not create destination directory <b>%1</b>.\n" +"The file has not been saved.</qt>" +msgstr "" +"<qt>Ni bilo moč ustvariti ciljnega imenika <b>%1</b>.\n" +"Datoteka ni bila shranjena.</qt>" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Primerjanje datotek v %1 z datotekami v %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"<qt>Could not upload the temporary file to the destination location <b>%1</" +"b>. The temporary file is still available under: <b>%2</b>. You can manually " +"copy it to the right place.</qt>" +msgstr "" +"<qt>Ni moč prenesti začasne datoteke na ciljno lokacijo <b>%1</b>. Začasna " +"datoteka je še vedno na voljo v: <b>%2</b>. Lahko jo ročno skopirate na " +"pravo mesto.</qt>" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Prikazovanje izhoda diff iz %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Ni bilo moč razčleniti izhoda diffa." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Mešanje izpisa diff iz %1 v datoteko %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Datoteki sta enaki." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Mešanje izpisa diff iz %1 v mapo %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Ni bilo moč pisati v začasno datoteko." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Spremenili ste ciljne datoteke.\n" -"Bi jih radi shranili?" +"Program za ogled razlik med datotekama in možno ustvarjanje datoteke " +"sprememb (diff)" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Shranim spremembe?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "To bo primerjalo URL1 z URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Ni datoteke diff ali pa nista bili primerjani dve datoteki. Statistika zaradi " -"tegani na voljo." +"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:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistika diff" +#: 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:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistika:\n" -"\n" -"Stara datoteka: %1\n" -"Nova datoteka: %2\n" -"\n" -"Oblika: %3\n" -"Število kosov: %4\n" -"Število razlik: %5" +"Onemogoči preverjanje samodejnega iskanja prvotne datoteke, ko se uporablja " +"»-« kot URL z možnostjo -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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." + +#: 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" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Datoteke" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Razlika" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Nastavitve prikaza" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Poženi diff v" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Ukazna vrstica" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd imenik && diff -udHprNa -- vir cilj" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Možnosti" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Išči manjše spremembe" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Prilagodi za velike datoteke" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Prezri spremembe med velikimi/malimi črkami" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Razširi tabulatorje v presledke" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Prezri dodane ali odstranjene prazne vrstice" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Prezri spremembe v praznem prostoru" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Prikaži imena funkcij" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Primerjaj mape rekurzivno" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Obravnavaj nove datoteke kot prazne" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Oblika" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Drug poleg drugega" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" 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" |